Skip to content
This repository was archived by the owner on Mar 5, 2025. It is now read-only.
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 @@ -39,8 +39,7 @@ public String value()
@Override
public String toString()
{
var isJava11 = System.getProperty("java.version").startsWith("11.");
return String.format("@%s(%s\"%s\")", ServiceType.class.getName(), isJava11 ? "value=" : "", value.replaceAll("([\\\\\"])", "\\\\$1"));
return String.format("@%s(%s\"%s\")", ServiceType.class.getName(), "", value.replaceAll("([\\\\\"])", "\\\\$1"));
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,7 @@ public String value()
@Override
public String toString()
{
var isJava11 = System.getProperty("java.version").startsWith("11.");
return String.format("@%s(%s\"%s\")", ServiceType.class.getName(), isJava11 ? "value=" : "", value.replaceAll("([\\\\\"])", "\\\\$1"));
return String.format("@%s(%s\"%s\")", ServiceType.class.getName(), "", value.replaceAll("([\\\\\"])", "\\\\$1"));
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -76,8 +76,7 @@ public class JettyHttpClient
{

private static final Logger log = Logger.get(JettyHttpClient.class);
private static final String[] ENABLED_PROTOCOLS = System.getProperty("java.version").matches("11(\\.0\\.[12])?") ?
new String[] {"TLSv1.2"} : new String[] {"TLSv1.2", "TLSv1.3"};
private static final String[] ENABLED_PROTOCOLS = {"TLSv1.2", "TLSv1.3"};
private static final String[] ENABLED_CIPHERS = {
"TLS_AES_128_GCM_SHA256",
"TLS_AES_256_GCM_SHA384",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -93,8 +93,7 @@

public class HttpServer
{
private static final String[] ENABLED_PROTOCOLS = System.getProperty("java.version").matches("11(\\.0\\.[12])?") ?
new String[] {"TLSv1.2"} : new String[] {"TLSv1.2", "TLSv1.3"};
private static final String[] ENABLED_PROTOCOLS = {"TLSv1.2", "TLSv1.3"};
private static final String[] ENABLED_CIPHERS = {
"TLS_AES_128_GCM_SHA256",
"TLS_AES_256_GCM_SHA384",
Expand Down Expand Up @@ -270,8 +269,6 @@ protected void runJob(Runnable job)
private ServerConnector createHttpsServerConnector(HttpServerConfig config, ServerSocketChannel serverSocketChannel, HttpConfiguration configuration, Executor threadPool, int acceptors, int selectors)
throws IOException
{
checkState(!System.getProperty("java.version").startsWith("1.8."), "Java 8 is no longer supported");

SecureRequestCustomizer customizer = new SecureRequestCustomizer();
customizer.setSniHostCheck(false);
customizer.setSniRequired(false);
Expand Down
136 changes: 0 additions & 136 deletions jmx/src/main/java/com/proofpoint/jmx/JavaVersion.java

This file was deleted.

49 changes: 0 additions & 49 deletions jmx/src/test/java/com/proofpoint/jmx/TestJavaVersion.java

This file was deleted.