You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ag...@apache.org on 2013/04/04 21:43:04 UTC
git commit: o Fix some poms - Use surefire-version that is under test
in working-directory and aggregate-report - Remove double commons-io
declaration in s-i-tests\pom.xml
Updated Branches:
refs/heads/master 24a96fb70 -> 9698e19be
o Fix some poms
- Use surefire-version that is under test in working-directory and aggregate-report
- Remove double commons-io declaration in s-i-tests\pom.xml
Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/9698e19b
Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/9698e19b
Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/9698e19b
Branch: refs/heads/master
Commit: 9698e19be7b0ad57f6010df7914d7a63e4d58cac
Parents: 24a96fb
Author: Andreas Gudian <ag...@apache.org>
Authored: Thu Apr 4 21:41:39 2013 +0200
Committer: Andreas Gudian <ag...@apache.org>
Committed: Thu Apr 4 21:41:39 2013 +0200
----------------------------------------------------------------------
surefire-integration-tests/pom.xml | 5 ---
.../test/resources/aggregate-report/child1/pom.xml | 10 +++++--
.../test/resources/aggregate-report/child2/pom.xml | 8 ++++-
.../src/test/resources/aggregate-report/pom.xml | 20 ++++++++------
.../test/resources/working-directory/child/pom.xml | 10 +++----
.../src/test/resources/working-directory/pom.xml | 16 ++++++-----
6 files changed, 37 insertions(+), 32 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/9698e19b/surefire-integration-tests/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/pom.xml b/surefire-integration-tests/pom.xml
index 4a3799f..40d17d1 100644
--- a/surefire-integration-tests/pom.xml
+++ b/surefire-integration-tests/pom.xml
@@ -71,11 +71,6 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- <version>2.0.1</version>
- </dependency>
- <dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-artifact</artifactId>
</dependency>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/9698e19b/surefire-integration-tests/src/test/resources/aggregate-report/child1/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/aggregate-report/child1/pom.xml b/surefire-integration-tests/src/test/resources/aggregate-report/child1/pom.xml
index db5f4f5..b28ab64 100644
--- a/surefire-integration-tests/src/test/resources/aggregate-report/child1/pom.xml
+++ b/surefire-integration-tests/src/test/resources/aggregate-report/child1/pom.xml
@@ -22,10 +22,14 @@
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>org.apache.maven.plugins.surefire</groupId>
+
+ <parent>
+ <groupId>org.apache.maven.plugins.surefire</groupId>
+ <artifactId>aggregate-report</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </parent>
+
<artifactId>aggregate-child1</artifactId>
- <version>1.0-SNAPSHOT</version>
<name>child1 for aggregate-reports</name>
<dependencies>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/9698e19b/surefire-integration-tests/src/test/resources/aggregate-report/child2/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/aggregate-report/child2/pom.xml b/surefire-integration-tests/src/test/resources/aggregate-report/child2/pom.xml
index bf09d15..35dee50 100644
--- a/surefire-integration-tests/src/test/resources/aggregate-report/child2/pom.xml
+++ b/surefire-integration-tests/src/test/resources/aggregate-report/child2/pom.xml
@@ -23,9 +23,13 @@
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>org.apache.maven.plugins.surefire</groupId>
+ <parent>
+ <groupId>org.apache.maven.plugins.surefire</groupId>
+ <artifactId>aggregate-report</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </parent>
+
<artifactId>aggregate-child2</artifactId>
- <version>1.0-SNAPSHOT</version>
<name>child2 for aggregate-reports</name>
<dependencies>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/9698e19b/surefire-integration-tests/src/test/resources/aggregate-report/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/aggregate-report/pom.xml b/surefire-integration-tests/src/test/resources/aggregate-report/pom.xml
index 39febf6..340452a 100644
--- a/surefire-integration-tests/src/test/resources/aggregate-report/pom.xml
+++ b/surefire-integration-tests/src/test/resources/aggregate-report/pom.xml
@@ -39,16 +39,18 @@
<module>child1</module>
<module>child2</module>
</modules>
-
+
<build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <testFailureIgnore>true</testFailureIgnore>
- </configuration>
- </plugin>
- </plugins>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <testFailureIgnore>true</testFailureIgnore>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
</build>
<reporting>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/9698e19b/surefire-integration-tests/src/test/resources/working-directory/child/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/working-directory/child/pom.xml b/surefire-integration-tests/src/test/resources/working-directory/child/pom.xml
index d12b79a..bca882c 100644
--- a/surefire-integration-tests/src/test/resources/working-directory/child/pom.xml
+++ b/surefire-integration-tests/src/test/resources/working-directory/child/pom.xml
@@ -24,14 +24,12 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.maven.surefire</groupId>
- <artifactId>it-parent</artifactId>
- <version>1.0</version>
- <relativePath>../../pom.xml</relativePath>
+ <groupId>org.apache.maven.plugins.surefire</groupId>
+ <artifactId>working-directory</artifactId>
+ <version>1.0-SNAPSHOT</version>
</parent>
- <groupId>org.apache.maven.plugins.surefire</groupId>
+
<artifactId>working-directory-child</artifactId>
- <version>1.0-SNAPSHOT</version>
<name>Test for working directory configuration</name>
<dependencies>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/9698e19b/surefire-integration-tests/src/test/resources/working-directory/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/working-directory/pom.xml b/surefire-integration-tests/src/test/resources/working-directory/pom.xml
index 318097e..80e97b3 100644
--- a/surefire-integration-tests/src/test/resources/working-directory/pom.xml
+++ b/surefire-integration-tests/src/test/resources/working-directory/pom.xml
@@ -33,12 +33,14 @@
</modules>
<build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>${surefire.version}</version>
- </plugin>
- </plugins>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>${surefire.version}</version>
+ </plugin>
+ </plugins>
+ </pluginManagement>
</build>
</project>
\ No newline at end of file