continuum-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From eveni...@apache.org
Subject svn commit: r521667 - in /maven/continuum/trunk/continuum-release/src/main: java/org/apache/maven/continuum/release/executors/ java/org/apache/maven/continuum/release/phase/ resources/META-INF/plexus/
Date Fri, 23 Mar 2007 10:46:19 GMT
Author: evenisse
Date: Fri Mar 23 03:46:18 2007
New Revision: 521667

URL: http://svn.apache.org/viewvc?view=rev&rev=521667
Log:
[CONTINUUM-1217] Use the local repository defined in settings.xml
Submitted by: Lester Ecarma

Modified:
    maven/continuum/trunk/continuum-release/src/main/java/org/apache/maven/continuum/release/executors/PerformReleaseTaskExecutor.java
    maven/continuum/trunk/continuum-release/src/main/java/org/apache/maven/continuum/release/phase/GenerateReactorProjectsPhase.java
    maven/continuum/trunk/continuum-release/src/main/resources/META-INF/plexus/components.xml

Modified: maven/continuum/trunk/continuum-release/src/main/java/org/apache/maven/continuum/release/executors/PerformReleaseTaskExecutor.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-release/src/main/java/org/apache/maven/continuum/release/executors/PerformReleaseTaskExecutor.java?view=diff&rev=521667&r1=521666&r2=521667
==============================================================================
--- maven/continuum/trunk/continuum-release/src/main/java/org/apache/maven/continuum/release/executors/PerformReleaseTaskExecutor.java
(original)
+++ maven/continuum/trunk/continuum-release/src/main/java/org/apache/maven/continuum/release/executors/PerformReleaseTaskExecutor.java
Fri Mar 23 03:46:18 2007
@@ -65,11 +65,6 @@
      */
     private MavenProjectBuilder projectBuilder;
 
-    /**
-     * @plexus.configuration
-     */
-    private String localRepository;
-
     private ProfileManager profileManager;
 
     private PlexusContainer container;
@@ -213,7 +208,7 @@
 
     private ArtifactRepository getLocalRepository()
     {
-        return new DefaultArtifactRepository( "local-repository", "file://" + localRepository,
+        return new DefaultArtifactRepository( "local-repository", "file://" + settings.getLocalRepository(),
                                                                                    new DefaultRepositoryLayout()
);
     }
 

Modified: maven/continuum/trunk/continuum-release/src/main/java/org/apache/maven/continuum/release/phase/GenerateReactorProjectsPhase.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-release/src/main/java/org/apache/maven/continuum/release/phase/GenerateReactorProjectsPhase.java?view=diff&rev=521667&r1=521666&r2=521667
==============================================================================
--- maven/continuum/trunk/continuum-release/src/main/java/org/apache/maven/continuum/release/phase/GenerateReactorProjectsPhase.java
(original)
+++ maven/continuum/trunk/continuum-release/src/main/java/org/apache/maven/continuum/release/phase/GenerateReactorProjectsPhase.java
Fri Mar 23 03:46:18 2007
@@ -68,8 +68,6 @@
 
     private PlexusContainer container;
 
-    private String localRepository;
-
     public ReleaseResult execute( ReleaseDescriptor releaseDescriptor, Settings settings,
List reactorProjects )
         throws ReleaseExecutionException, ReleaseFailureException
     {
@@ -178,8 +176,9 @@
     }
 
     private ArtifactRepository getLocalRepository()
+        throws ContinuumReleaseException
     {
-        return new DefaultArtifactRepository( "local-repository", "file://" + localRepository,
+        return new DefaultArtifactRepository( "local-repository", "file://" + getSettings().getLocalRepository(),
                                                                                    new DefaultRepositoryLayout()
);
     }
 

Modified: maven/continuum/trunk/continuum-release/src/main/resources/META-INF/plexus/components.xml
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-release/src/main/resources/META-INF/plexus/components.xml?view=diff&rev=521667&r1=521666&r2=521667
==============================================================================
--- maven/continuum/trunk/continuum-release/src/main/resources/META-INF/plexus/components.xml
(original)
+++ maven/continuum/trunk/continuum-release/src/main/resources/META-INF/plexus/components.xml
Fri Mar 23 03:46:18 2007
@@ -144,9 +144,6 @@
           <role>org.apache.maven.settings.MavenSettingsBuilder</role>
         </requirement>
       </requirements>
-      <configuration>
-        <local-repository>${plexus.home}/local-repository</local-repository>
-      </configuration>
     </component>
 
     <component>
@@ -309,9 +306,6 @@
           <role>org.apache.maven.settings.MavenSettingsBuilder</role>
         </requirement>
       </requirements>
-      <configuration>
-        <local-repository>${plexus.home}/local-repository</local-repository>
-      </configuration>
     </component>
 
     <!-- This needs to be removed once we can upgrade maven-project to 2.1-SNAPSHOT or
later. -->



Mime
View raw message