Skip to content

Commit 313a1f3

Browse files
authored
Bump to Java 11 (#3314)
1 parent a6bad6a commit 313a1f3

File tree

4 files changed

+12
-41
lines changed

4 files changed

+12
-41
lines changed

.github/workflows/ci-hadoop3.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
strategy:
2727
fail-fast: false
2828
matrix:
29-
java: [ { setup: '8', maven: '1.8' }, { setup: '11', maven: '11' }, { setup: '17', maven: '17' } ]
29+
java: [ { setup: '11', maven: '11' }, { setup: '17', maven: '17' } ]
3030
codes: [ 'uncompressed,brotli', 'gzip,snappy' ]
3131
name: Build Parquet with JDK ${{ matrix.java.setup }} and ${{ matrix.codes }}
3232

parquet-format-structures/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@
129129
<configuration>
130130
<!-- We have to turn off the javadoc check because thrift generates improper comments -->
131131
<doclint>none</doclint>
132-
<source>8</source>
132+
<source>11</source>
133133
<quiet>true</quiet>
134134
</configuration>
135135
</plugin>
@@ -144,7 +144,7 @@
144144
<configuration>
145145
<!-- We have to turn off the javadoc check because thrift generates improper comments -->
146146
<doclint>none</doclint>
147-
<source>8</source>
147+
<source>11</source>
148148
</configuration>
149149
</plugin>
150150
</plugins>

parquet-plugins/parquet-encoding-vector/pom.xml

Lines changed: 6 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,8 @@
3535
<url>https://parquet.apache.org</url>
3636

3737
<properties>
38-
<!-- Those properties prevent java 8 to try and compile this code -->
39-
<maven.compiler.source>17</maven.compiler.source>
40-
<maven.compiler.target>17</maven.compiler.target>
38+
<!-- Those properties prevent Java 11 to try and compile this code -->
39+
<maven.compiler.release>17</maven.compiler.release>
4140
</properties>
4241

4342
<dependencies>
@@ -74,7 +73,7 @@
7473
<artifactId>maven-compiler-plugin</artifactId>
7574
<configuration>
7675
<compilerArgs combine.children="append">
77-
<compilerArg>${extraJavaVectorArgs}</compilerArg>
76+
<compilerArg>--add-modules=jdk.incubator.vector</compilerArg>
7877
</compilerArgs>
7978
</configuration>
8079
</plugin>
@@ -83,23 +82,23 @@
8382
<groupId>org.apache.maven.plugins</groupId>
8483
<artifactId>maven-failsafe-plugin</artifactId>
8584
<configuration>
86-
<argLine>${extraJavaVectorArgs}</argLine>
85+
<argLine>--add-modules=jdk.incubator.vector</argLine>
8786
</configuration>
8887
</plugin>
8988

9089
<plugin>
9190
<groupId>org.apache.maven.plugins</groupId>
9291
<artifactId>maven-surefire-plugin</artifactId>
9392
<configuration>
94-
<argLine>${extraJavaVectorArgs}</argLine>
93+
<argLine>--add-modules=jdk.incubator.vector</argLine>
9594
</configuration>
9695
</plugin>
9796

9897
<plugin>
9998
<groupId>org.apache.maven.plugins</groupId>
10099
<artifactId>maven-javadoc-plugin</artifactId>
101100
<configuration>
102-
<additionalJOption>${extraJavaVectorArgs}</additionalJOption>>
101+
<additionalJOption>--add-modules=jdk.incubator.vector</additionalJOption>>
103102
</configuration>
104103
</plugin>
105104

@@ -130,20 +129,4 @@
130129
</plugin>
131130
</plugins>
132131
</build>
133-
134-
<profiles>
135-
<profile>
136-
<id>jdk9+</id>
137-
<activation>
138-
<jdk>[9,)</jdk>
139-
</activation>
140-
<properties>
141-
<!-- release takes precedence over source/target if java version is 9 or higher -->
142-
<maven.compiler.release>17</maven.compiler.release>
143-
<extraJavaVectorArgs>
144-
--add-modules=jdk.incubator.vector
145-
</extraJavaVectorArgs>
146-
</properties>
147-
</profile>
148-
</profiles>
149132
</project>

pom.xml

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,7 @@
6969
</mailingLists>
7070

7171
<properties>
72-
<maven.compiler.source>1.8</maven.compiler.source>
73-
<maven.compiler.target>1.8</maven.compiler.target>
72+
<maven.compiler.release>11</maven.compiler.release>
7473
<github.global.server>github</github.global.server>
7574
<jackson.groupId>com.fasterxml.jackson.core</jackson.groupId>
7675
<jackson.datatype.groupId>com.fasterxml.jackson.datatype</jackson.datatype.groupId>
@@ -246,7 +245,7 @@
246245
<sourceFileExcludes>
247246
<sourceFileExclude>**/generated-sources/**/*.java</sourceFileExclude>
248247
</sourceFileExcludes>
249-
<source>8</source>
248+
<source>11</source>
250249
<quiet>true</quiet>
251250
</configuration>
252251
</plugin>
@@ -383,7 +382,7 @@
383382
<sourceFileExcludes>
384383
<sourceFileExclude>**/generated-sources/**/*.java</sourceFileExclude>
385384
</sourceFileExcludes>
386-
<source>8</source>
385+
<source>11</source>
387386
<quiet>true</quiet>
388387
</configuration>
389388
</plugin>
@@ -629,17 +628,6 @@
629628
</build>
630629

631630
<profiles>
632-
<profile>
633-
<id>jdk9+</id>
634-
<activation>
635-
<jdk>[9,)</jdk>
636-
</activation>
637-
<properties>
638-
<!-- release takes precedence over source/target if java version is 9 or higher -->
639-
<maven.compiler.release>8</maven.compiler.release>
640-
</properties>
641-
</profile>
642-
643631
<!-- Profile for tests to have more output -->
644632
<profile>
645633
<id>verbose-test</id>

0 commit comments

Comments
 (0)