diff --git a/containers/grizzly2-http/pom.xml b/containers/grizzly2-http/pom.xml index e8cf5c093f..796403e937 100644 --- a/containers/grizzly2-http/pom.xml +++ b/containers/grizzly2-http/pom.xml @@ -146,30 +146,4 @@ - - - - jdk11 - - [11,17) - - - - - - maven-compiler-plugin - - - default-testCompile - - true - - - - - - - - - diff --git a/examples/osgi-http-service/functional-test/pom.xml b/examples/osgi-http-service/functional-test/pom.xml index ccc29996ed..49f88a1590 100644 --- a/examples/osgi-http-service/functional-test/pom.xml +++ b/examples/osgi-http-service/functional-test/pom.xml @@ -1,7 +1,7 @@ diff --git a/tests/e2e-client/pom.xml b/tests/e2e-client/pom.xml index 8555e68a06..a18bcb9a87 100644 --- a/tests/e2e-client/pom.xml +++ b/tests/e2e-client/pom.xml @@ -209,149 +209,18 @@ commons-io ${commons.io.version} + + org.glassfish.jersey.connectors + jersey-jetty-connector + test + + + org.glassfish.jersey.test-framework.providers + jersey-test-framework-provider-jetty + - - Jetty12Default - - [17,) - - - - org.glassfish.jersey.connectors - jersey-jetty-connector - test - - - org.glassfish.jersey.test-framework.providers - jersey-test-framework-provider-jetty - - - - - Jetty11JDK11 - - [11,17) - - - - org.glassfish.jersey.connectors - jersey-jetty11-connector - test - - - org.eclipse.jetty - jetty-client - ${jetty11.version} - - - org.slf4j - slf4j-api - - - - - org.eclipse.jetty - jetty-http - ${jetty11.version} - - - org.slf4j - slf4j-api - - - org.eclipse.jetty - jetty-util - - - - - org.eclipse.jetty - jetty-io - ${jetty11.version} - - - org.slf4j - slf4j-api - - - org.eclipse.jetty - jetty-util - - - - - org.eclipse.jetty - jetty-util - ${jetty11.version} - - - org.slf4j - slf4j-api - - - - - org.slf4j - slf4j-api - ${slf4j.version} - - - - - - org.apache.maven.plugins - maven-compiler-plugin - - - default-testCompile - test-compile - - - org/glassfish/jersey/tests/e2e/client/connector/proxy/Proxy*Test.java - org/glassfish/jersey/tests/e2e/client/nettyconnector/Expect100ContinueTest.java - - - - testCompile - - - - - - - - - - JettyTestExclude - - [11,17) - - - - - org.apache.maven.plugins - maven-compiler-plugin - - - default-testCompile - test-compile - - - org/glassfish/jersey/tests/e2e/client/connector/proxy/Proxy*Test.java - org/glassfish/jersey/tests/e2e/client/nettyconnector/Expect100ContinueTest.java - - - - testCompile - - - - - - - xdk diff --git a/tests/e2e-tls/pom.xml b/tests/e2e-tls/pom.xml index 6498b05070..f59026b8e7 100644 --- a/tests/e2e-tls/pom.xml +++ b/tests/e2e-tls/pom.xml @@ -115,26 +115,16 @@ ${project.version} test + + com.sun.xml.bind + jaxb-osgi + test + - - - jdk11+ - - [11,) - - - - com.sun.xml.bind - jaxb-osgi - test - - - - - -Djdk.tls.server.protocols=TLSv1.2 - - - + + + -Djdk.tls.server.protocols=TLSv1.2 + diff --git a/tests/pom.xml b/tests/pom.xml index 7bc93fe4b3..299e5425cd 100644 --- a/tests/pom.xml +++ b/tests/pom.xml @@ -49,8 +49,10 @@ jmockit mem-leaks osgi - stress + release-test performance + stress + version-agnostic @@ -114,23 +116,5 @@ - - JDK11+ - - [11,) - - - release-test - - - - JDK17+ - - [17,) - - - version-agnostic - -