Skip to content

Commit 3c561a2

Browse files
lidavidmlidavidm
committed
GH-41571: [Java] Revert GH-41307 (#41309)
This reverts commit 9090e67.
1 parent 6658044 commit 3c561a2

File tree

20 files changed

+441
-177
lines changed

20 files changed

+441
-177
lines changed

‎java/adapter/avro/pom.xml‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,27 +25,36 @@
2525
<url>http://maven.apache.org</url>
2626

2727
<dependencies>
28+
29+
<!-- https://mvnrepository.com/artifact/org.apache.arrow/arrow-memory-core -->
2830
<dependency>
2931
<groupId>org.apache.arrow</groupId>
3032
<artifactId>arrow-memory-core</artifactId>
3133
</dependency>
34+
35+
<!-- https://mvnrepository.com/artifact/org.apache.arrow/arrow-memory-netty -->
3236
<dependency>
3337
<groupId>org.apache.arrow</groupId>
3438
<artifactId>arrow-memory-netty</artifactId>
3539
<scope>runtime</scope>
3640
</dependency>
41+
42+
<!-- https://mvnrepository.com/artifact/org.apache.arrow/arrow-vector -->
3743
<dependency>
3844
<groupId>org.apache.arrow</groupId>
3945
<artifactId>arrow-vector</artifactId>
4046
</dependency>
47+
4148
<dependency>
4249
<groupId>org.immutables</groupId>
4350
<artifactId>value</artifactId>
4451
</dependency>
52+
4553
<dependency>
4654
<groupId>org.apache.avro</groupId>
4755
<artifactId>avro</artifactId>
4856
<version>${dep.avro.version}</version>
4957
</dependency>
5058
</dependencies>
59+
5160
</project>

‎java/adapter/jdbc/pom.xml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,17 +26,20 @@
2626

2727
<dependencies>
2828

29+
<!-- https://mvnrepository.com/artifact/org.apache.arrow/arrow-memory-core -->
2930
<dependency>
3031
<groupId>org.apache.arrow</groupId>
3132
<artifactId>arrow-memory-core</artifactId>
3233
</dependency>
3334

35+
<!-- https://mvnrepository.com/artifact/org.apache.arrow/arrow-memory-netty -->
3436
<dependency>
3537
<groupId>org.apache.arrow</groupId>
3638
<artifactId>arrow-memory-netty</artifactId>
3739
<scope>runtime</scope>
3840
</dependency>
3941

42+
<!-- https://mvnrepository.com/artifact/org.apache.arrow/arrow-vector -->
4043
<dependency>
4144
<groupId>org.apache.arrow</groupId>
4245
<artifactId>arrow-vector</artifactId>
@@ -48,6 +51,7 @@
4851
<artifactId>value</artifactId>
4952
</dependency>
5053

54+
<!-- https://mvnrepository.com/artifact/com.h2database/h2 -->
5155
<dependency>
5256
<groupId>com.h2database</groupId>
5357
<artifactId>h2</artifactId>
@@ -90,6 +94,9 @@
9094
<id>jdk11+</id>
9195
<activation>
9296
<jdk>[11,]</jdk>
97+
<property>
98+
<name>!m2e.version</name>
99+
</property>
93100
</activation>
94101
<build>
95102
<plugins>

‎java/adapter/orc/pom.xml‎

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -134,22 +134,5 @@
134134
</includes>
135135
</resource>
136136
</resources>
137-
<plugins>
138-
<plugin>
139-
<groupId>org.apache.maven.plugins</groupId>
140-
<artifactId>maven-dependency-plugin</artifactId>
141-
<executions>
142-
<execution>
143-
<id>analyze</id>
144-
<configuration>
145-
<ignoredDependencies combine.children="append">
146-
<!-- indirect use of org.apache.arrow.flatbuf.Message in OrcStripeReader -->
147-
<ignoredDependency>org.apache.arrow:arrow-format</ignoredDependency>
148-
</ignoredDependencies>
149-
</configuration>
150-
</execution>
151-
</executions>
152-
</plugin>
153-
</plugins>
154137
</build>
155138
</project>

‎java/bom/pom.xml‎

Lines changed: 7 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<parent>
1616
<groupId>org.apache</groupId>
1717
<artifactId>apache</artifactId>
18-
<version>31</version>
18+
<version>18</version>
1919
</parent>
2020

2121
<groupId>org.apache.arrow</groupId>
@@ -27,19 +27,6 @@
2727

2828
<properties>
2929
<arrow.vector.classifier></arrow.vector.classifier>
30-
<!-- org.apache:apache overrides -->
31-
<maven.compiler.source>1.8</maven.compiler.source>
32-
<maven.compiler.target>1.8</maven.compiler.target>
33-
<maven.plugin.tools.version>3.11.0</maven.plugin.tools.version>
34-
<surefire.version>3.2.5</surefire.version>
35-
<version.apache-rat-plugin>0.16.1</version.apache-rat-plugin>
36-
<version.maven-assembly-plugin>3.7.1</version.maven-assembly-plugin>
37-
<version.maven-compiler-plugin>3.12.1</version.maven-compiler-plugin>
38-
<version.maven-dependency-plugin>3.6.1</version.maven-dependency-plugin>
39-
<version.maven-gpg-plugin>3.2.0</version.maven-gpg-plugin>
40-
<version.maven-jar-plugin>3.2.2</version.maven-jar-plugin>
41-
<version.maven-javadoc-plugin>3.6.3</version.maven-javadoc-plugin>
42-
<version.maven-project-info-reports-plugin>3.5.0</version.maven-project-info-reports-plugin>
4330
</properties>
4431

4532
<dependencyManagement>
@@ -151,9 +138,11 @@
151138
<version>${project.version}</version>
152139
</dependency>
153140
</dependencies>
141+
154142
</dependencyManagement>
155143

156144
<build>
145+
157146
<pluginManagement>
158147
<plugins>
159148
<plugin>
@@ -167,10 +156,12 @@
167156
<plugin>
168157
<groupId>org.apache.maven.plugins</groupId>
169158
<artifactId>maven-project-info-reports-plugin</artifactId>
159+
<version>3.5.0</version>
170160
</plugin>
171161
<plugin>
172162
<groupId>org.apache.maven.plugins</groupId>
173163
<artifactId>maven-site-plugin</artifactId>
164+
<version>3.12.1</version>
174165
</plugin>
175166
<plugin>
176167
<groupId>com.diffplug.spotless</groupId>
@@ -197,10 +188,12 @@
197188
<plugin>
198189
<groupId>org.apache.maven.plugins</groupId>
199190
<artifactId>maven-project-info-reports-plugin</artifactId>
191+
<version>3.5.0</version>
200192
</plugin>
201193
<plugin>
202194
<groupId>org.apache.maven.plugins</groupId>
203195
<artifactId>maven-site-plugin</artifactId>
196+
<version>3.12.1</version>
204197
</plugin>
205198
</plugins>
206199
</reporting>

‎java/c/pom.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,4 +83,5 @@
8383
</resource>
8484
</resources>
8585
</build>
86+
8687
</project>

‎java/dataset/pom.xml‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
<description>Java implementation of Arrow Dataset API/Framework</description>
2424
<properties>
2525
<arrow.cpp.build.dir>../../../cpp/release-build/</arrow.cpp.build.dir>
26+
<protobuf.version>2.5.0</protobuf.version>
2627
<parquet.version>1.13.1</parquet.version>
2728
<avro.version>1.11.3</avro.version>
2829
</properties>
@@ -194,14 +195,21 @@
194195
<id>jdk11+</id>
195196
<activation>
196197
<jdk>[11,]</jdk>
198+
<property>
199+
<name>!m2e.version</name>
200+
</property>
197201
</activation>
198202
<build>
199203
<plugins>
200204
<plugin>
201205
<groupId>org.apache.maven.plugins</groupId>
202206
<artifactId>maven-surefire-plugin</artifactId>
203-
<configuration>
204-
<argLine combine.self="override">--add-reads=org.apache.arrow.dataset=com.fasterxml.jackson.databind --add-opens=java.base/java.nio=org.apache.arrow.memory.core,ALL-UNNAMED</argLine>
207+
<configuration combine.self="override">
208+
<enableAssertions>false</enableAssertions>
209+
<systemPropertyVariables>
210+
<arrow.test.dataRoot>${project.basedir}/../../testing/data</arrow.test.dataRoot>
211+
</systemPropertyVariables>
212+
<argLine>--add-reads=org.apache.arrow.dataset=com.fasterxml.jackson.databind --add-opens=java.base/java.nio=org.apache.arrow.memory.core,ALL-UNNAMED</argLine>
205213
</configuration>
206214
</plugin>
207215
</plugins>

‎java/flight/flight-core/pom.xml‎

Lines changed: 25 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
<groupId>org.apache.arrow</groupId>
1616
<artifactId>arrow-flight</artifactId>
1717
<version>17.0.0-SNAPSHOT</version>
18+
<relativePath>../pom.xml</relativePath>
1819
</parent>
1920

2021
<artifactId>flight-core</artifactId>
@@ -150,6 +151,13 @@
150151
<plugin>
151152
<groupId>org.apache.maven.plugins</groupId>
152153
<artifactId>maven-shade-plugin</artifactId>
154+
<!--
155+
Downgrade maven-shade-plugin specifically for this module.
156+
Using a newer version up to at least 3.5.1 will cause
157+
issues in the arrow-tools tests looking up FlatBuffer
158+
dependencies.
159+
-->
160+
<version>3.2.4</version>
153161
<executions>
154162
<execution>
155163
<id>shade-main</id>
@@ -236,6 +244,7 @@
236244
<plugin>
237245
<groupId>org.apache.maven.plugins</groupId>
238246
<artifactId>maven-dependency-plugin</artifactId>
247+
<version>3.3.0</version>
239248
<executions>
240249
<execution>
241250
<id>analyze</id>
@@ -255,6 +264,7 @@
255264
<!-- add generated sources to classpath -->
256265
<groupId>org.codehaus.mojo</groupId>
257266
<artifactId>build-helper-maven-plugin</artifactId>
267+
<version>1.9.1</version>
258268
<executions>
259269
<execution>
260270
<id>add-generated-sources-to-classpath</id>
@@ -272,6 +282,7 @@
272282
</plugin>
273283
<plugin>
274284
<artifactId>maven-assembly-plugin</artifactId>
285+
<version>3.7.1</version>
275286
<configuration>
276287
<descriptorRefs>
277288
<descriptorRef>jar-with-dependencies</descriptorRef>
@@ -288,21 +299,32 @@
288299
</executions>
289300
</plugin>
290301
</plugins>
302+
<extensions>
303+
<extension>
304+
<groupId>kr.motd.maven</groupId>
305+
<artifactId>os-maven-plugin</artifactId>
306+
<version>1.7.1</version>
307+
</extension>
308+
</extensions>
291309
</build>
292310

293311
<profiles>
294312
<profile>
295313
<id>jdk11+</id>
296314
<activation>
297315
<jdk>[11,]</jdk>
316+
<property>
317+
<name>!m2e.version</name>
318+
</property>
298319
</activation>
299320
<build>
300321
<plugins>
301322
<plugin>
302323
<groupId>org.apache.maven.plugins</groupId>
303324
<artifactId>maven-surefire-plugin</artifactId>
304-
<configuration>
305-
<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>
325+
<configuration combine.self="override">
326+
<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>
327+
<enableAssertions>false</enableAssertions>
306328
<systemPropertyVariables>
307329
<arrow.test.dataRoot>${project.basedir}/../../../testing/data</arrow.test.dataRoot>
308330
</systemPropertyVariables>
@@ -312,4 +334,5 @@
312334
</build>
313335
</profile>
314336
</profiles>
337+
315338
</project>

‎java/flight/flight-integration-tests/pom.xml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
<groupId>org.apache.arrow</groupId>
1616
<artifactId>arrow-flight</artifactId>
1717
<version>17.0.0-SNAPSHOT</version>
18+
<relativePath>../pom.xml</relativePath>
1819
</parent>
1920

2021
<artifactId>flight-integration-tests</artifactId>
@@ -62,6 +63,7 @@
6263
<plugins>
6364
<plugin>
6465
<artifactId>maven-assembly-plugin</artifactId>
66+
<version>3.7.1</version>
6567
<configuration>
6668
<descriptorRefs>
6769
<descriptorRef>jar-with-dependencies</descriptorRef>

‎java/flight/flight-sql-jdbc-core/pom.xml‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
<groupId>org.apache.arrow</groupId>
1616
<artifactId>arrow-flight</artifactId>
1717
<version>17.0.0-SNAPSHOT</version>
18+
<relativePath>../pom.xml</relativePath>
1819
</parent>
1920

2021
<artifactId>flight-sql-jdbc-core</artifactId>
@@ -46,17 +47,20 @@
4647
</exclusions>
4748
</dependency>
4849

50+
<!-- https://mvnrepository.com/artifact/org.apache.arrow/arrow-memory-core -->
4951
<dependency>
5052
<groupId>org.apache.arrow</groupId>
5153
<artifactId>arrow-memory-core</artifactId>
5254
</dependency>
5355

56+
<!-- https://mvnrepository.com/artifact/org.apache.arrow/arrow-memory-netty -->
5457
<dependency>
5558
<groupId>org.apache.arrow</groupId>
5659
<artifactId>arrow-memory-netty</artifactId>
5760
<scope>runtime</scope>
5861
</dependency>
5962

63+
<!-- https://mvnrepository.com/artifact/org.apache.arrow/arrow-vector -->
6064
<dependency>
6165
<groupId>org.apache.arrow</groupId>
6266
<artifactId>arrow-vector</artifactId>
@@ -132,6 +136,11 @@
132136
</dependencies>
133137

134138
<build>
139+
<resources>
140+
<resource>
141+
<directory>src/main/resources</directory>
142+
</resource>
143+
</resources>
135144
<plugins>
136145
<plugin>
137146
<artifactId>maven-surefire-plugin</artifactId>
@@ -145,6 +154,7 @@
145154
<plugin>
146155
<groupId>org.codehaus.mojo</groupId>
147156
<artifactId>properties-maven-plugin</artifactId>
157+
<version>1.2.1</version>
148158
<executions>
149159
<execution>
150160
<id>write-project-properties-to-file</id>

‎java/flight/flight-sql-jdbc-driver/pom.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
<groupId>org.apache.arrow</groupId>
1616
<artifactId>arrow-flight</artifactId>
1717
<version>17.0.0-SNAPSHOT</version>
18+
<relativePath>../pom.xml</relativePath>
1819
</parent>
1920

2021
<artifactId>flight-sql-jdbc-driver</artifactId>

0 commit comments

Comments
 (0)