[FIXED JENKINS-11164] upgrade Apache Maven Wagon to 2.0

olamy · olamy · commit ec29ce6f0c8e · 2011-09-29T23:11:26.000+02:00
diff --git a/licenseCompleter.groovy b/licenseCompleter.groovy
@@ -96,7 +96,10 @@ complete {
     }
            
 
-
+    match("nekohtml:xercesMinimal:1.9.6.2") {
+        if (dependency.licenses.isEmpty())
+            rewriteLicense([], apacheLicense)
+    }    
 
     //
     // Choose from multi-licensed modules
@@ -105,4 +108,5 @@ complete {
     match("*:jna-posix") {
         accept("GNU Lesser General Public License Version 2.1")
     }
+
 }
diff --git a/maven-plugin/pom.xml b/maven-plugin/pom.xml
@@ -46,7 +46,7 @@ THE SOFTWARE.
     <maven.version>${mavenVersion}</maven.version>
     <aetherVersion>1.11</aetherVersion>
     <sisuInjectVersion>2.2.0</sisuInjectVersion>
-    <wagonVersion>1.0</wagonVersion>
+    <wagonVersion>2.0</wagonVersion>
   </properties>
 
   <dependencyManagement>

Original file line number	Diff line number	Diff line change
`@@ -96,7 +96,10 @@ complete {`
`96`	`96`	`}`
`97`	`97`
`98`	`98`
`99`		`-`
	`99`	`+ match("nekohtml:xercesMinimal:1.9.6.2") {`
	`100`	`+ if (dependency.licenses.isEmpty())`
	`101`	`+ rewriteLicense([], apacheLicense)`
	`102`	`+ }`
`100`	`103`
`101`	`104`	`//`
`102`	`105`	`// Choose from multi-licensed modules`
`@@ -105,4 +108,5 @@ complete {`
`105`	`108`	`match("*:jna-posix") {`
`106`	`109`	`accept("GNU Lesser General Public License Version 2.1")`
`107`	`110`	`}`
	`111`	`+`
`108`	`112`	`}`