Merge pull request #13 from cicsdev/piw-gradle-update

Java 21 build support

Author: SoftlySplinter

.github/workflows/java.yml

@@ -16,11 +16,8 @@ jobs:
     continue-on-error: ${{ matrix.experimental }}
     strategy:
       matrix:
-        jdk: [8, 11]
-        experimental: [false]
-        include:
-          - jdk: 17
-            experimental: true
+        jdk: [8, 11, 17, 21]
+
     steps:
       - uses: actions/checkout@v3
       - name: Set up JDK ${{ matrix.jdk }}
@@ -31,11 +28,6 @@ jobs:
           cache: maven
       - name: Build with Maven
         run: mvn --batch-mode --update-snapshots --file pom.xml -Djava.version=${{ matrix.jdk }} package
-      - run: mkdir staging && cp target/*.war staging
-      - uses: actions/upload-artifact@v4
-        with:
-          name: cics-java-liberty-sprintboot-jcics (Maven, Java ${{ matrix.jdk }})
-          path: staging
 
   build-mvnw:
     name: Build Maven Wrapper

build.gradle

@@ -28,15 +28,6 @@ repositories
 	mavenCentral()
 }
 
-java
-{
-    toolchain
-    {
-        languageVersion = JavaLanguageVersion.of(java_version)
-        vendor = JvmVendorSpec.IBM
-        implementation = JvmImplementation.J9
-    }
-}
 
 dependencies 
 {

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-rc-1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-rc-1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists