JDK 26 compatibility
Signed-off-by: Maxim Nesen <maxim.nesen@oracle.com>
diff --git a/core-common/src/main/java/org/glassfish/jersey/internal/guava/Ordering.java b/core-common/src/main/java/org/glassfish/jersey/internal/guava/Ordering.java
index a544e36..c87d6a5 100644
--- a/core-common/src/main/java/org/glassfish/jersey/internal/guava/Ordering.java
+++ b/core-common/src/main/java/org/glassfish/jersey/internal/guava/Ordering.java
@@ -203,7 +203,7 @@
* @throws ClassCastException if the parameters are not <i>mutually
* comparable</i> under this ordering.
*/
- <E extends T> E min(E a, E b) {
+ public <E extends T> E min(E a, E b) {
return (compare(a, b) <= 0) ? a : b;
}
@@ -278,7 +278,7 @@
* @throws ClassCastException if the parameters are not <i>mutually
* comparable</i> under this ordering.
*/
- <E extends T> E max(E a, E b) {
+ public <E extends T> E max(E a, E b) {
return (compare(a, b) >= 0) ? a : b;
}
diff --git a/tests/e2e-client/pom.xml b/tests/e2e-client/pom.xml
index 6f3aac5..d647b0e 100644
--- a/tests/e2e-client/pom.xml
+++ b/tests/e2e-client/pom.xml
@@ -246,6 +246,18 @@
</properties>
</profile>
<profile>
+ <id>jdk26+</id>
+ <activation>
+ <jdk>[26,)</jdk>
+ </activation>
+ <properties>
+ <surefire.security.argline>
+ -Djdk.tls.server.protocols=TLSv1.2
+ -Djava.security.properties=${project.build.directory}/test-classes/disabled_tls.properties
+ </surefire.security.argline>
+ </properties>
+ </profile>
+ <profile>
<id>xdk</id>
<properties>
<!-- do not use security manager for xdk -->
diff --git a/tests/e2e-client/src/test/resources/disabled_tls.properties b/tests/e2e-client/src/test/resources/disabled_tls.properties
new file mode 100644
index 0000000..41cb0b9
--- /dev/null
+++ b/tests/e2e-client/src/test/resources/disabled_tls.properties
@@ -0,0 +1,19 @@
+#
+# Copyright (c) 2012, 2025 Oracle and/or its affiliates. All rights reserved.
+#
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License v. 2.0, which is available at
+# http://www.eclipse.org/legal/epl-2.0.
+#
+# This Source Code may also be made available under the following Secondary
+# Licenses when the conditions for such availability set forth in the
+# Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+# version 2 with the GNU Classpath Exception, which is available at
+# https://www.gnu.org/software/classpath/license.html.
+#
+# SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+#
+
+jdk.tls.disabledAlgorithms=SSLv3, TLSv1, TLSv1.1, DTLSv1.0, RC4, DES, \
+ MD5withRSA, DH keySize < 1024, EC keySize < 224, 3DES_EDE_CBC, anon, NULL, \
+ ECDH
\ No newline at end of file
