Skip to content
Open
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci-hadoop3.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
strategy:
fail-fast: false
matrix:
java: [ { setup: '8', maven: '1.8' }, { setup: '11', maven: '11' }, { setup: '17', maven: '17' } ]
java: [ { setup: '11', maven: '11' }, { setup: '17', maven: '17' } ]
codes: [ 'uncompressed,brotli', 'gzip,snappy' ]
name: Build Parquet with JDK ${{ matrix.java.setup }} and ${{ matrix.codes }}

Expand Down
4 changes: 2 additions & 2 deletions parquet-format-structures/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@
<configuration>
<!-- We have to turn off the javadoc check because thrift generates improper comments -->
<doclint>none</doclint>
<source>8</source>
<source>11</source>
<quiet>true</quiet>
</configuration>
</plugin>
Expand All @@ -144,7 +144,7 @@
<configuration>
<!-- We have to turn off the javadoc check because thrift generates improper comments -->
<doclint>none</doclint>
<source>8</source>
<source>11</source>
</configuration>
</plugin>
</plugins>
Expand Down
26 changes: 5 additions & 21 deletions parquet-plugins/parquet-encoding-vector/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
<url>https://parquet.apache.org</url>

<properties>
<!-- Those properties prevent java 8 to try and compile this code -->
<!-- Those properties prevent Java 11 to try and compile this code -->
<maven.compiler.source>17</maven.compiler.source>
<maven.compiler.target>17</maven.compiler.target>
</properties>
Expand Down Expand Up @@ -74,7 +74,7 @@
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<compilerArgs combine.children="append">
<compilerArg>${extraJavaVectorArgs}</compilerArg>
<compilerArg>--add-modules=jdk.incubator.vector</compilerArg>
</compilerArgs>
</configuration>
</plugin>
Expand All @@ -83,23 +83,23 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
<configuration>
<argLine>${extraJavaVectorArgs}</argLine>
<argLine>--add-modules=jdk.incubator.vector</argLine>
</configuration>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<argLine>${extraJavaVectorArgs}</argLine>
<argLine>--add-modules=jdk.incubator.vector</argLine>
</configuration>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>
<additionalJOption>${extraJavaVectorArgs}</additionalJOption>>
<additionalJOption>--add-modules=jdk.incubator.vector</additionalJOption>>
</configuration>
</plugin>

Expand Down Expand Up @@ -130,20 +130,4 @@
</plugin>
</plugins>
</build>

<profiles>
<profile>
<id>jdk9+</id>
<activation>
<jdk>[9,)</jdk>
</activation>
<properties>
<!-- release takes precedence over source/target if java version is 9 or higher -->
<maven.compiler.release>17</maven.compiler.release>
<extraJavaVectorArgs>
--add-modules=jdk.incubator.vector
</extraJavaVectorArgs>
</properties>
</profile>
</profiles>
</project>
19 changes: 4 additions & 15 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -69,8 +69,8 @@
</mailingLists>

<properties>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
<maven.compiler.source>11</maven.compiler.source>
<maven.compiler.target>11</maven.compiler.target>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we should start using maven.compiler.release instead.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good call, updated 👍

<github.global.server>github</github.global.server>
<jackson.groupId>com.fasterxml.jackson.core</jackson.groupId>
<jackson.datatype.groupId>com.fasterxml.jackson.datatype</jackson.datatype.groupId>
Expand Down Expand Up @@ -246,7 +246,7 @@
<sourceFileExcludes>
<sourceFileExclude>**/generated-sources/**/*.java</sourceFileExclude>
</sourceFileExcludes>
<source>8</source>
<source>11</source>
<quiet>true</quiet>
</configuration>
</plugin>
Expand Down Expand Up @@ -383,7 +383,7 @@
<sourceFileExcludes>
<sourceFileExclude>**/generated-sources/**/*.java</sourceFileExclude>
</sourceFileExcludes>
<source>8</source>
<source>11</source>
<quiet>true</quiet>
</configuration>
</plugin>
Expand Down Expand Up @@ -629,17 +629,6 @@
</build>

<profiles>
<profile>
<id>jdk9+</id>
<activation>
<jdk>[9,)</jdk>
</activation>
<properties>
<!-- release takes precedence over source/target if java version is 9 or higher -->
<maven.compiler.release>8</maven.compiler.release>
</properties>
</profile>

<!-- Profile for tests to have more output -->
<profile>
<id>verbose-test</id>
Expand Down