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

(cherry picked from commit ec29ce6) Conflicts: maven-plugin/pom.xml
jenkinsci · Feb 2, 2012 · b7dc3aa · b7dc3aa
1 parent 5a9e7dd
commit b7dc3aa
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
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>    
     <slf4jVersion>1.6.1</slf4jVersion> <!-- < 1.6.x version didn't specify the license (MIT) -->
   </properties>