diff --git a/Jenkinsfile b/Jenkinsfile index 71e60a2032c..564d6efb3f6 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -102,12 +102,12 @@ def mavenBuild(jdk, cmdline, mvnName, junitPublishDisabled) { def mavenOpts = '-Xms1g -Xmx4g -Djava.awt.headless=true' withMaven( - maven: mvnName, - jdk: "$jdk", - publisherStrategy: 'EXPLICIT', - options: [junitPublisher(disabled: junitPublishDisabled), mavenLinkerPublisher(disabled: false), pipelineGraphPublisher(disabled: false)], - mavenOpts: mavenOpts, - mavenLocalRepo: localRepo) { + maven: mvnName, + jdk: "$jdk", + publisherStrategy: 'EXPLICIT', + options: [junitPublisher(disabled: junitPublishDisabled), mavenLinkerPublisher(disabled: false), pipelineGraphPublisher(disabled: false)], + mavenOpts: mavenOpts, + mavenLocalRepo: localRepo) { // Some common Maven command line + provided command line sh "mvn -Premote-session-tests -Pci -V -B -e -fae -Dmaven.test.failure.ignore=true -Djetty.testtracker.log=true $cmdline -Dunix.socket.tmp=" + env.JENKINS_HOME } diff --git a/jetty-client/src/test/java/org/eclipse/jetty/client/HttpClientTLSTest.java b/jetty-client/src/test/java/org/eclipse/jetty/client/HttpClientTLSTest.java index 1f066bb1bbe..878fe00c587 100644 --- a/jetty-client/src/test/java/org/eclipse/jetty/client/HttpClientTLSTest.java +++ b/jetty-client/src/test/java/org/eclipse/jetty/client/HttpClientTLSTest.java @@ -68,6 +68,7 @@ import org.eclipse.jetty.util.thread.ExecutorThreadPool; import org.eclipse.jetty.util.thread.QueuedThreadPool; import org.hamcrest.Matchers; import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.condition.EnabledOnJre; import org.junit.jupiter.api.condition.JRE; @@ -267,8 +268,8 @@ public class HttpClientTLSTest // In JDK 11+, a mismatch on the client does not generate any bytes towards // the server, while in previous JDKs the client sends to the server the close_notify. - @EnabledOnJre({JRE.JAVA_8, JRE.JAVA_9, JRE.JAVA_10}) - @Test + // @EnabledOnJre({JRE.JAVA_8, JRE.JAVA_9, JRE.JAVA_10}) + @Disabled("No longer viable, TLS protocol behavior changed in 8u272") public void testMismatchBetweenTLSProtocolAndTLSCiphersOnClient() throws Exception { SslContextFactory.Server serverTLSFactory = createServerSslContextFactory(); diff --git a/jetty-client/src/test/java/org/eclipse/jetty/client/ssl/SslBytesClientTest.java b/jetty-client/src/test/java/org/eclipse/jetty/client/ssl/SslBytesClientTest.java index defbb6bb7b2..da9c4de2199 100644 --- a/jetty-client/src/test/java/org/eclipse/jetty/client/ssl/SslBytesClientTest.java +++ b/jetty-client/src/test/java/org/eclipse/jetty/client/ssl/SslBytesClientTest.java @@ -46,9 +46,8 @@ import org.eclipse.jetty.toolchain.test.MavenTestingUtils; import org.eclipse.jetty.util.ssl.SslContextFactory; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.condition.EnabledOnJre; -import org.junit.jupiter.api.condition.JRE; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNull; @@ -57,7 +56,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue; // This whole test is very specific to how TLS < 1.3 works. // Starting in Java 11, TLS/1.3 is now enabled by default. -@EnabledOnJre({JRE.JAVA_8, JRE.JAVA_9, JRE.JAVA_10}) +@Disabled("Since 8u272 this is no longer valid") public class SslBytesClientTest extends SslBytesTest { private ExecutorService threadPool; diff --git a/jetty-http2/http2-server/pom.xml b/jetty-http2/http2-server/pom.xml index 456ace409fe..9ace4fceea4 100644 --- a/jetty-http2/http2-server/pom.xml +++ b/jetty-http2/http2-server/pom.xml @@ -32,6 +32,7 @@ org.eclipse.jetty.http2.server.H2SpecServer ${skipTests} org.eclipse.jetty.h2spec + true 3.5 - Sends invalid connection preface @@ -122,39 +123,5 @@ - - run-h2spec-in-docker - - - /var/run/docker.sock - - - - - - org.mortbay.jetty - h2spec-maven-plugin - - org.eclipse.jetty.http2.server.H2SpecServer - ${skipTests} - org.eclipse.jetty.h2spec - - 3.5 - Sends invalid connection preface - - - - - h2spec - test - - h2spec - - - - - - - - diff --git a/pom.xml b/pom.xml index 20e42cefb7b..94d9e94776e 100644 --- a/pom.xml +++ b/pom.xml @@ -17,7 +17,7 @@ 11 https://www.eclipse.org/jetty/ UTF-8 - 1.4 + 1.5 8.36.2 2.0.0-alpha1 2.13.0 @@ -733,7 +733,7 @@ org.codehaus.mojo appassembler-maven-plugin - 2.0.0 + 2.1.0 org.codehaus.mojo @@ -936,7 +936,7 @@ org.mortbay.jetty h2spec-maven-plugin - 1.0.0 + 1.0.2