Author: jdcasey
Date: Tue Jun 24 11:57:39 2008
New Revision: 671296
URL: http://svn.apache.org/viewvc?rev=671296&view=rev
Log:
[MNG-3530] Merging dynamicBuild branch back to 2.0.x branch, to provide dynamic
build section of the POM that is back-propagated to an uninterpolated master
copy after each plugin execution, and reinterpolated before the next plugin
execution.
Modified:
maven/components/branches/maven-2.0.x/build.xml
maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/project/interpolation/ModelInterpolator.java
maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/project/interpolation/RegexBasedModelInterpolator.java
maven/components/branches/maven-2.0.x/pom.xml
Modified: maven/components/branches/maven-2.0.x/build.xml
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/build.xml?rev=671296&r1=671295&r2=671296&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.x/build.xml (original)
+++ maven/components/branches/maven-2.0.x/build.xml Tue Jun 24 11:57:39 2008
@@ -143,7 +143,7 @@
<java fork="true" classname="org.apache.maven.cli.MavenCli"
failonerror="true">
<classpath refid="maven.classpath"/>
<arg value="-B"/>
- <arg value="-X"/>
+ <arg value="-e"/>
<arg value="clean"/>
<arg value="install"/>
</java>
Modified:
maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java?rev=671296&r1=671295&r2=671296&view=diff
==============================================================================
---
maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
(original)
+++
maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
Tue Jun 24 11:57:39 2008
@@ -1131,7 +1131,6 @@
Properties userProps = config.getUserProperties();
if ( userProps != null )
{
- getLogger().debug( "Using user-defined properties for
interpolation:\n" + String.valueOf( userProps ).replace( ',', '\n' ) );
context.putAll( userProps );
}
}
Modified:
maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/project/interpolation/ModelInterpolator.java
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/project/interpolation/ModelInterpolator.java?rev=671296&r1=671295&r2=671296&view=diff
==============================================================================
---
maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/project/interpolation/ModelInterpolator.java
(original)
+++
maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/project/interpolation/ModelInterpolator.java
Tue Jun 24 11:57:39 2008
@@ -37,4 +37,9 @@
Model interpolate( Model model, Map context, boolean strict )
throws ModelInterpolationException;
+
+ String interpolate( String src,
+ Model model,
+ Map context )
+ throws ModelInterpolationException;
}
\ No newline at end of file
Modified:
maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/project/interpolation/RegexBasedModelInterpolator.java
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/project/interpolation/RegexBasedModelInterpolator.java?rev=671296&r1=671295&r2=671296&view=diff
==============================================================================
---
maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/project/interpolation/RegexBasedModelInterpolator.java
(original)
+++
maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/project/interpolation/RegexBasedModelInterpolator.java
Tue Jun 24 11:57:39 2008
@@ -48,9 +48,9 @@
extends AbstractLogEnabled
implements ModelInterpolator
{
- private static final Pattern EXPRESSION_PATTERN = Pattern.compile(
"\\$\\{(pom\\.|project\\.|env\\.)?([^}]+)\\}" );
+ static final Pattern EXPRESSION_PATTERN = Pattern.compile(
"\\$\\{(pom\\.|project\\.|env\\.)?([^}]+)\\}" );
- private Properties envars;
+ Properties envars;
public RegexBasedModelInterpolator( Properties envars )
{
@@ -95,7 +95,7 @@
}
String serializedModel = sWriter.toString();
- serializedModel = interpolateInternal( serializedModel, model, context
);
+ serializedModel = interpolate( serializedModel, model, context );
StringReader sReader = new StringReader( serializedModel );
@@ -118,7 +118,7 @@
return model;
}
- private String interpolateInternal( String src, Model model, Map context )
+ public String interpolate( String src, Model model, Map context )
throws ModelInterpolationException
{
String result = src;
Modified: maven/components/branches/maven-2.0.x/pom.xml
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/pom.xml?rev=671296&r1=671295&r2=671296&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.x/pom.xml (original)
+++ maven/components/branches/maven-2.0.x/pom.xml Tue Jun 24 11:57:39 2008
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven-parent</artifactId>
- <version>9-SNAPSHOT</version>
+ <version>8</version>
<relativePath>../pom/maven/pom.xml</relativePath>
</parent>
