From dc833bb3d6244d54400fa930115cadfb7a670262 Mon Sep 17 00:00:00 2001 From: Stepan Kadlec Date: Sat, 19 Aug 2017 23:18:04 +0200 Subject: [PATCH 1/4] adding maven-dependency-plugin and fixing all reported dependency errors --- java/format/pom.xml | 2 - java/memory/pom.xml | 19 ++++++--- java/pom.xml | 93 ++++++++++++++++++++++++++++++++++++--------- java/tools/pom.xml | 22 +++++++---- java/vector/pom.xml | 35 +++++++++++++---- 5 files changed, 130 insertions(+), 41 deletions(-) diff --git a/java/format/pom.xml b/java/format/pom.xml index 0e43d5e946c..ecf46132573 100644 --- a/java/format/pom.xml +++ b/java/format/pom.xml @@ -23,7 +23,6 @@ Arrow Format - 1.2.0-3f79e055 false ${project.build.directory}/flatc-${os.detected.classifier}-${fbs.version}.exe ${project.build.directory}/generated-sources/flatc @@ -36,7 +35,6 @@ com.vlkan flatbuffers - ${fbs.version} diff --git a/java/memory/pom.xml b/java/memory/pom.xml index 765013bee1f..32b74478220 100644 --- a/java/memory/pom.xml +++ b/java/memory/pom.xml @@ -23,13 +23,22 @@ com.google.code.findbugs jsr305 - 3.0.2 - - com.carrotsearch - hppc - 0.7.2 + com.google.guava + guava + + + io.netty + netty-buffer + + + io.netty + netty-common + + + org.slf4j + slf4j-api diff --git a/java/pom.xml b/java/pom.xml index cfcfcd448f0..30a51ece817 100644 --- a/java/pom.xml +++ b/java/pom.xml @@ -32,8 +32,10 @@ 4.11 1.7.25 18.0 + 4.0.49.Final + 1.2.0-3f79e055 2 - 2.7.9 + 2.7.9 2.7.1 false @@ -315,6 +317,22 @@ + + org.apache.maven.plugins + maven-dependency-plugin + 3.0.1 + + + + analyze-only + + + true + true + + + + @@ -449,26 +467,63 @@ - - - io.netty - netty-handler - 4.0.49.Final - - - - com.google.guava - guava - ${dep.guava.version} - - - - org.slf4j - slf4j-api - ${dep.slf4j.version} - + + + + com.vlkan + flatbuffers + ${fbs.version} + + + com.google.guava + guava + ${dep.guava.version} + + + io.netty + netty-handler + ${dep.netty.version} + + + io.netty + netty-buffer + ${dep.netty.version} + + + io.netty + netty-common + ${dep.netty.version} + + + com.fasterxml.jackson.core + jackson-core + ${dep.jackson.version} + + + com.fasterxml.jackson.core + jackson-annotations + ${dep.jackson.version} + + + com.fasterxml.jackson.core + jackson-databind + ${dep.jackson.version} + + + com.google.code.findbugs + jsr305 + 3.0.2 + + + org.slf4j + slf4j-api + ${dep.slf4j.version} + + + + org.slf4j diff --git a/java/tools/pom.xml b/java/tools/pom.xml index e2e3f8129c7..ba6a7bcb820 100644 --- a/java/tools/pom.xml +++ b/java/tools/pom.xml @@ -20,11 +20,6 @@ Arrow Tools - - org.apache.arrow - arrow-format - ${project.version} - org.apache.arrow arrow-memory @@ -36,9 +31,8 @@ ${project.version} - org.apache.commons - commons-lang3 - 3.6 + com.google.guava + guava commons-cli @@ -51,6 +45,18 @@ 1.2.3 run + + com.fasterxml.jackson.core + jackson-core + + + com.fasterxml.jackson.core + jackson-databind + + + org.slf4j + slf4j-api + diff --git a/java/vector/pom.xml b/java/vector/pom.xml index a89742ec142..bf33823fef5 100644 --- a/java/vector/pom.xml +++ b/java/vector/pom.xml @@ -36,31 +36,52 @@ joda-time 2.9.9 + + com.fasterxml.jackson.core + jackson-core + com.fasterxml.jackson.core jackson-annotations - ${jackson.version} com.fasterxml.jackson.core jackson-databind - ${jackson.version} com.carrotsearch hppc 0.7.2 - - org.apache.commons - commons-lang3 - 3.6 - commons-codec commons-codec 1.10 + + com.google.guava + guava + + + io.netty + netty-buffer + + + io.netty + netty-common + + + com.vlkan + flatbuffers + + + com.google.code.findbugs + jsr305 + + + org.slf4j + slf4j-api + From 8cbfe5f436517ba7efb4fc3efb9d84611ac9cff2 Mon Sep 17 00:00:00 2001 From: Antony Mayi Date: Mon, 21 Aug 2017 01:31:32 +0200 Subject: [PATCH 2/4] maven-dependency-plugin: ignoring dependencies of generated sources in arrow-vector --- java/format/pom.xml | 3 -- java/memory/pom.xml | 6 +++ java/pom.xml | 95 ++++++++++++++++++++++----------------------- java/tools/pom.xml | 4 ++ java/vector/pom.xml | 19 +++++++++ 5 files changed, 76 insertions(+), 51 deletions(-) diff --git a/java/format/pom.xml b/java/format/pom.xml index ecf46132573..3f8820a0faa 100644 --- a/java/format/pom.xml +++ b/java/format/pom.xml @@ -26,8 +26,6 @@ false ${project.build.directory}/flatc-${os.detected.classifier}-${fbs.version}.exe ${project.build.directory}/generated-sources/flatc - 3.3 - 2.10 1.5.0.Final @@ -52,7 +50,6 @@ org.apache.maven.plugins maven-dependency-plugin - ${maven-dependency-plugin.version} copy-flatc diff --git a/java/memory/pom.xml b/java/memory/pom.xml index 32b74478220..00b37c2f652 100644 --- a/java/memory/pom.xml +++ b/java/memory/pom.xml @@ -44,6 +44,12 @@ + + + org.apache.maven.plugins + maven-dependency-plugin + + diff --git a/java/pom.xml b/java/pom.xml index 30a51ece817..9df6deef088 100644 --- a/java/pom.xml +++ b/java/pom.xml @@ -273,56 +273,60 @@ - - org.apache.maven.plugins - maven-checkstyle-plugin - 2.17 - - - com.puppycrawl.tools - checkstyle - 6.19 - - - com.google.guava - guava - ${dep.guava.version} - - - org.slf4j - jcl-over-slf4j - 1.7.5 - - - - - validate - validate - - check - - - - - google_checks.xml - UTF-8 - true - ${checkstyle.failOnViolation} - ${checkstyle.failOnViolation} - warning - xml - html - ${project.build.directory}/test/checkstyle-errors.xml - false - - + + org.apache.maven.plugins + maven-checkstyle-plugin + 2.17 + + + com.puppycrawl.tools + checkstyle + 6.19 + + + com.google.guava + guava + ${dep.guava.version} + + + org.slf4j + jcl-over-slf4j + 1.7.5 + + + + + validate + validate + + check + + + + + google_checks.xml + UTF-8 + true + ${checkstyle.failOnViolation} + ${checkstyle.failOnViolation} + warning + xml + html + ${project.build.directory}/test/checkstyle-errors.xml + false + + + + + org.apache.maven.plugins maven-dependency-plugin 3.0.1 + analyze analyze-only @@ -333,11 +337,6 @@ - - - - - org.apache.rat apache-rat-plugin diff --git a/java/tools/pom.xml b/java/tools/pom.xml index ba6a7bcb820..f336b60395b 100644 --- a/java/tools/pom.xml +++ b/java/tools/pom.xml @@ -79,6 +79,10 @@ + + org.apache.maven.plugins + maven-dependency-plugin + diff --git a/java/vector/pom.xml b/java/vector/pom.xml index bf33823fef5..afc2304a230 100644 --- a/java/vector/pom.xml +++ b/java/vector/pom.xml @@ -53,6 +53,11 @@ hppc 0.7.2 + + org.apache.commons + commons-lang3 + 3.6 + commons-codec commons-codec @@ -150,6 +155,20 @@ + + org.apache.maven.plugins + maven-dependency-plugin + + + analyze + + + org.apache.commons:commons-lang3 + + + + + From ec7271756afa879a6c48ed7422226194275d52f4 Mon Sep 17 00:00:00 2001 From: Antony Mayi Date: Mon, 21 Aug 2017 23:16:04 +0200 Subject: [PATCH 3/4] removing unused apache.commons.lang3, fixing pom --- java/pom.xml | 4 ++-- java/tools/pom.xml | 2 +- java/vector/pom.xml | 15 --------------- .../src/main/codegen/includes/vv_imports.ftl | 2 -- 4 files changed, 3 insertions(+), 20 deletions(-) diff --git a/java/pom.xml b/java/pom.xml index 9df6deef088..1ab48f29f46 100644 --- a/java/pom.xml +++ b/java/pom.xml @@ -33,10 +33,10 @@ 1.7.25 18.0 4.0.49.Final + 2.7.9 + 2.7.1 1.2.0-3f79e055 2 - 2.7.9 - 2.7.1 false diff --git a/java/tools/pom.xml b/java/tools/pom.xml index f336b60395b..1c40f88f315 100644 --- a/java/tools/pom.xml +++ b/java/tools/pom.xml @@ -43,7 +43,7 @@ ch.qos.logback logback-classic 1.2.3 - run + runtime com.fasterxml.jackson.core diff --git a/java/vector/pom.xml b/java/vector/pom.xml index afc2304a230..586df4b1e8b 100644 --- a/java/vector/pom.xml +++ b/java/vector/pom.xml @@ -53,11 +53,6 @@ hppc 0.7.2 - - org.apache.commons - commons-lang3 - 3.6 - commons-codec commons-codec @@ -158,16 +153,6 @@ org.apache.maven.plugins maven-dependency-plugin - - - analyze - - - org.apache.commons:commons-lang3 - - - - diff --git a/java/vector/src/main/codegen/includes/vv_imports.ftl b/java/vector/src/main/codegen/includes/vv_imports.ftl index e723e7d7ea3..a55304d7335 100644 --- a/java/vector/src/main/codegen/includes/vv_imports.ftl +++ b/java/vector/src/main/codegen/includes/vv_imports.ftl @@ -22,8 +22,6 @@ import com.google.flatbuffers.FlatBufferBuilder; import com.google.common.base.Preconditions; import io.netty.buffer.*; -import org.apache.commons.lang3.ArrayUtils; - import org.apache.arrow.memory.*; import org.apache.arrow.vector.types.Types; import org.apache.arrow.vector.types.Types.*; From d7f081ea963b5a11998d9c052f272e4d39002532 Mon Sep 17 00:00:00 2001 From: Antony Mayi Date: Tue, 22 Aug 2017 22:57:45 +0200 Subject: [PATCH 4/4] moving `copy-flatc` to initialize phase and `analyze` execution to parent pom --- java/format/pom.xml | 2 +- java/memory/pom.xml | 9 --------- java/pom.xml | 29 +++++++++++++++++------------ java/tools/pom.xml | 4 ---- java/vector/pom.xml | 4 ---- 5 files changed, 18 insertions(+), 30 deletions(-) diff --git a/java/format/pom.xml b/java/format/pom.xml index 3f8820a0faa..647b716039e 100644 --- a/java/format/pom.xml +++ b/java/format/pom.xml @@ -53,7 +53,7 @@ copy-flatc - generate-sources + initialize copy diff --git a/java/memory/pom.xml b/java/memory/pom.xml index 00b37c2f652..1c4eef71fc0 100644 --- a/java/memory/pom.xml +++ b/java/memory/pom.xml @@ -42,16 +42,7 @@ - - - - org.apache.maven.plugins - maven-dependency-plugin - - - - diff --git a/java/pom.xml b/java/pom.xml index 1ab48f29f46..c4c301d1a41 100644 --- a/java/pom.xml +++ b/java/pom.xml @@ -316,6 +316,23 @@ false + + org.apache.maven.plugins + maven-dependency-plugin + + + analyze + verify + + analyze-only + + + true + true + + + + @@ -324,18 +341,6 @@ org.apache.maven.plugins maven-dependency-plugin 3.0.1 - - - analyze - - analyze-only - - - true - true - - - org.apache.rat diff --git a/java/tools/pom.xml b/java/tools/pom.xml index 1c40f88f315..48b507afdd1 100644 --- a/java/tools/pom.xml +++ b/java/tools/pom.xml @@ -79,10 +79,6 @@ - - org.apache.maven.plugins - maven-dependency-plugin - diff --git a/java/vector/pom.xml b/java/vector/pom.xml index 586df4b1e8b..bf33823fef5 100644 --- a/java/vector/pom.xml +++ b/java/vector/pom.xml @@ -150,10 +150,6 @@ - - org.apache.maven.plugins - maven-dependency-plugin -