You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by be...@apache.org on 2010/09/04 16:02:20 UTC
svn commit: r992604 - in
/maven/plugins/trunk/maven-compiler-plugin/src/it/jdk16-annotation:
invoker.properties pom.xml
Author: bentmann
Date: Sat Sep 4 14:02:20 2010
New Revision: 992604
URL: http://svn.apache.org/viewvc?rev=992604&view=rev
Log:
o Skipped test if preconditions aren't met
Modified:
maven/plugins/trunk/maven-compiler-plugin/src/it/jdk16-annotation/invoker.properties
maven/plugins/trunk/maven-compiler-plugin/src/it/jdk16-annotation/pom.xml
Modified: maven/plugins/trunk/maven-compiler-plugin/src/it/jdk16-annotation/invoker.properties
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-compiler-plugin/src/it/jdk16-annotation/invoker.properties?rev=992604&r1=992603&r2=992604&view=diff
==============================================================================
--- maven/plugins/trunk/maven-compiler-plugin/src/it/jdk16-annotation/invoker.properties (original)
+++ maven/plugins/trunk/maven-compiler-plugin/src/it/jdk16-annotation/invoker.properties Sat Sep 4 14:02:20 2010
@@ -1,3 +1,5 @@
# build project if Jdk is 1.6+, only then annotations get processed.
invoker.java.version = 1.6+
+# test requires MNG-3203 to work
+invoker.maven.version = 2.2.0+
Modified: maven/plugins/trunk/maven-compiler-plugin/src/it/jdk16-annotation/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-compiler-plugin/src/it/jdk16-annotation/pom.xml?rev=992604&r1=992603&r2=992604&view=diff
==============================================================================
--- maven/plugins/trunk/maven-compiler-plugin/src/it/jdk16-annotation/pom.xml (original)
+++ maven/plugins/trunk/maven-compiler-plugin/src/it/jdk16-annotation/pom.xml Sat Sep 4 14:02:20 2010
@@ -7,29 +7,31 @@
<version>1.0</version>
<name>jdk16-annotation</name>
<url>http://maven.apache.org</url>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>@project.version@</version>
- <executions>
- <execution>
- <id>default-compile</id>
- <configuration>
- <proc>none</proc>
- </configuration>
- </execution>
- </executions>
- <configuration>
- <source>1.6</source>
- <target>1.6</target>
- </configuration>
- </plugin>
- </plugins>
- </build>
- <dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>@project.version@</version>
+ <executions>
+ <execution>
+ <!-- NOTE: This requires MNG-3203 to take effect -->
+ <id>default-compile</id>
+ <configuration>
+ <proc>none</proc>
+ </configuration>
+ </execution>
+ </executions>
+ <configuration>
+ <source>1.6</source>
+ <target>1.6</target>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <dependencies>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
@@ -38,4 +40,3 @@
</dependency>
</dependencies>
</project>
-