Merge pull request #2937 from olamy/feature/jetty_http2_connector

[JENKINS-45438] Add Jetty HTTP/2 connector
jenkinsci · Jul 21, 2017 · 19f2d66 · 19f2d66
2 parents e952bba + ece79da
commit 19f2d66
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/pom.xml b/pom.xml
@@ -689,9 +689,6 @@ THE SOFTWARE.
                 </requireMavenVersion>
                 <enforceBytecodeVersion>
                   <maxJdkVersion>1.${java.level}</maxJdkVersion>
-                  <ignoreClasses>
-                    <ignoreClass>org.eclipse.jetty.spdy.*</ignoreClass>
-                  </ignoreClasses>
                 </enforceBytecodeVersion>
               </rules>
             </configuration>

diff --git a/war/pom.xml b/war/pom.xml
@@ -49,7 +49,7 @@ THE SOFTWARE.
     <dependency>
       <groupId>org.jenkins-ci</groupId>
       <artifactId>executable-war</artifactId>
-      <version>1.35.1</version>
+      <version>1.36</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
@@ -93,7 +93,7 @@ THE SOFTWARE.
       -->
       <groupId>org.jenkins-ci</groupId>
       <artifactId>winstone</artifactId>
-      <version>4.0</version>
+      <version>4.1</version>
       <scope>test</scope>
     </dependency>
     <dependency>