[WFLY-19888] Move to SE 17 as the minimum SE version

kabir · Oct 28, 2024 · d49fdcd · d49fdcd
1 parent 84d78b9
commit d49fdcd
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 49 deletions.
diff --git a/.github/workflows/build-manual.yml b/.github/workflows/build-manual.yml
@@ -54,25 +54,11 @@ jobs:
 
     steps:
       - uses: actions/checkout@v4
-      - name: Set up JDK ${{ inputs.jdk-distribution }} 17 to build for JDK 11 test
-        if: inputs.jdk-version == 11
-        uses: actions/setup-java@v4
-        with:
-          distribution: ${{ inputs.jdk-distribution }}
-          java-version: 17
-          cache: 'maven'
-      - name: Build with Maven and JDK 17 for JDK 11 Tests
-        if: inputs.jdk-version == 11
-        run: mvn -U -B -ntp clean install ${{ inputs.args }} -DskipTests
       - name: Set up JDK ${{ inputs.jdk-distribution }} ${{ inputs.jdk-version }}
         uses: actions/setup-java@v4
         with:
           distribution: ${{ inputs.jdk-distribution }}
           java-version: ${{ inputs.jdk-version }}
           cache: 'maven'
-      - name: Test with Maven and JDK 11 with -DnoCompile
-        if: inputs.jdk-version == 11
-        run: mvn -U -B -ntp test -DnoCompile ${{ inputs.args }} -rf testsuite
       - name: Build and test with Maven
-        if: inputs.jdk-version != 11
         run: mvn -U -B -ntp clean install ${{ inputs.args }}
diff --git a/.github/workflows/jdk-jre-build.yml b/.github/workflows/jdk-jre-build.yml
@@ -61,7 +61,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        java: ['11', '17', '21']
+        java: ['17', '21']
 
     steps:
       - name: Checkout code

diff --git a/.github/workflows/shared-wildfly-build-and-test.yml b/.github/workflows/shared-wildfly-build-and-test.yml
@@ -5,7 +5,7 @@
 # * build-arguments: Arguments used during build. That is where you can override the version of the dependency.
 # * maven-repo-path: The path to a tar.gz file of a maven repo that contains the built dependency(ies) you are using.
 # * maven-repo-name: The name that identifies the maven repo to be downloaded.
-# * java-versions: A string containing a JSON array of JDK versions. For example: "['11', '17']"
+# * java-versions: A string containing a JSON array of JDK versions. For example: "['17', '21']"
 # * os: A string containing a JSON array of operating systems. For example: "['ubuntu-latest', 'windows-latest']"
 # 
 # Example Usage (WildFly main branch is built and tested with a custom build of a dependency named 'my-dependency'.
@@ -42,13 +42,13 @@
 #          retention-days: 5
 #
 #  wildfly-build-and-test-galleon-layers:
-#    name: Galleon Linux - JDK11
+#    name: Galleon Linux - JDK17
 #    uses: wildfly/wildfly/.github/workflows/shared-wildfly-build-and-test.yml@main
 #    with:
 #      test-arguments: '-Dts.layers -Dts.galleon'
 #      build-arguments: '-Dversion.org.wildfly.my-dependency=${{needs.my-dependency-build.outputs.my-dependency-version}}'
 #      os: "['ubuntu-latest']"
-#      java-versions: "['11']"
+#      java-versions: "['17']"
 #      maven-repo-name: my-dependency-maven-repository
 #      maven-repo-path: my-dependency-maven-repository.tar.gz
 #    needs: my-dependency-build
@@ -111,38 +111,13 @@ jobs:
         shell: bash
         run: |
          tar -xzf ${{ inputs.maven-repo-path }} -C ~
-        # Do not compile with JDK 11. If 11 is specified, we will build with 17 and test with 11
-        # So, setup 17
-      - name: Set up JDK 17 and JDK 11 for JDK11 execution
-        if: matrix.java == 11
-        uses: actions/setup-java@v4
-        with:
-          java-version: |
-            17
-            11
-          distribution: 'temurin'
-          # Cache must be computed prior to build WildFly. On Windows we run into https://github.com/actions/upload-artifact/issues/240
-          # when computing cache hash (**/pom.xml) due to galleon generated feature long file names.
-          cache: 'maven'
       - name: Set up JDK ${{ matrix.java }}
-        if: matrix.java != 11
         uses: actions/setup-java@v4
         with:
           java-version: ${{ matrix.java }}
           distribution: 'temurin'
           cache: 'maven'
-        # For JDK 11 tests, build with 17, skipping tests
-      - name: Build WildFly SNAPSHOT ${{ inputs.build-arguments }}  ${{ inputs.test-arguments }} with JDK 17 for JDK 11 tests
-        if: matrix.java == 11
-        run: JAVA_HOME=$JAVA_HOME_17_${{ runner.arch }} mvn -U -B -ntp clean install ${{ inputs.build-arguments }} ${{ inputs.test-arguments }} -DskipTests
-        shell: bash
-        # For JDK 11 tests, we already built, so just run the 'test' goal with the -DnoCompile setting to disable recompile
-      - name: Test WildFly SNAPSHOT ${{ inputs.build-arguments }}  ${{ inputs.test-arguments }} with -DnoCompile for JDK 11 tests
-        if: matrix.java == 11
-        run: JAVA_HOME=$JAVA_HOME_${{ matrix.java }}_${{ runner.arch }} mvn -U -B -ntp test -DnoCompile ${{ inputs.build-arguments }} ${{ inputs.test-arguments }} -rf testsuite
-        shell: bash
       - name: Build and Test WildFly SNAPSHOT ${{ inputs.build-arguments }}  ${{ inputs.test-arguments }}
-        if: matrix.java != 11
         run: JAVA_HOME=$JAVA_HOME_${{ matrix.java }}_${{ runner.arch }} mvn -U -B -ntp clean install ${{ inputs.build-arguments }} ${{ inputs.test-arguments }}
         shell: bash
         # We need this due to long file names on Windows: https://github.com/actions/upload-artifact/issues/240

diff --git a/pom.xml b/pom.xml
@@ -153,9 +153,8 @@
         <maven.min.version>3.6.0</maven.min.version>
 
         <!--
-             To build, we require a Java 17 or higher compiler, but with a Java 11
-             source and binary level. This means we can compile against Java 17
-             dependencies, but our own code and binaries only require Java 11.
+             To build, we require a Java 17 or higher compiler, but with a Java 17
+             source and binary level.
              We allow builds with a compiler version higher than 17 to allow
              testing on later SE releases.
 
@@ -167,9 +166,9 @@
          -->
         <required.java.build.version>[17,)</required.java.build.version>
         <required.java.deploy.version>[17,18)</required.java.deploy.version>
-        <maven.compiler.target>11</maven.compiler.target>
-        <maven.compiler.source>11</maven.compiler.source>
-        <maven.compiler.release>11</maven.compiler.release>
+        <maven.compiler.release>17</maven.compiler.release>
+        <maven.compiler.target>${maven.compiler.release}</maven.compiler.target>
+        <maven.compiler.source>${maven.compiler.release}</maven.compiler.source>
 
         <!-- TarArchiver behavior -->
         <assembly.tarLongFileMode>posix</assembly.tarLongFileMode>