Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,7 @@ <E extends T> E min(Iterable<E> iterable) {
* @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;
}

Expand Down Expand Up @@ -278,7 +278,7 @@ <E extends T> E max(Iterable<E> iterable) {
* @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;
}

Expand Down
12 changes: 12 additions & 0 deletions tests/e2e-client/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -245,6 +245,18 @@
<surefire.security.argline>-Djdk.tls.server.protocols=TLSv1.2</surefire.security.argline>
</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>
Expand Down
19 changes: 19 additions & 0 deletions tests/e2e-client/src/test/resources/disabled_tls.properties
Original file line number Diff line number Diff line change
@@ -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
Loading