continuum-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dand...@apache.org
Subject svn commit: r170159 - in /maven/continuum/trunk: continuum-core/pom.xml continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m2/DefaultMavenBuilderHelper.java continuum-core/src/test/resources/org/apache/maven/continuum/network/SimpleServerSocketConnectionFactoryTest.xml pom.xml
Date Sat, 14 May 2005 19:13:10 GMT
Author: dandiep
Date: Sat May 14 12:13:09 2005
New Revision: 170159

URL: http://svn.apache.org/viewcvs?rev=170159&view=rev
Log:
Use m2-alpha-2

Modified:
    maven/continuum/trunk/continuum-core/pom.xml
    maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m2/DefaultMavenBuilderHelper.java
    maven/continuum/trunk/continuum-core/src/test/resources/org/apache/maven/continuum/network/SimpleServerSocketConnectionFactoryTest.xml
    maven/continuum/trunk/pom.xml

Modified: maven/continuum/trunk/continuum-core/pom.xml
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/pom.xml?rev=170159&r1=170158&r2=170159&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-core/pom.xml (original)
+++ maven/continuum/trunk/continuum-core/pom.xml Sat May 14 12:13:09 2005
@@ -53,22 +53,32 @@
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-core</artifactId>
-      <version>2.0-alpha-1</version>
+      <version>2.0-alpha-2</version>
     </dependency>
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-model</artifactId>
-      <version>2.0-alpha-1</version>
+      <version>2.0-alpha-2</version>
     </dependency>
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-artifact</artifactId>
-      <version>2.0-alpha-1</version>
+      <version>2.0-alpha-2</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven</groupId>
+      <artifactId>maven-project</artifactId>
+      <version>2.0-alpha-2</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven</groupId>
+      <artifactId>maven-settings</artifactId>
+      <version>2.0-alpha-2</version>
     </dependency>
     <dependency>
       <groupId>org.apache.maven.wagon</groupId>
       <artifactId>wagon-provider-api</artifactId>
-      <version>1.0-alpha-2</version>
+      <version>1.0-alpha-3</version>
     </dependency>
     <dependency>
       <groupId>org.apache.maven.scm</groupId>

Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m2/DefaultMavenBuilderHelper.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m2/DefaultMavenBuilderHelper.java?rev=170159&r1=170158&r2=170159&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m2/DefaultMavenBuilderHelper.java
(original)
+++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m2/DefaultMavenBuilderHelper.java
Sat May 14 12:13:09 2005
@@ -30,10 +30,8 @@
 import org.apache.maven.model.Scm;
 import org.apache.maven.project.MavenProject;
 import org.apache.maven.project.MavenProjectBuilder;
-import org.apache.maven.project.ProjectBuildingException;
-import org.apache.maven.settings.MavenSettings;
 import org.apache.maven.settings.MavenSettingsBuilder;
-
+import org.apache.maven.settings.Settings;
 import org.codehaus.plexus.logging.AbstractLogEnabled;
 import org.codehaus.plexus.util.StringUtils;
 
@@ -97,7 +95,7 @@
         {
             project = projectBuilder.build( file, getRepository() );
         }
-        catch ( ProjectBuildingException e )
+        catch ( Exception e )
         {
             throw new MavenBuilderHelperException( "Cannot build maven project from " + file,
e );
         }
@@ -186,23 +184,11 @@
     private ArtifactRepository getRepository()
         throws MavenBuilderHelperException
     {
-        MavenSettings settings;
-
-        try
-        {
-            settings = settingsBuilder.buildSettings();
-        }
-        catch ( Exception e )
-        {
-            throw new MavenBuilderHelperException( "Error while building settings.", e );
-        }
-
         Repository repository = new Repository();
 
-        repository.setId( "local" );
-
-        repository.setUrl( "file://" + localRepository );
-
-        return artifactRepositoryFactory.createArtifactRepository( repository, settings,
repositoryLayout );
+        return artifactRepositoryFactory.createArtifactRepository( "local", 
+                                                                   "file://" + localRepository,

+                                                                   repositoryLayout,
+                                                                   repository.getSnapshotPolicy()
);
     }
 }

Modified: maven/continuum/trunk/continuum-core/src/test/resources/org/apache/maven/continuum/network/SimpleServerSocketConnectionFactoryTest.xml
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src/test/resources/org/apache/maven/continuum/network/SimpleServerSocketConnectionFactoryTest.xml?rev=170159&r1=170158&r2=170159&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-core/src/test/resources/org/apache/maven/continuum/network/SimpleServerSocketConnectionFactoryTest.xml
(original)
+++ maven/continuum/trunk/continuum-core/src/test/resources/org/apache/maven/continuum/network/SimpleServerSocketConnectionFactoryTest.xml
Sat May 14 12:13:09 2005
@@ -14,6 +14,7 @@
     </component>
     <component>
       <role>org.apache.maven.continuum.network.ConnectionConsumer</role>
+      <role-hint>echoing</role-hint>
       <implementation>org.apache.maven.continuum.network.EchoingConnectionConsumer</implementation>
     </component>
   </components>

Modified: maven/continuum/trunk/pom.xml
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/pom.xml?rev=170159&r1=170158&r2=170159&view=diff
==============================================================================
--- maven/continuum/trunk/pom.xml (original)
+++ maven/continuum/trunk/pom.xml Sat May 14 12:13:09 2005
@@ -35,12 +35,12 @@
     <dependency>
       <groupId>plexus</groupId>
       <artifactId>plexus-container-default</artifactId>
-      <version>1.0-alpha-2</version>
+      <version>1.0-alpha-3</version>
     </dependency>
     <dependency>
       <groupId>plexus</groupId>
       <artifactId>plexus-utils</artifactId>
-      <version>1.0-alpha-3-SNAPSHOT</version>
+      <version>1.0-alpha-3</version>
     </dependency>
     <dependency>
       <groupId>junit</groupId>



Mime
View raw message