You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by hb...@apache.org on 2013/06/05 01:46:47 UTC
git commit: try to fix ITs for mng-5482: put m-site-p and
m-dependency-p in different groups to avoid conflicts
Updated Branches:
refs/heads/master 81061cd8c -> b5dcffe83
try to fix ITs for mng-5482: put m-site-p and m-dependency-p in
different groups to avoid conflicts
Project: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/commit/b5dcffe8
Tree: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/tree/b5dcffe8
Diff: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/diff/b5dcffe8
Branch: refs/heads/master
Commit: b5dcffe8343ca93cf39d2a9dec7ab285d9efd428
Parents: 81061cd
Author: Hervé Boutemy <hb...@apache.org>
Authored: Wed Jun 5 01:46:42 2013 +0200
Committer: Hervé Boutemy <hb...@apache.org>
Committed: Wed Jun 5 01:46:42 2013 +0200
----------------------------------------------------------------------
.../src/test/resources/bootstrap/group-5/pom.xml | 7 +++++++
.../src/test/resources/bootstrap/group-6/pom.xml | 8 +-------
.../resources/mng-5482/plugin-dependency/pom.xml | 12 ------------
3 files changed, 8 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/b5dcffe8/core-it-suite/src/test/resources/bootstrap/group-5/pom.xml
----------------------------------------------------------------------
diff --git a/core-it-suite/src/test/resources/bootstrap/group-5/pom.xml b/core-it-suite/src/test/resources/bootstrap/group-5/pom.xml
index 4f114fc..93267aa 100644
--- a/core-it-suite/src/test/resources/bootstrap/group-5/pom.xml
+++ b/core-it-suite/src/test/resources/bootstrap/group-5/pom.xml
@@ -58,5 +58,12 @@ under the License.
<version>1.3</version>
<scope>runtime</scope>
</dependency>
+ <!-- IT MNG-5482 plugin-dependency -->
+ <dependency>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <version>2.7</version>
+ <scope>runtime</scope>
+ </dependency>
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/b5dcffe8/core-it-suite/src/test/resources/bootstrap/group-6/pom.xml
----------------------------------------------------------------------
diff --git a/core-it-suite/src/test/resources/bootstrap/group-6/pom.xml b/core-it-suite/src/test/resources/bootstrap/group-6/pom.xml
index 455f9d5..453cba4 100644
--- a/core-it-suite/src/test/resources/bootstrap/group-6/pom.xml
+++ b/core-it-suite/src/test/resources/bootstrap/group-6/pom.xml
@@ -67,18 +67,12 @@ under the License.
</exclusion>
</exclusions>
</dependency>
- <!-- IT MNG-5482 -->
+ <!-- IT MNG-5482 plugin-site -->
<dependency>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
<version>3.2</version>
<scope>runtime</scope>
</dependency>
- <dependency>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <version>2.7</version>
- <scope>runtime</scope>
- </dependency>
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/b5dcffe8/core-it-suite/src/test/resources/mng-5482/plugin-dependency/pom.xml
----------------------------------------------------------------------
diff --git a/core-it-suite/src/test/resources/mng-5482/plugin-dependency/pom.xml b/core-it-suite/src/test/resources/mng-5482/plugin-dependency/pom.xml
index 4d9a699..405f507 100644
--- a/core-it-suite/src/test/resources/mng-5482/plugin-dependency/pom.xml
+++ b/core-it-suite/src/test/resources/mng-5482/plugin-dependency/pom.xml
@@ -20,18 +20,6 @@
</goals>
</execution>
</executions>
- <dependencies><!-- force components versions from group-6: Doxia version from maven-site-plugin 3.2 -->
- <dependency>
- <groupId>org.apache.maven.doxia</groupId>
- <artifactId>doxia-sink-api</artifactId>
- <version>1.3</version>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.doxia</groupId>
- <artifactId>doxia-site-renderer</artifactId>
- <version>1.3</version>
- </dependency>
- </dependencies>
</plugin>
</plugins>
</build>