Build with Java 21 (#3570)

dropwizard · Sep 21, 2023 · 8f05798 · 8f05798
1 parent 0c7474a
commit 8f05798
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 4 deletions.
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
@@ -13,7 +13,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        java_version: [11, 17]
+        java_version: [11, 17, 21]
         os:
         - ubuntu-latest
     env:

diff --git a/.github/workflows/trigger-release.yml b/.github/workflows/trigger-release.yml
@@ -26,7 +26,7 @@ jobs:
       uses: actions/setup-java@cd89f46ac9d01407894225f350157564c9c7cee2 # v3
       with:
         distribution: 'temurin'
-        java-version: '11'
+        java-version: '17'
         cache: 'maven'
         server-id: ossrh
         server-username: ${{ secrets.CI_DEPLOY_USERNAME }}

diff --git a/metrics-core/pom.xml b/metrics-core/pom.xml
@@ -66,5 +66,11 @@
             <version>${slf4j.version}</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+            <version>${commons-lang3.version}</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 </project>
diff --git a/metrics-core/src/test/java/com/codahale/metrics/ConsoleReporterTest.java b/metrics-core/src/test/java/com/codahale/metrics/ConsoleReporterTest.java
@@ -1,5 +1,7 @@
 package com.codahale.metrics;
 
+import org.apache.commons.lang3.JavaVersion;
+import org.apache.commons.lang3.SystemUtils;
 import org.junit.Before;
 import org.junit.Test;
 
@@ -42,9 +44,12 @@ public void setUp() throws Exception {
         when(clock.getTime()).thenReturn(1363568676000L);
         // JDK9 has changed the java.text.DateFormat API implementation according to Unicode.
         // See http://mail.openjdk.java.net/pipermail/jdk9-dev/2017-April/005732.html
-        dateHeader = System.getProperty("java.version").startsWith("1.8") ?
+        dateHeader = SystemUtils.isJavaVersionAtMost(JavaVersion.JAVA_1_8) ?
                 "3/17/13 6:04:36 PM =============================================================" :
-                "3/17/13, 6:04:36 PM ============================================================";
+                // https://bugs.openjdk.org/browse/JDK-8304925
+                SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_20) ?
+                        "3/17/13, 6:04:36\u202FPM ============================================================" :
+                        "3/17/13, 6:04:36 PM ============================================================";
     }
 
     @Test

diff --git a/pom.xml b/pom.xml
@@ -67,6 +67,7 @@
         <mockito.version>5.5.0</mockito.version>
         <junit.version>4.13.1</junit.version>
         <hamcrest.version>1.3</hamcrest.version>
+        <commons-lang3.version>3.13.0</commons-lang3.version>
         <maven-compiler-plugin.version>3.11.0</maven-compiler-plugin.version>
         <errorprone.version>2.22.0</errorprone.version>
         <errorprone.javac.version>9+181-r4173-1</errorprone.javac.version>