You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by si...@apache.org on 2009/02/04 16:33:48 UTC
svn commit: r740770 - in /maven/components/trunk: ./ maven-project-builder/
maven-project/src/test/java/org/apache/maven/project/builder/
maven-project/src/test/resources-project-builder/plugin-config-properties/
Author: sisbell
Date: Wed Feb 4 15:33:47 2009
New Revision: 740770
URL: http://svn.apache.org/viewvc?rev=740770&view=rev
Log:
[MNG-3803] - System properties in plugins
Added:
maven/components/trunk/maven-project/src/test/resources-project-builder/plugin-config-properties/
maven/components/trunk/maven-project/src/test/resources-project-builder/plugin-config-properties/pom.xml
Modified:
maven/components/trunk/maven-project-builder/pom.xml
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/builder/PomConstructionTest.java
maven/components/trunk/pom.xml
Modified: maven/components/trunk/maven-project-builder/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-project-builder/pom.xml?rev=740770&r1=740769&r2=740770&view=diff
==============================================================================
--- maven/components/trunk/maven-project-builder/pom.xml (original)
+++ maven/components/trunk/maven-project-builder/pom.xml Wed Feb 4 15:33:47 2009
@@ -33,4 +33,6 @@
<scope>test</scope>
</dependency>
</dependencies>
+
+
</project>
Modified: maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/builder/PomConstructionTest.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/builder/PomConstructionTest.java?rev=740770&r1=740769&r2=740770&view=diff
==============================================================================
--- maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/builder/PomConstructionTest.java (original)
+++ maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/builder/PomConstructionTest.java Wed Feb 4 15:33:47 2009
@@ -86,6 +86,13 @@
};
}
+ /*MNG-3803*/
+ public void testPluginConfigProperties()
+ throws Exception
+ {
+ PomTestWrapper pom = buildPom( "plugin-config-properties" );
+ assertEquals( "my.property", pom.getValue( "build/plugins[1]/configuration[1]/systemProperties[1]/property[1]/name" ) );
+ }
public void testPluginMergeSimple()
throws Exception
Added: maven/components/trunk/maven-project/src/test/resources-project-builder/plugin-config-properties/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/test/resources-project-builder/plugin-config-properties/pom.xml?rev=740770&view=auto
==============================================================================
--- maven/components/trunk/maven-project/src/test/resources-project-builder/plugin-config-properties/pom.xml (added)
+++ maven/components/trunk/maven-project/src/test/resources-project-builder/plugin-config-properties/pom.xml Wed Feb 4 15:33:47 2009
@@ -0,0 +1,29 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>a</groupId>
+ <artifactId>b</artifactId>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ </plugin>
+ </plugins>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.4</version>
+ <configuration>
+ <systemProperties>
+ <property>
+ <name>my.property</name>
+ <value>my.value</value>
+ </property>
+ </systemProperties>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+</project>
\ No newline at end of file
Modified: maven/components/trunk/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/trunk/pom.xml?rev=740770&r1=740769&r2=740770&view=diff
==============================================================================
--- maven/components/trunk/pom.xml (original)
+++ maven/components/trunk/pom.xml Wed Feb 4 15:33:47 2009
@@ -251,11 +251,6 @@
<!--start-->
<dependency>
<groupId>org.apache.maven</groupId>
- <artifactId>maven-mercury</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.maven</groupId>
<artifactId>maven-lifecycle</artifactId>
<version>${project.version}</version>
</dependency>
@@ -409,7 +404,7 @@
<dependency>
<groupId>commons-jxpath</groupId>
<artifactId>commons-jxpath</artifactId>
- <version>${jxpathVersion}</version>
+ <version
</dependency>
<!-- Mercury -->