You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by jd...@apache.org on 2008/09/08 23:53:33 UTC

svn commit: r693295 - in /maven/components/branches/maven-2.1.0-M1-RC: maven-project/src/main/java/org/apache/maven/project/interpolation/AbstractStringBasedModelInterpolator.java pom.xml

Author: jdcasey
Date: Mon Sep  8 14:53:32 2008
New Revision: 693295

URL: http://svn.apache.org/viewvc?rev=693295&view=rev
Log:
[MNG-3746] Restore ability to override system properties for the purposes of POM interpolation using POM properties. Integration test will follow in a second.

Modified:
    maven/components/branches/maven-2.1.0-M1-RC/maven-project/src/main/java/org/apache/maven/project/interpolation/AbstractStringBasedModelInterpolator.java
    maven/components/branches/maven-2.1.0-M1-RC/pom.xml

Modified: maven/components/branches/maven-2.1.0-M1-RC/maven-project/src/main/java/org/apache/maven/project/interpolation/AbstractStringBasedModelInterpolator.java
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.1.0-M1-RC/maven-project/src/main/java/org/apache/maven/project/interpolation/AbstractStringBasedModelInterpolator.java?rev=693295&r1=693294&r2=693295&view=diff
==============================================================================
--- maven/components/branches/maven-2.1.0-M1-RC/maven-project/src/main/java/org/apache/maven/project/interpolation/AbstractStringBasedModelInterpolator.java (original)
+++ maven/components/branches/maven-2.1.0-M1-RC/maven-project/src/main/java/org/apache/maven/project/interpolation/AbstractStringBasedModelInterpolator.java Mon Sep  8 14:53:32 2008
@@ -246,6 +246,8 @@
         // NOTE: Order counts here!
         valueSources.add( basedirValueSource );
         valueSources.add( new BuildTimestampValueSource( config.getBuildStartTime(), timestampFormat ) );
+        valueSources.add( modelValueSource1 );
+        valueSources.add( new PrefixedValueSourceWrapper( new MapBasedValueSource( modelProperties ), PROJECT_PREFIXES, true ) );
         valueSources.add( new MapBasedValueSource( config.getExecutionProperties() ) );
         valueSources.add( new AbstractValueSource( false )
         {
@@ -254,8 +256,6 @@
                 return config.getExecutionProperties().getProperty( "env." + expression );
             }
         } );
-        valueSources.add( modelValueSource1 );
-        valueSources.add( new PrefixedValueSourceWrapper( new MapBasedValueSource( modelProperties ), PROJECT_PREFIXES, true ) );
         valueSources.add( modelValueSource2 );
         valueSources.add( new MapBasedValueSource( config.getUserProperties() ) );
         

Modified: maven/components/branches/maven-2.1.0-M1-RC/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.1.0-M1-RC/pom.xml?rev=693295&r1=693294&r2=693295&view=diff
==============================================================================
--- maven/components/branches/maven-2.1.0-M1-RC/pom.xml (original)
+++ maven/components/branches/maven-2.1.0-M1-RC/pom.xml Mon Sep  8 14:53:32 2008
@@ -246,7 +246,7 @@
   </modules>
 
   <properties>
-    <mavenVersion>2.1.0-M1-RC15</mavenVersion>
+    <mavenVersion>2.1.0-M1-RC16-SNAPSHOT</mavenVersion>
     <wagonVersion>1.0-beta-4</wagonVersion>
   </properties>
 
@@ -373,7 +373,7 @@
       <dependency>
         <groupId>org.codehaus.plexus</groupId>
         <artifactId>plexus-interpolation</artifactId>
-        <version>1.4</version>
+        <version>1.5</version>
       </dependency>
       <dependency>
         <groupId>org.codehaus.plexus</groupId>