From 465f38b496b64e76f725931397668f9b2dfdbda2 Mon Sep 17 00:00:00 2001 From: Laurent Goujon Date: Fri, 12 Apr 2024 10:50:26 -0700 Subject: [PATCH 1/3] GH-41173: [Java] Add spotless configuration for Maven pom.xml files To make sure that all pom.xml files follow the same convention regarding indentation and organization, add spotless plugin with sortPom module to check and format the files automatically. Update Java developer documentation to provide the link to the convention and instructions on how to use spotless *Note* this change does not include changes to pom.xml files (and would fail the build. Changes to pom.xml files are in the next commit. --- docs/source/developers/java/development.rst | 17 +- java/bom/pom.xml | 27 ++++ .../module-info-compiler-maven-plugin/pom.xml | 9 +- java/maven/pom.xml | 153 ++++++++++-------- java/pom.xml | 22 +++ 5 files changed, 156 insertions(+), 72 deletions(-) diff --git a/docs/source/developers/java/development.rst b/docs/source/developers/java/development.rst index 261cd5702ae07..17d47c324ce12 100644 --- a/docs/source/developers/java/development.rst +++ b/docs/source/developers/java/development.rst @@ -110,7 +110,7 @@ integration tests, you would do: Code Style ========== -Code style is enforced with Checkstyle. The configuration is located at `checkstyle`_. +Java code style is enforced with Checkstyle. The configuration is located at `checkstyle`_. You can also just check the style without building the project. This checks the code style of all source code under the current directory or from within an individual module. @@ -118,7 +118,22 @@ This checks the code style of all source code under the current directory or fro $ mvn checkstyle:check +Maven `pom.xml` style is enforced with Spotless using `Apache Maven pom.xml guidelines`_ +You can also just check the style without building the project. +This checks the style of all pom.xml files under the current directory or from within an individual module. + +.. code-block:: + + $ mvn spotless:check + +This applies the style to all pom.xml files under the current directory or from within an individual module. + +.. code-block:: + + $ mvn spotless:apply + .. _benchmark: https://github.com/ursacomputing/benchmarks .. _archery: https://github.com/apache/arrow/blob/main/dev/conbench_envs/README.md#L188 .. _conbench: https://github.com/conbench/conbench .. _checkstyle: https://github.com/apache/arrow/blob/main/java/dev/checkstyle/checkstyle.xml +.. _Apache Maven pom.xml guidelines: https://maven.apache.org/developers/conventions/code.html#pom-code-convention diff --git a/java/bom/pom.xml b/java/bom/pom.xml index 2406886222dcb..427d8d7c5d0b1 100644 --- a/java/bom/pom.xml +++ b/java/bom/pom.xml @@ -153,7 +153,34 @@ maven-site-plugin 3.12.1 + + com.diffplug.spotless + spotless-maven-plugin + + + + + + + + spotless-check + + check + + + + + + + + + com.diffplug.spotless + spotless-maven-plugin + 2.43.0 + + + diff --git a/java/maven/module-info-compiler-maven-plugin/pom.xml b/java/maven/module-info-compiler-maven-plugin/pom.xml index c276e807e9855..573ab8318fc47 100644 --- a/java/maven/module-info-compiler-maven-plugin/pom.xml +++ b/java/maven/module-info-compiler-maven-plugin/pom.xml @@ -9,9 +9,7 @@ License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. --> - + 4.0.0 org.apache.arrow.maven.plugins @@ -72,7 +70,8 @@ - + + maven-clean-plugin @@ -112,7 +111,7 @@ - + diff --git a/java/maven/pom.xml b/java/maven/pom.xml index 0491b859d8580..15d0875b07ddb 100644 --- a/java/maven/pom.xml +++ b/java/maven/pom.xml @@ -1,4 +1,4 @@ - + - 4.0.0 diff --git a/java/adapter/jdbc/pom.xml b/java/adapter/jdbc/pom.xml index b6c450ecd32b2..55ad48e96d1ee 100644 --- a/java/adapter/jdbc/pom.xml +++ b/java/adapter/jdbc/pom.xml @@ -9,108 +9,107 @@ License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. --> - - 4.0.0 - - - org.apache.arrow - arrow-java-root - 16.0.0-SNAPSHOT - ../../pom.xml - - - arrow-jdbc - Arrow JDBC Adapter - (Contrib/Experimental)A library for converting JDBC data to Arrow data. - http://maven.apache.org - - - - - - org.apache.arrow - arrow-memory-core - - - - - org.apache.arrow - arrow-memory-netty - runtime - - - - - org.apache.arrow - arrow-vector - ${arrow.vector.classifier} - - - - org.immutables - value - - - - - com.h2database - h2 - 2.2.224 - test - - - - com.fasterxml.jackson.dataformat - jackson-dataformat-yaml - test - - - - com.fasterxml.jackson.core - jackson-databind - - - - com.fasterxml.jackson.core - jackson-core - - - - com.fasterxml.jackson.core - jackson-annotations - test - - - - org.assertj - assertj-core - test - - - - - - - jdk11+ - - [11,] - - !m2e.version - - - - - - org.apache.maven.plugins - maven-surefire-plugin - - --add-reads=org.apache.arrow.adapter.jdbc=com.fasterxml.jackson.dataformat.yaml --add-opens=java.base/java.nio=org.apache.arrow.memory.core,ALL-UNNAMED -Duser.timezone=UTC - - - - - - + 4.0.0 + + + org.apache.arrow + arrow-java-root + 16.0.0-SNAPSHOT + ../../pom.xml + + + arrow-jdbc + Arrow JDBC Adapter + (Contrib/Experimental)A library for converting JDBC data to Arrow data. + http://maven.apache.org + + + + + + org.apache.arrow + arrow-memory-core + + + + + org.apache.arrow + arrow-memory-netty + runtime + + + + + org.apache.arrow + arrow-vector + ${arrow.vector.classifier} + + + + org.immutables + value + + + + + com.h2database + h2 + 2.2.224 + test + + + + com.fasterxml.jackson.dataformat + jackson-dataformat-yaml + test + + + + com.fasterxml.jackson.core + jackson-databind + + + + com.fasterxml.jackson.core + jackson-core + + + + com.fasterxml.jackson.core + jackson-annotations + test + + + + org.assertj + assertj-core + test + + + + + + + jdk11+ + + [11,] + + !m2e.version + + + + + + org.apache.maven.plugins + maven-surefire-plugin + + --add-reads=org.apache.arrow.adapter.jdbc=com.fasterxml.jackson.dataformat.yaml --add-opens=java.base/java.nio=org.apache.arrow.memory.core,ALL-UNNAMED -Duser.timezone=UTC + + + + + + diff --git a/java/adapter/orc/pom.xml b/java/adapter/orc/pom.xml index 060aed5dcf156..545aa5afe91b7 100644 --- a/java/adapter/orc/pom.xml +++ b/java/adapter/orc/pom.xml @@ -9,133 +9,130 @@ License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. --> + + 4.0.0 - - 4.0.0 - - - org.apache.arrow - arrow-memory-core - compile - - - org.apache.arrow - arrow-memory-netty - runtime - - - org.apache.arrow - arrow-vector - compile - ${arrow.vector.classifier} - - - org.immutables - value - - - org.apache.orc - orc-core - 1.9.2 - test - - - log4j - log4j - - - org.slf4j - slf4j-log4j12 - - - commons-logging - commons-logging - - - - - org.apache.hadoop - hadoop-client-runtime - ${dep.hadoop.version} - test - - - commons-logging - commons-logging - - - - - org.apache.hadoop - hadoop-client-api - ${dep.hadoop.version} - - - org.apache.hadoop - hadoop-common - ${dep.hadoop.version} - test - - - commons-logging - commons-logging - - - log4j - log4j - - - org.slf4j - slf4j-log4j12 - - - javax.servlet - servlet-api - - - org.slf4j - slf4j-reload4j - - - ch.qos.reload4j - reload4j - - - - - org.apache.hive - hive-storage-api - 2.8.1 - test - - + + org.apache.arrow + arrow-java-root + 16.0.0-SNAPSHOT + ../../pom.xml + - - org.apache.arrow - arrow-java-root - 16.0.0-SNAPSHOT - ../../pom.xml - + org.apache.arrow.orc + arrow-orc + jar + Arrow Orc Adapter + (Experimental/Contrib)A JNI wrapper for the C++ ORC reader implementation. + + ../../../cpp/release-build/ + + + + org.apache.arrow + arrow-memory-core + compile + + + org.apache.arrow + arrow-memory-netty + runtime + + + org.apache.arrow + arrow-vector + ${arrow.vector.classifier} + compile + + + org.immutables + value + + + org.apache.orc + orc-core + 1.9.2 + test + + + log4j + log4j + + + org.slf4j + slf4j-log4j12 + + + commons-logging + commons-logging + + + + + org.apache.hadoop + hadoop-client-runtime + ${dep.hadoop.version} + test + + + commons-logging + commons-logging + + + + + org.apache.hadoop + hadoop-client-api + ${dep.hadoop.version} + + + org.apache.hadoop + hadoop-common + ${dep.hadoop.version} + test + + + commons-logging + commons-logging + + + log4j + log4j + + + org.slf4j + slf4j-log4j12 + + + javax.servlet + servlet-api + + + org.slf4j + slf4j-reload4j + + + ch.qos.reload4j + reload4j + + + + + org.apache.hive + hive-storage-api + 2.8.1 + test + + - org.apache.arrow.orc - arrow-orc - Arrow Orc Adapter - (Experimental/Contrib)A JNI wrapper for the C++ ORC reader implementation. - jar - - ../../../cpp/release-build/ - - - - - - ${arrow.cpp.build.dir} - - **/*arrow_orc_jni.* - - - - + + + + ${arrow.cpp.build.dir} + + **/*arrow_orc_jni.* + + + + diff --git a/java/algorithm/pom.xml b/java/algorithm/pom.xml index 25669010d2d42..a588d0d289a04 100644 --- a/java/algorithm/pom.xml +++ b/java/algorithm/pom.xml @@ -1,4 +1,4 @@ - + - - arrow-java-root - org.apache.arrow - 16.0.0-SNAPSHOT - - 4.0.0 + 4.0.0 + + org.apache.arrow + arrow-java-root + 16.0.0-SNAPSHOT + - arrow-c-data - Arrow Java C Data Interface - Java implementation of C Data Interface - jar - - ./build - + arrow-c-data + jar + Arrow Java C Data Interface + Java implementation of C Data Interface + + ./build + - - - org.apache.arrow - arrow-vector - compile - ${arrow.vector.classifier} - - - org.apache.arrow - arrow-vector - ${project.version} - test-jar - test - - - org.apache.arrow - arrow-memory-core - compile - - - org.slf4j - slf4j-api - - - org.immutables - value - - - org.apache.arrow - arrow-memory-unsafe - test - - - org.apache.arrow - arrow-format - test - - - com.google.guava - guava - test - - - org.assertj - assertj-core - test - - - - - - ${arrow.c.jni.dist.dir} - - **/*arrow_cdata_jni.* - - - - + + + org.apache.arrow + arrow-vector + ${arrow.vector.classifier} + compile + + + org.apache.arrow + arrow-vector + ${project.version} + test-jar + test + + + org.apache.arrow + arrow-memory-core + compile + + + org.slf4j + slf4j-api + + + org.immutables + value + + + org.apache.arrow + arrow-memory-unsafe + test + + + org.apache.arrow + arrow-format + test + + + com.google.guava + guava + test + + + org.assertj + assertj-core + test + + + + + + ${arrow.c.jni.dist.dir} + + **/*arrow_cdata_jni.* + + + + diff --git a/java/compression/pom.xml b/java/compression/pom.xml index 0db3fae4653a6..637dbb82cce20 100644 --- a/java/compression/pom.xml +++ b/java/compression/pom.xml @@ -1,4 +1,4 @@ - + - - - arrow-java-root - org.apache.arrow - 16.0.0-SNAPSHOT - - 4.0.0 + + 4.0.0 + + org.apache.arrow + arrow-java-root + 16.0.0-SNAPSHOT + - arrow-dataset - Arrow Java Dataset - Java implementation of Arrow Dataset API/Framework - jar - - ../../../cpp/release-build/ - 2.5.0 - 1.13.1 - 1.11.3 - + arrow-dataset + jar + Arrow Java Dataset + Java implementation of Arrow Dataset API/Framework + + ../../../cpp/release-build/ + 2.5.0 + 1.13.1 + 1.11.3 + - - - org.apache.arrow - arrow-vector - compile - ${arrow.vector.classifier} - - - org.apache.arrow - arrow-memory-core - compile - - - org.apache.arrow - arrow-c-data - compile - - - org.immutables - value - - - org.apache.arrow - arrow-memory-netty - test - - - org.apache.parquet - parquet-avro - ${parquet.version} - test - - - org.apache.avro - avro - ${avro.version} - test - - - org.apache.parquet - parquet-hadoop - ${parquet.version} - test - - - org.apache.arrow - arrow-vector - ${project.version} - test - tests - - - org.apache.hadoop - hadoop-common - ${dep.hadoop.version} - test - - - commons-logging - commons-logging - - - javax.servlet - servlet-api - - - log4j - log4j - - - org.slf4j - slf4j-log4j12 - - - - - com.google.guava - guava - test - - - com.fasterxml.jackson.core - jackson-databind - test - - - org.apache.arrow.orc - arrow-orc - ${project.version} - test - - - org.apache.orc - orc-core - 1.9.2 - test - - - log4j - log4j - - - org.slf4j - slf4j-log4j12 - - - commons-logging - commons-logging - - - - - org.apache.hive - hive-storage-api - 2.8.1 - test - - - commons-io - commons-io - 2.15.1 - test - - - - - - ${arrow.cpp.build.dir} - - **/*arrow_dataset_jni.* - - - + + + org.apache.arrow + arrow-vector + ${arrow.vector.classifier} + compile + + + org.apache.arrow + arrow-memory-core + compile + + + org.apache.arrow + arrow-c-data + compile + + + org.immutables + value + + + org.apache.arrow + arrow-memory-netty + test + + + org.apache.parquet + parquet-avro + ${parquet.version} + test + + + org.apache.avro + avro + ${avro.version} + test + + + org.apache.parquet + parquet-hadoop + ${parquet.version} + test + + + org.apache.arrow + arrow-vector + ${project.version} + tests + test + + + org.apache.hadoop + hadoop-common + ${dep.hadoop.version} + test + + + commons-logging + commons-logging + + + javax.servlet + servlet-api + + + log4j + log4j + + + org.slf4j + slf4j-log4j12 + + + + + com.google.guava + guava + test + + + com.fasterxml.jackson.core + jackson-databind + test + + + org.apache.arrow.orc + arrow-orc + ${project.version} + test + + + org.apache.orc + orc-core + 1.9.2 + test + + + log4j + log4j + + + org.slf4j + slf4j-log4j12 + + + commons-logging + commons-logging + + + + + org.apache.hive + hive-storage-api + 2.8.1 + test + + + commons-io + commons-io + 2.15.1 + test + + + + + + ${arrow.cpp.build.dir} + + **/*arrow_dataset_jni.* + + + + + + maven-surefire-plugin + + false + + ${project.basedir}/../../testing/data + + + + + org.xolstice.maven.plugins + protobuf-maven-plugin + + + src + + compile + + + ../../cpp/src/jni/dataset/proto + + + + + + + + + + jdk11+ + + [11,] + + !m2e.version + + + - - maven-surefire-plugin - - false - - ${project.basedir}/../../testing/data - - - - - org.xolstice.maven.plugins - protobuf-maven-plugin - - - src - - compile - - - ../../cpp/src/jni/dataset/proto - - - - + + org.apache.maven.plugins + maven-surefire-plugin + + false + + ${project.basedir}/../../testing/data + + --add-reads=org.apache.arrow.dataset=com.fasterxml.jackson.databind --add-opens=java.base/java.nio=org.apache.arrow.memory.core,ALL-UNNAMED + + - - - - - jdk11+ - - [11,] - - !m2e.version - - - - - - org.apache.maven.plugins - maven-surefire-plugin - - false - - ${project.basedir}/../../testing/data - - --add-reads=org.apache.arrow.dataset=com.fasterxml.jackson.databind --add-opens=java.base/java.nio=org.apache.arrow.memory.core,ALL-UNNAMED - - - - - - + + + diff --git a/java/flight/flight-core/pom.xml b/java/flight/flight-core/pom.xml index 991ac491cf96a..77bec8639594b 100644 --- a/java/flight/flight-core/pom.xml +++ b/java/flight/flight-core/pom.xml @@ -1,4 +1,4 @@ - + + + org.codehaus.mojo build-helper-maven-plugin 1.9.1 add-generated-sources-to-classpath - generate-sources add-source + generate-sources ${project.build.directory}/generated-sources/protobuf @@ -297,14 +291,21 @@ make-assembly - package single + package + + + kr.motd.maven + os-maven-plugin + 1.7.1 + + diff --git a/java/flight/flight-integration-tests/pom.xml b/java/flight/flight-integration-tests/pom.xml index 5a073a0f801ad..62c4ac516ad9a 100644 --- a/java/flight/flight-integration-tests/pom.xml +++ b/java/flight/flight-integration-tests/pom.xml @@ -9,77 +9,76 @@ License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. --> - - 4.0.0 - - arrow-flight - org.apache.arrow - 16.0.0-SNAPSHOT - ../pom.xml - + + 4.0.0 + + org.apache.arrow + arrow-flight + 16.0.0-SNAPSHOT + ../pom.xml + - flight-integration-tests - Arrow Flight Integration Tests - Integration tests for Flight RPC. - jar + flight-integration-tests + jar + Arrow Flight Integration Tests + Integration tests for Flight RPC. - - - org.apache.arrow - arrow-vector - - - org.apache.arrow - arrow-memory-core - - - org.apache.arrow - flight-core - - - org.apache.arrow - flight-sql - - - com.google.protobuf - protobuf-java - - - com.google.guava - guava - - - commons-cli - commons-cli - 1.6.0 - - - org.slf4j - slf4j-api - - + + + org.apache.arrow + arrow-vector + + + org.apache.arrow + arrow-memory-core + + + org.apache.arrow + flight-core + + + org.apache.arrow + flight-sql + + + com.google.protobuf + protobuf-java + + + com.google.guava + guava + + + commons-cli + commons-cli + 1.6.0 + + + org.slf4j + slf4j-api + + - - - - maven-assembly-plugin - 3.7.1 - - - jar-with-dependencies - - - - - make-assembly - package - - single - - - - - - + + + + maven-assembly-plugin + 3.7.1 + + + jar-with-dependencies + + + + + make-assembly + + single + + package + + + + + diff --git a/java/flight/flight-sql-jdbc-core/pom.xml b/java/flight/flight-sql-jdbc-core/pom.xml index 20996d7496c05..c2ccd390e3986 100644 --- a/java/flight/flight-sql-jdbc-core/pom.xml +++ b/java/flight/flight-sql-jdbc-core/pom.xml @@ -9,168 +9,165 @@ License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. --> - - - - arrow-flight - org.apache.arrow - 16.0.0-SNAPSHOT - ../pom.xml - - 4.0.0 - - flight-sql-jdbc-core - Arrow Flight SQL JDBC Driver Core - Core implementation of JDBC driver based on Arrow Flight SQL. - jar - https://arrow.apache.org - - - ${project.parent.groupId}:${project.parent.artifactId} - ${project.parent.version} - ${project.name} - ${project.version} - - - - - org.apache.arrow - flight-core - - - io.netty - netty-transport-native-kqueue - - - io.netty - netty-transport-native-epoll - - - - - - - org.apache.arrow - arrow-memory-core - - - - - org.apache.arrow - arrow-memory-netty - runtime - - - - - org.apache.arrow - arrow-vector - ${arrow.vector.classifier} - - - - com.google.guava - guava - - - - org.slf4j - slf4j-api - runtime - - - - com.google.protobuf - protobuf-java - - - - org.hamcrest - hamcrest - 2.2 - test - - - - commons-io - commons-io - 2.15.1 - test - - - - org.mockito - mockito-core - ${mockito.core.version} - test - - - - org.mockito - mockito-inline - ${mockito.inline.version} - test - - - - io.netty - netty-common - - - - org.apache.arrow - flight-sql - ${project.version} - - - - org.apache.calcite.avatica - avatica - 1.24.0 - - - - org.bouncycastle - bcpkix-jdk15on - 1.70 - - - - - - - src/main/resources - - - - - maven-surefire-plugin - - false - - ${project.basedir}/../../../testing/data - - - - - org.codehaus.mojo - properties-maven-plugin - 1.2.1 - - - write-project-properties-to-file - generate-resources - - write-project-properties - - - src/main/resources/properties/flight.properties - - - - - - + + 4.0.0 + + org.apache.arrow + arrow-flight + 16.0.0-SNAPSHOT + ../pom.xml + + + flight-sql-jdbc-core + jar + Arrow Flight SQL JDBC Driver Core + Core implementation of JDBC driver based on Arrow Flight SQL. + https://arrow.apache.org + + + ${project.parent.groupId}:${project.parent.artifactId} + ${project.parent.version} + ${project.name} + ${project.version} + + + + + org.apache.arrow + flight-core + + + io.netty + netty-transport-native-kqueue + + + io.netty + netty-transport-native-epoll + + + + + + + org.apache.arrow + arrow-memory-core + + + + + org.apache.arrow + arrow-memory-netty + runtime + + + + + org.apache.arrow + arrow-vector + ${arrow.vector.classifier} + + + + com.google.guava + guava + + + + org.slf4j + slf4j-api + runtime + + + + com.google.protobuf + protobuf-java + + + + org.hamcrest + hamcrest + 2.2 + test + + + + commons-io + commons-io + 2.15.1 + test + + + + org.mockito + mockito-core + ${mockito.core.version} + test + + + + org.mockito + mockito-inline + ${mockito.inline.version} + test + + + + io.netty + netty-common + + + + org.apache.arrow + flight-sql + ${project.version} + + + + org.apache.calcite.avatica + avatica + 1.24.0 + + + + org.bouncycastle + bcpkix-jdk15on + 1.70 + + + + + + + src/main/resources + + + + + maven-surefire-plugin + + false + + ${project.basedir}/../../../testing/data + + + + + org.codehaus.mojo + properties-maven-plugin + 1.2.1 + + + write-project-properties-to-file + + write-project-properties + + generate-resources + + src/main/resources/properties/flight.properties + + + + + + diff --git a/java/flight/flight-sql-jdbc-driver/pom.xml b/java/flight/flight-sql-jdbc-driver/pom.xml index b586a0e46f51f..7e484a4140a4e 100644 --- a/java/flight/flight-sql-jdbc-driver/pom.xml +++ b/java/flight/flight-sql-jdbc-driver/pom.xml @@ -9,161 +9,158 @@ License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. --> + + 4.0.0 + + org.apache.arrow + arrow-flight + 16.0.0-SNAPSHOT + ../pom.xml + - - - arrow-flight - org.apache.arrow - 16.0.0-SNAPSHOT - ../pom.xml - - 4.0.0 + flight-sql-jdbc-driver + jar + Arrow Flight SQL JDBC Driver + A JDBC driver based on Arrow Flight SQL. + https://arrow.apache.org - flight-sql-jdbc-driver - Arrow Flight SQL JDBC Driver - A JDBC driver based on Arrow Flight SQL. - jar - https://arrow.apache.org + + + org.apache.arrow + flight-sql-jdbc-core + runtime + - - - org.apache.arrow - flight-sql-jdbc-core - runtime - + + org.slf4j + slf4j-jdk14 + runtime + - - org.slf4j - slf4j-jdk14 - runtime - + + com.google.guava + guava + + runtime + + - - com.google.guava - guava - - runtime - - - - - - - org.apache.maven.plugins - maven-failsafe-plugin - - - - integration-test - verify - - - - - - org.apache.maven.plugins - maven-shade-plugin - - - package - - shade - - - false - true - false - - - *:* - - - - org.checkerframework:checker-qual - org.codehaus.mojo:animal-sniffer-annotations - javax.annotation:javax.annotation-api - com.google.android:annotations - com.google.errorprone:error_prone_annotations - com.google.code.findbugs:jsr305 - com.google.j2objc:j2objc-annotations - - - - - com. - org.apache.arrow.driver.jdbc.shaded.com. - - com.sun.** - - - - org. - org.apache.arrow.driver.jdbc.shaded.org. - - org.apache.arrow.driver.jdbc.** - - org.apache.arrow.flight.name - org.apache.arrow.flight.version - org.apache.arrow.flight.jdbc-driver.name - org.apache.arrow.flight.jdbc-driver.version - - - - io. - org.apache.arrow.driver.jdbc.shaded.io. - - - net. - org.apache.arrow.driver.jdbc.shaded.net. - - - mozilla. - org.apache.arrow.driver.jdbc.shaded.mozilla. - - - - META-INF.native.libnetty_ - META-INF.native.liboaadj_netty_ - - - META-INF.native.netty_ - META-INF.native.oaadj_netty_ - - - - - - - - org.apache.arrow:arrow-vector - - codegen/** - - - - org.apache.calcite.avatica:* - - META-INF/services/java.sql.Driver - - - - *:* - - **/*.SF - **/*.RSA - **/*.DSA - META-INF/native/libio_grpc_netty* - META-INF/native/io_grpc_netty_shaded* - **/*.proto - - - - - - - - - + + + + org.apache.maven.plugins + maven-failsafe-plugin + + + + integration-test + verify + + + + + + org.apache.maven.plugins + maven-shade-plugin + + + + shade + + package + + false + true + false + + + *:* + + + + org.checkerframework:checker-qual + org.codehaus.mojo:animal-sniffer-annotations + javax.annotation:javax.annotation-api + com.google.android:annotations + com.google.errorprone:error_prone_annotations + com.google.code.findbugs:jsr305 + com.google.j2objc:j2objc-annotations + + + + + com. + org.apache.arrow.driver.jdbc.shaded.com. + + com.sun.** + + + + org. + org.apache.arrow.driver.jdbc.shaded.org. + + org.apache.arrow.driver.jdbc.** + + org.apache.arrow.flight.name + org.apache.arrow.flight.version + org.apache.arrow.flight.jdbc-driver.name + org.apache.arrow.flight.jdbc-driver.version + + + + io. + org.apache.arrow.driver.jdbc.shaded.io. + + + net. + org.apache.arrow.driver.jdbc.shaded.net. + + + mozilla. + org.apache.arrow.driver.jdbc.shaded.mozilla. + + + + META-INF.native.libnetty_ + META-INF.native.liboaadj_netty_ + + + META-INF.native.netty_ + META-INF.native.oaadj_netty_ + + + + + + + + org.apache.arrow:arrow-vector + + codegen/** + + + + org.apache.calcite.avatica:* + + META-INF/services/java.sql.Driver + + + + *:* + + **/*.SF + **/*.RSA + **/*.DSA + META-INF/native/libio_grpc_netty* + META-INF/native/io_grpc_netty_shaded* + **/*.proto + + + + + + + + + diff --git a/java/flight/flight-sql/pom.xml b/java/flight/flight-sql/pom.xml index 1da6ed276011b..45c745082ec13 100644 --- a/java/flight/flight-sql/pom.xml +++ b/java/flight/flight-sql/pom.xml @@ -12,16 +12,16 @@ 4.0.0 - arrow-flight org.apache.arrow + arrow-flight 16.0.0-SNAPSHOT ../pom.xml flight-sql + jar Arrow Flight SQL (Experimental)Contains utility classes to expose Flight SQL semantics for clients and servers over Arrow Flight - jar 1 diff --git a/java/flight/pom.xml b/java/flight/pom.xml index 5b9caafa82ef9..105b1b6f60c67 100644 --- a/java/flight/pom.xml +++ b/java/flight/pom.xml @@ -9,39 +9,37 @@ License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. --> - - - arrow-java-root - org.apache.arrow - 16.0.0-SNAPSHOT - - 4.0.0 + + 4.0.0 + + org.apache.arrow + arrow-java-root + 16.0.0-SNAPSHOT + + arrow-flight - Arrow Flight - arrow-flight + pom - pom + Arrow Flight - - flight-core - flight-sql - flight-sql-jdbc-core - flight-sql-jdbc-driver - flight-integration-tests - + + flight-core + flight-sql + flight-sql-jdbc-core + flight-sql-jdbc-driver + flight-integration-tests + - - - pin-mockito-jdk8 - - 1.8 - - - 4.11.0 - 5.2.0 - - - + + + pin-mockito-jdk8 + + 1.8 + + + 4.11.0 + 5.2.0 + + + diff --git a/java/format/pom.xml b/java/format/pom.xml index a98edefbeb217..1e8b300b65ce9 100644 --- a/java/format/pom.xml +++ b/java/format/pom.xml @@ -1,4 +1,4 @@ - + -4.0.0 + 4.0.0 - - arrow-java-root - org.apache.arrow - 16.0.0-SNAPSHOT - + + org.apache.arrow + arrow-java-root + 16.0.0-SNAPSHOT + -arrow-format -jar -Arrow Format -Generated Java files from the IPC Flatbuffer definitions. + arrow-format + jar + Arrow Format + Generated Java files from the IPC Flatbuffer definitions. @@ -30,17 +30,18 @@ - + - - - org.apache.maven.plugins - maven-checkstyle-plugin - - true - - - + + + + org.apache.maven.plugins + maven-checkstyle-plugin + + true + + + - + diff --git a/java/gandiva/pom.xml b/java/gandiva/pom.xml index cb2deb07db42a..5fa96174c60cc 100644 --- a/java/gandiva/pom.xml +++ b/java/gandiva/pom.xml @@ -10,141 +10,141 @@ OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. --> - 4.0.0 - - org.apache.arrow - arrow-java-root - 16.0.0-SNAPSHOT - + 4.0.0 + + org.apache.arrow + arrow-java-root + 16.0.0-SNAPSHOT + - org.apache.arrow.gandiva - arrow-gandiva - jar - Arrow Gandiva - Java wrappers around the native Gandiva SQL expression compiler. - - 1.8 - 1.8 - 3.25.1 - true - ../../../cpp/release-build - - - - org.apache.arrow - arrow-memory-core - - - org.immutables - value - - - org.apache.arrow - arrow-memory-netty - test - - - org.apache.arrow - arrow-vector - ${arrow.vector.classifier} - - - com.google.protobuf - protobuf-java - ${protobuf.version} - - - com.google.guava - guava - - - org.slf4j - slf4j-api - - - - - release - - - - org.apache.maven.plugins - maven-source-plugin - 2.2.1 - - - attach-sources - - jar-no-fork - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - 3.6.3 - - - attach-javadocs - - jar - - - - - - org.apache.maven.plugins - maven-gpg-plugin - 3.2.2 - - - sign-artifacts - verify - - sign - - - - - - - - - - - - ${arrow.cpp.build.dir} - - **/*gandiva_jni.* - - - + org.apache.arrow.gandiva + arrow-gandiva + jar + Arrow Gandiva + Java wrappers around the native Gandiva SQL expression compiler. + + 1.8 + 1.8 + 3.25.1 + true + ../../../cpp/release-build + + + + org.apache.arrow + arrow-memory-core + + + org.immutables + value + + + org.apache.arrow + arrow-memory-netty + test + + + org.apache.arrow + arrow-vector + ${arrow.vector.classifier} + + + com.google.protobuf + protobuf-java + ${protobuf.version} + + + com.google.guava + guava + + + org.slf4j + slf4j-api + + + + + + ${arrow.cpp.build.dir} + + **/*gandiva_jni.* + + + + + + org.xolstice.maven.plugins + protobuf-maven-plugin + + + src + + compile + + + proto + + + + + - - - kr.motd.maven - os-maven-plugin - 1.7.1 - - + + + kr.motd.maven + os-maven-plugin + 1.7.1 + + + + + + release + - - org.xolstice.maven.plugins - protobuf-maven-plugin - - - src - - compile - - - proto - - - - + + org.apache.maven.plugins + maven-source-plugin + 2.2.1 + + + attach-sources + + jar-no-fork + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + 3.6.3 + + + attach-javadocs + + jar + + + + + + org.apache.maven.plugins + maven-gpg-plugin + 3.2.2 + + + sign-artifacts + + sign + + verify + + + - + + + diff --git a/java/memory/memory-core/pom.xml b/java/memory/memory-core/pom.xml index 2a92d032942c9..2c7212cea55f3 100644 --- a/java/memory/memory-core/pom.xml +++ b/java/memory/memory-core/pom.xml @@ -10,12 +10,12 @@ OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. --> + 4.0.0 - arrow-memory org.apache.arrow + arrow-memory 16.0.0-SNAPSHOT - 4.0.0 arrow-memory-core @@ -96,10 +96,10 @@ opens-tests - test test + test -Dfoo=bar @@ -133,12 +133,15 @@ 8 UTF-8 - -Xmaxerrs + -Xmaxerrs + 10000 -Xmaxwarns 10000 - -AskipDefs=.*Test - -AatfDoNotCache + -AskipDefs=.*Test + + -AatfDoNotCache + diff --git a/java/memory/memory-netty-buffer-patch/pom.xml b/java/memory/memory-netty-buffer-patch/pom.xml index 97b224e9ccc5c..53e6ba6a9d2dc 100644 --- a/java/memory/memory-netty-buffer-patch/pom.xml +++ b/java/memory/memory-netty-buffer-patch/pom.xml @@ -9,15 +9,13 @@ License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. --> - + + 4.0.0 - arrow-memory org.apache.arrow + arrow-memory 16.0.0-SNAPSHOT - 4.0.0 arrow-memory-netty-buffer-patch Arrow Memory - Netty Buffer diff --git a/java/memory/memory-netty/pom.xml b/java/memory/memory-netty/pom.xml index 9b20e1bde2ae7..1466adae41d30 100644 --- a/java/memory/memory-netty/pom.xml +++ b/java/memory/memory-netty/pom.xml @@ -10,12 +10,12 @@ OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. --> + 4.0.0 - arrow-memory org.apache.arrow + arrow-memory 16.0.0-SNAPSHOT - 4.0.0 arrow-memory-netty Arrow Memory - Netty diff --git a/java/memory/memory-unsafe/pom.xml b/java/memory/memory-unsafe/pom.xml index 07a140e594522..da4a5fe322338 100644 --- a/java/memory/memory-unsafe/pom.xml +++ b/java/memory/memory-unsafe/pom.xml @@ -10,18 +10,17 @@ OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. --> + 4.0.0 - arrow-memory org.apache.arrow + arrow-memory 16.0.0-SNAPSHOT - 4.0.0 arrow-memory-unsafe Arrow Memory - Unsafe Allocator and utils for allocating memory in Arrow based on sun.misc.Unsafe - org.apache.arrow diff --git a/java/memory/pom.xml b/java/memory/pom.xml index 9e2d612765738..647a64bd0753f 100644 --- a/java/memory/pom.xml +++ b/java/memory/pom.xml @@ -1,4 +1,4 @@ - + - 4.0.0 - - arrow-java-root - org.apache.arrow - 16.0.0-SNAPSHOT - - arrow-performance - jar - Arrow Performance Benchmarks - JMH Performance benchmarks for other Arrow libraries. + 4.0.0 + + org.apache.arrow + arrow-java-root + 16.0.0-SNAPSHOT + + arrow-performance + jar + Arrow Performance Benchmarks + JMH Performance benchmarks for other Arrow libraries. - - - org.openjdk.jmh - jmh-core - ${jmh.version} - test - - - org.openjdk.jmh - jmh-generator-annprocess - ${jmh.version} - provided - - - org.apache.arrow - arrow-vector - ${arrow.vector.classifier} - test - - - org.apache.arrow - arrow-memory-core - test - - - org.apache.arrow - arrow-memory-netty - test - - - org.apache.avro - avro - ${dep.avro.version} - test - - - org.apache.arrow - arrow-avro - test - - - com.h2database - h2 - 2.2.224 - test - - - org.apache.arrow - arrow-jdbc - test - - - org.apache.arrow - arrow-algorithm - test - - + + UTF-8 + 1.37 + 1.8 + benchmarks + true + .* + 1 + + 5 + 5 + + jmh-result.json + json + - - UTF-8 - 1.37 - 1.8 - benchmarks - true - .* - 1 - - 5 - 5 - - jmh-result.json - json - + + + org.openjdk.jmh + jmh-core + ${jmh.version} + test + + + org.openjdk.jmh + jmh-generator-annprocess + ${jmh.version} + provided + + + org.apache.arrow + arrow-vector + ${arrow.vector.classifier} + test + + + org.apache.arrow + arrow-memory-core + test + + + org.apache.arrow + arrow-memory-netty + test + + + org.apache.avro + avro + ${dep.avro.version} + test + + + org.apache.arrow + arrow-avro + test + + + com.h2database + h2 + 2.2.224 + test + + + org.apache.arrow + arrow-jdbc + test + + + org.apache.arrow + arrow-algorithm + test + + - - - - org.apache.maven.plugins - maven-compiler-plugin - - ${javac.target} - ${javac.target} - ${javac.target} - - - - org.apache.maven.plugins - maven-shade-plugin - - - package - - shade - - - ${uberjar.name} - - - org.openjdk.jmh.Main - - - - - *:* - - META-INF/*.SF - META-INF/*.DSA - META-INF/*.RSA - - - - - - - - - org.codehaus.mojo - exec-maven-plugin - 3.2.0 - - - run-java-benchmarks - integration-test - - exec - - - - - ${skip.perf.benchmarks} - test - java - - -classpath - - org.openjdk.jmh.Main - ${benchmark.filter} - -f - ${benchmark.forks} - -jvmArgs - ${benchmark.jvmargs} - -wi - ${benchmark.warmups} - -i - ${benchmark.runs} - ${benchmark.list} - -rff - ${benchmark.resultfile} - -rf - ${benchmark.resultformat} - - - - - - - - maven-clean-plugin - 3.3.2 - - - maven-deploy-plugin - 3.1.1 - - - maven-install-plugin - 3.1.1 - - - maven-jar-plugin - 3.3.0 - - - maven-javadoc-plugin - 3.6.3 - - - maven-resources-plugin - 3.3.1 - - - maven-source-plugin - 2.2.1 - - - maven-surefire-plugin - 3.2.5 - - - - + + + + + maven-clean-plugin + 3.3.2 + + + maven-deploy-plugin + 3.1.1 + + + maven-install-plugin + 3.1.1 + + + maven-jar-plugin + 3.3.0 + + + maven-javadoc-plugin + 3.6.3 + + + maven-resources-plugin + 3.3.1 + + + maven-source-plugin + 2.2.1 + + + maven-surefire-plugin + 3.2.5 + + + + + + org.apache.maven.plugins + maven-compiler-plugin + + ${javac.target} + ${javac.target} + ${javac.target} + + + + org.apache.maven.plugins + maven-shade-plugin + + + + shade + + package + + ${uberjar.name} + + + org.openjdk.jmh.Main + + + + + *:* + + META-INF/*.SF + META-INF/*.DSA + META-INF/*.RSA + + + + + + + + + org.codehaus.mojo + exec-maven-plugin + 3.2.0 + + ${skip.perf.benchmarks} + test + java + + -classpath + + org.openjdk.jmh.Main + ${benchmark.filter} + -f + ${benchmark.forks} + -jvmArgs + ${benchmark.jvmargs} + -wi + ${benchmark.warmups} + -i + ${benchmark.runs} + ${benchmark.list} + -rff + ${benchmark.resultfile} + -rf + ${benchmark.resultformat} + + + + + run-java-benchmarks + + exec + + integration-test + + + + + diff --git a/java/pom.xml b/java/pom.xml index 5e55567d210dd..9f6b5b79e9d52 100644 --- a/java/pom.xml +++ b/java/pom.xml @@ -27,37 +27,6 @@ Apache Arrow is open source, in-memory columnar data structures and low-overhead messaging https://arrow.apache.org/ - - ${project.build.directory}/generated-sources - 1.9.0 - 5.10.2 - 2.0.12 - 33.0.0-jre - 4.1.108.Final - 1.63.0 - 3.23.1 - 2.17.0 - 3.4.0 - 23.5.26 - 1.11.3 - - 2 - true - 9+181-r4173-1 - 2.24.0 - 3.12.1 - 5.11.0 - 5.2.0 - 3.42.0 - - - - scm:git:https://github.com/apache/arrow.git - scm:git:https://github.com/apache/arrow.git - https://github.com/apache/arrow - apache-arrow-2.0.0 - - Developer List @@ -81,344 +50,230 @@ - + + maven + bom + format + memory + vector + tools + adapter/jdbc + flight + performance + algorithm + adapter/avro + compression + - + + scm:git:https://github.com/apache/arrow.git + scm:git:https://github.com/apache/arrow.git + apache-arrow-2.0.0 + https://github.com/apache/arrow + Jira https://issues.apache.org/jira/browse/arrow - - - - - kr.motd.maven - os-maven-plugin - 1.7.1 - - + + ${project.build.directory}/generated-sources + 1.9.0 + 5.10.2 + 2.0.12 + 33.0.0-jre + 4.1.108.Final + 1.63.0 + 3.23.1 + 2.17.0 + 3.4.0 + 23.5.26 + 1.11.3 + + 2 + true + 9+181-r4173-1 + 2.24.0 + 3.12.1 + 5.11.0 + 5.2.0 + 3.42.0 + - - - org.apache.rat - apache-rat-plugin - - - rat-checks - validate - - check - - - - - false - - **/dependency-reduced-pom.xml - **/*.log - **/*.css - **/*.js - **/*.md - **/*.eps - **/*.json - **/*.seq - **/*.parquet - **/*.sql - **/arrow-git.properties - **/*.csv - **/*.csvh - **/*.csvh-test - **/*.tsv - **/*.txt - **/*.ssv - **/arrow-*.conf - **/.buildpath - **/*.proto - **/*.fmpp - **/target/** - **/*.tdd - **/*.project - **/TAGS - **/*.checkstyle - **/.classpath - **/.factorypath - **/.settings/** - .*/** - **/*.patch - **/*.pb.cc - **/*.pb.h - **/*.linux - **/client/build/** - **/*.tbl - **/*.iml - **/flight.properties - **/*.idea/** - - - + + + + + org.apache.arrow + arrow-bom + ${project.version} + pom + import + + + org.checkerframework + checker-qual + ${checker.framework.version} + + + com.google.flatbuffers + flatbuffers-java + ${dep.fbs.version} + + + com.google.code.findbugs + jsr305 + 3.0.2 + + + org.slf4j + slf4j-api + ${dep.slf4j.version} + + + org.slf4j + slf4j-jdk14 + ${dep.slf4j.version} + + + javax.annotation + javax.annotation-api + 1.3.2 + + + org.assertj + assertj-core + 3.25.3 + test + + + org.immutables + value + 2.10.0 + provided + + + org.hamcrest + hamcrest + 2.2 + + + com.fasterxml.jackson + jackson-bom + ${dep.jackson-bom.version} + pom + import + + + com.google.guava + guava-bom + ${dep.guava-bom.version} + pom + import + + + io.netty + netty-bom + ${dep.netty-bom.version} + pom + import + + + io.grpc + grpc-bom + ${dep.grpc-bom.version} + pom + import + + + com.google.protobuf + protobuf-bom + ${dep.protobuf-bom.version} + pom + import + + + - - org.apache.maven.plugins - maven-jar-plugin - - - **/logging.properties - **/logback-test.xml - **/logback.out.xml - **/logback.xml - - - true - - true - true - - - org.apache.arrow - ${username} - https://arrow.apache.org/ - - - - - - - test-jar - - - true - - - - + + + + org.slf4j + jul-to-slf4j + ${dep.slf4j.version} + test + + + org.slf4j + jcl-over-slf4j + ${dep.slf4j.version} + test + - - org.apache.maven.plugins - maven-resources-plugin - - UTF-8 - - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.8 - 1.8 - 2048m - false - true - - - - maven-enforcer-plugin - - - validate_java_and_maven_version - verify - - enforce - - false - - - - [3.3.0,4) - - - - - - avoid_bad_dependencies - verify - - enforce - - - - - - commons-logging - javax.servlet:servlet-api - org.mortbay.jetty:servlet-api - org.mortbay.jetty:servlet-api-2.5 - log4j:log4j - - - - - - - - - pl.project13.maven - git-commit-id-plugin - 4.0.5 - - - for-jars - true - - revision - - - target/classes/arrow-git.properties - - - - for-source-tarball - - revision - - false - - ./arrow-git.properties - - - + + org.slf4j + log4j-over-slf4j + ${dep.slf4j.version} + test + - - dd.MM.yyyy '@' HH:mm:ss z - false - false - true - false - - false - false - 7 - -dirty - true - - - + + org.junit.jupiter + junit-jupiter-engine + ${dep.junit.jupiter.version} + test + + + org.junit.jupiter + junit-jupiter-api + ${dep.junit.jupiter.version} + test + + + org.junit.vintage + junit-vintage-engine + ${dep.junit.jupiter.version} + test + + + org.junit.jupiter + junit-jupiter-params + ${dep.junit.jupiter.version} + test + + + + junit + junit + 4.13.2 + test + + + org.mockito + mockito-junit-jupiter + 2.25.1 + test + + + ch.qos.logback + logback-classic + 1.3.14 + test + + + de.huxhorn.lilith + de.huxhorn.lilith.logback.appender.multiplex-classic + 8.3.0 + test + - - org.apache.maven.plugins - maven-checkstyle-plugin - 3.1.0 - - - com.puppycrawl.tools - checkstyle - 8.29 - - - org.slf4j - jcl-over-slf4j - ${dep.slf4j.version} - - - - - validate - validate - - check - - - - - **/module-info.java - dev/checkstyle/checkstyle.xml - dev/checkstyle/checkstyle.license - dev/checkstyle/suppressions.xml - true - UTF-8 - true - ${checkstyle.failOnViolation} - ${checkstyle.failOnViolation} - warning - xml - ${project.build.directory}/test/checkstyle-errors.xml - false - - - - org.apache.maven.plugins - maven-dependency-plugin - - - analyze - verify - - analyze-only - - - true - true - - - javax.annotation:javax.annotation-api:* - org.apache.hadoop:hadoop-client-api - org.checkerframework:checker-qual - - - - - - - org.cyclonedx - cyclonedx-maven-plugin - 2.7.11 - - - package - - makeBom - - - - - - org.apache.arrow.maven.plugins - module-info-compiler-maven-plugin - - - default-compile - - compile - - - - default-testCompile - - testCompile - - - - - - org.apache.maven.plugins - maven-project-info-reports-plugin - 3.5.0 - - - org.apache.maven.plugins - maven-site-plugin - 3.12.1 - - - com.diffplug.spotless - spotless-maven-plugin - - - - - - - - spotless-check - - check - - - - - + + + + + @@ -471,18 +326,6 @@ maven-surefire-plugin 3.2.5 - - - org.junit.jupiter - junit-jupiter-engine - ${dep.junit.jupiter.version} - - - org.apache.maven.surefire - surefire-junit-platform - 3.2.5 - - true true @@ -497,6 +340,18 @@ 1048576 + + + org.junit.jupiter + junit-jupiter-engine + ${dep.junit.jupiter.version} + + + org.apache.maven.surefire + surefire-junit-platform + 3.2.5 + + maven-failsafe-plugin @@ -534,7 +389,7 @@ - + @@ -547,22 +402,20 @@ - + org.apache.maven.plugins - - maven-remote-resources-plugin - + maven-remote-resources-plugin [1.1,) process - + @@ -575,7 +428,7 @@ - + @@ -588,7 +441,7 @@ - + @@ -648,8 +501,8 @@ - - + + @@ -670,177 +523,334 @@ - - - - - - - org.apache.arrow - arrow-bom - ${project.version} - pom - import - - - org.checkerframework - checker-qual - ${checker.framework.version} - - - com.google.flatbuffers - flatbuffers-java - ${dep.fbs.version} - - - com.google.code.findbugs - jsr305 - 3.0.2 - - - org.slf4j - slf4j-api - ${dep.slf4j.version} - - - org.slf4j - slf4j-jdk14 - ${dep.slf4j.version} - - - javax.annotation - javax.annotation-api - 1.3.2 - - - org.assertj - assertj-core - 3.25.3 - test - - - org.immutables - value - 2.10.0 - provided - - - org.hamcrest - hamcrest - 2.2 - - - com.fasterxml.jackson - jackson-bom - ${dep.jackson-bom.version} - pom - import - - - com.google.guava - guava-bom - ${dep.guava-bom.version} - pom - import - - - io.netty - netty-bom - ${dep.netty-bom.version} - pom - import - - - io.grpc - grpc-bom - ${dep.grpc-bom.version} - pom - import - - - com.google.protobuf - protobuf-bom - ${dep.protobuf-bom.version} - pom - import - - - - - - - - org.slf4j - jul-to-slf4j - ${dep.slf4j.version} - test - - - org.slf4j - jcl-over-slf4j - ${dep.slf4j.version} - test - + + + org.apache.rat + apache-rat-plugin + + false + + **/dependency-reduced-pom.xml + **/*.log + **/*.css + **/*.js + **/*.md + **/*.eps + **/*.json + **/*.seq + **/*.parquet + **/*.sql + **/arrow-git.properties + **/*.csv + **/*.csvh + **/*.csvh-test + **/*.tsv + **/*.txt + **/*.ssv + **/arrow-*.conf + **/.buildpath + **/*.proto + **/*.fmpp + **/target/** + **/*.tdd + **/*.project + **/TAGS + **/*.checkstyle + **/.classpath + **/.factorypath + **/.settings/** + .*/** + **/*.patch + **/*.pb.cc + **/*.pb.h + **/*.linux + **/client/build/** + **/*.tbl + **/*.iml + **/flight.properties + **/*.idea/** + + + + + rat-checks + + check + + validate + + + - - org.slf4j - log4j-over-slf4j - ${dep.slf4j.version} - test - + + org.apache.maven.plugins + maven-jar-plugin + + + **/logging.properties + **/logback-test.xml + **/logback.out.xml + **/logback.xml + + + true + + true + true + + + org.apache.arrow + ${username} + https://arrow.apache.org/ + + + + + + + test-jar + + + true + + + + - - org.junit.jupiter - junit-jupiter-engine - ${dep.junit.jupiter.version} - test - - - org.junit.jupiter - junit-jupiter-api - ${dep.junit.jupiter.version} - test - - - org.junit.vintage - junit-vintage-engine - ${dep.junit.jupiter.version} - test - - - org.junit.jupiter - junit-jupiter-params - ${dep.junit.jupiter.version} - test - - - - junit - junit - 4.13.2 - test - - - org.mockito - mockito-junit-jupiter - 2.25.1 - test - - - ch.qos.logback - logback-classic - 1.3.14 - test - - - de.huxhorn.lilith - de.huxhorn.lilith.logback.appender.multiplex-classic - 8.3.0 - test - + + org.apache.maven.plugins + maven-resources-plugin + + UTF-8 + + + + org.apache.maven.plugins + maven-compiler-plugin + + 1.8 + 1.8 + 2048m + false + true + + + + maven-enforcer-plugin + + + validate_java_and_maven_version + + enforce + + verify + false + + + + [3.3.0,4) + + + + + + avoid_bad_dependencies + + enforce + + verify + + + + + commons-logging + javax.servlet:servlet-api + org.mortbay.jetty:servlet-api + org.mortbay.jetty:servlet-api-2.5 + log4j:log4j + + + + + + + + + pl.project13.maven + git-commit-id-plugin + 4.0.5 - + + dd.MM.yyyy '@' HH:mm:ss z + false + false + true + false + + false + false + 7 + -dirty + true + + + + + for-jars + + revision + + true + + target/classes/arrow-git.properties + + + + for-source-tarball + + revision + + false + + ./arrow-git.properties + + + + + + + org.apache.maven.plugins + maven-checkstyle-plugin + 3.1.0 + + **/module-info.java + dev/checkstyle/checkstyle.xml + dev/checkstyle/checkstyle.license + dev/checkstyle/suppressions.xml + true + UTF-8 + true + ${checkstyle.failOnViolation} + ${checkstyle.failOnViolation} + warning + xml + ${project.build.directory}/test/checkstyle-errors.xml + false + + + + com.puppycrawl.tools + checkstyle + 8.29 + + + org.slf4j + jcl-over-slf4j + ${dep.slf4j.version} + + + + + validate + + check + + validate + + + + + org.apache.maven.plugins + maven-dependency-plugin + + + analyze + + analyze-only + + verify + + true + true + + + javax.annotation:javax.annotation-api:* + org.apache.hadoop:hadoop-client-api + org.checkerframework:checker-qual + + + + + + + org.cyclonedx + cyclonedx-maven-plugin + 2.7.11 + + + + makeBom + + package + + + + + org.apache.arrow.maven.plugins + module-info-compiler-maven-plugin + + + default-compile + + compile + + + + default-testCompile + + testCompile + + + + + + org.apache.maven.plugins + maven-project-info-reports-plugin + 3.5.0 + + + org.apache.maven.plugins + maven-site-plugin + 3.12.1 + + + com.diffplug.spotless + spotless-maven-plugin + + + + + + + + spotless-check + + check + + + + + + + + + kr.motd.maven + os-maven-plugin + 1.7.1 + + + @@ -848,25 +858,29 @@ org.apache.maven.plugins maven-javadoc-plugin 3.6.3 + + + **/module-info.java + + - - + + + + javadoc - + + aggregate - false + aggregate + false - - - **/module-info.java - - org.apache.maven.plugins @@ -881,21 +895,6 @@ - - maven - bom - format - memory - vector - tools - adapter/jdbc - flight - performance - algorithm - adapter/avro - compression - - java-nodoclint @@ -1064,11 +1063,12 @@ 0.8.11 - false + report + false @@ -1110,35 +1110,31 @@ cdata-cmake - generate-resources exec + generate-resources cmake - - -S java + -S java -B java-jni -DARROW_JAVA_JNI_ENABLE_C=ON -DARROW_JAVA_JNI_ENABLE_DEFAULT=OFF -DBUILD_TESTING=OFF -DCMAKE_BUILD_TYPE=Release - -DCMAKE_INSTALL_PREFIX=${arrow.c.jni.dist.dir} - + -DCMAKE_INSTALL_PREFIX=${arrow.c.jni.dist.dir} ../ cdata-build - generate-resources exec + generate-resources cmake - - --build java-jni --target install --config Release - + --build java-jni --target install --config Release ../ @@ -1171,14 +1167,13 @@ jni-cpp-cmake - generate-resources exec + generate-resources cmake - - -S cpp + -S cpp -B cpp-jni -DARROW_BUILD_SHARED=OFF -DARROW_CSV=${ARROW_DATASET} @@ -1196,37 +1191,33 @@ -DARROW_USE_CCACHE=ON -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=java-dist - -DCMAKE_UNITY_BUILD=ON - + -DCMAKE_UNITY_BUILD=ON ../ ${cpp.dependencies.builded} jni-cpp-build - generate-resources exec + generate-resources cmake - - --build cpp-jni --target install --config Release - + --build cpp-jni --target install --config Release ../ ${cpp.dependencies.builded} jni-cmake - generate-resources exec + generate-resources cmake - - -S java + -S java -B java-jni -DARROW_JAVA_JNI_ENABLE_C=${ARROW_JAVA_JNI_ENABLE_C} -DARROW_JAVA_JNI_ENABLE_DATASET=${ARROW_JAVA_JNI_ENABLE_DATASET} @@ -1238,22 +1229,19 @@ -DCMAKE_INSTALL_PREFIX=${arrow.dataset.jni.dist.dir} -DCMAKE_PREFIX_PATH=${project.basedir}/../java-dist/lib/${os.detected.arch}/cmake -DProtobuf_USE_STATIC_LIBS=ON - -DProtobuf_ROOT=${project.basedir}/../cpp-jni/protobuf_ep-install - + -DProtobuf_ROOT=${project.basedir}/../cpp-jni/protobuf_ep-install ../ jni-build - generate-resources exec + generate-resources cmake - - --build java-jni --target install --config Release - + --build java-jni --target install --config Release ../ @@ -1286,14 +1274,13 @@ jni-cpp-cmake - generate-resources exec + generate-resources cmake - - -S cpp + -S cpp -B cpp-jni -DARROW_BUILD_SHARED=OFF -DARROW_CSV=${ARROW_DATASET} @@ -1315,37 +1302,33 @@ -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=java-dist -DCMAKE_UNITY_BUILD=ON - -GNinja - + -GNinja ../ ${cpp.dependencies.builded} jni-cpp-build - generate-resources exec + generate-resources ninja - - install - + install ../cpp-jni ${cpp.dependencies.builded} jni-cmake - generate-resources exec + generate-resources cmake - - -S java + -S java -B java-jni -DARROW_JAVA_JNI_ENABLE_C=${ARROW_JAVA_JNI_ENABLE_C} -DARROW_JAVA_JNI_ENABLE_DATASET=${ARROW_JAVA_JNI_ENABLE_DATASET} @@ -1355,22 +1338,19 @@ -DBUILD_TESTING=OFF -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=${arrow.dataset.jni.dist.dir} - -DCMAKE_PREFIX_PATH=${project.basedir}/../java-dist/lib/${os.detected.arch}/cmake - + -DCMAKE_PREFIX_PATH=${project.basedir}/../java-dist/lib/${os.detected.arch}/cmake ../ jni-build - generate-resources exec + generate-resources cmake - - --build java-jni --target install --config Release - + --build java-jni --target install --config Release ../ diff --git a/java/tools/pom.xml b/java/tools/pom.xml index 77d1d6a5f1e35..5a5a954a3425d 100644 --- a/java/tools/pom.xml +++ b/java/tools/pom.xml @@ -1,4 +1,4 @@ - + - 4.0.0 - - org.apache.arrow - arrow-java-root - 16.0.0-SNAPSHOT - - arrow-tools - Arrow Tools - Java applications for working with Arrow ValueVectors. + 4.0.0 + + org.apache.arrow + arrow-java-root + 16.0.0-SNAPSHOT + + arrow-tools + Arrow Tools + Java applications for working with Arrow ValueVectors. - - - org.apache.arrow - arrow-memory-core - - - org.apache.arrow - arrow-vector - ${arrow.vector.classifier} - - - org.apache.arrow - arrow-compression - - - org.immutables - value - - - com.google.guava - guava - test - - - commons-cli - commons-cli - 1.6.0 - - - ch.qos.logback - logback-classic - 1.3.14 - test - - - com.fasterxml.jackson.core - jackson-core - - - com.fasterxml.jackson.core - jackson-databind - - - org.slf4j - slf4j-api - - - org.apache.arrow - arrow-memory-netty - runtime - - - org.apache.arrow - arrow-vector - ${project.version} - tests - test-jar - test - - + + + org.apache.arrow + arrow-memory-core + + + org.apache.arrow + arrow-vector + ${arrow.vector.classifier} + + + org.apache.arrow + arrow-compression + + + org.immutables + value + + + com.google.guava + guava + test + + + commons-cli + commons-cli + 1.6.0 + + + ch.qos.logback + logback-classic + 1.3.14 + test + + + com.fasterxml.jackson.core + jackson-core + + + com.fasterxml.jackson.core + jackson-databind + + + org.slf4j + slf4j-api + + + org.apache.arrow + arrow-memory-netty + runtime + + + org.apache.arrow + arrow-vector + ${project.version} + tests + test-jar + test + + - - - - maven-assembly-plugin - 3.7.1 - - - jar-with-dependencies - - - - - make-assembly - package - - single - - - - - - + + + + maven-assembly-plugin + 3.7.1 + + + jar-with-dependencies + + + + + make-assembly + + single + + package + + + + + diff --git a/java/vector/pom.xml b/java/vector/pom.xml index 436ffd15b297d..7127ec3ebcb48 100644 --- a/java/vector/pom.xml +++ b/java/vector/pom.xml @@ -1,4 +1,4 @@ - + ${basedir}/src/main/codegen - codegen + + + + + org.eclipse.m2e + lifecycle-mapping + 1.0.0 + + + + + + org.apache.drill.tools + drill-fmpp-maven-plugin + [1.0,) + + generate + + + + + false + true + + + + + + + + + @@ -117,10 +150,10 @@ run-unsafe - test test + test org.apache.arrow:arrow-memory-netty @@ -133,12 +166,13 @@ maven-resources-plugin - + + copy-fmpp-resources - initialize copy-resources + initialize ${project.build.directory}/codegen @@ -151,17 +185,18 @@ - + + org.apache.drill.tools drill-fmpp-maven-plugin 1.21.1 generate-fmpp - generate-sources generate + generate-sources src/main/codegen/config.fmpp ${project.build.directory}/generated-sources @@ -182,10 +217,10 @@ 3.2.4 - package shade + package @@ -208,44 +243,9 @@ - - - - - org.eclipse.m2e - lifecycle-mapping - 1.0.0 - - - - - - org.apache.drill.tools - drill-fmpp-maven-plugin - [1.0,) - - generate - - - - - false - true - - - - - - - - - - -