This is an automated email from the ASF dual-hosted git repository.
lidavidm pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/arrow.git
The following commit(s) were added to refs/heads/main by this push:
new 01d2fa0d46 GH-41307: [Java] Use org.apache:apache parent pom version
31 (#41772)
01d2fa0d46 is described below
commit 01d2fa0d461869a07b2ffeee517beb8116bd0ce2
Author: Laurent Goujon <[email protected]>
AuthorDate: Thu Jun 6 23:19:06 2024 -0700
GH-41307: [Java] Use org.apache:apache parent pom version 31 (#41772)
Use/update Maven modules to `org.apache:apache:31` and clean up Maven
modules to remove unnecessary configuration or outdated workarounds
* Add `org.apache:apache:31` to `org.apache.arrow:arrow-bom` and
`org.apache.arrow.maven.plugins:arrow-maven-plugins` to make them conformant
with ASF standards
* Update `org.apache.arrow:arrow-java-root` parent to `org.apache:parent:31`
* Use `version.*` and other properties to override plugin versions defined
by `org.apache:parent`
* Move standalone plugin versions under pluginManagement at the top level
* Cleanup redundant plugin version or configuration declaration
* Update `maven-dependency-plugin` to 3.6.1 and add the required overrides
when necessary
* Update `maven-shade-plugin` to 3.5.1 (via `org.apache:parent`)
- disable reduced dependency pom creation for non-terminal modules
* Remove enforcer check for java and maven version (handled by
`org.apache:parent`)
* Remove unnecessary `mvnrepository` link comments
* Remove `m2e.version` property check in profiles (only needed for
errorprone plugin configuration which is incompatible with M2E)
* Cleanup `argLine` overrides for surefire/failsafe plugins
* Remove unnecessary `../pom.xml` `<relativePath>` directives
* Remove source/target/encoding configuration properties for
`maven-compiler-plugin`, `maven-javadoc-plugin` and `maven-resources-plugin` as
it is handled by `org.apache:parent` and plugin themselves
* Remove unnecessary copy of codegen templates in `arrow-vector` module
* Remove unnecessary junit jupiter engine dependencies for
surefire/failsafe plugins.
* GitHub Issue: #41307
Lead-authored-by: Laurent Goujon <[email protected]>
Co-authored-by: Laurent Goujon <[email protected]>
Signed-off-by: David Li <[email protected]>
---
ci/scripts/java_full_build.sh | 10 +-
dev/tasks/tasks.yml | 2 -
java/adapter/avro/pom.xml | 9 -
java/adapter/jdbc/pom.xml | 7 -
java/adapter/orc/pom.xml | 17 ++
java/bom/pom.xml | 44 ++++-
java/c/pom.xml | 1 -
java/flight/flight-core/pom.xml | 29 +--
java/flight/flight-integration-tests/pom.xml | 2 -
java/flight/flight-sql-jdbc-core/pom.xml | 10 -
java/flight/flight-sql-jdbc-driver/pom.xml | 1 -
java/flight/flight-sql/pom.xml | 5 -
java/format/pom.xml | 2 -
java/gandiva/pom.xml | 19 +-
.../module-info-compiler-maven-plugin/pom.xml | 28 +--
java/maven/pom.xml | 120 ++++++------
java/memory/memory-core/pom.xml | 22 +--
java/performance/pom.xml | 41 +---
java/pom.xml | 207 +++++++++------------
java/tools/pom.xml | 22 ++-
java/vector/pom.xml | 94 +---------
21 files changed, 226 insertions(+), 466 deletions(-)
diff --git a/ci/scripts/java_full_build.sh b/ci/scripts/java_full_build.sh
index 2734f3e9db..d914aa2d84 100755
--- a/ci/scripts/java_full_build.sh
+++ b/ci/scripts/java_full_build.sh
@@ -49,21 +49,13 @@ fi
# build the entire project
mvn clean \
install \
- assembly:single \
- source:jar \
- javadoc:jar \
-Papache-release \
-Parrow-c-data \
-Parrow-jni \
-Darrow.cpp.build.dir=$dist_dir \
- -Darrow.c.jni.dist.dir=$dist_dir \
- -DdescriptorId=source-release
+ -Darrow.c.jni.dist.dir=$dist_dir
# copy all jar, zip and pom files to the distribution folder
-find . \
- "(" -name "*-javadoc.jar" -o -name "*-sources.jar" ")" \
- -exec echo {} ";" \
- -exec cp {} $dist_dir ";"
find ~/.m2/repository/org/apache/arrow \
"(" \
-name "*.jar" -o \
diff --git a/dev/tasks/tasks.yml b/dev/tasks/tasks.yml
index d8e09ec207..2d84751d0f 100644
--- a/dev/tasks/tasks.yml
+++ b/dev/tasks/tasks.yml
@@ -747,7 +747,6 @@ tasks:
- arrow-jdbc-{no_rc_snapshot_version}.pom
- arrow-maven-plugins-{no_rc_snapshot_version}-cyclonedx.json
- arrow-maven-plugins-{no_rc_snapshot_version}-cyclonedx.xml
- - arrow-maven-plugins-{no_rc_snapshot_version}-src.zip
- arrow-maven-plugins-{no_rc_snapshot_version}.pom
- arrow-memory-core-{no_rc_snapshot_version}-cyclonedx.json
- arrow-memory-core-{no_rc_snapshot_version}-cyclonedx.xml
@@ -851,7 +850,6 @@ tasks:
-
module-info-compiler-maven-plugin-{no_rc_snapshot_version}-cyclonedx.xml
- module-info-compiler-maven-plugin-{no_rc_snapshot_version}-javadoc.jar
- module-info-compiler-maven-plugin-{no_rc_snapshot_version}-sources.jar
- - module-info-compiler-maven-plugin-{no_rc_snapshot_version}-src.zip
- module-info-compiler-maven-plugin-{no_rc_snapshot_version}.jar
- module-info-compiler-maven-plugin-{no_rc_snapshot_version}.pom
diff --git a/java/adapter/avro/pom.xml b/java/adapter/avro/pom.xml
index 0046fcac62..f9bf295967 100644
--- a/java/adapter/avro/pom.xml
+++ b/java/adapter/avro/pom.xml
@@ -25,36 +25,27 @@
<url>http://maven.apache.org</url>
<dependencies>
-
- <!-- https://mvnrepository.com/artifact/org.apache.arrow/arrow-memory-core
-->
<dependency>
<groupId>org.apache.arrow</groupId>
<artifactId>arrow-memory-core</artifactId>
</dependency>
-
- <!--
https://mvnrepository.com/artifact/org.apache.arrow/arrow-memory-netty -->
<dependency>
<groupId>org.apache.arrow</groupId>
<artifactId>arrow-memory-netty</artifactId>
<scope>runtime</scope>
</dependency>
-
- <!-- https://mvnrepository.com/artifact/org.apache.arrow/arrow-vector -->
<dependency>
<groupId>org.apache.arrow</groupId>
<artifactId>arrow-vector</artifactId>
</dependency>
-
<dependency>
<groupId>org.immutables</groupId>
<artifactId>value-annotations</artifactId>
</dependency>
-
<dependency>
<groupId>org.apache.avro</groupId>
<artifactId>avro</artifactId>
<version>${dep.avro.version}</version>
</dependency>
</dependencies>
-
</project>
diff --git a/java/adapter/jdbc/pom.xml b/java/adapter/jdbc/pom.xml
index 17681538ac..2f2911dd9d 100644
--- a/java/adapter/jdbc/pom.xml
+++ b/java/adapter/jdbc/pom.xml
@@ -26,20 +26,17 @@
<dependencies>
- <!-- https://mvnrepository.com/artifact/org.apache.arrow/arrow-memory-core
-->
<dependency>
<groupId>org.apache.arrow</groupId>
<artifactId>arrow-memory-core</artifactId>
</dependency>
- <!--
https://mvnrepository.com/artifact/org.apache.arrow/arrow-memory-netty -->
<dependency>
<groupId>org.apache.arrow</groupId>
<artifactId>arrow-memory-netty</artifactId>
<scope>runtime</scope>
</dependency>
- <!-- https://mvnrepository.com/artifact/org.apache.arrow/arrow-vector -->
<dependency>
<groupId>org.apache.arrow</groupId>
<artifactId>arrow-vector</artifactId>
@@ -51,7 +48,6 @@
<artifactId>value-annotations</artifactId>
</dependency>
- <!-- https://mvnrepository.com/artifact/com.h2database/h2 -->
<dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
@@ -94,9 +90,6 @@
<id>jdk11+</id>
<activation>
<jdk>[11,]</jdk>
- <property>
- <name>!m2e.version</name>
- </property>
</activation>
<build>
<plugins>
diff --git a/java/adapter/orc/pom.xml b/java/adapter/orc/pom.xml
index ca817510bf..bc89c4698e 100644
--- a/java/adapter/orc/pom.xml
+++ b/java/adapter/orc/pom.xml
@@ -134,5 +134,22 @@
</includes>
</resource>
</resources>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>analyze</id>
+ <configuration>
+ <ignoredDependencies combine.children="append">
+ <!-- indirect use of org.apache.arrow.flatbuf.Message in
OrcStripeReader -->
+
<ignoredDependency>org.apache.arrow:arrow-format</ignoredDependency>
+ </ignoredDependencies>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
</build>
</project>
diff --git a/java/bom/pom.xml b/java/bom/pom.xml
index 12b9950ad8..77aed2d0f6 100644
--- a/java/bom/pom.xml
+++ b/java/bom/pom.xml
@@ -15,7 +15,7 @@
<parent>
<groupId>org.apache</groupId>
<artifactId>apache</artifactId>
- <version>18</version>
+ <version>31</version>
</parent>
<groupId>org.apache.arrow</groupId>
@@ -27,6 +27,19 @@
<properties>
<arrow.vector.classifier></arrow.vector.classifier>
+ <!-- org.apache:apache overrides -->
+ <maven.compiler.source>1.8</maven.compiler.source>
+ <maven.compiler.target>1.8</maven.compiler.target>
+ <maven.plugin.tools.version>3.12.0</maven.plugin.tools.version>
+ <surefire.version>3.2.5</surefire.version>
+ <version.apache-rat-plugin>0.16.1</version.apache-rat-plugin>
+ <version.maven-assembly-plugin>3.7.1</version.maven-assembly-plugin>
+ <version.maven-compiler-plugin>3.12.1</version.maven-compiler-plugin>
+ <version.maven-dependency-plugin>3.6.1</version.maven-dependency-plugin>
+ <version.maven-gpg-plugin>3.2.4</version.maven-gpg-plugin>
+ <version.maven-jar-plugin>3.2.2</version.maven-jar-plugin>
+ <version.maven-javadoc-plugin>3.6.3</version.maven-javadoc-plugin>
+
<version.maven-project-info-reports-plugin>3.5.0</version.maven-project-info-reports-plugin>
</properties>
<dependencyManagement>
@@ -138,11 +151,9 @@
<version>${project.version}</version>
</dependency>
</dependencies>
-
</dependencyManagement>
<build>
-
<pluginManagement>
<plugins>
<plugin>
@@ -156,12 +167,10 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId>
- <version>3.5.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
- <version>3.12.1</version>
</plugin>
<plugin>
<groupId>com.diffplug.spotless</groupId>
@@ -188,13 +197,34 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId>
- <version>3.5.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
- <version>3.12.1</version>
</plugin>
</plugins>
</reporting>
+
+ <profiles>
+ <profile>
+ <id>apache-release</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>source-release-assembly</id>
+ <configuration>
+ <!-- source release assembly is managed at the root of the
project. -->
+ <skipAssembly>true</skipAssembly>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
diff --git a/java/c/pom.xml b/java/c/pom.xml
index bfb233315a..afb6e0cd8b 100644
--- a/java/c/pom.xml
+++ b/java/c/pom.xml
@@ -83,5 +83,4 @@
</resource>
</resources>
</build>
-
</project>
diff --git a/java/flight/flight-core/pom.xml b/java/flight/flight-core/pom.xml
index b565572b38..f2070d4ff7 100644
--- a/java/flight/flight-core/pom.xml
+++ b/java/flight/flight-core/pom.xml
@@ -15,7 +15,6 @@
<groupId>org.apache.arrow</groupId>
<artifactId>arrow-flight</artifactId>
<version>17.0.0-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
</parent>
<artifactId>flight-core</artifactId>
@@ -151,13 +150,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
- <!--
- Downgrade maven-shade-plugin specifically for this module.
- Using a newer version up to at least 3.5.1 will cause
- issues in the arrow-tools tests looking up FlatBuffer
- dependencies.
- -->
- <version>3.2.4</version>
<executions>
<execution>
<id>shade-main</id>
@@ -166,6 +158,7 @@
</goals>
<phase>package</phase>
<configuration>
+ <createDependencyReducedPom>false</createDependencyReducedPom>
<shadedArtifactAttached>true</shadedArtifactAttached>
<shadedClassifierName>shaded</shadedClassifierName>
<artifactSet>
@@ -192,6 +185,7 @@
</goals>
<phase>package</phase>
<configuration>
+ <createDependencyReducedPom>false</createDependencyReducedPom>
<shadedArtifactAttached>true</shadedArtifactAttached>
<shadedClassifierName>shaded-ext</shadedClassifierName>
<artifactSet>
@@ -244,7 +238,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
- <version>3.3.0</version>
<executions>
<execution>
<id>analyze</id>
@@ -264,7 +257,6 @@
<!-- add generated sources to classpath -->
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
- <version>1.9.1</version>
<executions>
<execution>
<id>add-generated-sources-to-classpath</id>
@@ -282,7 +274,6 @@
</plugin>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
- <version>3.7.1</version>
<configuration>
<descriptorRefs>
<descriptorRef>jar-with-dependencies</descriptorRef>
@@ -299,13 +290,6 @@
</executions>
</plugin>
</plugins>
- <extensions>
- <extension>
- <groupId>kr.motd.maven</groupId>
- <artifactId>os-maven-plugin</artifactId>
- <version>1.7.1</version>
- </extension>
- </extensions>
</build>
<profiles>
@@ -313,18 +297,14 @@
<id>jdk11+</id>
<activation>
<jdk>[11,]</jdk>
- <property>
- <name>!m2e.version</name>
- </property>
</activation>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <configuration combine.self="override">
-
<argLine>--add-opens=org.apache.arrow.flight.core/org.apache.arrow.flight.perf.impl=protobuf.java
--add-opens=java.base/java.nio=org.apache.arrow.memory.core,ALL-UNNAMED</argLine>
- <enableAssertions>false</enableAssertions>
+ <configuration>
+ <argLine
combine.self="override">--add-opens=org.apache.arrow.flight.core/org.apache.arrow.flight.perf.impl=protobuf.java
--add-opens=java.base/java.nio=org.apache.arrow.memory.core,ALL-UNNAMED</argLine>
<systemPropertyVariables>
<arrow.test.dataRoot>${project.basedir}/../../../testing/data</arrow.test.dataRoot>
</systemPropertyVariables>
@@ -334,5 +314,4 @@
</build>
</profile>
</profiles>
-
</project>
diff --git a/java/flight/flight-integration-tests/pom.xml
b/java/flight/flight-integration-tests/pom.xml
index 74016d81e9..cd2c28ba89 100644
--- a/java/flight/flight-integration-tests/pom.xml
+++ b/java/flight/flight-integration-tests/pom.xml
@@ -15,7 +15,6 @@
<groupId>org.apache.arrow</groupId>
<artifactId>arrow-flight</artifactId>
<version>17.0.0-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
</parent>
<artifactId>flight-integration-tests</artifactId>
@@ -63,7 +62,6 @@
<plugins>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
- <version>3.7.1</version>
<configuration>
<descriptorRefs>
<descriptorRef>jar-with-dependencies</descriptorRef>
diff --git a/java/flight/flight-sql-jdbc-core/pom.xml
b/java/flight/flight-sql-jdbc-core/pom.xml
index 459412e0f8..50d7b2617a 100644
--- a/java/flight/flight-sql-jdbc-core/pom.xml
+++ b/java/flight/flight-sql-jdbc-core/pom.xml
@@ -15,7 +15,6 @@
<groupId>org.apache.arrow</groupId>
<artifactId>arrow-flight</artifactId>
<version>17.0.0-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
</parent>
<artifactId>flight-sql-jdbc-core</artifactId>
@@ -47,20 +46,17 @@
</exclusions>
</dependency>
- <!-- https://mvnrepository.com/artifact/org.apache.arrow/arrow-memory-core
-->
<dependency>
<groupId>org.apache.arrow</groupId>
<artifactId>arrow-memory-core</artifactId>
</dependency>
- <!--
https://mvnrepository.com/artifact/org.apache.arrow/arrow-memory-netty -->
<dependency>
<groupId>org.apache.arrow</groupId>
<artifactId>arrow-memory-netty</artifactId>
<scope>runtime</scope>
</dependency>
- <!-- https://mvnrepository.com/artifact/org.apache.arrow/arrow-vector -->
<dependency>
<groupId>org.apache.arrow</groupId>
<artifactId>arrow-vector</artifactId>
@@ -136,11 +132,6 @@
</dependencies>
<build>
- <resources>
- <resource>
- <directory>src/main/resources</directory>
- </resource>
- </resources>
<plugins>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
@@ -154,7 +145,6 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>properties-maven-plugin</artifactId>
- <version>1.2.1</version>
<executions>
<execution>
<id>write-project-properties-to-file</id>
diff --git a/java/flight/flight-sql-jdbc-driver/pom.xml
b/java/flight/flight-sql-jdbc-driver/pom.xml
index b3afbe1def..4456270e7b 100644
--- a/java/flight/flight-sql-jdbc-driver/pom.xml
+++ b/java/flight/flight-sql-jdbc-driver/pom.xml
@@ -15,7 +15,6 @@
<groupId>org.apache.arrow</groupId>
<artifactId>arrow-flight</artifactId>
<version>17.0.0-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
</parent>
<artifactId>flight-sql-jdbc-driver</artifactId>
diff --git a/java/flight/flight-sql/pom.xml b/java/flight/flight-sql/pom.xml
index e6d703c673..14fde34c3b 100644
--- a/java/flight/flight-sql/pom.xml
+++ b/java/flight/flight-sql/pom.xml
@@ -15,7 +15,6 @@
<groupId>org.apache.arrow</groupId>
<artifactId>arrow-flight</artifactId>
<version>17.0.0-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
</parent>
<artifactId>flight-sql</artifactId>
@@ -119,9 +118,6 @@
<id>jdk11+</id>
<activation>
<jdk>[11,]</jdk>
- <property>
- <name>!m2e.version</name>
- </property>
</activation>
<build>
<plugins>
@@ -136,5 +132,4 @@
</build>
</profile>
</profiles>
-
</project>
diff --git a/java/format/pom.xml b/java/format/pom.xml
index e9eded79de..4483047e20 100644
--- a/java/format/pom.xml
+++ b/java/format/pom.xml
@@ -31,7 +31,6 @@
</dependencies>
<build>
-
<plugins>
<plugin>
<!-- no checkstyle on the generated code -->
@@ -42,6 +41,5 @@
</configuration>
</plugin>
</plugins>
-
</build>
</project>
diff --git a/java/gandiva/pom.xml b/java/gandiva/pom.xml
index a87f26028b..1c17023e5c 100644
--- a/java/gandiva/pom.xml
+++ b/java/gandiva/pom.xml
@@ -22,13 +22,12 @@
<packaging>jar</packaging>
<name>Arrow Gandiva</name>
<description>Java wrappers around the native Gandiva SQL expression
compiler.</description>
+
<properties>
- <maven.compiler.source>1.8</maven.compiler.source>
- <maven.compiler.target>1.8</maven.compiler.target>
- <protobuf.version>3.25.1</protobuf.version>
<checkstyle.failOnViolation>true</checkstyle.failOnViolation>
<arrow.cpp.build.dir>../../../cpp/release-build</arrow.cpp.build.dir>
</properties>
+
<dependencies>
<dependency>
<groupId>org.apache.arrow</groupId>
@@ -51,7 +50,6 @@
<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java</artifactId>
- <version>${protobuf.version}</version>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
@@ -62,6 +60,7 @@
<artifactId>slf4j-api</artifactId>
</dependency>
</dependencies>
+
<build>
<resources>
<resource>
@@ -88,14 +87,6 @@
</executions>
</plugin>
</plugins>
-
- <extensions>
- <extension>
- <groupId>kr.motd.maven</groupId>
- <artifactId>os-maven-plugin</artifactId>
- <version>1.7.1</version>
- </extension>
- </extensions>
</build>
<profiles>
<profile>
@@ -105,7 +96,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
- <version>2.2.1</version>
<executions>
<execution>
<id>attach-sources</id>
@@ -118,7 +108,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>3.6.3</version>
<executions>
<execution>
<id>attach-javadocs</id>
@@ -131,7 +120,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
- <version>3.2.4</version>
<executions>
<execution>
<id>sign-artifacts</id>
@@ -146,5 +134,4 @@
</build>
</profile>
</profiles>
-
</project>
diff --git a/java/maven/module-info-compiler-maven-plugin/pom.xml
b/java/maven/module-info-compiler-maven-plugin/pom.xml
index 57ba7933ea..9f0cd7b103 100644
--- a/java/maven/module-info-compiler-maven-plugin/pom.xml
+++ b/java/maven/module-info-compiler-maven-plugin/pom.xml
@@ -64,39 +64,14 @@
<dependency>
<groupId>org.apache.maven.plugin-tools</groupId>
<artifactId>maven-plugin-annotations</artifactId>
- <version>3.11.0</version>
+ <version>${maven.plugin.tools.version}</version>
<scope>provided</scope>
</dependency>
</dependencies>
<build>
<pluginManagement>
- <!-- lock down plugins versions to avoid using Maven defaults (may be
moved to parent pom) -->
<plugins>
- <plugin>
- <artifactId>maven-clean-plugin</artifactId>
- <version>3.3.2</version>
- </plugin>
- <plugin>
- <artifactId>maven-plugin-plugin</artifactId>
- <version>3.12.0</version>
- </plugin>
- <plugin>
- <artifactId>maven-jar-plugin</artifactId>
- <version>3.3.0</version>
- </plugin>
- <plugin>
- <artifactId>maven-install-plugin</artifactId>
- <version>3.1.2</version>
- </plugin>
- <plugin>
- <artifactId>maven-deploy-plugin</artifactId>
- <version>3.1.1</version>
- </plugin>
- <plugin>
- <artifactId>maven-invoker-plugin</artifactId>
- <version>3.1.0</version>
- </plugin>
<plugin>
<groupId>com.gradle</groupId>
<artifactId>develocity-maven-extension</artifactId>
@@ -118,7 +93,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-plugin-plugin</artifactId>
- <version>3.12.0</version>
<configuration>
<skipErrorNoDescriptorsFound>true</skipErrorNoDescriptorsFound>
</configuration>
diff --git a/java/maven/pom.xml b/java/maven/pom.xml
index 470e198cae..72140dd657 100644
--- a/java/maven/pom.xml
+++ b/java/maven/pom.xml
@@ -15,6 +15,13 @@
Note: Do not inherit from the Arrow parent POM as plugins can be referenced
during the parent POM, introducing circular dependencies.
-->
+ <parent>
+ <groupId>org.apache</groupId>
+ <artifactId>apache</artifactId>
+ <version>31</version>
+ <relativePath></relativePath>
+ </parent>
+
<groupId>org.apache.arrow.maven.plugins</groupId>
<artifactId>arrow-maven-plugins</artifactId>
<version>17.0.0-SNAPSHOT</version>
@@ -27,25 +34,38 @@
<properties>
<checkstyle.failOnViolation>true</checkstyle.failOnViolation>
+ <!-- org.apache:apache overrides -->
+ <maven.compiler.source>1.8</maven.compiler.source>
+ <maven.compiler.target>1.8</maven.compiler.target>
+ <maven.plugin.tools.version>3.12.0</maven.plugin.tools.version>
+ <surefire.version>3.2.5</surefire.version>
+ <version.apache-rat-plugin>0.16.1</version.apache-rat-plugin>
+ <version.maven-assembly-plugin>3.7.1</version.maven-assembly-plugin>
+ <version.maven-compiler-plugin>3.12.1</version.maven-compiler-plugin>
+ <version.maven-dependency-plugin>3.6.1</version.maven-dependency-plugin>
+ <version.maven-gpg-plugin>3.2.4</version.maven-gpg-plugin>
+ <version.maven-jar-plugin>3.2.2</version.maven-jar-plugin>
+ <version.maven-javadoc-plugin>3.6.3</version.maven-javadoc-plugin>
+
<version.maven-project-info-reports-plugin>3.5.0</version.maven-project-info-reports-plugin>
</properties>
<build>
<pluginManagement>
<plugins>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-project-info-reports-plugin</artifactId>
- <version>3.5.0</version>
+ <groupId>com.diffplug.spotless</groupId>
+ <artifactId>spotless-maven-plugin</artifactId>
+ <version>2.30.0</version>
</plugin>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-site-plugin</artifactId>
- <version>3.12.1</version>
+ <groupId>pl.project13.maven</groupId>
+ <artifactId>git-commit-id-plugin</artifactId>
+ <version>4.0.5</version>
</plugin>
<plugin>
- <groupId>com.diffplug.spotless</groupId>
- <artifactId>spotless-maven-plugin</artifactId>
- <version>2.30.0</version>
+ <groupId>org.cyclonedx</groupId>
+ <artifactId>cyclonedx-maven-plugin</artifactId>
+ <version>2.7.11</version>
</plugin>
</plugins>
</pluginManagement>
@@ -119,11 +139,6 @@
<exclude>**/logback.xml</exclude>
</excludes>
<archive>
- <index>true</index>
- <manifest>
-
<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
-
<addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
- </manifest>
<manifestEntries>
<Extension-Name>org.apache.arrow</Extension-Name>
<Built-By>${username}</Built-By>
@@ -143,43 +158,17 @@
</executions>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-resources-plugin</artifactId>
- <configuration>
- <encoding>UTF-8</encoding>
- </configuration>
- </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
- <encoding>UTF-8</encoding>
- <source>1.8</source>
- <target>1.8</target>
<maxmem>2048m</maxmem>
- <useIncrementalCompilation>false</useIncrementalCompilation>
<fork>true</fork>
</configuration>
</plugin>
<plugin>
<artifactId>maven-enforcer-plugin</artifactId>
<executions>
- <execution>
- <id>validate_java_and_maven_version</id>
- <goals>
- <goal>enforce</goal>
- </goals>
- <phase>verify</phase>
- <inherited>false</inherited>
- <configuration>
- <rules>
- <requireMavenVersion>
- <version>[3.3.0,4)</version>
- </requireMavenVersion>
- </rules>
- </configuration>
- </execution>
<execution>
<id>avoid_bad_dependencies</id>
<goals>
@@ -205,8 +194,6 @@
<plugin>
<groupId>pl.project13.maven</groupId>
<artifactId>git-commit-id-plugin</artifactId>
- <version>4.0.5</version>
-
<configuration>
<dateFormat>dd.MM.yyyy '@' HH:mm:ss z</dateFormat>
<verbose>false</verbose>
@@ -248,7 +235,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
- <version>3.1.0</version>
<configuration>
<configLocation>../dev/checkstyle/checkstyle.xml</configLocation>
<headerLocation>../dev/checkstyle/checkstyle.license</headerLocation>
@@ -288,7 +274,6 @@
<plugin>
<groupId>org.cyclonedx</groupId>
<artifactId>cyclonedx-maven-plugin</artifactId>
- <version>2.7.11</version>
<executions>
<execution>
<goals>
@@ -298,28 +283,6 @@
</execution>
</executions>
</plugin>
- <!--
- Generate custom Arrow Java Maven Plugin for module-info.java compiler.
- Needed to pass GitHub CI validation `$ mvn assembly:single`
- -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <descriptorRefs>
- <descriptorRef>src</descriptorRef>
- </descriptorRefs>
- </configuration>
- <executions>
- <execution>
- <goals>
- <goal>single</goal>
- </goals>
- <phase>package</phase>
- </execution>
- </executions>
- </plugin>
-
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId>
@@ -353,13 +316,34 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId>
- <version>3.5.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
- <version>3.12.1</version>
</plugin>
</plugins>
</reporting>
+
+ <profiles>
+ <profile>
+ <id>apache-release</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>source-release-assembly</id>
+ <configuration>
+ <!-- source release assembly is managed at the root of the
project. -->
+ <skipAssembly>true</skipAssembly>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
diff --git a/java/memory/memory-core/pom.xml b/java/memory/memory-core/pom.xml
index 1e29ccf8ab..783a13a6fb 100644
--- a/java/memory/memory-core/pom.xml
+++ b/java/memory/memory-core/pom.xml
@@ -61,9 +61,6 @@
<id>jdk11+</id>
<activation>
<jdk>[11,]</jdk>
- <property>
- <name>!m2e.version</name>
- </property>
</activation>
<build>
<plugins>
@@ -92,7 +89,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
-
<executions>
<execution>
<id>opens-tests</id>
@@ -101,12 +97,9 @@
</goals>
<phase>test</phase>
<configuration>
- <!-- Dummy value to stop inheriting the default add-opens
flag -->
- <argLine>-Dfoo=bar</argLine>
- <excludes>
- <!-- Need something (anything) here to make Maven not
inherit the value above -->
- <exclude>**/TestArrowBuf.java</exclude>
- </excludes>
+ <!-- Do not inherit the default add-opens flag and excludes
-->
+ <argLine combine.self="override"></argLine>
+ <excludes combine.self="override"></excludes>
<includes>
<include>**/TestOpens.java</include>
</includes>
@@ -129,9 +122,6 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
- <source>8</source>
- <target>8</target>
- <encoding>UTF-8</encoding>
<compilerArgs combine.children="append">
<arg>-Xmaxerrs</arg>
<!-- javac only reports the first 100 errors or warnings -->
@@ -150,12 +140,6 @@
<version>${checker.framework.version}</version>
</path>
</annotationProcessorPaths>
- <annotationProcessors>
- <!-- To support @Value.Immutable processors -->
-
<annotationProcessor>org.immutables.value.internal.$processor$.$Processor</annotationProcessor>
- <!-- Add all the checkers you want to enable here -->
-
<annotationProcessor>org.checkerframework.checker.nullness.NullnessChecker</annotationProcessor>
- </annotationProcessors>
</configuration>
</plugin>
</plugins>
diff --git a/java/performance/pom.xml b/java/performance/pom.xml
index f01e8d9a4e..07ca8d1e61 100644
--- a/java/performance/pom.xml
+++ b/java/performance/pom.xml
@@ -22,9 +22,7 @@
<description>JMH Performance benchmarks for other Arrow
libraries.</description>
<properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<jmh.version>1.37</jmh.version>
- <javac.target>1.8</javac.target>
<uberjar.name>benchmarks</uberjar.name>
<skip.perf.benchmarks>true</skip.perf.benchmarks>
<benchmark.filter>.*</benchmark.filter>
@@ -83,42 +81,6 @@
</dependencies>
<build>
- <pluginManagement>
- <plugins>
- <plugin>
- <artifactId>maven-clean-plugin</artifactId>
- <version>3.3.2</version>
- </plugin>
- <plugin>
- <artifactId>maven-deploy-plugin</artifactId>
- <version>3.1.1</version>
- </plugin>
- <plugin>
- <artifactId>maven-install-plugin</artifactId>
- <version>3.1.2</version>
- </plugin>
- <plugin>
- <artifactId>maven-jar-plugin</artifactId>
- <version>3.3.0</version>
- </plugin>
- <plugin>
- <artifactId>maven-javadoc-plugin</artifactId>
- <version>3.6.3</version>
- </plugin>
- <plugin>
- <artifactId>maven-resources-plugin</artifactId>
- <version>3.3.1</version>
- </plugin>
- <plugin>
- <artifactId>maven-source-plugin</artifactId>
- <version>2.2.1</version>
- </plugin>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>3.2.5</version>
- </plugin>
- </plugins>
- </pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -144,6 +106,7 @@
<phase>package</phase>
<configuration>
<finalName>${uberjar.name}</finalName>
+ <createDependencyReducedPom>false</createDependencyReducedPom>
<transformers>
<transformer
implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
<mainClass>org.openjdk.jmh.Main</mainClass>
@@ -166,7 +129,6 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
- <version>3.2.0</version>
<configuration>
<skip>${skip.perf.benchmarks}</skip>
<classpathScope>test</classpathScope>
@@ -203,5 +165,4 @@
</plugin>
</plugins>
</build>
-
</project>
diff --git a/java/pom.xml b/java/pom.xml
index 0e9b7f0e25..9624444cf4 100644
--- a/java/pom.xml
+++ b/java/pom.xml
@@ -15,7 +15,7 @@
<parent>
<groupId>org.apache</groupId>
<artifactId>apache</artifactId>
- <version>18</version>
+ <version>31</version>
</parent>
<groupId>org.apache.arrow</groupId>
@@ -85,7 +85,7 @@
<dep.guava-bom.version>33.2.1-jre</dep.guava-bom.version>
<dep.netty-bom.version>4.1.108.Final</dep.netty-bom.version>
<dep.grpc-bom.version>1.63.0</dep.grpc-bom.version>
- <dep.protobuf-bom.version>3.23.1</dep.protobuf-bom.version>
+ <dep.protobuf-bom.version>3.25.1</dep.protobuf-bom.version>
<dep.jackson-bom.version>2.17.0</dep.jackson-bom.version>
<dep.hadoop.version>3.4.0</dep.hadoop.version>
<dep.fbs.version>23.5.26</dep.fbs.version>
@@ -95,10 +95,28 @@
<checkstyle.failOnViolation>true</checkstyle.failOnViolation>
<errorprone.javac.version>9+181-r4173-1</errorprone.javac.version>
<error_prone_core.version>2.28.0</error_prone_core.version>
- <maven-compiler-plugin.version>3.12.1</maven-compiler-plugin.version>
<mockito.core.version>5.11.0</mockito.core.version>
<mockito.inline.version>5.2.0</mockito.inline.version>
<checker.framework.version>3.43.0</checker.framework.version>
+ <doclint>none</doclint>
+ <additionalparam>-Xdoclint:none</additionalparam>
+ <!-- org.apache:apache overrides -->
+ <maven.compiler.source>1.8</maven.compiler.source>
+ <maven.compiler.target>1.8</maven.compiler.target>
+ <maven.plugin.tools.version>3.12.0</maven.plugin.tools.version>
+ <surefire.version>3.2.5</surefire.version>
+ <version.apache-rat-plugin>0.16.1</version.apache-rat-plugin>
+ <version.maven-assembly-plugin>3.7.1</version.maven-assembly-plugin>
+ <version.maven-compiler-plugin>3.12.1</version.maven-compiler-plugin>
+ <version.maven-dependency-plugin>3.6.1</version.maven-dependency-plugin>
+ <version.maven-gpg-plugin>3.2.4</version.maven-gpg-plugin>
+ <!--
+ Downgrade maven-jar-plugin until
https://github.com/codehaus-plexus/plexus-archiver/issues/332
+ is addressed
+ -->
+ <version.maven-jar-plugin>3.2.2</version.maven-jar-plugin>
+ <version.maven-javadoc-plugin>3.6.3</version.maven-javadoc-plugin>
+
<version.maven-project-info-reports-plugin>3.5.0</version.maven-project-info-reports-plugin>
</properties>
<dependencyManagement>
@@ -269,40 +287,16 @@
<version>8.3.0</version>
<scope>test</scope>
</dependency>
-
</dependencies>
- <repositories></repositories>
-
<build>
-
<pluginManagement>
<plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <!--
- This appears to report a false positive with versions
- greater than 3.1.2 (tested up to 3.6.0) when compiling
- arrow-tools about Jackson being only used for tests.
- -->
- <version>3.1.2</version>
- </plugin>
- <plugin>
- <groupId>org.apache.rat</groupId>
- <artifactId>apache-rat-plugin</artifactId>
- <version>0.16.1</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-resources-plugin</artifactId>
- <version>3.3.1</version>
- </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>${maven-compiler-plugin.version}</version>
<configuration>
+ <fork>true</fork>
<excludes>**/module-info.java</excludes>
<testExcludes>**/module-info.java</testExcludes>
<useModulePath>false</useModulePath>
@@ -315,18 +309,8 @@
</annotationProcessorPaths>
</configuration>
</plugin>
- <plugin>
- <artifactId>maven-enforcer-plugin</artifactId>
- <version>3.4.1</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-shade-plugin</artifactId>
- <version>3.5.1</version>
- </plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
- <version>3.2.5</version>
<configuration>
<enableAssertions>true</enableAssertions>
<childDelegation>true</childDelegation>
@@ -341,22 +325,9 @@
<arrow.vector.max_allocation_bytes>1048576</arrow.vector.max_allocation_bytes>
</systemPropertyVariables>
</configuration>
- <dependencies>
- <dependency>
- <groupId>org.junit.jupiter</groupId>
- <artifactId>junit-jupiter-engine</artifactId>
- <version>${dep.junit.jupiter.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.surefire</groupId>
- <artifactId>surefire-junit-platform</artifactId>
- <version>3.2.5</version>
- </dependency>
- </dependencies>
</plugin>
<plugin>
<artifactId>maven-failsafe-plugin</artifactId>
- <version>3.2.5</version>
<configuration>
<systemPropertyVariables>
<java.io.tmpdir>${project.build.directory}</java.io.tmpdir>
@@ -445,6 +416,22 @@
<ignore></ignore>
</action>
</pluginExecution>
+ <pluginExecution>
+ <pluginExecutionFilter>
+ <groupId>org.apache.drill.tools</groupId>
+ <artifactId>drill-fmpp-maven-plugin</artifactId>
+ <versionRange>[1.0,)</versionRange>
+ <goals>
+ <goal>generate</goal>
+ </goals>
+ </pluginExecutionFilter>
+ <action>
+ <execute>
+ <runOnIncremental>false</runOnIncremental>
+ <runOnConfiguration>true</runOnConfiguration>
+ </execute>
+ </action>
+ </pluginExecution>
</pluginExecutions>
</lifecycleMappingMetadata>
</configuration>
@@ -452,9 +439,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>3.6.3</version>
<configuration>
- <source>8</source>
<sourceFileExcludes>
<sourceFileExclude>**/module-info.java</sourceFileExclude>
</sourceFileExcludes>
@@ -465,16 +450,6 @@
<artifactId>module-info-compiler-maven-plugin</artifactId>
<version>${project.version}</version>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-project-info-reports-plugin</artifactId>
- <version>3.5.0</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-site-plugin</artifactId>
- <version>3.12.1</version>
- </plugin>
<plugin>
<groupId>com.gradle</groupId>
<artifactId>develocity-maven-extension</artifactId>
@@ -522,6 +497,36 @@
<artifactId>spotless-maven-plugin</artifactId>
<version>2.30.0</version>
</plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <version>1.9.1</version>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>properties-maven-plugin</artifactId>
+ <version>1.2.1</version>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>exec-maven-plugin</artifactId>
+ <version>3.2.0</version>
+ </plugin>
+ <plugin>
+ <groupId>pl.project13.maven</groupId>
+ <artifactId>git-commit-id-plugin</artifactId>
+ <version>4.0.5</version>
+ </plugin>
+ <plugin>
+ <groupId>org.cyclonedx</groupId>
+ <artifactId>cyclonedx-maven-plugin</artifactId>
+ <version>2.7.11</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.drill.tools</groupId>
+ <artifactId>drill-fmpp-maven-plugin</artifactId>
+ <version>1.21.1</version>
+ </plugin>
</plugins>
</pluginManagement>
@@ -595,11 +600,6 @@
<exclude>**/logback.xml</exclude>
</excludes>
<archive>
- <index>true</index>
- <manifest>
-
<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
-
<addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
- </manifest>
<manifestEntries>
<Extension-Name>org.apache.arrow</Extension-Name>
<Built-By>${username}</Built-By>
@@ -619,42 +619,17 @@
</executions>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-resources-plugin</artifactId>
- <configuration>
- <encoding>UTF-8</encoding>
- </configuration>
- </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
- <source>1.8</source>
- <target>1.8</target>
<maxmem>2048m</maxmem>
- <useIncrementalCompilation>false</useIncrementalCompilation>
<fork>true</fork>
</configuration>
</plugin>
<plugin>
<artifactId>maven-enforcer-plugin</artifactId>
<executions>
- <execution>
- <id>validate_java_and_maven_version</id>
- <goals>
- <goal>enforce</goal>
- </goals>
- <phase>verify</phase>
- <inherited>false</inherited>
- <configuration>
- <rules>
- <requireMavenVersion>
- <version>[3.3.0,4)</version>
- </requireMavenVersion>
- </rules>
- </configuration>
- </execution>
<execution>
<id>avoid_bad_dependencies</id>
<goals>
@@ -683,8 +658,6 @@
<plugin>
<groupId>pl.project13.maven</groupId>
<artifactId>git-commit-id-plugin</artifactId>
- <version>4.0.5</version>
-
<configuration>
<dateFormat>dd.MM.yyyy '@' HH:mm:ss z</dateFormat>
<verbose>false</verbose>
@@ -726,7 +699,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
- <version>3.1.0</version>
<configuration>
<excludes>**/module-info.java</excludes>
<configLocation>dev/checkstyle/checkstyle.xml</configLocation>
@@ -789,7 +761,6 @@
<plugin>
<groupId>org.cyclonedx</groupId>
<artifactId>cyclonedx-maven-plugin</artifactId>
- <version>2.7.11</version>
<executions>
<execution>
<goals>
@@ -820,12 +791,10 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId>
- <version>3.5.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
- <version>3.12.1</version>
</plugin>
<plugin>
<groupId>com.diffplug.spotless</groupId>
@@ -860,7 +829,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>3.6.3</version>
<configuration>
<sourceFileExcludes>
<sourceFileExclude>**/module-info.java</sourceFileExclude>
@@ -888,28 +856,15 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId>
- <version>3.5.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
- <version>3.12.1</version>
</plugin>
</plugins>
</reporting>
<profiles>
- <profile>
- <id>java-nodoclint</id>
- <activation>
- <jdk>[1.8,)</jdk>
- </activation>
- <properties>
- <doclint>none</doclint>
- <additionalparam>-Xdoclint:none</additionalparam>
- </properties>
- </profile>
-
<profile>
<!-- C data interface depends on building a native library -->
<id>arrow-c-data</id>
@@ -960,7 +915,6 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
- <fork>true</fork>
<compilerArgs combine.children="append">
<arg>-XDcompilePolicy=simple</arg>
<arg>-Xplugin:ErrorProne</arg>
@@ -1000,9 +954,6 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
- <source>8</source>
- <target>8</target>
- <encoding>UTF-8</encoding>
<compilerArgs combine.children="append">
<arg>-XDcompilePolicy=simple</arg>
<arg>-Xplugin:ErrorProne
-XepExcludedPaths:.*/(target/generated-source|format/src/main/java/org/apache/arrow/flatbuf)/.*</arg>
@@ -1026,6 +977,16 @@
</annotationProcessorPaths>
</configuration>
</plugin>
+ </plugins>
+ </build>
+ </profile>
+ <profile>
+ <id>jdk11+</id>
+ <activation>
+ <jdk>[11,]</jdk>
+ </activation>
+ <build>
+ <plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
@@ -1033,6 +994,13 @@
<argLine>--add-opens=java.base/java.nio=org.apache.arrow.memory.core,ALL-UNNAMED</argLine>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-failsafe-plugin</artifactId>
+ <configuration>
+
<argLine>--add-opens=java.base/java.nio=org.apache.arrow.memory.core,ALL-UNNAMED</argLine>
+ </configuration>
+ </plugin>
</plugins>
</build>
</profile>
@@ -1073,7 +1041,6 @@
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
- <version>0.8.11</version>
<reportSets>
<reportSet>
<!-- don't run aggregate in child modules -->
@@ -1119,7 +1086,6 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
- <version>3.2.0</version>
<executions>
<execution>
<id>cdata-cmake</id>
@@ -1176,7 +1142,6 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
- <version>3.2.0</version>
<executions>
<execution>
<id>jni-cpp-cmake</id>
@@ -1283,7 +1248,6 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
- <version>3.2.0</version>
<executions>
<execution>
<id>jni-cpp-cmake</id>
@@ -1373,5 +1337,4 @@
</build>
</profile>
</profiles>
-
</project>
diff --git a/java/tools/pom.xml b/java/tools/pom.xml
index 5d9db75e52..53dcd51771 100644
--- a/java/tools/pom.xml
+++ b/java/tools/pom.xml
@@ -54,6 +54,11 @@
<version>1.3.14</version>
<scope>test</scope>
</dependency>
+ <!--
+ Adding jackson as a compile dependency although only directly used in
tests.
+ Using <scope>test</scope> however would cause the final scope to be
test instead of
+ compile because of MNG-4156
+ -->
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
@@ -85,7 +90,6 @@
<plugins>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
- <version>3.7.1</version>
<configuration>
<descriptorRefs>
<descriptorRef>jar-with-dependencies</descriptorRef>
@@ -101,7 +105,21 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>analyze</id>
+ <phase>verify</phase>
+ <configuration>
+ <ignoredNonTestScopedDependencies>
+
<ignoredNonTestScopedDependency>com.fasterxml.jackson.core:*</ignoredNonTestScopedDependency>
+ </ignoredNonTestScopedDependencies>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
-
</project>
diff --git a/java/vector/pom.xml b/java/vector/pom.xml
index c39504df2b..6ff869ee21 100644
--- a/java/vector/pom.xml
+++ b/java/vector/pom.xml
@@ -76,64 +76,7 @@
</dependency>
</dependencies>
- <pluginRepositories>
- <pluginRepository>
- <releases>
- <enabled>true</enabled>
- </releases>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- <id>apache</id>
- <name>apache</name>
- <url>https://repo.maven.apache.org/maven2/</url>
- </pluginRepository>
- </pluginRepositories>
-
<build>
-
- <resources>
- <resource>
- <targetPath>codegen</targetPath>
- <!-- Copy freemarker template and fmpp configuration files of Vector's
- to allow clients to leverage definitions. -->
- <directory>${basedir}/src/main/codegen</directory>
- </resource>
- </resources>
- <pluginManagement>
- <plugins>
- <!--This plugin's configuration is used to store Eclipse m2e settings
- only. It has no influence on the Maven build itself. -->
- <plugin>
- <groupId>org.eclipse.m2e</groupId>
- <artifactId>lifecycle-mapping</artifactId>
- <version>1.0.0</version>
- <configuration>
- <lifecycleMappingMetadata>
- <pluginExecutions>
- <pluginExecution>
- <pluginExecutionFilter>
- <groupId>org.apache.drill.tools</groupId>
- <artifactId>drill-fmpp-maven-plugin</artifactId>
- <versionRange>[1.0,)</versionRange>
- <goals>
- <goal>generate</goal>
- </goals>
- </pluginExecutionFilter>
- <action>
- <execute>
- <runOnIncremental>false</runOnIncremental>
- <runOnConfiguration>true</runOnConfiguration>
- </execute>
- </action>
- </pluginExecution>
- </pluginExecutions>
- </lifecycleMappingMetadata>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
-
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -163,33 +106,10 @@
</execution>
</executions>
</plugin>
- <plugin>
- <artifactId>maven-resources-plugin</artifactId>
- <executions>
- <execution>
- <!-- copy all templates in the same location to compile them at
once -->
- <id>copy-fmpp-resources</id>
- <goals>
- <goal>copy-resources</goal>
- </goals>
- <phase>initialize</phase>
- <configuration>
-
<outputDirectory>${project.build.directory}/codegen</outputDirectory>
- <resources>
- <resource>
- <directory>src/main/codegen</directory>
- <filtering>false</filtering>
- </resource>
- </resources>
- </configuration>
- </execution>
- </executions>
- </plugin>
<plugin>
<!-- generate sources from fmpp -->
<groupId>org.apache.drill.tools</groupId>
<artifactId>drill-fmpp-maven-plugin</artifactId>
- <version>1.21.1</version>
<executions>
<execution>
<id>generate-fmpp</id>
@@ -200,7 +120,7 @@
<configuration>
<config>src/main/codegen/config.fmpp</config>
<output>${project.build.directory}/generated-sources/fmpp</output>
-
<templates>${project.build.directory}/codegen/templates</templates>
+ <templates>src/main/codegen/templates</templates>
</configuration>
</execution>
</executions>
@@ -208,13 +128,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
- <!--
- Downgrade maven-shade-plugin specifically for this module.
- Using a newer version up to at least 3.5.1 will cause
- issues in the arrow-tools tests looking up FlatBuffer
- dependencies.
- -->
- <version>3.2.4</version>
<executions>
<execution>
<goals>
@@ -228,10 +141,9 @@
<include>com.google.flatbuffers:*</include>
</includes>
</artifactSet>
+ <createDependencyReducedPom>false</createDependencyReducedPom>
<shadedArtifactAttached>true</shadedArtifactAttached>
<shadedClassifierName>shade-format-flatbuffers</shadedClassifierName>
-
<keepDependenciesWithProvidedScope>true</keepDependenciesWithProvidedScope>
-
<promoteTransitiveDependencies>true</promoteTransitiveDependencies>
<relocations>
<relocation>
<pattern>com.google.flatbuffers</pattern>
@@ -243,7 +155,6 @@
</executions>
</plugin>
</plugins>
-
</build>
<profiles>
@@ -276,5 +187,4 @@
</build>
</profile>
</profiles>
-
</project>
