Skip to content
Permalink
Browse files
[FIXED JENKINS-24521] Merge branch 'pull-1387'
  • Loading branch information
kohsuke committed Oct 15, 2014
2 parents c7e9882 + 57ee1de commit 7230a38da5d03073dea93e9984cf68d6b0cdeafe
Showing with 6 additions and 7 deletions.
  1. +3 −0 changelog.html
  2. +3 −3 core/pom.xml
  3. +0 −4 licenseCompleter.groovy
@@ -55,6 +55,9 @@
<!-- Record your changes in the trunk here. -->
<div id="trunk" style="display:none"><!--=TRUNK-BEGIN=-->
<ul class=image>
<li class=rfe>
Bumping up JNA to 4.10. This is potentially a breaking change for plugins that depend on JNA 3.x
(<a href="https://issues.jenkins-ci.org/browse/JENKINS-24521">issue 24521</a>)
<li class=bug>
Prevent empty file creation if file parameter is left empty.
(<a href="https://issues.jenkins-ci.org/browse/JENKINS-3539">issue 3539</a>)
@@ -489,7 +489,7 @@ THE SOFTWARE.
<dependency>
<groupId>org.jenkins-ci</groupId>
<artifactId>memory-monitor</artifactId>
<version>1.8</version>
<version>1.9</version>
</dependency>
<dependency><!-- StAX implementation. See HUDSON-2547. -->
<groupId>org.codehaus.woodstox</groupId>
@@ -504,7 +504,7 @@ THE SOFTWARE.
<dependency>
<groupId>net.java.dev.jna</groupId>
<artifactId>jna</artifactId>
<version>3.3.0-jenkins-3</version>
<version>4.1.0</version>
</dependency>
<dependency>
<groupId>org.kohsuke</groupId>
@@ -514,7 +514,7 @@ THE SOFTWARE.
<dependency>
<groupId>org.kohsuke</groupId>
<artifactId>libpam4j</artifactId>
<version>1.6</version>
<version>1.8</version>
</dependency>
<dependency>
<groupId>org.jvnet.libzfs</groupId>
@@ -72,10 +72,6 @@ complete {
rewriteLicense([],jenkinsLicense)
}

match("*:jna") {
rewriteLicense([],lgpl)
}

match(["org.jvnet.localizer:localizer"]) {
// see http://java.net/projects/localizer
// see http://java.net/projects/trilead-putty-extension/

0 comments on commit 7230a38

Please sign in to comment.