Skip to content
Permalink
Browse files
[FIXED JENKINS-18366] Winstone is now powered by Jetty
(cherry picked from commit b19f465)

Conflicts:
	changelog.html
	war/pom.xml
  • Loading branch information
kohsuke authored and jglick committed Oct 26, 2014
1 parent 94590fd commit 2394c0cd0e233449c85da3bc75628420a2b07a05
Showing with 5 additions and 2 deletions.
  1. +4 −1 pom.xml
  2. +1 −1 war/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>
@@ -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>

3 comments on commit 2394c0c

@md-5
Copy link

@md-5 md-5 commented on 2394c0c Oct 30, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Huh I'm confused, I thought this was in master last year?

@jglick
Copy link
Member

@jglick jglick commented on 2394c0c Oct 30, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It was; this is just a merge of a cherry-pick.

@md-5
Copy link

@md-5 md-5 commented on 2394c0c Oct 30, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

GitHub doesn't illustrate that very well :p The issue tracker alerts confused me.

Thanks

Please sign in to comment.