Merge branch 'jetty-9.4.x' into jetty-10.0.x

jetty · Oct 28, 2020 · 651f23e · 651f23e
2 parents be4e5ab + 47885f7
commit 651f23e
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 48 deletions.
diff --git 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
@@ -68,6 +68,7 @@
 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 void handshakeFailed(Event event, Throwable failure)
 
     // 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
@@ -46,9 +46,8 @@
 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 @@
 
 // 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
@@ -32,6 +32,7 @@
           <mainClass>org.eclipse.jetty.http2.server.H2SpecServer</mainClass>
           <skip>${skipTests}</skip>
           <junitPackage>org.eclipse.jetty.h2spec</junitPackage>
+          <skipNoDockerAvailable>true</skipNoDockerAvailable>
           <excludeSpecs>
             <excludeSpec>3.5 - Sends invalid connection preface</excludeSpec>
           </excludeSpecs>
@@ -122,39 +123,5 @@
         </plugins>
       </build>
     </profile>
-    <profile>
-      <id>run-h2spec-in-docker</id>
-      <activation>
-        <file>
-          <exists>/var/run/docker.sock</exists>
-        </file>
-      </activation>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.mortbay.jetty</groupId>
-            <artifactId>h2spec-maven-plugin</artifactId>
-            <configuration>
-              <mainClass>org.eclipse.jetty.http2.server.H2SpecServer</mainClass>
-              <skip>${skipTests}</skip>
-              <junitPackage>org.eclipse.jetty.h2spec</junitPackage>
-              <excludeSpecs>
-                <excludeSpec>3.5 - Sends invalid connection preface</excludeSpec>
-              </excludeSpecs>
-            </configuration>
-            <executions>
-              <execution>
-                <id>h2spec</id>
-                <phase>test</phase>
-                <goals>
-                  <goal>h2spec</goal>
-                </goals>
-              </execution>
-            </executions>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
   </profiles>
-
 </project>
diff --git a/pom.xml b/pom.xml
@@ -17,7 +17,7 @@
     <compiler.release>11</compiler.release>
     <jetty.url>https://www.eclipse.org/jetty/</jetty.url>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <build-support.version>1.4</build-support.version>
+    <build-support.version>1.5</build-support.version>
     <checkstyle.version>8.36.2</checkstyle.version>
     <slf4j.version>2.0.0-alpha1</slf4j.version>
     <log4j2.version>2.13.0</log4j2.version>
@@ -733,7 +733,7 @@
         <plugin>
           <groupId>org.codehaus.mojo</groupId>
           <artifactId>appassembler-maven-plugin</artifactId>
-          <version>2.0.0</version>
+          <version>2.1.0</version>
         </plugin>
         <plugin>
           <groupId>org.codehaus.mojo</groupId>
@@ -936,7 +936,7 @@
         <plugin>
           <groupId>org.mortbay.jetty</groupId>
           <artifactId>h2spec-maven-plugin</artifactId>
-          <version>1.0.0</version>
+          <version>1.0.2</version>
         </plugin>
       </plugins>
     </pluginManagement>