Fixes #240 - Update to Java 21 (#241)

manorrock · Nov 26, 2023 · 8079d54 · 8079d54
1 parent e3a9408
commit 8079d54
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 16 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -7,9 +7,10 @@ jobs:
     steps:
     - name: Checkout sources
       uses: actions/checkout@v1
-    - name: Set up Java
-      uses: actions/setup-java@v1
+    - name: Set up Java 21
+      uses: actions/setup-java@v3
       with:
-        java-version: 17
+        distribution: 'temurin'
+        java-version: 21
     - name: Build with Maven
       run: mvn -B install
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -9,10 +9,11 @@ jobs:
     steps:
     - name: Checkout sources
       uses: actions/checkout@v1
-    - name: Set up Java
-      uses: actions/setup-java@v1
+    - name: Set up Java 21
+      uses: actions/setup-java@v3
       with:
-        java-version: 17
+        distribution: 'temurin'
+        java-version: 21
         server-id: ossrh
         server-username: MAVEN_USERNAME
         server-password: MAVEN_PASSWORD

diff --git a/.github/workflows/tck.yml b/.github/workflows/tck.yml
@@ -10,10 +10,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v1
-    - name: Set up Java 20
-      uses: actions/setup-java@v1
+    - name: Set up Java 21
+      uses: actions/setup-java@v3
       with:
-        java-version: 20
+        distribution: 'temurin'
+        java-version: 21
     - name: Build with Maven
       run: mvn -B --ntp package
     - name: Run TCK

diff --git a/impl/pom.xml b/impl/pom.xml
@@ -14,6 +14,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
+                <version>3.2.2</version>
                 <configuration>
                     <useModulePath>false</useModulePath>
                 </configuration>
@@ -44,7 +45,7 @@
         <dependency>
             <groupId>org.jboss.weld.se</groupId>
             <artifactId>weld-se-shaded</artifactId>
-            <version>4.0.0.Final</version>
+            <version>4.0.3.Final</version>
             <scope>test</scope>
         </dependency>
     </dependencies>

diff --git a/pom.xml b/pom.xml
@@ -19,6 +19,13 @@
             <url>https://github.com/manorrock/flounder/blob/master/LICENSE</url>
         </license>
     </licenses>
+    <properties>
+        <!-- other -->
+        <java.version>21</java.version>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <!-- plugins -->
+        <jacoco-maven-plugin.version>0.8.11</jacoco-maven-plugin.version>
+    </properties>
     <build>
         <pluginManagement>
             <plugins>
@@ -67,7 +74,7 @@
                 <plugin>
                     <groupId>org.jacoco</groupId>
                     <artifactId>jacoco-maven-plugin</artifactId>
-                    <version>0.8.8</version>
+                    <version>${jacoco-maven-plugin.version}</version>
                 </plugin>
             </plugins>
         </pluginManagement>
@@ -77,8 +84,7 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <inherited>true</inherited>
                 <configuration>
-                    <source>17</source>
-                    <target>17</target>
+                    <release>${java.version}</release>
                 </configuration>
             </plugin>
             <plugin>
@@ -210,9 +216,6 @@
             </build>
         </profile>
     </profiles>
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    </properties>
     <scm>
         <connection>scm:git:git://github.com/manorrock/flounder.git</connection>
         <developerConnection>scm:git:[email protected]:manorrock/flounder.git</developerConnection>