From 5ed028fde0b5cdaac8448473928fd5d24c9294cd Mon Sep 17 00:00:00 2001
From: Cheryl King <cheryllk@us.ibm.com>
Date: Wed, 28 Jun 2023 11:13:32 -0500
Subject: [PATCH] Test with Liberty 23.0.0.6 and latest ant/common snapshots

---
 .github/workflows/gradle.yml | 38 +++++++++++++++++-------------------
 build.gradle                 |  2 +-
 2 files changed, 19 insertions(+), 21 deletions(-)

diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
index 9100dee8..86a805d9 100644
--- a/.github/workflows/gradle.yml
+++ b/.github/workflows/gradle.yml
@@ -18,13 +18,13 @@ jobs:
       matrix:
         # test against latest update of each major Java version, as well as specific updates of LTS versions:
         RUNTIME: [ol, wlp]
-        RUNTIME_VERSION: [22.0.0.12, 23.0.0.3]
+        RUNTIME_VERSION: [23.0.0.6, 23.0.0.3]
         java: [17, 11, 8]
         exclude:
         - java: 8
-          RUNTIME_VERSION: 22.0.0.12
+          RUNTIME_VERSION: 23.0.0.3
         - java: 17
-          RUNTIME_VERSION: 22.0.0.12
+          RUNTIME_VERSION: 23.0.0.3
     name: ${{ matrix.RUNTIME }} ${{ matrix.RUNTIME_VERSION }}, Java ${{ matrix.java }}, Linux
     steps:
     # Checkout repos
@@ -65,11 +65,8 @@ jobs:
     # Install dependencies
     - name: Install ci.ant and ci.common
       run: |
-        cd ./ci.ant
-        mvn clean install
-        cd ../ci.common
-        mvn clean install
-        cd ..
+        mvn -V clean install -f ci.ant --batch-mode --no-transfer-progress --errors -DtrimStackTrace=false
+        mvn -V clean install -f ci.common --batch-mode --no-transfer-progress --errors -DtrimStackTrace=false
     # Run tests
     - name: Run tests with Gradle on Ubuntu
       run:
@@ -86,7 +83,7 @@ jobs:
     - uses: actions/upload-artifact@v3
       if: ${{ failure() }}
       with:
-        name: buildReportsArtifact
+        name: buildReportsArtifactLinux
         path: /buildReports
         retention-days: 3
 
@@ -98,15 +95,15 @@ jobs:
       matrix:
         # test against latest update of each major Java version, as well as specific updates of LTS versions:
         RUNTIME: [ol, wlp]
-        RUNTIME_VERSION: [22.0.0.12, 23.0.0.3]
+        RUNTIME_VERSION: [23.0.0.6, 23.0.0.3]
         java: [17, 11, 8]
         exclude:
         - java: 8
-          RUNTIME_VERSION: 22.0.0.12
+          RUNTIME_VERSION: 23.0.0.3
         - java: 8
           RUNTIME: wlp
         - java: 17
-          RUNTIME_VERSION: 22.0.0.12
+          RUNTIME_VERSION: 23.0.0.3
     name: ${{ matrix.RUNTIME }} ${{ matrix.RUNTIME_VERSION }}, Java ${{ matrix.java }}, Windows
     steps:
     # Checkout repos
@@ -140,13 +137,14 @@ jobs:
         key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
         restore-keys: |
           ${{ runner.os }}-gradle-
-    # Install dependencies
-    - name: Install ci.ant and ci.common
-      run: |
-        cd C:/ci.ant
-        mvn clean install
-        cd C:/ci.common
-        mvn clean install
+    # Install ci.ant
+    - name: Install ci.ant
+      working-directory: C:/ci.ant
+      run: mvn -V clean install --batch-mode --no-transfer-progress --errors -DtrimStackTrace=false
+    # Install ci.common
+    - name: Install ci.common
+      working-directory: C:/ci.common
+      run: mvn -V clean install --batch-mode --no-transfer-progress --errors -DtrimStackTrace=false
     # Run tests
     - name: Run tests with Gradle on Windows
       working-directory: C:/ci.gradle
@@ -161,6 +159,6 @@ jobs:
     - uses: actions/upload-artifact@v3
       if: ${{ failure() }}
       with:
-        name: buildReportsArtifact
+        name: buildReportsArtifactWindows
         path: D:/buildReports
         retention-days: 3
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index bdd22e35..24fd13b8 100644
--- a/build.gradle
+++ b/build.gradle
@@ -59,7 +59,7 @@ compileTestGroovy {
     targetCompatibility = JavaVersion.VERSION_1_7
 }
 
-def libertyAntVersion = "1.9.12"
+def libertyAntVersion = "1.9.13-SNAPSHOT"
 def libertyCommonVersion = "1.8.27-SNAPSHOT"
 
 dependencies {