From 5232b6a099f1cf14a3d915e1b54afe25545f761b Mon Sep 17 00:00:00 2001
From: "James R. Perkins" <jperkins@redhat.com>
Date: Mon, 1 Nov 2021 08:47:25 -0700
Subject: [PATCH 1/4] [LOGMGR-288] Test building with Java 17 plus minor CI
 updates.

https://issues.redhat.com/browse/LOGMGR-288
---
 .github/workflows/maven.yml | 29 ++++++++++++++---------------
 1 file changed, 14 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index e92e0cfc..530bcb43 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -15,27 +15,26 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-latest, windows-latest ]
+        os: [ubuntu-latest, windows-latest]
+        java: ['11', '17']
 
     steps:
       - uses: actions/checkout@v2
-      - uses: actions/cache@v1
+      - name: Set up JDK 8
+        uses: actions/setup-java@v2
         with:
-          path: ~/.m2/repository
-          key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
-          restore-keys: |
-            ${{ runner.os }}-maven-
-      - name: Set up JDK 1.8
-        uses: actions/setup-java@v1
+          java-version: 8
+          distribution: 'temurin'
+          cache: 'maven'
+      - name: Set up JDK ${{ matrix.java }}
+        uses: actions/setup-java@v2
         with:
-          java-version: 1.8
-      - name: Set up JDK 11
-        uses: actions/setup-java@v1
-        with:
-          java-version: 11
+          java-version: ${{ matrix.java }}
+          distribution: 'temurin'
+          cache: 'maven'
       - name: Build with Maven Linux
         if: runner.os == 'Linux'
-        run: mvn verify -Djava8.home=$JAVA_HOME_8_X64
+        run: mvn -B clean verify -Djava8.home=$JAVA_HOME_8_X64
       - name: Build with Maven Windows
         if: runner.os == 'Windows'
-        run: mvn verify '-Djava8.home="%JAVA_HOME_8_X64%"'
+        run: mvn -B clean verify '-Djava8.home="%JAVA_HOME_8_X64%"'

From 055d4a89eb8146a8a42af220d8b6a1da735ff03d Mon Sep 17 00:00:00 2001
From: "James R. Perkins" <jperkins@redhat.com>
Date: Thu, 24 Mar 2022 15:23:27 -0700
Subject: [PATCH 2/4] [LOGMGR-292] Upgrade Byteman to 4.0.17.

https://issues.redhat.com/browse/LOGMGR-292
Signed-off-by: James R. Perkins <jperkins@redhat.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index a07e89f7..654a8aba 100644
--- a/pom.xml
+++ b/pom.xml
@@ -53,7 +53,7 @@
     <properties>
         <!-- Dependency versions -->
         <version.jakarta.json.jakarta-json-api>1.1.6</version.jakarta.json.jakarta-json-api>
-        <version.org.byteman>4.0.6</version.org.byteman>
+        <version.org.byteman>4.0.17</version.org.byteman>
         <version.org.glassfish.jakarta.json>1.1.6</version.org.glassfish.jakarta.json>
         <version.org.jboss.logging.jboss-logging>3.4.0.Final</version.org.jboss.logging.jboss-logging>
         <version.org.jboss.modules.jboss-modules>1.10.1.Final</version.org.jboss.modules.jboss-modules>

From cfa86f925c0f7d1f0a7d72b2b2f22a66784dbccc Mon Sep 17 00:00:00 2001
From: "James R. Perkins" <jperkins@redhat.com>
Date: Thu, 24 Mar 2022 15:26:17 -0700
Subject: [PATCH 3/4] [LOGMGR-290] Upgrade JUnit to 4.13.2.

https://issues.redhat.com/browse/LOGMGR-290
Signed-off-by: James R. Perkins <jperkins@redhat.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 654a8aba..6daf29e7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -59,7 +59,7 @@
         <version.org.jboss.modules.jboss-modules>1.10.1.Final</version.org.jboss.modules.jboss-modules>
         <version.org.kohsuke.metainf-services>1.8</version.org.kohsuke.metainf-services>
         <version.org.wildfly.common.wildfly-common>1.5.1.Final</version.org.wildfly.common.wildfly-common>
-        <version.junit.junit>4.12</version.junit.junit>
+        <version.junit.junit>4.13.2</version.junit.junit>
 
         <!-- Test properties -->
         <org.jboss.test.address>127.0.0.1</org.jboss.test.address>

From a10079a95dfa8e290be0debbae50c4d0ffae68d2 Mon Sep 17 00:00:00 2001
From: "James R. Perkins" <jperkins@redhat.com>
Date: Thu, 24 Mar 2022 15:27:02 -0700
Subject: [PATCH 4/4] [LOGMGR-289] Upgrade jboss-parent to 38.

https://issues.redhat.com/browse/LOGMGR-289
Signed-off-by: James R. Perkins <jperkins@redhat.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 6daf29e7..a494c252 100644
--- a/pom.xml
+++ b/pom.xml
@@ -33,7 +33,7 @@
     <parent>
         <groupId>org.jboss</groupId>
         <artifactId>jboss-parent</artifactId>
-        <version>36</version>
+        <version>38</version>
     </parent>
 
     <licenses>