Skip to content

Commit bf73732

Browse files
committed
JDK 26 compatibility
Signed-off-by: Maxim Nesen <[email protected]>
1 parent f2c95e7 commit bf73732

File tree

3 files changed

+17
-2
lines changed

3 files changed

+17
-2
lines changed

core-common/src/main/java/org/glassfish/jersey/internal/guava/Ordering.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ <E extends T> E min(Iterable<E> iterable) {
203203
* @throws ClassCastException if the parameters are not <i>mutually
204204
* comparable</i> under this ordering.
205205
*/
206-
<E extends T> E min(E a, E b) {
206+
public <E extends T> E min(E a, E b) {
207207
return (compare(a, b) <= 0) ? a : b;
208208
}
209209

@@ -278,7 +278,7 @@ <E extends T> E max(Iterable<E> iterable) {
278278
* @throws ClassCastException if the parameters are not <i>mutually
279279
* comparable</i> under this ordering.
280280
*/
281-
<E extends T> E max(E a, E b) {
281+
public <E extends T> E max(E a, E b) {
282282
return (compare(a, b) >= 0) ? a : b;
283283
}
284284

tests/e2e-client/pom.xml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -245,6 +245,18 @@
245245
<surefire.security.argline>-Djdk.tls.server.protocols=TLSv1.2</surefire.security.argline>
246246
</properties>
247247
</profile>
248+
<profile>
249+
<id>jdk26+</id>
250+
<activation>
251+
<jdk>[26,)</jdk>
252+
</activation>
253+
<properties>
254+
<surefire.security.argline>
255+
-Djdk.tls.server.protocols=TLSv1.2
256+
-Djava.security.properties=${project.build.directory}/test-classes/disabled_tls.properties
257+
</surefire.security.argline>
258+
</properties>
259+
</profile>
248260
<profile>
249261
<id>xdk</id>
250262
<properties>
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
jdk.tls.disabledAlgorithms=SSLv3, TLSv1, TLSv1.1, DTLSv1.0, RC4, DES, \
2+
MD5withRSA, DH keySize < 1024, EC keySize < 224, 3DES_EDE_CBC, anon, NULL, \
3+
ECDH

0 commit comments

Comments
 (0)