提交 b9eb8c56 编写于 作者: K Kohsuke Kawaguchi

Revert "Integrated a new version of Winstone and executable-war to set unique"

This reverts commit a859d2e9.
I pushed relevant jars yesterday but doesn't look like they hit central
yet.
上级 a859d2e9
......@@ -55,8 +55,7 @@ Upcoming changes</a>
<!-- Record your changes in the trunk here. -->
<div id="trunk" style="display:none"><!--=TRUNK-BEGIN=-->
<ul class=image>
<li class=bug>
If you run multiple Jenkins on the same host but on a different port, their login sessions get mixed up
<li class=>
</ul>
</div><!--=TRUNK-END=-->
......
......@@ -357,7 +357,7 @@ THE SOFTWARE.
<dependency>
<groupId>org.kohsuke</groupId>
<artifactId>trilead-putty-extension</artifactId>
<version>1.1</version>
<version>1.0</version>
</dependency>
<dependency>
<groupId>org.jvnet.hudson</groupId>
......@@ -419,9 +419,9 @@ THE SOFTWARE.
<version>1.2</version>
</dependency>
<dependency>
<groupId>org.jenkins-ci</groupId>
<groupId>org.jvnet.hudson</groupId>
<artifactId>task-reactor</artifactId>
<version>1.3</version>
<version>1.2</version>
</dependency>
<dependency>
<groupId>org.jvnet.localizer</groupId>
......@@ -667,7 +667,7 @@ THE SOFTWARE.
<dependency>
<groupId>org.jenkins-ci</groupId>
<artifactId>memory-monitor</artifactId>
<version>1.6</version>
<version>1.5</version>
</dependency>
<dependency><!-- StAX implementation. See HUDSON-2547. -->
<groupId>org.codehaus.woodstox</groupId>
......@@ -730,7 +730,7 @@ THE SOFTWARE.
<dependency>
<groupId>org.kohsuke.metainf-services</groupId>
<artifactId>metainf-services</artifactId>
<version>1.2</version>
<version>1.1</version>
<optional>true</optional>
</dependency>
<dependency>
......
......@@ -76,7 +76,7 @@ complete {
rewriteLicense([],lgpl)
}
match(["org.jvnet.localizer:localizer"]) {
match(["org.jvnet.localizer:localizer","*:trilead-putty-extension"]) {
// see http://java.net/projects/localizer
// see http://java.net/projects/trilead-putty-extension/
rewriteLicense([],mitLicense);
......
......@@ -111,7 +111,7 @@ THE SOFTWARE.
<mkdir dir="target/generated-resources" />
<!-- put executable war header -->
<resolveArtifact groupId="org.jenkins-ci" artifactId="executable-war" version="1.23" type="jar" property="executable-war.jar" />
<resolveArtifact groupId="org.jenkins-ci" artifactId="executable-war" version="1.22" type="jar" property="executable-war.jar" />
<unjar src="${executable-war.jar}" dest="target/generated-resources">
<patternset>
<include name="**/*.class" />
......@@ -285,7 +285,7 @@ THE SOFTWARE.
-->
<groupId>org.jenkins-ci</groupId>
<artifactId>winstone</artifactId>
<version>0.9.10-jenkins-26</version>
<version>0.9.10-jenkins-25</version>
<scope>test</scope>
</dependency>
<dependency>
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册