diff --git a/jetty-http2/http2-server/pom.xml b/jetty-http2/http2-server/pom.xml index edb874e50e5..4db05543447 100644 --- a/jetty-http2/http2-server/pom.xml +++ b/jetty-http2/http2-server/pom.xml @@ -15,31 +15,6 @@ 28888 - - - - 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 - - - - - - @@ -111,6 +86,37 @@ + + run-docker-http2spec + + /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/jetty-server/src/test/java/org/eclipse/jetty/server/ssl/SniSslConnectionFactoryTest.java b/jetty-server/src/test/java/org/eclipse/jetty/server/ssl/SniSslConnectionFactoryTest.java index 12a5ab631ce..62211916546 100644 --- a/jetty-server/src/test/java/org/eclipse/jetty/server/ssl/SniSslConnectionFactoryTest.java +++ b/jetty-server/src/test/java/org/eclipse/jetty/server/ssl/SniSslConnectionFactoryTest.java @@ -65,6 +65,8 @@ import org.hamcrest.Matchers; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.condition.DisabledOnOs; +import org.junit.jupiter.api.condition.OS; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.containsString; @@ -231,6 +233,7 @@ public class SniSslConnectionFactoryTest } @Test + @DisabledOnOs(OS.WINDOWS) public void testWrongSNIRejectedConnection() throws Exception { start(ssl -> @@ -273,6 +276,7 @@ public class SniSslConnectionFactoryTest } @Test + @DisabledOnOs(OS.WINDOWS) public void testWrongSNIRejectedFunction() throws Exception { start(ssl -> @@ -302,6 +306,7 @@ public class SniSslConnectionFactoryTest } @Test + @DisabledOnOs(OS.WINDOWS) public void testWrongSNIRejectedConnectionWithNonSNIKeystore() throws Exception { start(ssl ->