Author: hboutemy
Date: Fri Nov 23 10:48:45 2007
New Revision: 597714
URL: http://svn.apache.org/viewvc?rev=597714&view=rev
Log:
[MANTTASKS-101] get pom properties values like any other element
Modified:
maven/ant-tasks/trunk/pom.xml
maven/ant-tasks/trunk/sample.build.xml
maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/Pom.java
Modified: maven/ant-tasks/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/maven/ant-tasks/trunk/pom.xml?rev=597714&r1=597713&r2=597714&view=diff
==============================================================================
--- maven/ant-tasks/trunk/pom.xml (original)
+++ maven/ant-tasks/trunk/pom.xml Fri Nov 23 10:48:45 2007
@@ -92,7 +92,7 @@
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-project</artifactId>
- <version>2.0.8-SNAPSHOT</version>
+ <version>${mavenVersion}</version>
<exclusions>
<exclusion>
<artifactId>junit</artifactId>
@@ -103,23 +103,23 @@
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-error-diagnostics</artifactId>
- <version>2.0.8-SNAPSHOT</version>
+ <version>${mavenVersion}</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-settings</artifactId>
- <version>2.0.8-SNAPSHOT</version>
+ <version>${mavenVersion}</version>
</dependency>
<dependency>
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-file</artifactId>
- <version>1.0-beta-2</version>
+ <version>${wagonVersion}</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-http-lightweight</artifactId>
- <version>1.0-beta-2</version>
+ <version>${wagonVersion}</version>
<scope>runtime</scope>
</dependency>
<dependency>
@@ -130,7 +130,7 @@
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-artifact-manager</artifactId>
- <version>2.0.8-SNAPSHOT</version>
+ <version>${mavenVersion}</version>
<exclusions>
<exclusion>
<artifactId>junit</artifactId>
@@ -146,12 +146,12 @@
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-artifact</artifactId>
- <version>2.0.8-SNAPSHOT</version>
+ <version>${mavenVersion}</version>
</dependency>
<dependency>
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-provider-api</artifactId>
- <version>1.0-beta-2</version>
+ <version>${wagonVersion}</version>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
@@ -159,4 +159,9 @@
<version>1.0-alpha-9-stable-1</version>
</dependency>
</dependencies>
+
+ <properties>
+ <mavenVersion>2.0.8-SNAPSHOT</mavenVersion>
+ <wagonVersion>1.0-beta-2</wagonVersion>
+ </properties>
</project>
Modified: maven/ant-tasks/trunk/sample.build.xml
URL:
http://svn.apache.org/viewvc/maven/ant-tasks/trunk/sample.build.xml?rev=597714&r1=597713&r2=597714&view=diff
==============================================================================
--- maven/ant-tasks/trunk/sample.build.xml (original)
+++ maven/ant-tasks/trunk/sample.build.xml Fri Nov 23 10:48:45 2007
@@ -78,6 +78,20 @@
<echo>Artifact ID = ${my.maven.project.artifactId}</echo>
<echo>Parent Artifact ID = ${my.maven.project.parent.artifactId}</echo>
+
+ <fail message="failed to get pom info ${my.maven.project.artifactId}">
+ <condition>
+ <not><equals arg1="${my.maven.project.artifactId}"
arg2="${pom.xml.project.artifactId}"/></not>
+ </condition>
+ </fail>
+
+ <echo>Maven Core Version =
${my.maven.project.properties.mavenVersion}</echo>
+
+ <fail message="failed to get pom properties
${my.maven.project.properties.mavenVersion}">
+ <condition>
+ <not><equals arg1="${my.maven.project.properties.mavenVersion}"
arg2="${pom.xml.project.properties.mavenVersion}"/></not>
+ </condition>
+ </fail>
</target>
<target name="test-legacy-pom" depends="initTaskDefs">
Modified:
maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/Pom.java
URL:
http://svn.apache.org/viewvc/maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/Pom.java?rev=597714&r1=597713&r2=597714&view=diff
==============================================================================
--- maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/Pom.java
(original)
+++ maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/Pom.java
Fri Nov 23 10:48:45 2007
@@ -424,7 +424,15 @@
try
{
- value = ReflectionValueExtractor.evaluate( expression,
getMavenProject() );
+ if ( expression.indexOf( "project.properties." ) >= 0 )
+ {
+ expression = expression.substring( 19 );
+ value = getMavenProject().getProperties().get( expression
);
+ }
+ else
+ {
+ value = ReflectionValueExtractor.evaluate( expression,
getMavenProject() );
+ }
}
catch ( Exception e )
{
