Author: hboutemy
Date: Sun Nov 23 14:59:06 2014
New Revision: 1641194
URL: http://svn.apache.org/r1641194
Log:
[MTOOLCHAINS-13] update custom toolchain IT to build with Maven 2
Modified:
maven/plugins/trunk/maven-toolchains-plugin/src/it/setup-custom-toolchain/invoker.properties
maven/plugins/trunk/maven-toolchains-plugin/src/it/setup-custom-toolchain/pom.xml
maven/plugins/trunk/maven-toolchains-plugin/src/it/use-custom-toolchain/invoker.properties
Modified:
maven/plugins/trunk/maven-toolchains-plugin/src/it/setup-custom-toolchain/invoker.properties
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-toolchains-plugin/src/it/setup-custom-toolchain/invoker.properties?rev=1641194&r1=1641193&r2=1641194&view=diff
==============================================================================
---
maven/plugins/trunk/maven-toolchains-plugin/src/it/setup-custom-toolchain/invoker.properties
(original)
+++
maven/plugins/trunk/maven-toolchains-plugin/src/it/setup-custom-toolchain/invoker.properties
Sun Nov 23 14:59:06 2014
@@ -16,4 +16,3 @@
# under the License.
invoker.goals = install
-invoker.maven.version = 3.0+
Modified:
maven/plugins/trunk/maven-toolchains-plugin/src/it/setup-custom-toolchain/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-toolchains-plugin/src/it/setup-custom-toolchain/pom.xml?rev=1641194&r1=1641193&r2=1641194&view=diff
==============================================================================
---
maven/plugins/trunk/maven-toolchains-plugin/src/it/setup-custom-toolchain/pom.xml
(original)
+++
maven/plugins/trunk/maven-toolchains-plugin/src/it/setup-custom-toolchain/pom.xml
Sun Nov 23 14:59:06 2014
@@ -116,4 +116,36 @@ under the License.
</plugin>
</plugins>
</build>
+
+ <profiles>
+ <profile>
+ <id>maven-2</id><!-- only necessary to build with Maven 2 -->
+ <activation>
+ <file>
+ <!-- This employs that the basedir expression is only recognized by
Maven 3.x (see MNG-2363) -->
+ <missing>${basedir}</missing>
+ </file>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-plugin-plugin</artifactId>
+ <configuration>
+ <!-- see http://jira.codehaus.org/browse/MNG-5346 -->
+ <skipErrorNoDescriptorsFound>true</skipErrorNoDescriptorsFound>
+ </configuration>
+ <executions>
+ <execution>
+ <id>mojo-descriptor</id>
+ <goals><!-- Maven 2 does not support phase overriding: need to
add an execution -->
+ <goal>descriptor</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
Modified:
maven/plugins/trunk/maven-toolchains-plugin/src/it/use-custom-toolchain/invoker.properties
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-toolchains-plugin/src/it/use-custom-toolchain/invoker.properties?rev=1641194&r1=1641193&r2=1641194&view=diff
==============================================================================
---
maven/plugins/trunk/maven-toolchains-plugin/src/it/use-custom-toolchain/invoker.properties
(original)
+++
maven/plugins/trunk/maven-toolchains-plugin/src/it/use-custom-toolchain/invoker.properties
Sun Nov 23 14:59:06 2014
@@ -16,4 +16,5 @@
# under the License.
invoker.goals = --toolchains ../../../src/it/toolchains.xml compile
+# cannot run this IT with Maven 2 since required --toolchains option was added
in 3.0-alpha-3: see MNG-3714
invoker.maven.version = 3.0+
