Fix test failure for JDK 21 CI build

google · Sep 7, 2024 · c8606b9 · c8606b9
1 parent e0114e9
commit c8606b9
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/gson/src/test/java/com/google/gson/integration/OSGiManifestIT.java b/gson/src/test/java/com/google/gson/integration/OSGiManifestIT.java
@@ -144,9 +144,12 @@ public void testExports() {
 
   @Test
   public void testRequireCapability() {
+    // When building with JDK >= 21, the minimum target version is Java 8
+    String expectedJavaVersion = Runtime.version().feature() < 21 ? "1.7" : "1.8";
+
     // Defines the minimum required Java version
     assertThat(getAttribute("Require-Capability"))
-        .isEqualTo("osgi.ee;filter:=\"(&(osgi.ee=JavaSE)(version=1.7))\"");
+        .isEqualTo("osgi.ee;filter:=\"(&(osgi.ee=JavaSE)(version=" + expectedJavaVersion + "))\"");
 
     // Should not define deprecated "Bundle-RequiredExecutionEnvironment"
     assertThat(getAttribute("Bundle-RequiredExecutionEnvironment")).isNull();