Skip to content

Commit ad263e4

Browse files
committed
Bump to Java 11
1 parent 43c5976 commit ad263e4

File tree

5 files changed

+13
-40
lines changed

5 files changed

+13
-40
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' }, { setup: '21', maven: '21' } ]
3030
codes: [ 'uncompressed,brotli', 'gzip,snappy' ]
3131
name: Build Parquet with JDK ${{ matrix.java.setup }} and ${{ matrix.codes }}
3232

.github/workflows/vector-plugins.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: [ '17' ]
29+
java: [ '17', '21' ]
3030
codes: [ 'uncompressed' ]
3131
name: Build Parquet with JDK ${{ matrix.java }} 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: 5 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
<url>https://parquet.apache.org</url>
3636

3737
<properties>
38-
<!-- Those properties prevent java 8 to try and compile this code -->
38+
<!-- Those properties prevent Java 11 to try and compile this code -->
3939
<maven.compiler.source>17</maven.compiler.source>
4040
<maven.compiler.target>17</maven.compiler.target>
4141
</properties>
@@ -74,7 +74,7 @@
7474
<artifactId>maven-compiler-plugin</artifactId>
7575
<configuration>
7676
<compilerArgs combine.children="append">
77-
<compilerArg>${extraJavaVectorArgs}</compilerArg>
77+
<compilerArg>--add-modules=jdk.incubator.vector</compilerArg>
7878
</compilerArgs>
7979
</configuration>
8080
</plugin>
@@ -83,23 +83,23 @@
8383
<groupId>org.apache.maven.plugins</groupId>
8484
<artifactId>maven-failsafe-plugin</artifactId>
8585
<configuration>
86-
<argLine>${extraJavaVectorArgs}</argLine>
86+
<argLine>--add-modules=jdk.incubator.vector</argLine>
8787
</configuration>
8888
</plugin>
8989

9090
<plugin>
9191
<groupId>org.apache.maven.plugins</groupId>
9292
<artifactId>maven-surefire-plugin</artifactId>
9393
<configuration>
94-
<argLine>${extraJavaVectorArgs}</argLine>
94+
<argLine>--add-modules=jdk.incubator.vector</argLine>
9595
</configuration>
9696
</plugin>
9797

9898
<plugin>
9999
<groupId>org.apache.maven.plugins</groupId>
100100
<artifactId>maven-javadoc-plugin</artifactId>
101101
<configuration>
102-
<additionalJOption>${extraJavaVectorArgs}</additionalJOption>>
102+
<additionalJOption>--add-modules=jdk.incubator.vector</additionalJOption>>
103103
</configuration>
104104
</plugin>
105105

@@ -130,20 +130,4 @@
130130
</plugin>
131131
</plugins>
132132
</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>
149133
</project>

pom.xml

Lines changed: 4 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,8 @@
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.source>11</maven.compiler.source>
73+
<maven.compiler.target>11</maven.compiler.target>
7474
<github.global.server>github</github.global.server>
7575
<jackson.groupId>com.fasterxml.jackson.core</jackson.groupId>
7676
<jackson.datatype.groupId>com.fasterxml.jackson.datatype</jackson.datatype.groupId>
@@ -246,7 +246,7 @@
246246
<sourceFileExcludes>
247247
<sourceFileExclude>**/generated-sources/**/*.java</sourceFileExclude>
248248
</sourceFileExcludes>
249-
<source>8</source>
249+
<source>11</source>
250250
<quiet>true</quiet>
251251
</configuration>
252252
</plugin>
@@ -383,7 +383,7 @@
383383
<sourceFileExcludes>
384384
<sourceFileExclude>**/generated-sources/**/*.java</sourceFileExclude>
385385
</sourceFileExcludes>
386-
<source>8</source>
386+
<source>11</source>
387387
<quiet>true</quiet>
388388
</configuration>
389389
</plugin>
@@ -629,17 +629,6 @@
629629
</build>
630630

631631
<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-
643632
<!-- Profile for tests to have more output -->
644633
<profile>
645634
<id>verbose-test</id>

0 commit comments

Comments
 (0)