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/05/15 21:43:55 UTC
git commit: o Fix ITs on mvn 2.2.1 by removing property attribute
from dependenciesToScan
Updated Branches:
refs/heads/master ccc6806c3 -> 06f9d9d8a
o Fix ITs on mvn 2.2.1 by removing property attribute from dependenciesToScan
Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/06f9d9d8
Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/06f9d9d8
Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/06f9d9d8
Branch: refs/heads/master
Commit: 06f9d9d8a9c637dbb1bf232e82d1bf36cbdd889a
Parents: ccc6806
Author: Andreas Gudian <ag...@apache.org>
Authored: Wed May 15 21:43:39 2013 +0200
Committer: Andreas Gudian <ag...@apache.org>
Committed: Wed May 15 21:43:39 2013 +0200
----------------------------------------------------------------------
.../plugin/surefire/AbstractSurefireMojo.java | 4 +-
.../module1/pom.xml | 2 +-
.../surefire-569-RunTestFromDependencyJars/pom.xml | 22 +++-----------
.../testjar/pom.xml | 3 +-
4 files changed, 10 insertions(+), 21 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/06f9d9d8/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java
----------------------------------------------------------------------
diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java
index b521300..0efa49a 100644
--- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java
+++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java
@@ -589,8 +589,8 @@ public abstract class AbstractSurefireMojo
*
* @since 2.14
*/
- @Parameter(property = "dependenciesToScan")
- protected List<String> dependenciesToScan;
+ @Parameter
+ protected List<String> dependenciesToScan = new ArrayList<String>(0);
/**
*
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/06f9d9d8/surefire-integration-tests/src/test/resources/surefire-569-RunTestFromDependencyJars/module1/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-569-RunTestFromDependencyJars/module1/pom.xml b/surefire-integration-tests/src/test/resources/surefire-569-RunTestFromDependencyJars/module1/pom.xml
index 7f1c672..9b4847c 100644
--- a/surefire-integration-tests/src/test/resources/surefire-569-RunTestFromDependencyJars/module1/pom.xml
+++ b/surefire-integration-tests/src/test/resources/surefire-569-RunTestFromDependencyJars/module1/pom.xml
@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.maven.plugins.surefire</groupId>
+ <groupId>org.apache.maven.surefire</groupId>
<artifactId>surefire-569-RunTestFromDependencyJars</artifactId>
<version>0.0.1-SNAPSHOT</version>
<relativePath>../</relativePath>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/06f9d9d8/surefire-integration-tests/src/test/resources/surefire-569-RunTestFromDependencyJars/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-569-RunTestFromDependencyJars/pom.xml b/surefire-integration-tests/src/test/resources/surefire-569-RunTestFromDependencyJars/pom.xml
index cd55a0e..d2574fc 100644
--- a/surefire-integration-tests/src/test/resources/surefire-569-RunTestFromDependencyJars/pom.xml
+++ b/surefire-integration-tests/src/test/resources/surefire-569-RunTestFromDependencyJars/pom.xml
@@ -1,27 +1,15 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" 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.surefire</groupId>
+ <artifactId>it-parent</artifactId>
+ <version>1.0</version>
+ </parent>
<artifactId>surefire-569-RunTestFromDependencyJars</artifactId>
<version>0.0.1-SNAPSHOT</version>
<packaging>pom</packaging>
- <properties>
- <surefire.version>2.14-SNAPSHOT</surefire.version>
- </properties>
-
- <build>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>${surefire.version}</version>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
-
<modules>
<module>testjar</module>
<module>module1</module>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/06f9d9d8/surefire-integration-tests/src/test/resources/surefire-569-RunTestFromDependencyJars/testjar/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-569-RunTestFromDependencyJars/testjar/pom.xml b/surefire-integration-tests/src/test/resources/surefire-569-RunTestFromDependencyJars/testjar/pom.xml
index ddfe3c0..f13be52 100644
--- a/surefire-integration-tests/src/test/resources/surefire-569-RunTestFromDependencyJars/testjar/pom.xml
+++ b/surefire-integration-tests/src/test/resources/surefire-569-RunTestFromDependencyJars/testjar/pom.xml
@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.maven.plugins.surefire</groupId>
+ <groupId>org.apache.maven.surefire</groupId>
<artifactId>surefire-569-RunTestFromDependencyJars</artifactId>
<version>0.0.1-SNAPSHOT</version>
<relativePath>../</relativePath>
@@ -12,6 +12,7 @@
<groupId>org.apache.maven.plugins.surefire.dependency-jar</groupId>
<artifactId>testjar</artifactId>
<version>0.0.1-SNAPSHOT</version>
+
<dependencies>
<dependency>
<groupId>junit</groupId>