Merge pull request #342 from jamezp/component-upgrades

Component upgrades
jboss-logging · Nov 1, 2021 · bc13d3d · bc13d3d
2 parents e48c856 + 32df5e4
commit bc13d3d
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 26 deletions.
diff --git 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%"'
diff --git a/pom.xml b/pom.xml
@@ -33,7 +33,7 @@
     <parent>
         <groupId>org.jboss</groupId>
         <artifactId>jboss-parent</artifactId>
-        <version>34</version>
+        <version>38</version>
     </parent>
 
     <licenses>
@@ -46,12 +46,12 @@
 
     <properties>
         <!-- Dependency versions -->
-        <version.javax.json>1.0</version.javax.json>
-        <version.org.byteman>4.0.6</version.org.byteman>
-        <version.org.glassfish.javax.json>1.0.4</version.org.glassfish.javax.json>
+        <version.jakarta.json>1.1.6</version.jakarta.json>
+        <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.modules.jboss-modules>1.9.1.Final</version.org.jboss.modules.jboss-modules>
         <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>
@@ -80,17 +80,17 @@
         </dependency>
 
         <dependency>
-            <groupId>javax.json</groupId>
-            <artifactId>javax.json-api</artifactId>
-            <version>${version.javax.json}</version>
+            <groupId>jakarta.json</groupId>
+            <artifactId>jakarta.json-api</artifactId>
+            <version>${version.jakarta.json}</version>
             <!-- only required for the JsonFormatter -->
             <optional>true</optional>
         </dependency>
         <!-- JSON implementation -->
         <dependency>
             <groupId>org.glassfish</groupId>
-            <artifactId>javax.json</artifactId>
-            <version>${version.org.glassfish.javax.json}</version>
+            <artifactId>jakarta.json</artifactId>
+            <version>${version.org.glassfish.jakarta.json}</version>
             <!-- only required for the JsonFormatter, another implementation of the JSON-P API may be used as well -->
             <optional>true</optional>
         </dependency>
@@ -287,7 +287,7 @@
                     <dependency>
                         <groupId>biz.aQute.bnd</groupId>
                         <artifactId>biz.aQute.bndlib</artifactId>
-                        <version>4.2.0</version>
+                        <version>6.0.0</version>
                     </dependency>
                 </dependencies>
                 <configuration>