Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Build with JDK 16 as 15 is EOL #2700

Merged
merged 1 commit into from
Jul 20, 2021
Merged

Build with JDK 16 as 15 is EOL #2700

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 8 additions & 2 deletions .github/workflows/ci-build.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,10 +250,16 @@ jobs:
strategy:
fail-fast: false
matrix:
java: [ '11', '15' ]
java: [ '11', '16' ]
env:
MAVEN_OPTS: -Xmx3000m
steps:
- name: Setup jdk.compiler options for Kotlin Kapt
if: matrix.java == '16'
run: |
# Set additional options for Kotlin Kapt
# https://youtrack.jetbrains.com/issue/KT-43704
echo "MAVEN_OPTS=${{env.MAVEN_OPTS}} --add-opens jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED --add-opens jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED --add-opens jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED --add-opens jdk.compiler/com.sun.tools.javac.jvm=ALL-UNNAMED --add-opens jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED --add-opens jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED --add-opens jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED --add-opens jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED --add-opens jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED --add-opens jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED" >> $GITHUB_ENV
- name: Setup apache-snapshots profile
if: github.ref == 'refs/heads/camel-main' || github.base_ref == 'camel-main'
run: |
Expand Down Expand Up @@ -300,7 +306,7 @@ jobs:
strategy:
fail-fast: false
matrix:
java: [ '15' ]
java: [ '16' ]
env:
MAVEN_OPTS: -Xmx3000m
steps:
Expand Down
21 changes: 21 additions & 0 deletions extensions-jvm/spark/integration-test/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,4 +87,25 @@
</dependency>
</dependencies>

<profiles>
<!-- https://issues.apache.org/jira/browse/SPARK-33772 -->
<profile>
<id>jdk16-workarounds</id>
<activation>
<jdk>[16,)</jdk>
</activation>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<argLine>--add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/java.util=ALL-UNNAMED --add-opens java.base/java.util.concurrent=ALL-UNNAMED</argLine>
</configuration>
</plugin>
</plugins>
</build>
</profile>
</profiles>

</project>
18 changes: 18 additions & 0 deletions integration-tests/kudu/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,5 +151,23 @@
</plugins>
</build>
</profile>
<!-- Required by KuduInfrastructureTestHelper.overrideTabletServerHostnameResolution -->
<profile>
<id>jdk16-workarounds</id>
<activation>
<jdk>[16,)</jdk>
</activation>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<argLine>--add-opens java.base/java.net=ALL-UNNAMED</argLine>
</configuration>
</plugin>
</plugins>
</build>
</profile>
</profiles>
</project>
18 changes: 18 additions & 0 deletions integration-tests/leveldb/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,6 +147,24 @@
</plugins>
</build>
</profile>
<!-- https://github.com/FasterXML/jackson-databind/issues/3117 -->
<profile>
<id>jdk16-workarounds</id>
<activation>
<jdk>[16,)</jdk>
</activation>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<argLine>--add-opens java.base/java.lang=ALL-UNNAMED</argLine>
</configuration>
</plugin>
</plugins>
</build>
</profile>
</profiles>

</project>
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@
<!-- NOTE: We pin to this version due to https://github.com/apache/camel-quarkus/issues/723 -->
<maven-surefire-plugin.version>2.22.2</maven-surefire-plugin.version>
<properties-maven-plugin.version>1.0.0</properties-maven-plugin.version>
<rpkgtests-maven-plugin.version>0.9.0</rpkgtests-maven-plugin.version>
<rpkgtests-maven-plugin.version>0.10.0</rpkgtests-maven-plugin.version>

<!-- Plugin configuration through properties -->

Expand Down