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 2009/03/13 15:44:22 UTC
svn commit: r753285 - in /maven/plugins/trunk/maven-dependency-plugin:
pom.xml src/it/filterunpack/goals.txt src/it/filterunpack/pom.xml
src/it/filterunpack/validate.groovy src/it/settings.xml
Author: bentmann
Date: Fri Mar 13 14:44:21 2009
New Revision: 753285
URL: http://svn.apache.org/viewvc?rev=753285&view=rev
Log:
o Migrated ITs to use maven-invoker-plugin
Added:
maven/plugins/trunk/maven-dependency-plugin/src/it/settings.xml (with props)
Removed:
maven/plugins/trunk/maven-dependency-plugin/src/it/filterunpack/goals.txt
Modified:
maven/plugins/trunk/maven-dependency-plugin/pom.xml
maven/plugins/trunk/maven-dependency-plugin/src/it/filterunpack/pom.xml
maven/plugins/trunk/maven-dependency-plugin/src/it/filterunpack/validate.groovy
Modified: maven/plugins/trunk/maven-dependency-plugin/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/pom.xml?rev=753285&r1=753284&r2=753285&view=diff
==============================================================================
--- maven/plugins/trunk/maven-dependency-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-dependency-plugin/pom.xml Fri Mar 13 14:44:21 2009
@@ -228,19 +228,31 @@
<build>
<plugins>
<plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>shitty-maven-plugin</artifactId>
- <version>1.0-alpha-3</version>
+ <artifactId>maven-invoker-plugin</artifactId>
+ <version>1.3</version>
+ <configuration>
+ <debug>true</debug>
+ <projectsDirectory>src/it</projectsDirectory>
+ <cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo>
+ <pomIncludes>
+ <pomInclude>*/pom.xml</pomInclude>
+ </pomIncludes>
+ <preBuildHookScript>setup</preBuildHookScript>
+ <postBuildHookScript>validate</postBuildHookScript>
+ <localRepositoryPath>${project.build.directory}/local-repo</localRepositoryPath>
+ <settingsFile>src/it/settings.xml</settingsFile>
+ <goals>
+ <goal>clean</goal>
+ <goal>process-sources</goal>
+ </goals>
+ </configuration>
<executions>
<execution>
+ <id>integration-test</id>
<goals>
- <goal>clean</goal>
<goal>install</goal>
- <goal>test</goal>
+ <goal>run</goal>
</goals>
- <configuration>
- <parallel>false</parallel>
- </configuration>
</execution>
</executions>
</plugin>
Modified: maven/plugins/trunk/maven-dependency-plugin/src/it/filterunpack/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/it/filterunpack/pom.xml?rev=753285&r1=753284&r2=753285&view=diff
==============================================================================
--- maven/plugins/trunk/maven-dependency-plugin/src/it/filterunpack/pom.xml (original)
+++ maven/plugins/trunk/maven-dependency-plugin/src/it/filterunpack/pom.xml Fri Mar 13 14:44:21 2009
@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?><project>
+<?xml version="1.0" encoding="UTF-8"?>
+<project>
<modelVersion>4.0.0</modelVersion>
<groupId>dependency</groupId>
@@ -10,7 +11,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>3.8.1</version>
+ <version>3.8.2</version>
<scope>test</scope>
</dependency>
</dependencies>
@@ -19,7 +20,7 @@
<plugins>
<plugin>
<artifactId>maven-dependency-plugin</artifactId>
- <version>testing</version>
+ <version>@project.version@</version>
<executions>
<execution>
<goals>
Modified: maven/plugins/trunk/maven-dependency-plugin/src/it/filterunpack/validate.groovy
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/it/filterunpack/validate.groovy?rev=753285&r1=753284&r2=753285&view=diff
==============================================================================
--- maven/plugins/trunk/maven-dependency-plugin/src/it/filterunpack/validate.groovy (original)
+++ maven/plugins/trunk/maven-dependency-plugin/src/it/filterunpack/validate.groovy Fri Mar 13 14:44:21 2009
@@ -19,3 +19,5 @@
throw new RuntimeException("This file shouldn't be here: "+file.name);
}
}
+
+return true;
Added: maven/plugins/trunk/maven-dependency-plugin/src/it/settings.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/it/settings.xml?rev=753285&view=auto
==============================================================================
--- maven/plugins/trunk/maven-dependency-plugin/src/it/settings.xml (added)
+++ maven/plugins/trunk/maven-dependency-plugin/src/it/settings.xml Fri Mar 13 14:44:21 2009
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<settings>
+ <profiles>
+ <profile>
+ <id>it-repo</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <repositories>
+ <repository>
+ <id>local.central</id>
+ <url>@localRepositoryUrl@</url>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ </repository>
+ <repository>
+ <id>apache.snapshots</id>
+ <name>Apache Snapshot Repository</name>
+ <url>http://repository.apache.org/snapshots/</url>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ </repository>
+ </repositories>
+ <pluginRepositories>
+ <pluginRepository>
+ <id>local.central</id>
+ <url>@localRepositoryUrl@</url>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ </pluginRepository>
+ </pluginRepositories>
+ </profile>
+ </profiles>
+</settings>
Propchange: maven/plugins/trunk/maven-dependency-plugin/src/it/settings.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-dependency-plugin/src/it/settings.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision