diff --git a/gson/src/test/java/com/google/gson/integration/OSGiManifestIT.java b/gson/src/test/java/com/google/gson/integration/OSGiManifestIT.java index 7d3637098d..cf9d1f344a 100644 --- 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();