Build with JDK 16 as 15 is EOL

apache · Jul 20, 2021 · f1fbc98 · f1fbc98
1 parent e4a94be
commit f1fbc98
Show file tree

Hide file tree

Showing 5 changed files with 66 additions and 3 deletions.
diff --git a/.github/workflows/ci-build.yaml b/.github/workflows/ci-build.yaml
@@ -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: |
@@ -300,7 +306,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        java: [ '15' ]
+        java: [ '16' ]
     env:
       MAVEN_OPTS: -Xmx3000m
     steps:

diff --git a/extensions-jvm/spark/integration-test/pom.xml b/extensions-jvm/spark/integration-test/pom.xml
@@ -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>
diff --git a/integration-tests/kudu/pom.xml b/integration-tests/kudu/pom.xml
@@ -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>
diff --git a/integration-tests/leveldb/pom.xml b/integration-tests/leveldb/pom.xml
@@ -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>
diff --git a/pom.xml b/pom.xml
@@ -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  -->