You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@continuum.apache.org by br...@apache.org on 2007/02/14 08:17:36 UTC
svn commit: r507424 - in /maven/continuum/trunk: ./ continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m2/ continuum-release/ continuum-release/src/main/java/org/apache/maven/continuum/release/executors/

Author: brett
Date: Tue Feb 13 23:17:35 2007
New Revision: 507424

URL: http://svn.apache.org/viewvc?view=rev&rev=507424
Log:
utilise reloading of settings.xml

Modified:
    maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m2/DefaultMavenBuilderHelper.java
    maven/continuum/trunk/continuum-release/pom.xml
    maven/continuum/trunk/continuum-release/src/main/java/org/apache/maven/continuum/release/executors/AbstractReleaseTaskExecutor.java
    maven/continuum/trunk/pom.xml

Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m2/DefaultMavenBuilderHelper.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m2/DefaultMavenBuilderHelper.java?view=diff&rev=507424&r1=507423&r2=507424
==============================================================================
--- 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 Tue Feb 13 23:17:35 2007
@@ -535,8 +535,7 @@
     {
         try
         {
-            //TODO: buildSettings cache settings so if user modify it, we need to restart Continuum, we need to use a non-cached settings there
-            return mavenSettingsBuilder.buildSettings();
+            return mavenSettingsBuilder.buildSettings( false );
         }
         catch ( IOException e )
         {

Modified: maven/continuum/trunk/continuum-release/pom.xml
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-release/pom.xml?view=diff&rev=507424&r1=507423&r2=507424
==============================================================================
--- maven/continuum/trunk/continuum-release/pom.xml (original)
+++ maven/continuum/trunk/continuum-release/pom.xml Tue Feb 13 23:17:35 2007
@@ -38,6 +38,10 @@
     </dependency>
     <dependency>
       <groupId>org.apache.maven</groupId>
+      <artifactId>maven-settings</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven</groupId>
       <artifactId>maven-project</artifactId>
     </dependency>
     <dependency>

Modified: maven/continuum/trunk/continuum-release/src/main/java/org/apache/maven/continuum/release/executors/AbstractReleaseTaskExecutor.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-release/src/main/java/org/apache/maven/continuum/release/executors/AbstractReleaseTaskExecutor.java?view=diff&rev=507424&r1=507423&r2=507424
==============================================================================
--- maven/continuum/trunk/continuum-release/src/main/java/org/apache/maven/continuum/release/executors/AbstractReleaseTaskExecutor.java (original)
+++ maven/continuum/trunk/continuum-release/src/main/java/org/apache/maven/continuum/release/executors/AbstractReleaseTaskExecutor.java Tue Feb 13 23:17:35 2007
@@ -100,7 +100,7 @@
     {
         try
         {
-            settings = settingsBuilder.buildSettings();
+            settings = settingsBuilder.buildSettings( false );
         }
         catch ( IOException e )
         {

Modified: maven/continuum/trunk/pom.xml
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/pom.xml?view=diff&rev=507424&r1=507423&r2=507424
==============================================================================
--- maven/continuum/trunk/pom.xml (original)
+++ maven/continuum/trunk/pom.xml Tue Feb 13 23:17:35 2007
@@ -569,7 +569,7 @@
 
   <properties>
     <continuumWebappVersion>${pom.version}</continuumWebappVersion>
-    <maven.version>2.0.4</maven.version>
+    <maven.version>2.0.5-SNAPSHOT</maven.version>
     <wagon.version>1.0-beta-2</wagon.version>
     <maven-scm.version>1.0-beta-4</maven-scm.version>
     <plexus-security.version>1.0-alpha-10-SNAPSHOT</plexus-security.version>