diff --git a/java/format/pom.xml b/java/format/pom.xml index 0e43d5e946c..647b716039e 100644 --- a/java/format/pom.xml +++ b/java/format/pom.xml @@ -23,12 +23,9 @@ Arrow Format - 1.2.0-3f79e055 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 @@ -36,7 +33,6 @@ com.vlkan flatbuffers - ${fbs.version} @@ -54,11 +50,10 @@ org.apache.maven.plugins maven-dependency-plugin - ${maven-dependency-plugin.version} copy-flatc - generate-sources + initialize copy diff --git a/java/memory/pom.xml b/java/memory/pom.xml index 765013bee1f..1c4eef71fc0 100644 --- a/java/memory/pom.xml +++ b/java/memory/pom.xml @@ -23,20 +23,26 @@ 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..c4c301d1a41 100644 --- a/java/pom.xml +++ b/java/pom.xml @@ -32,9 +32,11 @@ 4.11 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 @@ -271,55 +273,75 @@ - - 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 + + + analyze + verify + + analyze-only + + + true + true + + + + - + + + org.apache.maven.plugins + maven-dependency-plugin + 3.0.1 + org.apache.rat apache-rat-plugin @@ -449,26 +471,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..48b507afdd1 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 @@ -49,7 +43,19 @@ ch.qos.logback logback-classic 1.2.3 - run + runtime + + + 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 + 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.*;