You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by sc...@apache.org on 2016/06/24 23:13:47 UTC
[1/3] maven git commit: [MNG-3507] ANSI Color logging for improved
output visibility. [Forced Update!]
Repository: maven
Updated Branches:
refs/heads/MNG-6006 a36e7e7e8 -> a07dbf537 (forced update)
[MNG-3507] ANSI Color logging for improved output visibility.
This reverts commit 521e07cfb053f802b478e4406ce19c89e954ad3c.
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/2824696d
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/2824696d
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/2824696d
Branch: refs/heads/MNG-6006
Commit: 2824696d5420da99358017ed28fb05c3fe30b7a8
Parents: 521e07c
Author: Christian Schulte <sc...@apache.org>
Authored: Thu Jun 23 22:00:02 2016 +0200
Committer: Christian Schulte <sc...@apache.org>
Committed: Thu Jun 23 22:01:30 2016 +0200
----------------------------------------------------------------------
.../org/apache/maven/lifecycle/LifecycleExecutionException.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/2824696d/maven-core/src/main/java/org/apache/maven/lifecycle/LifecycleExecutionException.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/LifecycleExecutionException.java b/maven-core/src/main/java/org/apache/maven/lifecycle/LifecycleExecutionException.java
index ef6fd1d..5645abd 100644
--- a/maven-core/src/main/java/org/apache/maven/lifecycle/LifecycleExecutionException.java
+++ b/maven-core/src/main/java/org/apache/maven/lifecycle/LifecycleExecutionException.java
@@ -93,12 +93,12 @@ public class LifecycleExecutionException
if ( project != null )
{
buffer.a( " on project " );
- buffer.project( project.getArtifactId() ).reset();
+ buffer.project( project.getArtifactId() );
}
if ( cause != null )
{
- buffer.a( ": " ).failure( cause.getMessage() ).reset();
+ buffer.a( ": " ).failure( cause.getMessage() );
}
return buffer.toString();
[2/3] maven git commit: [MNG-6006] Import Aether to Maven codebase
Posted by sc...@apache.org.
[MNG-6006] Import Aether to Maven codebase
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/3d65eceb
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/3d65eceb
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/3d65eceb
Branch: refs/heads/MNG-6006
Commit: 3d65eceb6f10976d1f33d4e79d805739b86f1241
Parents: 2824696
Author: Christian Schulte <sc...@apache.org>
Authored: Fri Jun 10 16:50:33 2016 +0200
Committer: Christian Schulte <sc...@apache.org>
Committed: Sat Jun 25 01:13:29 2016 +0200
----------------------------------------------------------------------
apache-maven/pom.xml | 6 +++---
maven-aether-provider/pom.xml | 14 +++++++-------
maven-artifact/pom.xml | 2 +-
maven-builder-support/pom.xml | 2 +-
maven-compat/pom.xml | 6 +++---
maven-core/pom.xml | 8 ++++----
maven-embedder/pom.xml | 2 +-
maven-model-builder/pom.xml | 2 +-
maven-model/pom.xml | 2 +-
maven-plugin-api/pom.xml | 2 +-
maven-repository-metadata/pom.xml | 2 +-
maven-settings-builder/pom.xml | 2 +-
maven-settings/pom.xml | 2 +-
pom.xml | 16 ++++++++--------
14 files changed, 34 insertions(+), 34 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/3d65eceb/apache-maven/pom.xml
----------------------------------------------------------------------
diff --git a/apache-maven/pom.xml b/apache-maven/pom.xml
index 37751cc..92a05ac 100644
--- a/apache-maven/pom.xml
+++ b/apache-maven/pom.xml
@@ -25,7 +25,7 @@ under the License.
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven</artifactId>
- <version>3.4.0-SNAPSHOT</version>
+ <version>3.5.0-SNAPSHOT</version>
</parent>
<artifactId>apache-maven</artifactId>
@@ -84,11 +84,11 @@ under the License.
<artifactId>wagon-file</artifactId>
</dependency>
<dependency>
- <groupId>org.eclipse.aether</groupId>
+ <groupId>org.apache.maven.aether</groupId>
<artifactId>aether-connector-basic</artifactId>
</dependency>
<dependency>
- <groupId>org.eclipse.aether</groupId>
+ <groupId>org.apache.maven.aether</groupId>
<artifactId>aether-transport-wagon</artifactId>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/maven/blob/3d65eceb/maven-aether-provider/pom.xml
----------------------------------------------------------------------
diff --git a/maven-aether-provider/pom.xml b/maven-aether-provider/pom.xml
index 4c36ebd..bdde872 100644
--- a/maven-aether-provider/pom.xml
+++ b/maven-aether-provider/pom.xml
@@ -25,7 +25,7 @@ under the License.
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven</artifactId>
- <version>3.4.0-SNAPSHOT</version>
+ <version>3.5.0-SNAPSHOT</version>
</parent>
<artifactId>maven-aether-provider</artifactId>
@@ -47,19 +47,19 @@ under the License.
<artifactId>maven-repository-metadata</artifactId>
</dependency>
<dependency>
- <groupId>org.eclipse.aether</groupId>
+ <groupId>org.apache.maven.aether</groupId>
<artifactId>aether-api</artifactId>
</dependency>
<dependency>
- <groupId>org.eclipse.aether</groupId>
+ <groupId>org.apache.maven.aether</groupId>
<artifactId>aether-spi</artifactId>
</dependency>
<dependency>
- <groupId>org.eclipse.aether</groupId>
+ <groupId>org.apache.maven.aether</groupId>
<artifactId>aether-util</artifactId>
</dependency>
<dependency>
- <groupId>org.eclipse.aether</groupId>
+ <groupId>org.apache.maven.aether</groupId>
<artifactId>aether-impl</artifactId>
</dependency>
<dependency>
@@ -92,12 +92,12 @@ under the License.
</dependency>
<!-- Testing -->
<dependency>
- <groupId>org.eclipse.aether</groupId>
+ <groupId>org.apache.maven.aether</groupId>
<artifactId>aether-connector-basic</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.eclipse.aether</groupId>
+ <groupId>org.apache.maven.aether</groupId>
<artifactId>aether-transport-wagon</artifactId>
<scope>test</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/maven/blob/3d65eceb/maven-artifact/pom.xml
----------------------------------------------------------------------
diff --git a/maven-artifact/pom.xml b/maven-artifact/pom.xml
index 503e097..e3943c9 100644
--- a/maven-artifact/pom.xml
+++ b/maven-artifact/pom.xml
@@ -25,7 +25,7 @@ under the License.
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven</artifactId>
- <version>3.4.0-SNAPSHOT</version>
+ <version>3.5.0-SNAPSHOT</version>
</parent>
<artifactId>maven-artifact</artifactId>
http://git-wip-us.apache.org/repos/asf/maven/blob/3d65eceb/maven-builder-support/pom.xml
----------------------------------------------------------------------
diff --git a/maven-builder-support/pom.xml b/maven-builder-support/pom.xml
index 90fa43b..39eb161 100644
--- a/maven-builder-support/pom.xml
+++ b/maven-builder-support/pom.xml
@@ -25,7 +25,7 @@ under the License.
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven</artifactId>
- <version>3.4.0-SNAPSHOT</version>
+ <version>3.5.0-SNAPSHOT</version>
</parent>
<artifactId>maven-builder-support</artifactId>
http://git-wip-us.apache.org/repos/asf/maven/blob/3d65eceb/maven-compat/pom.xml
----------------------------------------------------------------------
diff --git a/maven-compat/pom.xml b/maven-compat/pom.xml
index f828d6e..f15de58 100644
--- a/maven-compat/pom.xml
+++ b/maven-compat/pom.xml
@@ -25,7 +25,7 @@ under the License.
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven</artifactId>
- <version>3.4.0-SNAPSHOT</version>
+ <version>3.5.0-SNAPSHOT</version>
</parent>
<artifactId>maven-compat</artifactId>
@@ -85,12 +85,12 @@ under the License.
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.eclipse.aether</groupId>
+ <groupId>org.apache.maven.aether</groupId>
<artifactId>aether-connector-basic</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.eclipse.aether</groupId>
+ <groupId>org.apache.maven.aether</groupId>
<artifactId>aether-transport-wagon</artifactId>
<scope>test</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/maven/blob/3d65eceb/maven-core/pom.xml
----------------------------------------------------------------------
diff --git a/maven-core/pom.xml b/maven-core/pom.xml
index f03eead..80b4b62 100644
--- a/maven-core/pom.xml
+++ b/maven-core/pom.xml
@@ -25,7 +25,7 @@ under the License.
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven</artifactId>
- <version>3.4.0-SNAPSHOT</version>
+ <version>3.5.0-SNAPSHOT</version>
</parent>
<artifactId>maven-core</artifactId>
@@ -73,15 +73,15 @@ under the License.
<artifactId>maven-aether-provider</artifactId>
</dependency>
<dependency>
- <groupId>org.eclipse.aether</groupId>
+ <groupId>org.apache.maven.aether</groupId>
<artifactId>aether-impl</artifactId>
</dependency>
<dependency>
- <groupId>org.eclipse.aether</groupId>
+ <groupId>org.apache.maven.aether</groupId>
<artifactId>aether-api</artifactId>
</dependency>
<dependency>
- <groupId>org.eclipse.aether</groupId>
+ <groupId>org.apache.maven.aether</groupId>
<artifactId>aether-util</artifactId>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/maven/blob/3d65eceb/maven-embedder/pom.xml
----------------------------------------------------------------------
diff --git a/maven-embedder/pom.xml b/maven-embedder/pom.xml
index 7e4032f..5d6bae2 100644
--- a/maven-embedder/pom.xml
+++ b/maven-embedder/pom.xml
@@ -25,7 +25,7 @@ under the License.
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven</artifactId>
- <version>3.4.0-SNAPSHOT</version>
+ <version>3.5.0-SNAPSHOT</version>
</parent>
<artifactId>maven-embedder</artifactId>
http://git-wip-us.apache.org/repos/asf/maven/blob/3d65eceb/maven-model-builder/pom.xml
----------------------------------------------------------------------
diff --git a/maven-model-builder/pom.xml b/maven-model-builder/pom.xml
index b6ea3cd..0dd08ac 100644
--- a/maven-model-builder/pom.xml
+++ b/maven-model-builder/pom.xml
@@ -25,7 +25,7 @@ under the License.
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven</artifactId>
- <version>3.4.0-SNAPSHOT</version>
+ <version>3.5.0-SNAPSHOT</version>
</parent>
<artifactId>maven-model-builder</artifactId>
http://git-wip-us.apache.org/repos/asf/maven/blob/3d65eceb/maven-model/pom.xml
----------------------------------------------------------------------
diff --git a/maven-model/pom.xml b/maven-model/pom.xml
index 29c454c..41cf168 100644
--- a/maven-model/pom.xml
+++ b/maven-model/pom.xml
@@ -25,7 +25,7 @@ under the License.
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven</artifactId>
- <version>3.4.0-SNAPSHOT</version>
+ <version>3.5.0-SNAPSHOT</version>
</parent>
<artifactId>maven-model</artifactId>
http://git-wip-us.apache.org/repos/asf/maven/blob/3d65eceb/maven-plugin-api/pom.xml
----------------------------------------------------------------------
diff --git a/maven-plugin-api/pom.xml b/maven-plugin-api/pom.xml
index a05d059..d8f802d 100644
--- a/maven-plugin-api/pom.xml
+++ b/maven-plugin-api/pom.xml
@@ -25,7 +25,7 @@ under the License.
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven</artifactId>
- <version>3.4.0-SNAPSHOT</version>
+ <version>3.5.0-SNAPSHOT</version>
</parent>
<artifactId>maven-plugin-api</artifactId>
http://git-wip-us.apache.org/repos/asf/maven/blob/3d65eceb/maven-repository-metadata/pom.xml
----------------------------------------------------------------------
diff --git a/maven-repository-metadata/pom.xml b/maven-repository-metadata/pom.xml
index 1bef9ef..7480de7 100644
--- a/maven-repository-metadata/pom.xml
+++ b/maven-repository-metadata/pom.xml
@@ -25,7 +25,7 @@ under the License.
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven</artifactId>
- <version>3.4.0-SNAPSHOT</version>
+ <version>3.5.0-SNAPSHOT</version>
</parent>
<artifactId>maven-repository-metadata</artifactId>
http://git-wip-us.apache.org/repos/asf/maven/blob/3d65eceb/maven-settings-builder/pom.xml
----------------------------------------------------------------------
diff --git a/maven-settings-builder/pom.xml b/maven-settings-builder/pom.xml
index 886031c..2d415c9 100644
--- a/maven-settings-builder/pom.xml
+++ b/maven-settings-builder/pom.xml
@@ -25,7 +25,7 @@ under the License.
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven</artifactId>
- <version>3.4.0-SNAPSHOT</version>
+ <version>3.5.0-SNAPSHOT</version>
</parent>
<artifactId>maven-settings-builder</artifactId>
http://git-wip-us.apache.org/repos/asf/maven/blob/3d65eceb/maven-settings/pom.xml
----------------------------------------------------------------------
diff --git a/maven-settings/pom.xml b/maven-settings/pom.xml
index 39b1791..133ee32 100644
--- a/maven-settings/pom.xml
+++ b/maven-settings/pom.xml
@@ -25,7 +25,7 @@ under the License.
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven</artifactId>
- <version>3.4.0-SNAPSHOT</version>
+ <version>3.5.0-SNAPSHOT</version>
</parent>
<artifactId>maven-settings</artifactId>
http://git-wip-us.apache.org/repos/asf/maven/blob/3d65eceb/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index e53a2ee..d34488f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -30,7 +30,7 @@ under the License.
</parent>
<artifactId>maven</artifactId>
- <version>3.4.0-SNAPSHOT</version>
+ <version>3.5.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Apache Maven</name>
@@ -64,7 +64,7 @@ under the License.
<cipherVersion>1.7</cipherVersion>
<modelloVersion>1.8.3</modelloVersion>
<jxpathVersion>1.3</jxpathVersion>
- <aetherVersion>1.0.2.v20150114</aetherVersion>
+ <aetherVersion>1.2.0-SNAPSHOT</aetherVersion>
<!-- Upgrade of SLF4J blocked by SLF4J-370 (MNG-6023). -->
<!-- https://issues.apache.org/jira/browse/MNG-6023 -->
<!-- http://jira.qos.ch/browse/SLF4J-370 -->
@@ -328,32 +328,32 @@ under the License.
</dependency>
<!-- Repository -->
<dependency>
- <groupId>org.eclipse.aether</groupId>
+ <groupId>org.apache.maven.aether</groupId>
<artifactId>aether-api</artifactId>
<version>${aetherVersion}</version>
</dependency>
<dependency>
- <groupId>org.eclipse.aether</groupId>
+ <groupId>org.apache.maven.aether</groupId>
<artifactId>aether-spi</artifactId>
<version>${aetherVersion}</version>
</dependency>
<dependency>
- <groupId>org.eclipse.aether</groupId>
+ <groupId>org.apache.maven.aether</groupId>
<artifactId>aether-impl</artifactId>
<version>${aetherVersion}</version>
</dependency>
<dependency>
- <groupId>org.eclipse.aether</groupId>
+ <groupId>org.apache.maven.aether</groupId>
<artifactId>aether-util</artifactId>
<version>${aetherVersion}</version>
</dependency>
<dependency>
- <groupId>org.eclipse.aether</groupId>
+ <groupId>org.apache.maven.aether</groupId>
<artifactId>aether-connector-basic</artifactId>
<version>${aetherVersion}</version>
</dependency>
<dependency>
- <groupId>org.eclipse.aether</groupId>
+ <groupId>org.apache.maven.aether</groupId>
<artifactId>aether-transport-wagon</artifactId>
<version>${aetherVersion}</version>
</dependency>
[3/3] maven git commit: [MNG-5761] Dependency management is not
transitive.
Posted by sc...@apache.org.
[MNG-5761] Dependency management is not transitive.
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/a07dbf53
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/a07dbf53
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/a07dbf53
Branch: refs/heads/MNG-6006
Commit: a07dbf5377190a7becdebb9518a14ae9e7c83e5e
Parents: 3d65ece
Author: Christian Schulte <sc...@apache.org>
Authored: Fri Jun 10 16:55:30 2016 +0200
Committer: Christian Schulte <sc...@apache.org>
Committed: Sat Jun 25 01:13:29 2016 +0200
----------------------------------------------------------------------
.../maven/repository/internal/MavenRepositorySystemUtils.java | 4 ++--
.../apache/maven/artifact/AbstractArtifactComponentTestCase.java | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/a07dbf53/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/MavenRepositorySystemUtils.java
----------------------------------------------------------------------
diff --git a/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/MavenRepositorySystemUtils.java b/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/MavenRepositorySystemUtils.java
index 3a98b2a..b0b0a8d 100644
--- a/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/MavenRepositorySystemUtils.java
+++ b/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/MavenRepositorySystemUtils.java
@@ -33,7 +33,7 @@ import org.eclipse.aether.impl.MetadataGeneratorFactory;
import org.eclipse.aether.impl.VersionRangeResolver;
import org.eclipse.aether.impl.VersionResolver;
import org.eclipse.aether.util.artifact.DefaultArtifactTypeRegistry;
-import org.eclipse.aether.util.graph.manager.ClassicDependencyManager;
+import org.eclipse.aether.util.graph.manager.TransitiveDependencyManager;
import org.eclipse.aether.util.graph.selector.AndDependencySelector;
import org.eclipse.aether.util.graph.selector.ExclusionDependencySelector;
import org.eclipse.aether.util.graph.selector.OptionalDependencySelector;
@@ -95,7 +95,7 @@ public final class MavenRepositorySystemUtils
DependencyTraverser depTraverser = new FatArtifactTraverser();
session.setDependencyTraverser( depTraverser );
- DependencyManager depManager = new ClassicDependencyManager();
+ DependencyManager depManager = new TransitiveDependencyManager();
session.setDependencyManager( depManager );
DependencySelector depFilter =
http://git-wip-us.apache.org/repos/asf/maven/blob/a07dbf53/maven-compat/src/test/java/org/apache/maven/artifact/AbstractArtifactComponentTestCase.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/test/java/org/apache/maven/artifact/AbstractArtifactComponentTestCase.java b/maven-compat/src/test/java/org/apache/maven/artifact/AbstractArtifactComponentTestCase.java
index 365acc4..73780c1 100644
--- a/maven-compat/src/test/java/org/apache/maven/artifact/AbstractArtifactComponentTestCase.java
+++ b/maven-compat/src/test/java/org/apache/maven/artifact/AbstractArtifactComponentTestCase.java
@@ -39,7 +39,7 @@ import org.eclipse.aether.collection.DependencySelector;
import org.eclipse.aether.collection.DependencyTraverser;
import org.eclipse.aether.internal.impl.SimpleLocalRepositoryManagerFactory;
import org.eclipse.aether.repository.LocalRepository;
-import org.eclipse.aether.util.graph.manager.ClassicDependencyManager;
+import org.eclipse.aether.util.graph.manager.TransitiveDependencyManager;
import org.eclipse.aether.util.graph.selector.AndDependencySelector;
import org.eclipse.aether.util.graph.selector.ExclusionDependencySelector;
import org.eclipse.aether.util.graph.selector.OptionalDependencySelector;
@@ -349,7 +349,7 @@ public abstract class AbstractArtifactComponentTestCase
DependencyTraverser depTraverser = new FatArtifactTraverser();
session.setDependencyTraverser( depTraverser );
- DependencyManager depManager = new ClassicDependencyManager();
+ DependencyManager depManager = new TransitiveDependencyManager();
session.setDependencyManager( depManager );
DependencySelector depFilter = new AndDependencySelector( new ScopeDependencySelector( "test", "provided" ),