svn commit: r1234633 - in /openejb/trunk/openejb: pom.xml utils/openejb-provisionning/pom.xml utils/openejb-provisionning/src/main/java/org/apache/openejb/resolver/maven/ManualWagonProvider.java

[rm...@apache.org]

Author: rmannibucau
Date: Sun Jan 22 22:10:57 2012
New Revision: 1234633

URL: http://svn.apache.org/viewvc?rev=1234633&view=rev
Log:
upgrading maven version

Modified:
    openejb/trunk/openejb/pom.xml
    openejb/trunk/openejb/utils/openejb-provisionning/pom.xml
    openejb/trunk/openejb/utils/openejb-provisionning/src/main/java/org/apache/openejb/resolver/maven/ManualWagonProvider.java

Modified: openejb/trunk/openejb/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/pom.xml?rev=1234633&r1=1234632&r2=1234633&view=diff
==============================================================================
--- openejb/trunk/openejb/pom.xml (original)
+++ openejb/trunk/openejb/pom.xml Sun Jan 22 22:10:57 2012
@@ -116,11 +116,11 @@
     <openejb-cxf.version>2.5.1-SNAPSHOT</openejb-cxf.version>
     <jetty.version>7.5.3.v20111011</jetty.version>
     <pax-url.version>1.3.5</pax-url.version>
-    <aether.version>1.11</aether.version>
-    <maven.version>3.0.3</maven.version>
-    <wagon.version>1.0-beta-7</wagon.version>
-    <plexus.version>1.5.4</plexus.version>
-    <plexus-utils.version>2.0.5</plexus-utils.version>
+    <aether.version>1.13.1</aether.version>
+    <maven.version>3.0.4</maven.version>
+    <wagon.version>2.2</wagon.version>
+    <plexus.version>1.5.5</plexus.version>
+    <plexus-utils.version>2.0.6</plexus-utils.version>
 
     <!--
     - http://docs.codehaus.org/display/MAVENUSER/POM+Element+for+Source+File+Encoding

Modified: openejb/trunk/openejb/utils/openejb-provisionning/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/utils/openejb-provisionning/pom.xml?rev=1234633&r1=1234632&r2=1234633&view=diff
==============================================================================
--- openejb/trunk/openejb/utils/openejb-provisionning/pom.xml (original)
+++ openejb/trunk/openejb/utils/openejb-provisionning/pom.xml Sun Jan 22 22:10:57 2012
@@ -84,20 +84,20 @@
     </dependency>
     <dependency>
       <groupId>org.apache.maven.wagon</groupId>
-      <artifactId>wagon-http-lightweight</artifactId>
+      <artifactId>wagon-http</artifactId>
       <version>${wagon.version}</version>
       <exclusions>
         <exclusion>
-          <groupId>nekohtml</groupId>
-          <artifactId>nekohtml</artifactId>
+          <groupId>commons-logging</groupId>
+          <artifactId>commons-logging</artifactId>
         </exclusion>
         <exclusion>
-          <groupId>nekohtml</groupId>
-          <artifactId>xercesMinimal</artifactId>
+          <groupId>commons-io</groupId>
+          <artifactId>commons-io</artifactId>
         </exclusion>
         <exclusion>
-          <groupId>commons-logging</groupId>
-          <artifactId>commons-logging</artifactId>
+          <groupId>commons-codec</groupId>
+          <artifactId>commons-codec</artifactId>
         </exclusion>
       </exclusions>
     </dependency>

Modified: openejb/trunk/openejb/utils/openejb-provisionning/src/main/java/org/apache/openejb/resolver/maven/ManualWagonProvider.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/utils/openejb-provisionning/src/main/java/org/apache/openejb/resolver/maven/ManualWagonProvider.java?rev=1234633&r1=1234632&r2=1234633&view=diff
==============================================================================
--- openejb/trunk/openejb/utils/openejb-provisionning/src/main/java/org/apache/openejb/resolver/maven/ManualWagonProvider.java (original)
+++ openejb/trunk/openejb/utils/openejb-provisionning/src/main/java/org/apache/openejb/resolver/maven/ManualWagonProvider.java Sun Jan 22 22:10:57 2012
@@ -18,8 +18,7 @@ package org.apache.openejb.resolver.mave
 
 import org.apache.maven.wagon.Wagon;
 import org.apache.maven.wagon.providers.file.FileWagon;
-import org.apache.maven.wagon.providers.http.LightweightHttpWagon;
-import org.apache.maven.wagon.providers.http.LightweightHttpsWagon;
+import org.apache.maven.wagon.providers.http.HttpWagon;
 import org.sonatype.aether.connector.wagon.WagonProvider;
 
 public class ManualWagonProvider implements WagonProvider {
@@ -27,10 +26,8 @@ public class ManualWagonProvider impleme
             throws Exception {
         if ("file".equals(roleHint)) {
             return new FileWagon();
-        } else if ("http".equals(roleHint)) {
-            return new LightweightHttpWagon();
-        } else if ("https".equals(roleHint)) {
-            return new LightweightHttpsWagon();
+        } else if (roleHint != null && roleHint.startsWith("http")) { // http and https
+            return new HttpWagon();
         }
         return null;
     }