Adjust build to support Java 17.

raphw · Dec 15, 2020 · 745d77e · 745d77e
1 parent 92629e3
commit 745d77e
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 5 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -20,15 +20,15 @@ jobs:
         run: |
           . ./.github/scripts/install-jdk.sh --feature ea --os linux-x64
           export MAVEN_OPTS="--add-opens java.base/java.lang=ALL-UNNAMED"
-          ./mvnw verify -Pjava15 -Dnet.bytebuddy.experimental=true
+          ./mvnw verify -Pjava16 -Dnet.bytebuddy.experimental=true
         continue-on-error: true
   hotspot-supported:
     name: HotSpot (supported)
     strategy:
       fail-fast: false
       matrix:
         os: [ubuntu-18.04, macOS-10.15, windows-2019]
-        java: [8, 11, 14]
+        java: [8, 11, 15]
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v2

diff --git a/pom.xml b/pom.xml
@@ -548,13 +548,28 @@
                 <bytecode.test.version>8</bytecode.test.version>
             </properties>
         </profile>
-        <!-- Runs the build with compatibility for Java 15 JVMs. -->
+        <!-- Runs the build with compatibility for Java 16 JVMs. -->
         <profile>
             <id>java16-compatibility</id>
             <activation>
                 <activeByDefault>false</activeByDefault>
                 <jdk>16</jdk>
             </activation>
+            <properties>
+                <sourcecode.main.version>8</sourcecode.main.version>
+                <sourcecode.test.version>8</sourcecode.test.version>
+                <bytecode.main.version>8</bytecode.main.version>
+                <bytecode.test.version>8</bytecode.test.version>
+                <jacoco.skip>true</jacoco.skip>
+            </properties>
+        </profile>
+        <!-- Runs the build with compatibility for Java 15 JVMs. -->
+        <profile>
+            <id>java17-compatibility</id>
+            <activation>
+                <activeByDefault>false</activeByDefault>
+                <jdk>17</jdk>
+            </activation>
             <properties>
                 <sourcecode.main.version>8</sourcecode.main.version>
                 <sourcecode.test.version>8</sourcecode.test.version>
@@ -686,8 +701,20 @@
                 <activeByDefault>false</activeByDefault>
             </activation>
             <properties>
-                <bytecode.main.version>15</bytecode.main.version>
-                <bytecode.test.version>15</bytecode.test.version>
+                <bytecode.main.version>16</bytecode.main.version>
+                <bytecode.test.version>16</bytecode.test.version>
+                <spotbugs.skip>true</spotbugs.skip>
+            </properties>
+        </profile>
+        <!-- Builds using a byte code target for Java 17. -->
+        <profile>
+            <id>java17</id>
+            <activation>
+                <activeByDefault>false</activeByDefault>
+            </activation>
+            <properties>
+                <bytecode.main.version>17</bytecode.main.version>
+                <bytecode.test.version>17</bytecode.test.version>
                 <spotbugs.skip>true</spotbugs.skip>
             </properties>
         </profile>