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/21 23:23:03 UTC
[1/7] maven git commit: [MNG-3705] added maven-project-utils to
dependencies graph [Forced Update!]
Repository: maven
Updated Branches:
refs/heads/MNG-6006 c123ba8ef -> 43cd84df6 (forced update)
[MNG-3705] added maven-project-utils to dependencies graph
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/d4d7f476
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/d4d7f476
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/d4d7f476
Branch: refs/heads/MNG-6006
Commit: d4d7f4763f34e2c23e590ce02551943a1cad84e5
Parents: 70e824b
Author: Herv� Boutemy <hb...@apache.org>
Authored: Mon Jun 20 18:56:03 2016 +0200
Committer: Herv� Boutemy <hb...@apache.org>
Committed: Mon Jun 20 18:56:03 2016 +0200
----------------------------------------------------------------------
src/site/resources/images/maven-deps.png | Bin 74014 -> 75522 bytes
src/site/xdoc/index.xml | 5 +++--
src/site/xdoc/maven-deps.odg | Bin 33675 -> 34309 bytes
3 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/d4d7f476/src/site/resources/images/maven-deps.png
----------------------------------------------------------------------
diff --git a/src/site/resources/images/maven-deps.png b/src/site/resources/images/maven-deps.png
index 6f5d6db..f18688d 100644
Binary files a/src/site/resources/images/maven-deps.png and b/src/site/resources/images/maven-deps.png differ
http://git-wip-us.apache.org/repos/asf/maven/blob/d4d7f476/src/site/xdoc/index.xml
----------------------------------------------------------------------
diff --git a/src/site/xdoc/index.xml b/src/site/xdoc/index.xml
index 5e97077..a1a7f73 100644
--- a/src/site/xdoc/index.xml
+++ b/src/site/xdoc/index.xml
@@ -57,8 +57,9 @@
<area shape="rect" coords="409,342,500,378" alt="maven-model" href="maven-model/" />
<area shape="rect" coords="88,59,192,94" alt="slf4j-api" href="http://www.slf4j.org/manual.html" />
<area shape="rect" coords="551,58,707,94" alt="commons-cli" href="http://commons.apache.org/cli/" />
- <area shape="rect" coords="109,175,192,212" alt="jansi" href="http://fusesource.github.io/jansi/" />
- <area shape="rect" coords="1,175,83,212" alt="jansi-native" href="https://github.com/fusesource/jansi-native" />
+ <area shape="rect" coords="88,175,205,211" alt="maven-project-utils" href="https://maven.apache.org/shared/maven-shared-utils/" />
+ <area shape="rect" coords="0,176,70,211" alt="jansi" href="http://fusesource.github.io/jansi/" />
+ <area shape="rect" coords="0,229,71,266" alt="jansi-native" href="https://github.com/fusesource/jansi-native" />
<area shape="rect" coords="551,116,739,152" alt="wagon-provider-api" href="https://maven.apache.org/wagon/wagon-provider-api/" />
<area shape="rect" coords="550,175,690,211" alt="plexus-sec-dispatcher" href="https://github.com/codehaus-plexus/plexus-sec-dispatcher" />
<area shape="rect" coords="581,230,660,265" alt="plexus-cipher" href="https://github.com/codehaus-plexus/plexus-cipher" />
http://git-wip-us.apache.org/repos/asf/maven/blob/d4d7f476/src/site/xdoc/maven-deps.odg
----------------------------------------------------------------------
diff --git a/src/site/xdoc/maven-deps.odg b/src/site/xdoc/maven-deps.odg
index 533eaa7..a14e6fc 100644
Binary files a/src/site/xdoc/maven-deps.odg and b/src/site/xdoc/maven-deps.odg differ
[2/7] maven git commit: [MNG-3507] activate color (since not done by
AnsiUtils)
Posted by sc...@apache.org.
[MNG-3507] activate color (since not done by AnsiUtils)
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/a04ba941
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/a04ba941
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/a04ba941
Branch: refs/heads/MNG-6006
Commit: a04ba941d891fa4674f18668b3d83ecde7d035f4
Parents: d4d7f47
Author: Herv� Boutemy <hb...@apache.org>
Authored: Tue Jun 21 08:29:49 2016 +0200
Committer: Herv� Boutemy <hb...@apache.org>
Committed: Tue Jun 21 08:29:49 2016 +0200
----------------------------------------------------------------------
maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/a04ba941/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
----------------------------------------------------------------------
diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java b/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
index fd0a81a..a0e09f2 100644
--- a/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
+++ b/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
@@ -212,6 +212,7 @@ public class MavenCli
MavenCli cli = new MavenCli();
AnsiUtils.systemInstall();
+ AnsiUtils.setEnabled( true ); // activate colors by default: will be deactivated later if necessary
int result = cli.doMain( new CliRequest( args, classWorld ) );
AnsiUtils.systemUninstall();
[5/7] maven git commit: [MNG-5527] Relocation does not work for
imported poms
Posted by sc...@apache.org.
[MNG-5527] Relocation does not work for imported poms
o Updated to improve error message when building an import POM fails.
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/de817fd8
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/de817fd8
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/de817fd8
Branch: refs/heads/MNG-6006
Commit: de817fd82253c6191b02044e33795acf4ff076d9
Parents: d3761d4
Author: Christian Schulte <sc...@apache.org>
Authored: Wed Jun 22 01:21:00 2016 +0200
Committer: Christian Schulte <sc...@apache.org>
Committed: Wed Jun 22 01:21:00 2016 +0200
----------------------------------------------------------------------
.../model/building/DefaultModelBuilder.java | 26 +++++++++++++++++---
1 file changed, 23 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/de817fd8/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
----------------------------------------------------------------------
diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java b/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
index 87b6a96..06ee1fa 100644
--- a/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
+++ b/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
@@ -1510,10 +1510,11 @@ public class DefaultModelBuilder
return importModel;
}
}
- catch ( UnresolvableModelException e )
+ catch ( final UnresolvableModelException e )
{
- StringBuilder buffer = new StringBuilder( 256 );
+ final StringBuilder buffer = new StringBuilder( 256 );
buffer.append( "Non-resolvable " + dependency.getScope() + " POM" );
+
if ( !containsCoordinates( e.getMessage(), dependency.getGroupId(), dependency.getArtifactId(),
dependency.getVersion() ) )
{
@@ -1521,6 +1522,7 @@ public class DefaultModelBuilder
dependency.getGroupId(), dependency.getArtifactId(), dependency.getVersion() ) );
}
+
buffer.append( ": " ).append( e.getMessage() );
problems.add( new ModelProblemCollectorRequest( Severity.ERROR, Version.BASE ).
@@ -1529,8 +1531,26 @@ public class DefaultModelBuilder
setException( e ) );
}
- catch ( ModelBuildingException e )
+ catch ( final ModelBuildingException e )
{
+ final StringBuilder buffer = new StringBuilder( 256 );
+ buffer.append( "Failure building " + dependency.getScope() + " POM" );
+
+ if ( !containsCoordinates( e.getMessage(), dependency.getGroupId(), dependency.getArtifactId(),
+ dependency.getVersion() ) )
+ {
+ buffer.append( ' ' ).append( ModelProblemUtils.toId(
+ dependency.getGroupId(), dependency.getArtifactId(), dependency.getVersion() ) );
+
+ }
+
+ buffer.append( ": " ).append( e.getMessage() );
+
+ problems.add( new ModelProblemCollectorRequest( Severity.ERROR, Version.BASE ).
+ setMessage( buffer.toString() ).
+ setLocation( dependency.getLocation( "" ) ).
+ setException( e ) );
+
problems.addAll( e.getProblems() );
}
[4/7] maven git commit: [MNG-5527] Relocation does not work for
imported poms
Posted by sc...@apache.org.
[MNG-5527] Relocation does not work for imported poms
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/d3761d46
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/d3761d46
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/d3761d46
Branch: refs/heads/MNG-6006
Commit: d3761d46551e2eb8e29d476b4ae52fcf4ab3d4bc
Parents: c6fb60b
Author: Christian Schulte <sc...@apache.org>
Authored: Tue Jun 21 21:35:40 2016 +0200
Committer: Christian Schulte <sc...@apache.org>
Committed: Tue Jun 21 21:35:40 2016 +0200
----------------------------------------------------------------------
.../model/building/DefaultModelBuilder.java | 173 +++++++++++--------
1 file changed, 105 insertions(+), 68 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/d3761d46/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
----------------------------------------------------------------------
diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java b/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
index 5970dc4..87b6a96 100644
--- a/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
+++ b/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
@@ -1275,8 +1275,6 @@ public class DefaultModelBuilder
final WorkspaceModelResolver workspaceResolver = request.getWorkspaceModelResolver();
final ModelResolver modelResolver = request.getModelResolver();
- ModelBuildingRequest importRequest = null;
-
List<DependencyManagement> importMngts = null;
for ( Iterator<Dependency> it = depMngt.getDependencies().iterator(); it.hasNext(); )
@@ -1370,78 +1368,15 @@ public class DefaultModelBuilder
}
}
- // no workspace resolver or workspace resolver returned null (i.e. model not in workspace)
if ( importModel == null )
{
- final ModelSource importSource;
- try
- {
- dependency = dependency.clone();
- importSource = modelResolver.resolveModel( dependency );
- final String resolvedId =
- dependency.getGroupId() + ':' + dependency.getArtifactId() + ':'
- + dependency.getVersion();
-
- if ( !imported.equals( resolvedId ) && importIds.contains( resolvedId ) )
- {
- // A version range has been resolved to a cycle.
- String message = "The dependencies of type=pom and scope=" + scope + " form a cycle: ";
- for ( String modelId : importIds )
- {
- message += modelId + " -> ";
- }
- message += resolvedId;
- problems.add( new ModelProblemCollectorRequest( Severity.ERROR, Version.BASE ).
- setMessage( message ) );
-
- continue;
- }
- }
- catch ( UnresolvableModelException e )
- {
- StringBuilder buffer = new StringBuilder( 256 );
- buffer.append( "Non-resolvable " + scope + " POM" );
- if ( !containsCoordinates( e.getMessage(), groupId, artifactId, version ) )
- {
- buffer.append( ' ' ).append( ModelProblemUtils.toId( groupId, artifactId, version ) );
- }
- buffer.append( ": " ).append( e.getMessage() );
-
- problems.add( new ModelProblemCollectorRequest( Severity.ERROR, Version.BASE ).
- setMessage( buffer.toString() ).
- setLocation( dependency.getLocation( "" ) ).
- setException( e ) );
-
- continue;
- }
+ // no workspace resolver or workspace resolver returned null (i.e. model not in workspace)
+ importModel = this.buildImportModelFromRepository( request, dependency, importIds, problems );
- if ( importRequest == null )
+ if ( importModel == null )
{
- importRequest = new DefaultModelBuildingRequest();
- importRequest.setValidationLevel( ModelBuildingRequest.VALIDATION_LEVEL_MINIMAL );
- importRequest.setModelCache( request.getModelCache() );
- importRequest.setSystemProperties( request.getSystemProperties() );
- importRequest.setUserProperties( request.getUserProperties() );
- importRequest.setLocationTracking( request.isLocationTracking() );
- }
-
- importRequest.setModelSource( importSource );
- importRequest.setModelResolver( modelResolver.newCopy() );
-
- final ModelBuildingResult importResult;
- try
- {
- importResult = build( importRequest );
- }
- catch ( ModelBuildingException e )
- {
- problems.addAll( e.getProblems() );
continue;
}
-
- problems.addAll( importResult.getProblems() );
-
- importModel = importResult.getEffectiveModel();
}
importMngt = importModel.getDependencyManagement() != null
@@ -1500,6 +1435,108 @@ public class DefaultModelBuilder
}
}
+ private Model buildImportModelFromRepository( final ModelBuildingRequest targetModelBuildingRequest,
+ final Dependency dependency, final Collection<String> importIds,
+ final DefaultModelProblemCollector problems )
+ {
+ try
+ {
+ final String imported =
+ String.format( "%s:%s:%s", dependency.getGroupId(), dependency.getArtifactId(),
+ dependency.getVersion() );
+
+ final Dependency resolvedDependency = dependency.clone();
+ final ModelSource importSource =
+ targetModelBuildingRequest.getModelResolver().resolveModel( resolvedDependency );
+
+ final String resolvedId =
+ String.format( "%s:%s:%s", resolvedDependency.getGroupId(), resolvedDependency.getArtifactId(),
+ resolvedDependency.getVersion() );
+
+ if ( !imported.equals( resolvedId ) && importIds.contains( resolvedId ) )
+ {
+ // A version range has been resolved to a cycle.
+ String message = "The dependencies of type=pom and scope=" + dependency.getScope() + " form a cycle: ";
+ for ( String modelId : importIds )
+ {
+ message += modelId + " -> ";
+ }
+ message += resolvedId;
+ problems.add( new ModelProblemCollectorRequest( Severity.ERROR, Version.BASE ).setMessage( message ) );
+ }
+ else
+ {
+ final ModelBuildingRequest importRequest = new DefaultModelBuildingRequest();
+ importRequest.setValidationLevel( ModelBuildingRequest.VALIDATION_LEVEL_MINIMAL );
+ importRequest.setModelCache( targetModelBuildingRequest.getModelCache() );
+ importRequest.setSystemProperties( targetModelBuildingRequest.getSystemProperties() );
+ importRequest.setUserProperties( targetModelBuildingRequest.getUserProperties() );
+ importRequest.setLocationTracking( targetModelBuildingRequest.isLocationTracking() );
+ importRequest.setModelSource( importSource );
+ importRequest.setModelResolver( targetModelBuildingRequest.getModelResolver().newCopy() );
+
+ final ModelBuildingResult importResult = build( importRequest );
+ problems.addAll( importResult.getProblems() );
+
+ Model importModel = importResult.getEffectiveModel();
+
+ if ( importModel.getDistributionManagement() != null
+ && importModel.getDistributionManagement().getRelocation() != null )
+ {
+ final Dependency relocated = dependency.clone();
+ relocated.setGroupId( importModel.getDistributionManagement().getRelocation().getGroupId() );
+ relocated.setArtifactId( importModel.getDistributionManagement().getRelocation().getArtifactId() );
+ relocated.setVersion( importModel.getDistributionManagement().getRelocation().getVersion() );
+
+ String message = String.format(
+ "The dependency of type='%s' and scope='%s' has been relocated to '%s:%s:%s'",
+ dependency.getType(), dependency.getScope(), relocated.getGroupId(),
+ relocated.getArtifactId(), relocated.getVersion() );
+
+ if ( importModel.getDistributionManagement().getRelocation().getMessage() != null )
+ {
+ message += ". " + importModel.getDistributionManagement().getRelocation().getMessage();
+ }
+
+ problems.add( new ModelProblemCollectorRequest( Severity.WARNING, Version.BASE ).
+ setMessage( message ).
+ setLocation( importModel.getDistributionManagement().getRelocation().getLocation( "" ) ) );
+
+ importModel = this.buildImportModelFromRepository(
+ targetModelBuildingRequest, relocated, importIds, problems );
+
+ }
+
+ return importModel;
+ }
+ }
+ catch ( UnresolvableModelException e )
+ {
+ StringBuilder buffer = new StringBuilder( 256 );
+ buffer.append( "Non-resolvable " + dependency.getScope() + " POM" );
+ if ( !containsCoordinates( e.getMessage(), dependency.getGroupId(), dependency.getArtifactId(),
+ dependency.getVersion() ) )
+ {
+ buffer.append( ' ' ).append( ModelProblemUtils.toId(
+ dependency.getGroupId(), dependency.getArtifactId(), dependency.getVersion() ) );
+
+ }
+ buffer.append( ": " ).append( e.getMessage() );
+
+ problems.add( new ModelProblemCollectorRequest( Severity.ERROR, Version.BASE ).
+ setMessage( buffer.toString() ).
+ setLocation( dependency.getLocation( "" ) ).
+ setException( e ) );
+
+ }
+ catch ( ModelBuildingException e )
+ {
+ problems.addAll( e.getProblems() );
+ }
+
+ return null;
+ }
+
private <T> void putCache( ModelCache modelCache, String groupId, String artifactId, String version,
ModelCacheTag<T> tag, T data )
{
[7/7] 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/43cd84df
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/43cd84df
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/43cd84df
Branch: refs/heads/MNG-6006
Commit: 43cd84df631c01e81e55609cda6becbb0da1e585
Parents: 01dbf4f
Author: Christian Schulte <sc...@apache.org>
Authored: Fri Jun 10 16:55:30 2016 +0200
Committer: Christian Schulte <sc...@apache.org>
Committed: Wed Jun 22 01:22:18 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/43cd84df/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/43cd84df/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" ),
[6/7] 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/01dbf4fd
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/01dbf4fd
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/01dbf4fd
Branch: refs/heads/MNG-6006
Commit: 01dbf4fdec7cd9877604b790968cdb0a277480bc
Parents: de817fd
Author: Christian Schulte <sc...@apache.org>
Authored: Fri Jun 10 16:50:33 2016 +0200
Committer: Christian Schulte <sc...@apache.org>
Committed: Wed Jun 22 01:22:18 2016 +0200
----------------------------------------------------------------------
apache-maven/pom.xml | 4 ++--
maven-aether-provider/pom.xml | 12 ++++++------
maven-compat/pom.xml | 4 ++--
maven-core/pom.xml | 6 +++---
pom.xml | 14 +++++++-------
5 files changed, 20 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/01dbf4fd/apache-maven/pom.xml
----------------------------------------------------------------------
diff --git a/apache-maven/pom.xml b/apache-maven/pom.xml
index 37751cc..3f8a05a 100644
--- a/apache-maven/pom.xml
+++ b/apache-maven/pom.xml
@@ -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/01dbf4fd/maven-aether-provider/pom.xml
----------------------------------------------------------------------
diff --git a/maven-aether-provider/pom.xml b/maven-aether-provider/pom.xml
index 6306d4f..e6fd8f4 100644
--- a/maven-aether-provider/pom.xml
+++ b/maven-aether-provider/pom.xml
@@ -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>
@@ -88,12 +88,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/01dbf4fd/maven-compat/pom.xml
----------------------------------------------------------------------
diff --git a/maven-compat/pom.xml b/maven-compat/pom.xml
index f828d6e..6ca061e 100644
--- a/maven-compat/pom.xml
+++ b/maven-compat/pom.xml
@@ -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/01dbf4fd/maven-core/pom.xml
----------------------------------------------------------------------
diff --git a/maven-core/pom.xml b/maven-core/pom.xml
index f03eead..640758d 100644
--- a/maven-core/pom.xml
+++ b/maven-core/pom.xml
@@ -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/01dbf4fd/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 2547ed5..e542de2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -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/7] maven git commit: [MNG-3705] fixed mojo execution id color
display
Posted by sc...@apache.org.
[MNG-3705] fixed mojo execution id color display
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/c6fb60b5
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/c6fb60b5
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/c6fb60b5
Branch: refs/heads/MNG-6006
Commit: c6fb60b5482a12e3f94b74cd050ba46eddaa2423
Parents: a04ba94
Author: Herv� Boutemy <hb...@apache.org>
Authored: Tue Jun 21 08:36:12 2016 +0200
Committer: Herv� Boutemy <hb...@apache.org>
Committed: Tue Jun 21 08:36:12 2016 +0200
----------------------------------------------------------------------
.../main/java/org/apache/maven/cli/event/ExecutionEventLogger.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/c6fb60b5/maven-embedder/src/main/java/org/apache/maven/cli/event/ExecutionEventLogger.java
----------------------------------------------------------------------
diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/event/ExecutionEventLogger.java b/maven-embedder/src/main/java/org/apache/maven/cli/event/ExecutionEventLogger.java
index 9b3bad4..911f605 100644
--- a/maven-embedder/src/main/java/org/apache/maven/cli/event/ExecutionEventLogger.java
+++ b/maven-embedder/src/main/java/org/apache/maven/cli/event/ExecutionEventLogger.java
@@ -343,7 +343,7 @@ public class ExecutionEventLogger
ansi.a( ':' ).a( me.getGoal() ).reset();
if ( me.getExecutionId() != null )
{
- ansi.strong( " (" ).a( me.getExecutionId() ).a( ')' );
+ ansi.strong().a( " (" ).a( me.getExecutionId() ).a( ')' ).reset();
}
}