You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ti...@apache.org on 2016/01/07 16:53:20 UTC
maven-surefire git commit: [SUREFIRE] preparation for 3.0
Repository: maven-surefire
Updated Branches:
refs/heads/3.0-rc1 353fb0fac -> 781312a3b
[SUREFIRE] preparation for 3.0
Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/781312a3
Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/781312a3
Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/781312a3
Branch: refs/heads/3.0-rc1
Commit: 781312a3b2b54b5ef886ed6387f192ca6f4ca3f9
Parents: 353fb0f
Author: Tibor17 <ti...@lycos.com>
Authored: Thu Jan 7 16:52:49 2016 +0100
Committer: Tibor17 <ti...@lycos.com>
Committed: Thu Jan 7 16:52:49 2016 +0100
----------------------------------------------------------------------
maven-surefire-common/pom.xml | 10 +++--
.../maven/plugin/surefire/SurefireHelper.java | 19 +-------
maven-surefire-report-plugin/pom.xml | 45 ++++++++++++++++++-
pom.xml | 40 +++++++++--------
surefire-integration-tests/pom.xml | 47 --------------------
5 files changed, 73 insertions(+), 88 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/781312a3/maven-surefire-common/pom.xml
----------------------------------------------------------------------
diff --git a/maven-surefire-common/pom.xml b/maven-surefire-common/pom.xml
index aef1950..240947d 100644
--- a/maven-surefire-common/pom.xml
+++ b/maven-surefire-common/pom.xml
@@ -39,6 +39,10 @@
<dependencies>
<dependency>
<groupId>org.apache.maven</groupId>
+ <artifactId>maven-compat</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
</dependency>
<dependency>
@@ -62,14 +66,14 @@
<groupId>org.apache.maven</groupId>
<artifactId>maven-artifact</artifactId>
</dependency>
- <dependency>
+ <!--<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-descriptor</artifactId>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-project</artifactId>
- </dependency>
+ </dependency>-->
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
@@ -97,7 +101,7 @@
<dependency>
<groupId>org.apache.maven.shared</groupId>
<artifactId>maven-common-artifact-filters</artifactId>
- <version>1.3</version>
+ <version>3.0.0</version>
<exclusions>
<exclusion>
<groupId>org.apache.maven.shared</groupId>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/781312a3/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/SurefireHelper.java
----------------------------------------------------------------------
diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/SurefireHelper.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/SurefireHelper.java
index a4319bc..b86daa5 100644
--- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/SurefireHelper.java
+++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/SurefireHelper.java
@@ -27,7 +27,6 @@ import org.apache.maven.plugin.logging.Log;
import org.apache.maven.surefire.cli.CommandLineOption;
import org.apache.maven.surefire.suite.RunResult;
-import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.util.ArrayList;
import java.util.Collection;
@@ -121,7 +120,7 @@ public final class SurefireHelper
Method getRequestMethod = session.getClass().getMethod( "getRequest" );
MavenExecutionRequest request = (MavenExecutionRequest) getRequestMethod.invoke( session );
- String f = getFailureBehavior( request );
+ String f = request.getReactorFailureBehavior();
if ( f != null )
{
// compatible with enums Maven 3.0
@@ -158,20 +157,4 @@ public final class SurefireHelper
}
}
}
-
- private static String getFailureBehavior( MavenExecutionRequest request )
- throws NoSuchMethodException, InvocationTargetException, IllegalAccessException
- {
- try
- {
- return request.getFailureBehavior();
- }
- catch ( NoSuchMethodError e )
- {
- return (String) request.getClass()
- .getMethod( "getReactorFailureBehavior" )
- .invoke( request );
- }
- }
-
}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/781312a3/maven-surefire-report-plugin/pom.xml
----------------------------------------------------------------------
diff --git a/maven-surefire-report-plugin/pom.xml b/maven-surefire-report-plugin/pom.xml
index 37e421d..ba6a07e 100644
--- a/maven-surefire-report-plugin/pom.xml
+++ b/maven-surefire-report-plugin/pom.xml
@@ -49,8 +49,24 @@
<dependencies>
<dependency>
<groupId>org.apache.maven</groupId>
- <artifactId>maven-project</artifactId>
+ <artifactId>maven-core</artifactId>
+ <!--
+ If 3.1.1:
+ org.codehaus.plexus.component.repository.exception.ComponentLookupException: java.util.NoSuchElementException
+ role: org.apache.maven.repository.RepositorySystem
+ roleHint:
+ <version>3.1.1</version>
+
+ If 3.0.0:
+java.lang.NoSuchMethodError: org.codehaus.plexus.ContainerConfiguration.setClassPathScanning(Ljava/lang/String;)Lorg/codehaus/plexus/ContainerConfiguration;
+See DefaultContainerConfiguration and AbstractMojoTestCase#L248
+
+ -->
</dependency>
+ <!--<dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-project</artifactId>
+ </dependency>-->
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-model</artifactId>
@@ -105,9 +121,34 @@
<dependency>
<groupId>org.apache.maven.plugin-testing</groupId>
<artifactId>maven-plugin-testing-harness</artifactId>
- <version>1.2</version>
+ <version>3.0.0</version>
+ <scope>test</scope>
+ </dependency>
+ <!--<dependency>
+ <!– maven-plugin-testing-harness depends on maven-core which is dependent on scope=runtime Aether –>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-aether-provider</artifactId>
+ <version>3.0</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.sonatype.aether</groupId>
+ <artifactId>aether-api</artifactId>
+ <version>1.7</version>
+ <scope>test</scope>
+ </dependency>-->
+ <dependency>
+ <groupId>org.eclipse.aether</groupId>
+ <artifactId>aether-api</artifactId>
+ <version>0.9.0.M2</version>
+ <scope>test</scope>
+ </dependency>
+ <!--<dependency>
+ <groupId>org.sonatype.sisu</groupId>
+ <artifactId>sisu-inject-plexus</artifactId>
+ <version>1.4.2</version>
+ <scope>test</scope>
+ </dependency>-->
</dependencies>
<build>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/781312a3/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 220df14..6a593ad 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,10 +21,9 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>maven-parent</artifactId>
- <groupId>org.apache.maven</groupId>
- <version>26</version>
- <relativePath>../pom/maven/pom.xml</relativePath>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-plugins</artifactId>
+ <version>28</version>
</parent>
<groupId>org.apache.maven.surefire</groupId>
@@ -85,9 +84,9 @@
</distributionManagement>
<properties>
- <mavenVersion>2.2.1</mavenVersion>
+ <mavenVersion>3.0</mavenVersion>
<!-- <shadedVersion>2.12.4</shadedVersion> commented out due to http://jira.codehaus.org/browse/MRELEASE-799 -->
- <mavenPluginPluginVersion>3.3</mavenPluginPluginVersion>
+ <mavenPluginPluginVersion>3.4</mavenPluginPluginVersion>
<maven.surefire.scm.devConnection>scm:git:https://git-wip-us.apache.org/repos/asf/maven-surefire.git</maven.surefire.scm.devConnection>
<maven.site.path>surefire-archives/surefire-LATEST</maven.site.path>
</properties>
@@ -133,7 +132,7 @@
<groupId>org.apache.maven</groupId>
<artifactId>maven-core</artifactId>
<version>${mavenVersion}</version>
- <exclusions>
+ <!--<exclusions>
<exclusion>
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-file</artifactId>
@@ -166,7 +165,7 @@
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-interactivity-api</artifactId>
</exclusion>
- </exclusions>
+ </exclusions>-->
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
@@ -184,30 +183,35 @@
<artifactId>maven-artifact</artifactId>
<version>${mavenVersion}</version>
</dependency>
- <dependency>
+ <!--<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-descriptor</artifactId>
- <version>${mavenVersion}</version>
- </dependency>
- <dependency>
+ <version>2.2.1</version>
+ </dependency>-->
+ <!--<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-project</artifactId>
+ <version>2.2.1</version>
+ </dependency>-->
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-model</artifactId>
<version>${mavenVersion}</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
- <artifactId>maven-model</artifactId>
+ <artifactId>maven-compat</artifactId>
<version>${mavenVersion}</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-toolchain</artifactId>
- <version>${mavenVersion}</version>
+ <version>2.2.1</version>
</dependency>
<dependency>
<groupId>org.apache.maven.shared</groupId>
<artifactId>maven-shared-utils</artifactId>
- <version>0.9</version>
+ <version>3.0.0</version>
</dependency>
<dependency>
<groupId>org.apache.maven.shared</groupId>
@@ -272,7 +276,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>animal-sniffer-maven-plugin</artifactId>
- <version>1.11</version>
+ <version>1.14</version>
<executions>
<execution>
<id>signature-check</id>
@@ -284,8 +288,8 @@
<configuration>
<signature>
<groupId>org.codehaus.mojo.signature</groupId>
- <artifactId>java15</artifactId>
- <version>1.0</version>
+ <artifactId>java16</artifactId>
+ <version>1.1</version>
</signature>
</configuration>
</plugin>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/781312a3/surefire-integration-tests/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/pom.xml b/surefire-integration-tests/pom.xml
index 64bf878..e86220e 100644
--- a/surefire-integration-tests/pom.xml
+++ b/surefire-integration-tests/pom.xml
@@ -190,7 +190,6 @@
</plugins>
</build>
</profile>
-
<profile>
<id>embedded</id>
<activation>
@@ -203,51 +202,5 @@
<verifier.forkMode>auto</verifier.forkMode>
</properties>
</profile>
-
- <profile>
- <id>maven-2.2.1</id>
- <properties>
- <mavenHomeUsed>${project.build.directory}/maven-extract/apache-maven-2.2.1</mavenHomeUsed>
- </properties>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <version>2.4</version>
- <executions>
- <execution>
- <id>unpack</id>
- <phase>package</phase>
- <goals>
- <goal>unpack</goal>
- </goals>
- <configuration>
- <artifactItems>
- <artifactItem>
- <groupId>org.apache.maven</groupId>
- <artifactId>apache-maven</artifactId>
- <version>2.2.1</version>
- <type>tar.gz</type>
- <classifier>bin</classifier>
- <overWrite>false</overWrite>
- <outputDirectory>${project.build.directory}/maven-extract</outputDirectory>
- </artifactItem>
- </artifactItems>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-failsafe-plugin</artifactId>
- <version>2.12.4</version> <!-- ${shadedVersion}, but resolved due to http://jira.codehaus.org/browse/MRELEASE-799 -->
- <configuration>
- <excludedGroups>org.apache.maven.surefire.its.Not2xCompatible</excludedGroups>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
-
</profiles>
</project>