maven-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jdca...@apache.org
Subject svn commit: r517870 [2/2] - in /maven/components/branches/2.1-lifecycle-refactor: ./ maven-artifact-manager/ maven-artifact-manager/src/main/java/org/apache/maven/artifact/deployer/ maven-artifact-manager/src/main/java/org/apache/maven/artifact/manager...
Date Tue, 13 Mar 2007 21:08:41 GMT
Modified: maven/components/branches/2.1-lifecycle-refactor/maven-embedder/src/main/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestDefaultsPopulator.java
URL: http://svn.apache.org/viewvc/maven/components/branches/2.1-lifecycle-refactor/maven-embedder/src/main/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestDefaultsPopulator.java?view=diff&rev=517870&r1=517869&r2=517870
==============================================================================
--- maven/components/branches/2.1-lifecycle-refactor/maven-embedder/src/main/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestDefaultsPopulator.java
(original)
+++ maven/components/branches/2.1-lifecycle-refactor/maven-embedder/src/main/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestDefaultsPopulator.java
Tue Mar 13 14:08:35 2007
@@ -20,6 +20,7 @@
  */
 
 import org.apache.maven.SettingsConfigurationException;
+import org.apache.maven.artifact.manager.WagonManager;
 import org.apache.maven.artifact.repository.ArtifactRepositoryFactory;
 import org.apache.maven.artifact.repository.ArtifactRepositoryPolicy;
 import org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout;
@@ -33,11 +34,10 @@
 import org.apache.maven.settings.Server;
 import org.apache.maven.settings.Settings;
 import org.apache.maven.usability.SystemWarnings;
-import org.apache.maven.wagon.manager.RepositorySettings;
-import org.apache.maven.wagon.manager.WagonManager;
 import org.codehaus.plexus.PlexusConstants;
 import org.codehaus.plexus.PlexusContainer;
-import org.codehaus.plexus.configuration.xml.XmlPlexusConfiguration;
+import org.codehaus.plexus.component.repository.exception.ComponentLifecycleException;
+import org.codehaus.plexus.component.repository.exception.ComponentLookupException;
 import org.codehaus.plexus.context.Context;
 import org.codehaus.plexus.context.ContextException;
 import org.codehaus.plexus.logging.AbstractLogEnabled;
@@ -113,9 +113,11 @@
         }
         else
         {
+            wagonManager.findAndRegisterWagons( container );
+
             wagonManager.setInteractive( request.isInteractiveMode() );
 
-            wagonManager.addTransferListener( request.getTransferListener() );
+            wagonManager.setDownloadMonitor( request.getTransferListener() );
 
             wagonManager.setOnline( true );
         }
@@ -124,7 +126,7 @@
         {
             resolveParameters( request.getSettings() );
         }
-        catch ( SettingsConfigurationException e )
+        catch ( Exception e )
         {
             throw new MavenEmbedderException( "Unable to configure Maven for execution",
e );
         }
@@ -151,52 +153,51 @@
     }
 
     private void resolveParameters( Settings settings )
-        throws SettingsConfigurationException
+        throws ComponentLookupException, ComponentLifecycleException, SettingsConfigurationException
     {
-        Proxy proxy = settings.getActiveProxy();
+        WagonManager wagonManager = (WagonManager) container.lookup( WagonManager.ROLE );
 
-        if ( proxy != null )
+        try
         {
-            if ( proxy.getHost() == null )
+            Proxy proxy = settings.getActiveProxy();
+
+            if ( proxy != null )
             {
-                throw new SettingsConfigurationException( "Proxy in settings.xml has no host"
);
-            }
+                if ( proxy.getHost() == null )
+                {
+                    throw new SettingsConfigurationException( "Proxy in settings.xml has
no host" );
+                }
 
-            wagonManager.addProxy( proxy.getProtocol(), proxy.getHost(), proxy.getPort(),
proxy.getUsername(), proxy
-                .getPassword(), proxy.getNonProxyHosts() );
-        }
+                wagonManager.addProxy( proxy.getProtocol(), proxy.getHost(), proxy.getPort(),
proxy.getUsername(),
+                                       proxy.getPassword(), proxy.getNonProxyHosts() );
+            }
 
-        for ( Iterator i = settings.getServers().iterator(); i.hasNext(); )
-        {
-            Server server = (Server) i.next();
+            for ( Iterator i = settings.getServers().iterator(); i.hasNext(); )
+            {
+                Server server = (Server) i.next();
 
-            RepositorySettings repoSetting = wagonManager.getRepositorySettings( server.getId()
);
+                wagonManager.addAuthenticationInfo( server.getId(), server.getUsername(),
server.getPassword(),
+                                                    server.getPrivateKey(), server.getPassphrase()
);
 
-            repoSetting.setAuthentication( server.getUsername(), server.getPassword(), server.getPrivateKey(),
server
-                .getPassphrase() );
+                wagonManager.addPermissionInfo( server.getId(), server.getFilePermissions(),
+                                                server.getDirectoryPermissions() );
 
-            repoSetting
-                .setPermissions( /* group */null, server.getFilePermissions(), server.getDirectoryPermissions()
);
+                if ( server.getConfiguration() != null )
+                {
+                    wagonManager.addConfiguration( server.getId(), (Xpp3Dom) server.getConfiguration()
);
+                }
+            }
 
-            if ( server.getConfiguration() != null )
+            for ( Iterator i = settings.getMirrors().iterator(); i.hasNext(); )
             {
-                repoSetting.setConfiguration( new XmlPlexusConfiguration( (Xpp3Dom) server.getConfiguration()
) );
+                Mirror mirror = (Mirror) i.next();
+
+                wagonManager.addMirror( mirror.getId(), mirror.getMirrorOf(), mirror.getUrl()
);
             }
         }
-
-        for ( Iterator i = settings.getMirrors().iterator(); i.hasNext(); )
+        finally
         {
-            Mirror mirror = (Mirror) i.next();
-
-            try
-            {
-                wagonManager.addRepositoryMirror( mirror.getMirrorOf(), mirror.getId(), mirror.getUrl()
);
-            }
-            catch ( IllegalArgumentException e )
-            {
-                throw new SettingsConfigurationException(
-                    "Unable to configure mirror " + mirror + ": " + e.getMessage(), e );
-            }
+            container.release( wagonManager );
         }
     }
 

Modified: maven/components/branches/2.1-lifecycle-refactor/maven-embedder/src/main/resources/META-INF/plexus/components.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/2.1-lifecycle-refactor/maven-embedder/src/main/resources/META-INF/plexus/components.xml?view=diff&rev=517870&r1=517869&r2=517870
==============================================================================
--- maven/components/branches/2.1-lifecycle-refactor/maven-embedder/src/main/resources/META-INF/plexus/components.xml
(original)
+++ maven/components/branches/2.1-lifecycle-refactor/maven-embedder/src/main/resources/META-INF/plexus/components.xml
Tue Mar 13 14:08:35 2007
@@ -24,7 +24,7 @@
       <implementation>org.apache.maven.embedder.execution.DefaultMavenExecutionRequestDefaultsPopulator</implementation>
       <requirements>
         <requirement>
-          <role>org.apache.maven.wagon.manager.WagonManager</role>
+          <role>org.apache.maven.artifact.manager.WagonManager</role>
           <role-hint>default</role-hint>
         </requirement>
         <requirement>

Modified: maven/components/branches/2.1-lifecycle-refactor/maven-embedder/src/test/embedder-test-project/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/2.1-lifecycle-refactor/maven-embedder/src/test/embedder-test-project/pom.xml?view=diff&rev=517870&r1=517869&r2=517870
==============================================================================
--- maven/components/branches/2.1-lifecycle-refactor/maven-embedder/src/test/embedder-test-project/pom.xml
(original)
+++ maven/components/branches/2.1-lifecycle-refactor/maven-embedder/src/test/embedder-test-project/pom.xml
Tue Mar 13 14:08:35 2007
@@ -17,25 +17,6 @@
 under the License.
 -->
 
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>

Modified: maven/components/branches/2.1-lifecycle-refactor/maven-embedder/src/test/java/org/apache/maven/cli/AbstractConsoleDownloadMonitorTest.java
URL: http://svn.apache.org/viewvc/maven/components/branches/2.1-lifecycle-refactor/maven-embedder/src/test/java/org/apache/maven/cli/AbstractConsoleDownloadMonitorTest.java?view=diff&rev=517870&r1=517869&r2=517870
==============================================================================
--- maven/components/branches/2.1-lifecycle-refactor/maven-embedder/src/test/java/org/apache/maven/cli/AbstractConsoleDownloadMonitorTest.java
(original)
+++ maven/components/branches/2.1-lifecycle-refactor/maven-embedder/src/test/java/org/apache/maven/cli/AbstractConsoleDownloadMonitorTest.java
Tue Mar 13 14:08:35 2007
@@ -20,7 +20,7 @@
  */
 
 import junit.framework.TestCase;
-import org.apache.maven.MavenTransferListener;
+
 import org.apache.maven.wagon.ConnectionException;
 import org.apache.maven.wagon.authentication.AuthenticationException;
 import org.apache.maven.wagon.events.TransferEvent;
@@ -28,8 +28,6 @@
 import org.apache.maven.wagon.repository.Repository;
 import org.apache.maven.wagon.resource.Resource;
 
-import java.io.File;
-
 /**
  * Test for {@link AbstractConsoleDownloadMonitor}
  * 
@@ -39,19 +37,20 @@
 public abstract class AbstractConsoleDownloadMonitorTest
     extends TestCase
 {
-    private MavenTransferListener monitor;
+
+    private AbstractConsoleDownloadMonitor monitor;
 
     public AbstractConsoleDownloadMonitorTest()
     {
         super();
     }
 
-    public void setMonitor( MavenTransferListener monitor )
+    public void setMonitor( AbstractConsoleDownloadMonitor monitor )
     {
         this.monitor = monitor;
     }
 
-    public MavenTransferListener getMonitor()
+    public AbstractConsoleDownloadMonitor getMonitor()
     {
         return monitor;
     }
@@ -92,18 +91,6 @@
     {
         monitor.debug( "msg" );
     }
-    
-    private class RepositoryMock
-    extends Repository
-    {
-        public RepositoryMock()
-        {
-            super();
-            setId("mock");
-            File basedir = new File(System.getProperty( "basedir", "." ));
-            setUrl( "file://" + basedir.getAbsolutePath() + "/target/" );
-        }
-    }
 
     private class TransferEventMock
         extends TransferEvent
@@ -111,19 +98,19 @@
         public TransferEventMock()
             throws ConnectionException, AuthenticationException
         {
-            super( new FileWagon(), new RepositoryMock(), new Resource(), TransferEvent.TRANSFER_INITIATED,
TransferEvent.REQUEST_GET );
+            super( new FileWagon(), new Resource(), TransferEvent.TRANSFER_INITIATED, TransferEvent.REQUEST_GET
);
             getResource().setContentLength( 100000 );
-            getWagon().setRepository( new RepositoryMock() );
-            getWagon().connect();
+            Repository repository = new Repository();
+            getWagon().connect( repository );
         }
 
         public TransferEventMock( Exception exception )
             throws ConnectionException, AuthenticationException
         {
-            super( new FileWagon(), new RepositoryMock(), new Resource(), exception, TransferEvent.REQUEST_GET
);
+            super( new FileWagon(), new Resource(), exception, TransferEvent.REQUEST_GET
);
             getResource().setContentLength( 100000 );
-            getWagon().setRepository( new RepositoryMock() );
-            getWagon().connect();
+            Repository repository = new Repository();
+            getWagon().connect( repository );
         }
     }
-}
\ No newline at end of file
+}

Modified: maven/components/branches/2.1-lifecycle-refactor/maven-embedder/src/test/java/org/apache/maven/embedder/MavenEmbedderTest.java
URL: http://svn.apache.org/viewvc/maven/components/branches/2.1-lifecycle-refactor/maven-embedder/src/test/java/org/apache/maven/embedder/MavenEmbedderTest.java?view=diff&rev=517870&r1=517869&r2=517870
==============================================================================
--- maven/components/branches/2.1-lifecycle-refactor/maven-embedder/src/test/java/org/apache/maven/embedder/MavenEmbedderTest.java
(original)
+++ maven/components/branches/2.1-lifecycle-refactor/maven-embedder/src/test/java/org/apache/maven/embedder/MavenEmbedderTest.java
Tue Mar 13 14:08:35 2007
@@ -252,9 +252,21 @@
         throws Exception
     {
         MavenExecutionRequest request = new DefaultMavenExecutionRequest().setShowErrors(
true )
-            .setPomFile( getPomFile().getAbsolutePath() );
+            .setPomFile( getPomFile().getAbsolutePath() ).setShowErrors( true );
 
         MavenExecutionResult result = maven.readProjectWithDependencies( request );
+
+        if ( result.hasExceptions() )
+        {
+            for ( Iterator i = result.getExceptions().iterator(); i.hasNext(); )
+            {
+                Exception e = (Exception) i.next();
+
+                e.printStackTrace();
+            }
+
+            fail( "Exception is readProjectWithDependencies() test." );
+        }
 
         assertNoExceptions( result );
 

Modified: maven/components/branches/2.1-lifecycle-refactor/maven-embedder/src/test/resources/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/2.1-lifecycle-refactor/maven-embedder/src/test/resources/pom.xml?view=diff&rev=517870&r1=517869&r2=517870
==============================================================================
--- maven/components/branches/2.1-lifecycle-refactor/maven-embedder/src/test/resources/pom.xml
(original)
+++ maven/components/branches/2.1-lifecycle-refactor/maven-embedder/src/test/resources/pom.xml
Tue Mar 13 14:08:35 2007
@@ -21,31 +21,9 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.maven</groupId>
   <artifactId>maven-model</artifactId>
-  <name>Maven Model</name>
-  <version>2.0-beta-2-SNAPSHOT</version>
-  <description>Maven Model</description>
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.codehaus.modello</groupId>
-        <artifactId>modello-maven-plugin</artifactId>
-        <executions>
-          <execution>
-            <goals>
-              <goal>xpp3-writer</goal>
-              <goal>java</goal>
-              <goal>xpp3-reader</goal>
-              <goal>xsd</goal>
-            </goals>
-          </execution>
-        </executions>
-        <configuration>
-          <version>4.0.0</version>
-          <model>maven.mdo</model>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
+  <name>Maven Embedder Test Project</name>
+  <version>1.0</version>
+  <description>Maven Embedder Test Project</description>
   <dependencies>
     <dependency>
       <groupId>plexus</groupId>

Modified: maven/components/branches/2.1-lifecycle-refactor/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
URL: http://svn.apache.org/viewvc/maven/components/branches/2.1-lifecycle-refactor/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java?view=diff&rev=517870&r1=517869&r2=517870
==============================================================================
--- maven/components/branches/2.1-lifecycle-refactor/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
(original)
+++ maven/components/branches/2.1-lifecycle-refactor/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
Tue Mar 13 14:08:35 2007
@@ -19,32 +19,13 @@
  * under the License.
  */
 
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
 import org.apache.maven.MavenTools;
 import org.apache.maven.artifact.Artifact;
 import org.apache.maven.artifact.ArtifactStatus;
 import org.apache.maven.artifact.ArtifactUtils;
 import org.apache.maven.artifact.InvalidRepositoryException;
+import org.apache.maven.artifact.manager.WagonManager;
 import org.apache.maven.artifact.factory.ArtifactFactory;
-import org.apache.maven.artifact.manager.ArtifactManager;
 import org.apache.maven.artifact.metadata.ArtifactMetadataSource;
 import org.apache.maven.artifact.repository.ArtifactRepository;
 import org.apache.maven.artifact.repository.ArtifactRepositoryPolicy;
@@ -195,10 +176,10 @@
     // a monitor wagon monitor as a parameter so that tools can use the
     // methods here and receive callbacks. MNG-1015
     //     
-    //    Probably no longer relevant with wagonManager/artifactManager change - joakime
+    //    Probably no longer relevant with wagonManager/wagonManager change - joakime
     // ----------------------------------------------------------------------
 
-    private ArtifactManager artifactManager;
+    private WagonManager wagonManager;
 
     public static final String MAVEN_MODEL_VERSION = "4.0.0";
 
@@ -382,7 +363,7 @@
 
         if ( transferListener != null )
         {
-            artifactManager.getWagonManager().addTransferListener( transferListener );
+            wagonManager.setDownloadMonitor( transferListener );
         }
 
         ArtifactResolutionResult result = artifactResolver.resolveTransitively( project.getDependencyArtifacts(),

Modified: maven/components/branches/2.1-lifecycle-refactor/maven-project/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java
URL: http://svn.apache.org/viewvc/maven/components/branches/2.1-lifecycle-refactor/maven-project/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java?view=diff&rev=517870&r1=517869&r2=517870
==============================================================================
--- maven/components/branches/2.1-lifecycle-refactor/maven-project/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java
(original)
+++ maven/components/branches/2.1-lifecycle-refactor/maven-project/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java
Tue Mar 13 14:08:35 2007
@@ -59,7 +59,7 @@
 import java.util.Set;
 
 /**
- * @author <a href="mailto:jason@maven.org">Jason van Zyl</a>
+ * @author Jason van Zyl
  * @author <a href="mailto:brett@apache.org">Brett Porter</a>
  * @version $Id$
  */

Modified: maven/components/branches/2.1-lifecycle-refactor/maven-project/src/main/resources/META-INF/plexus/components.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/2.1-lifecycle-refactor/maven-project/src/main/resources/META-INF/plexus/components.xml?view=diff&rev=517870&r1=517869&r2=517870
==============================================================================
--- maven/components/branches/2.1-lifecycle-refactor/maven-project/src/main/resources/META-INF/plexus/components.xml
(original)
+++ maven/components/branches/2.1-lifecycle-refactor/maven-project/src/main/resources/META-INF/plexus/components.xml
Tue Mar 13 14:08:35 2007
@@ -30,7 +30,7 @@
       <role-hint>project-cache-aware</role-hint>
       <requirements>
         <requirement>
-          <role>org.apache.maven.artifact.manager.ArtifactManager</role>
+          <role>org.apache.maven.artifact.manager.WagonManager</role>
         </requirement>
         <requirement>
           <role>org.apache.maven.artifact.transform.ArtifactTransformationManager</role>
@@ -185,7 +185,7 @@
           <role-hint>default</role-hint>
         </requirement>
         <requirement>
-          <role>org.apache.maven.artifact.manager.ArtifactManager</role>
+          <role>org.apache.maven.artifact.manager.WagonManager</role>
         </requirement>
         <requirement>
           <role>org.apache.maven.MavenTools</role>

Modified: maven/components/branches/2.1-lifecycle-refactor/maven-project/src/test/resources/org/apache/maven/project/ProjectClasspathTest.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/2.1-lifecycle-refactor/maven-project/src/test/resources/org/apache/maven/project/ProjectClasspathTest.xml?view=diff&rev=517870&r1=517869&r2=517870
==============================================================================
--- maven/components/branches/2.1-lifecycle-refactor/maven-project/src/test/resources/org/apache/maven/project/ProjectClasspathTest.xml
(original)
+++ maven/components/branches/2.1-lifecycle-refactor/maven-project/src/test/resources/org/apache/maven/project/ProjectClasspathTest.xml
Tue Mar 13 14:08:35 2007
@@ -59,9 +59,11 @@
       <role>org.apache.maven.project.TestArtifactResolver</role>
       <implementation>org.apache.maven.project.TestArtifactResolver</implementation>
       <requirements>
+        <!--
         <requirement>
           <role>org.apache.maven.artifact.manager.ArtifactManager</role>
         </requirement>
+        -->
         <requirement>
           <role>org.apache.maven.artifact.factory.ArtifactFactory</role>
         </requirement>
@@ -120,4 +122,4 @@
       </requirements>
     </component>
   </components>
-</plexus>
\ No newline at end of file
+</plexus>

Modified: maven/components/branches/2.1-lifecycle-refactor/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/2.1-lifecycle-refactor/pom.xml?view=diff&rev=517870&r1=517869&r2=517870
==============================================================================
--- maven/components/branches/2.1-lifecycle-refactor/pom.xml (original)
+++ maven/components/branches/2.1-lifecycle-refactor/pom.xml Tue Mar 13 14:08:35 2007
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.maven</groupId>
     <artifactId>maven-parent</artifactId>
-    <version>6-SNAPSHOT</version>
+    <version>5</version>
     <relativePath>../pom/maven/pom.xml</relativePath>
   </parent>
   <artifactId>maven</artifactId>
@@ -39,33 +39,6 @@
     <url>http://jira.codehaus.org/browse/MNG</url>
   </issueManagement>
 
-  <pluginRepositories>
-    <pluginRepository>
-      <id>apache.snapshots</id>
-      <url>http://people.apache.org/repo/m2-snapshot-repository</url>
-      <releases>
-        <enabled>false</enabled>
-      </releases>
-      <snapshots>
-        <enabled>true</enabled>
-      </snapshots>
-    </pluginRepository>
-  </pluginRepositories>
-
-  <!-- For plexus snapshots -->
-  <repositories>
-    <repository>
-      <id>codehaus.snapshots</id>
-      <url>http://snapshots.repository.codehaus.org</url>
-      <releases>
-        <enabled>false</enabled>
-      </releases>
-      <snapshots>
-        <enabled>true</enabled>
-      </snapshots>
-    </repository>
-  </repositories>
-
   <mailingLists>
     <mailingList>
       <name>Maven User List</name>
@@ -164,8 +137,8 @@
     <module>maven-embedder</module>
   </modules>
   <properties>
-    <plexusVersion>1.0-alpha-18</plexusVersion>
-    <wagonVersion>1.0-beta-3-SNAPSHOT</wagonVersion>
+    <plexusVersion>1.0-alpha-19</plexusVersion>
+    <wagonVersion>1.0-beta-2</wagonVersion>
   </properties>
   <dependencies>
     <dependency>
@@ -199,7 +172,27 @@
       </dependency>
       <dependency>
         <groupId>org.apache.maven.wagon</groupId>
-        <artifactId>wagon-manager</artifactId>
+        <artifactId>wagon-provider-api</artifactId>
+        <version>${wagonVersion}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.maven.wagon</groupId>
+        <artifactId>wagon-file</artifactId>
+        <version>${wagonVersion}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.maven.wagon</groupId>
+        <artifactId>wagon-http-lightweight</artifactId>
+        <version>${wagonVersion}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.maven.wagon</groupId>
+        <artifactId>wagon-ssh</artifactId>
+        <version>${wagonVersion}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.maven.wagon</groupId>
+        <artifactId>wagon-ssh-external</artifactId>
         <version>${wagonVersion}</version>
       </dependency>
       <dependency>



Mime
View raw message