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 21:02:54 UTC
[1/2] maven-surefire git commit: [SUREFIRE] preparation for 3.0:
removed maven-compat and added maven-artifact-transfer
Repository: maven-surefire
Updated Branches:
refs/heads/3.0-rc1 9cb143414 -> 20d328d58
[SUREFIRE] preparation for 3.0: removed maven-compat and added maven-artifact-transfer
Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/d2bcecc4
Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/d2bcecc4
Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/d2bcecc4
Branch: refs/heads/3.0-rc1
Commit: d2bcecc4c7547cbd726bfebcab0d5f0f6663aec8
Parents: c7c76ea
Author: Tibor17 <ti...@lycos.com>
Authored: Thu Jan 7 20:59:55 2016 +0100
Committer: Tibor17 <ti...@lycos.com>
Committed: Thu Jan 7 20:59:55 2016 +0100
----------------------------------------------------------------------
maven-surefire-common/pom.xml | 6 +++++-
.../apache/maven/plugin/surefire/AbstractSurefireMojo.java | 2 +-
.../maven/plugin/surefire/SurefireDependencyResolver.java | 2 +-
pom.xml | 9 +++++++--
4 files changed, 14 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/d2bcecc4/maven-surefire-common/pom.xml
----------------------------------------------------------------------
diff --git a/maven-surefire-common/pom.xml b/maven-surefire-common/pom.xml
index 240947d..7bfb6e5 100644
--- a/maven-surefire-common/pom.xml
+++ b/maven-surefire-common/pom.xml
@@ -37,9 +37,13 @@
</prerequisites>
<dependencies>
- <dependency>
+ <!--<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-compat</artifactId>
+ </dependency>-->
+ <dependency>
+ <groupId>org.apache.maven.shared</groupId>
+ <artifactId>maven-artifact-transfer</artifactId>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/d2bcecc4/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 3b3af1d..fddc7b4 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
@@ -44,7 +44,7 @@ import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.resolver.ArtifactNotFoundException;
import org.apache.maven.artifact.resolver.ArtifactResolutionException;
import org.apache.maven.artifact.resolver.ArtifactResolutionResult;
-import org.apache.maven.artifact.resolver.ArtifactResolver;
+import org.apache.maven.shared.artifact.resolve.ArtifactResolver;
import org.apache.maven.artifact.resolver.filter.ArtifactFilter;
import org.apache.maven.artifact.resolver.filter.ExcludesArtifactFilter;
import org.apache.maven.artifact.resolver.filter.ScopeArtifactFilter;
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/d2bcecc4/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/SurefireDependencyResolver.java
----------------------------------------------------------------------
diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/SurefireDependencyResolver.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/SurefireDependencyResolver.java
index 41b6171..7f91a5e 100644
--- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/SurefireDependencyResolver.java
+++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/SurefireDependencyResolver.java
@@ -30,7 +30,6 @@ import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.resolver.ArtifactNotFoundException;
import org.apache.maven.artifact.resolver.ArtifactResolutionException;
import org.apache.maven.artifact.resolver.ArtifactResolutionResult;
-import org.apache.maven.artifact.resolver.ArtifactResolver;
import org.apache.maven.artifact.resolver.filter.ArtifactFilter;
import org.apache.maven.artifact.resolver.filter.ExcludesArtifactFilter;
import org.apache.maven.artifact.versioning.DefaultArtifactVersion;
@@ -38,6 +37,7 @@ import org.apache.maven.artifact.versioning.InvalidVersionSpecificationException
import org.apache.maven.artifact.versioning.OverConstrainedVersionException;
import org.apache.maven.artifact.versioning.VersionRange;
import org.apache.maven.plugin.logging.Log;
+import org.apache.maven.shared.artifact.resolve.ArtifactResolver;
import org.apache.maven.surefire.booter.Classpath;
import javax.annotation.Nonnull;
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/d2bcecc4/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index b421ef9..cfb1ff3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -198,11 +198,11 @@
<artifactId>maven-model</artifactId>
<version>${mavenVersion}</version>
</dependency>
- <dependency>
+ <!--<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-compat</artifactId>
<version>${mavenVersion}</version>
- </dependency>
+ </dependency>-->
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-toolchain</artifactId>
@@ -210,6 +210,11 @@
</dependency>
<dependency>
<groupId>org.apache.maven.shared</groupId>
+ <artifactId>maven-artifact-transfer</artifactId>
+ <version>3.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.shared</groupId>
<artifactId>maven-shared-utils</artifactId>
<version>3.0.0</version>
</dependency>
[2/2] maven-surefire git commit: Merge remote-tracking branch
'origin/3.0-rc1' into 3.0-rc1
Posted by ti...@apache.org.
Merge remote-tracking branch 'origin/3.0-rc1' into 3.0-rc1
Conflicts:
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/20d328d5
Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/20d328d5
Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/20d328d5
Branch: refs/heads/3.0-rc1
Commit: 20d328d58c4c8dfbaa551127f14ada3b6db2df9a
Parents: d2bcecc 9cb1434
Author: Tibor17 <ti...@lycos.com>
Authored: Thu Jan 7 21:01:40 2016 +0100
Committer: Tibor17 <ti...@lycos.com>
Committed: Thu Jan 7 21:01:40 2016 +0100
----------------------------------------------------------------------
maven-surefire-report-plugin/pom.xml | 6 ++++++
pom.xml | 5 +++--
2 files changed, 9 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/20d328d5/pom.xml
----------------------------------------------------------------------