Merge pull request #14 from cicsdev/piw-gradle-update2

Fix up builds

Author: SoftlySplinter

.github/workflows/java.yml

@@ -9,69 +9,42 @@ on:
     - cron: '0 0 * * *'
 
 jobs:
-  build-maven:
-    name: Build Maven
-
-    runs-on: ubuntu-latest
-    continue-on-error: ${{ matrix.experimental }}
-    strategy:
-      matrix:
-        jdk: [8, 11, 17, 21]
-
-    steps:
-      - uses: actions/checkout@v3
-      - name: Set up JDK ${{ matrix.jdk }}
-        uses: actions/setup-java@v3
-        with:
-          java-version: ${{ matrix.jdk }}
-          distribution: "semeru"
-          cache: maven
-      - name: Build with Maven
-        run: mvn --batch-mode --update-snapshots --file pom.xml -Djava.version=${{ matrix.jdk }} package
 
   build-mvnw:
     name: Build Maven Wrapper
 
     runs-on: ubuntu-latest
-    continue-on-error: ${{ matrix.experimental }}
     strategy:
       matrix:
-        jdk: [8, 11]
-        experimental: [false]
-        include:
-          - jdk: 17
-            experimental: true
+         jdk: [8, 11, 17]
+         
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Set up JDK ${{ matrix.jdk }}
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           java-version: ${{ matrix.jdk }}
           distribution: "semeru"
           cache: maven
       - name: Build with Maven
-        run: ./mvnw --batch-mode --update-snapshots --file pom.xml -Djava.version=${{ matrix.jdk }} package
+        run: ./mvnw --batch-mode --update-snapshots --file pom.xml -Djava.version=${{ matrix.jdk }} package 
 
-  build-gradle:
-    name: Build Gradle
+  build-gradlew:
+    name: Build Gradle wrapper
 
     runs-on: ubuntu-latest
-    continue-on-error: ${{ matrix.experimental }}
     strategy:
       matrix:
-        jdk: [8, 11]
-        experimental: [false]
-        include:
-          - jdk: 17
-            experimental: true
+         jdk: [8, 11, 17]
+         
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Set up JDK ${{ matrix.jdk }}
       uses: actions/setup-java@v4
       with:
         java-version: ${{ matrix.jdk }}
         distribution: 'semeru'
+    - name: Setup Gradle
+      uses: gradle/actions/setup-gradle@v4
     - name: Build with Gradle
-      uses: gradle/gradle-build-action@bd5760595778326ba7f1441bcf7e88b49de61a25 # v2.6.0
-      with:
-        arguments: bootWar -Pjava_version=${{ matrix.jdk }}
+      run: ./gradlew build bootWar -Pjava_version=${{ matrix.jdk }}