[FIXED JENKINS-18366] Winstone is now powered by Jetty

(cherry picked from commit b19f465) Conflicts: changelog.html war/pom.xml
jenkinsci · Oct 26, 2014 · 2394c0c · 2394c0c · md-5 · Oct 30, 2014
1 parent 94590fd
commit 2394c0c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/pom.xml b/pom.xml
@@ -629,6 +629,9 @@ THE SOFTWARE.
                 </requireMavenVersion>
                 <enforceBytecodeVersion>
                   <maxJdkVersion>1.${java.level}</maxJdkVersion>
+                  <ignoreClasses>
+                    <ignoreClass>org.eclipse.jetty.spdy.*</ignoreClass>
+                  </ignoreClasses>
                 </enforceBytecodeVersion>
               </rules>
             </configuration>
@@ -653,7 +656,7 @@ THE SOFTWARE.
           <dependency>
             <groupId>org.codehaus.mojo</groupId>
             <artifactId>extra-enforcer-rules</artifactId>
-            <version>1.0-alpha-5</version>
+            <version>1.0-beta-1+kohsuke</version>
           </dependency>
         </dependencies>
       </plugin>

diff --git a/war/pom.xml b/war/pom.xml
@@ -51,7 +51,7 @@ THE SOFTWARE.
     <dependency>
       <groupId>org.jenkins-ci</groupId>
       <artifactId>executable-war</artifactId>
-      <version>1.28</version>
+      <version>1.29</version>
       <scope>provided</scope>
     </dependency>