Merge pull request #117 from dmlloyd/test

Fix workflow to build on 17 and test on 11 and 17
jboss-remoting · Sep 19, 2023 · 9b9f6e6 · 9b9f6e6
2 parents 188f708 + 068f6c1
commit 9b9f6e6
Show file tree

Hide file tree

Showing 10 changed files with 13 additions and 11 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -9,15 +9,14 @@ on:
 
 jobs:
   build-test-matrix:
-    name: ${{ matrix.jdk-distribution }}-${{ matrix.jdk-version }}-${{ matrix.os }}
+    name: ${{ matrix.jdk-distribution }}-${{ matrix.os }}
     runs-on: ${{ matrix.os }}
     timeout-minutes: 10
     strategy:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, windows-latest]
         jdk-distribution: [temurin, adopt-openj9]
-        jdk-version: [11, 17]
     steps:
     - name: Configure runner - Linux
       if: contains(matrix.os, 'ubuntu')
@@ -31,15 +30,17 @@ jobs:
         echo '::1         localhost localhost.localdomain localhost6 localhost6.localdomain6' >> %SystemRoot%\System32\drivers\etc\hosts
       shell: cmd
     - uses: actions/checkout@v3
-    - name: Set up JDK ${{ matrix.jdk-distribution }} ${{ matrix.jdk-version }}
+    - name: Set up JDK ${{ matrix.jdk-distribution }} 17
       uses: actions/setup-java@v3
       with:
         distribution: ${{ matrix.jdk-distribution }}
-        java-version: ${{ matrix.jdk-version }}
+        java-version: |
+          11
+          17
     - name: Run Tests
-      run: mvn -ntp -U -B -fae clean install
+      run: mvn "-Djava11.home=${{env.JAVA_HOME_11_X64}}" -ntp -U -B -fae clean install
     - uses: actions/upload-artifact@v3
       if: failure()
       with:
-        name: surefire-${{ matrix.jdk-distribution }}-${{ matrix.jdk-version }}-${{ matrix.os }}
+        name: surefire-${{ matrix.jdk-distribution }}-${{ matrix.os }}
         path: '**/surefire-reports/*.txt'
diff --git a/api/build-test-java11 b/api/build-test-java11
diff --git a/api/build-test-java17 b/api/build-test-java17
diff --git a/pom.xml b/pom.xml
@@ -31,7 +31,7 @@
     <parent>
         <groupId>org.jboss</groupId>
         <artifactId>jboss-parent</artifactId>
-        <version>34</version>
+        <version>39</version>
     </parent>
 
     <licenses>
@@ -62,6 +62,9 @@
                 <plugin>
                     <artifactId>maven-compiler-plugin</artifactId>
                     <version>3.7.0-jboss-1</version>
+                    <configuration>
+                        <release>11</release>
+                    </configuration>
                 </plugin>
                 <plugin>
                     <artifactId>maven-shade-plugin</artifactId>

diff --git a/river/build-test-java11 b/river/build-test-java11
diff --git a/river/build-test-java17 b/river/build-test-java17
diff --git a/serial/build-test-java11 b/serial/build-test-java11
diff --git a/serial/build-test-java17 b/serial/build-test-java17
diff --git a/tests/build-test-java17 b/tests/build-test-java17
diff --git a/tests/pom.xml b/tests/pom.xml
@@ -58,8 +58,7 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>3.7.0-jboss-1</version>
                 <configuration>
-                    <testSource>11</testSource>
-                    <testTarget>11</testTarget>
+                    <testRelease>11</testRelease>
                 </configuration>
                 <executions>
                     <execution>
@@ -78,8 +77,7 @@
                             <goal>testCompile</goal>
                         </goals>
                         <configuration>
-                            <testSource>16</testSource>
-                            <testTarget>16</testTarget>
+                            <testRelease>16</testRelease>
                             <testIncludes>
                                 <include>**/org/jboss/test/marshalling/RecordTests.java</include>
                                 <include>**/org/jboss/test/marshalling/RecordTestFactory.java</include>