From 47885f7ecb07ff501245c95ed061152cfc53597a Mon Sep 17 00:00:00 2001
From: Olivier Lamy <oliver.lamy@gmail.com>
Date: Wed, 28 Oct 2020 12:07:49 +1000
Subject: [PATCH] Jetty 9.4.x h2spec-maven-plugin now check if docker is
 available (new version fixing issues with generated junit file) (#5497)

* skip h2spec if no docker available

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

* active snapshot-repositories for jenkins build

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

* h2spec plugin 1.0.1

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

* new snapshot to debug jenkins

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

* simplify build to ease debug

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

* force snapshot download:

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

* use h2spec release 1.0.2

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

* remove commented sections

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

* no need of this profile

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

* profile not needed anymore

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
---
 Jenkinsfile                      |  3 +-
 jetty-http2/http2-server/pom.xml | 60 ++++++++++++++------------------
 pom.xml                          |  2 +-
 3 files changed, 28 insertions(+), 37 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index c5264f3588b..fa321ab3ad1 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -128,7 +128,7 @@ def slackNotif() {
  *
  * @param jdk the jdk tool name (in jenkins) to use for this build
  * @param cmdline the command line in "<profiles> <goals> <properties>"`format.
- * @return the Jenkinsfile step representing a maven build
+ * @param consoleParsers array of console parsers to run
  */
 def mavenBuild(jdk, cmdline, mvnName, consoleParsers) {
   script {
@@ -146,7 +146,6 @@ def mavenBuild(jdk, cmdline, mvnName, consoleParsers) {
     finally
     {
       junit testResults: '**/target/surefire-reports/*.xml,**/target/invoker-reports/TEST*.xml'
-      //archiveArtifacts artifacts: '**/jetty-webapp/target/**'
       if(consoleParsers!=null){
         warnings consoleParsers: consoleParsers
       }
diff --git a/jetty-http2/http2-server/pom.xml b/jetty-http2/http2-server/pom.xml
index 4901475c562..4dd62f2dcd0 100644
--- a/jetty-http2/http2-server/pom.xml
+++ b/jetty-http2/http2-server/pom.xml
@@ -15,6 +15,32 @@
     <manual.test.port>28888</manual.test.port>
   </properties>
 
+  <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>
+          <skipNoDockerAvailable>true</skipNoDockerAvailable>
+          <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>
 
   <dependencies>
     <dependency>
@@ -86,39 +112,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
index 222b802f265..9abe5a8127e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -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>