Merge branch '3.0.x' into 3.1.x

spring-projects · Sep 18, 2023 · 3900c0a · 3900c0a
2 parents 0ba928b + 9a1e146
commit 3900c0a
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/.../spring-boot/src/test/java/org/springframework/boot/ssl/pem/PemPrivateKeyParserTests.java b/.../spring-boot/src/test/java/org/springframework/boot/ssl/pem/PemPrivateKeyParserTests.java
@@ -22,8 +22,6 @@
 import java.security.interfaces.ECPrivateKey;
 
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.condition.EnabledForJreRange;
-import org.junit.jupiter.api.condition.JRE;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.CsvSource;
 import org.junit.jupiter.params.provider.ValueSource;
@@ -129,7 +127,6 @@ void shouldNotParseUnsupportedEcPkcs8(String file) {
 			.hasMessageContaining("Unrecognized private key format");
 	}
 
-	@EnabledForJreRange(min = JRE.JAVA_17, disabledReason = "EdDSA is only supported since Java 17")
 	@ParameterizedTest
 	// @formatter:off
 	@ValueSource(strings = {
@@ -144,7 +141,6 @@ void shouldParseEdDsaPkcs8(String file) throws IOException {
 		assertThat(privateKey.getAlgorithm()).isEqualTo("EdDSA");
 	}
 
-	@EnabledForJreRange(min = JRE.JAVA_17, disabledReason = "XDH is only supported since Java 17")
 	@ParameterizedTest
 	// @formatter:off
 	@ValueSource(strings = {