from:"schulte"

svn commit: r1719038 - /maven/pom/trunk/maven/pom.xml

2015-12-10 Thread schulte

Author: schulte
Date: Thu Dec 10 09:39:15 2015
New Revision: 1719038

URL: http://svn.apache.org/viewvc?rev=1719038=rev
Log:
Updated to add 'Christian Schulte' to the list of committers.


Modified:
maven/pom/trunk/maven/pom.xml

Modified: maven/pom/trunk/maven/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/pom/trunk/maven/pom.xml?rev=1719038=1719037=1719038=diff
==
--- maven/pom/trunk/maven/pom.xml (original)
+++ maven/pom/trunk/maven/pom.xml Thu Dec 10 09:39:15 2015
@@ -494,6 +494,15 @@ under the License.
   +1
 
 
+  schulte
+  Christian Schulte
+  schu...@apache.org
+  
+Committer
+  
+  Europe/Berlin
+
+
   simonetripodi
   Simone Tripodi
   simonetrip...@apache.org

maven git commit: [MNG-5629] ClosedChannelException from DefaultUpdateCheckManager.read

2015-12-11 Thread schulte

Repository: maven
Updated Branches:
  refs/heads/master 7cd7bd864 -> 792a9b8ea


[MNG-5629] ClosedChannelException from DefaultUpdateCheckManager.read

o Updated to support shrinking of tracking files.


Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/792a9b8e
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/792a9b8e
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/792a9b8e

Branch: refs/heads/master
Commit: 792a9b8eaae2345b6dd0429d8b90d0358f48fa24
Parents: 7cd7bd8
Author: Christian Schulte <schu...@apache.org>
Authored: Fri Dec 11 22:36:27 2015 +0100
Committer: Christian Schulte <schu...@apache.org>
Committed: Fri Dec 11 22:36:27 2015 +0100

--
 .../apache/maven/repository/legacy/DefaultUpdateCheckManager.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/792a9b8e/maven-compat/src/main/java/org/apache/maven/repository/legacy/DefaultUpdateCheckManager.java
--
diff --git 
a/maven-compat/src/main/java/org/apache/maven/repository/legacy/DefaultUpdateCheckManager.java
 
b/maven-compat/src/main/java/org/apache/maven/repository/legacy/DefaultUpdateCheckManager.java
index 2c26f71..4839d68 100644
--- 
a/maven-compat/src/main/java/org/apache/maven/repository/legacy/DefaultUpdateCheckManager.java
+++ 
b/maven-compat/src/main/java/org/apache/maven/repository/legacy/DefaultUpdateCheckManager.java
@@ -259,7 +259,7 @@ public class DefaultUpdateCheckManager
 }
 
 getLogger().debug( "Writing resolution-state to: " + touchfile 
);
-channel.position( 0 );
+channel.truncate( 0 );
 props.store( Channels.newOutputStream( channel ), "Last 
modified on: " + new Date() );
 
 lock.release();

maven git commit: Updated to ensure collections are immutable consistently.

2015-12-13 Thread schulte

Repository: maven
Updated Branches:
  refs/heads/master ab130cf9f -> c7e9e4489


Updated to ensure collections are immutable consistently.


Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/c7e9e448
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/c7e9e448
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/c7e9e448

Branch: refs/heads/master
Commit: c7e9e44893c2938cbb8026d01fbeff51d7f825f7
Parents: ab130cf
Author: Christian Schulte <schu...@apache.org>
Authored: Mon Dec 14 05:51:40 2015 +0100
Committer: Christian Schulte <schu...@apache.org>
Committed: Mon Dec 14 05:51:40 2015 +0100

--
 .../apache/maven/artifact/DefaultArtifact.java  |  2 +-
 .../maven/artifact/versioning/VersionRange.java |  2 +-
 .../repository/DefaultArtifactRepository.java   |  2 +-
 .../repository/MetadataResolutionResult.java| 27 ++--
 .../repository/MavenArtifactRepository.java |  2 +-
 .../resolver/ArtifactResolutionResult.java  | 27 ++--
 .../maven/artifact/resolver/ResolutionNode.java |  1 +
 .../maven/exception/ExceptionSummary.java   |  5 +++-
 .../execution/DefaultMavenExecutionResult.java  |  6 +++--
 .../maven/lifecycle/internal/MojoExecutor.java  | 18 +++--
 .../internal/DefaultMavenPluginManager.java |  2 +-
 .../prefix/DefaultPluginPrefixRequest.java  |  4 +--
 .../version/DefaultPluginVersionRequest.java|  2 +-
 .../DefaultDependencyResolutionResult.java  |  5 +++-
 .../maven/project/DefaultProjectRealmCache.java |  4 ++-
 .../org/apache/maven/project/MavenProject.java  | 19 +++---
 .../maven/project/artifact/ProjectArtifact.java |  5 +++-
 .../java/org/apache/maven/cli/MavenCli.java |  4 ++-
 .../model/building/ModelBuildingException.java  |  2 +-
 19 files changed, 89 insertions(+), 50 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/c7e9e448/maven-artifact/src/main/java/org/apache/maven/artifact/DefaultArtifact.java
--
diff --git 
a/maven-artifact/src/main/java/org/apache/maven/artifact/DefaultArtifact.java 
b/maven-artifact/src/main/java/org/apache/maven/artifact/DefaultArtifact.java
index 147e88e..675f1d9 100644
--- 
a/maven-artifact/src/main/java/org/apache/maven/artifact/DefaultArtifact.java
+++ 
b/maven-artifact/src/main/java/org/apache/maven/artifact/DefaultArtifact.java
@@ -272,7 +272,7 @@ public class DefaultArtifact
 return Collections.emptyList();
 }
 
-return metadataMap.values();
+return Collections.unmodifiableCollection( metadataMap.values() );
 }
 
 // --

http://git-wip-us.apache.org/repos/asf/maven/blob/c7e9e448/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/VersionRange.java
--
diff --git 
a/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/VersionRange.java
 
b/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/VersionRange.java
index 0d094ef..7ee854f 100644
--- 
a/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/VersionRange.java
+++ 
b/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/VersionRange.java
@@ -261,7 +261,7 @@ public class VersionRange
 }
 else
 {
-restrictions = intersection( r1, r2 );
+restrictions = Collections.unmodifiableList( intersection( r1, r2 
) );
 }
 
 ArtifactVersion version = null;

http://git-wip-us.apache.org/repos/asf/maven/blob/c7e9e448/maven-compat/src/main/java/org/apache/maven/artifact/repository/DefaultArtifactRepository.java
--
diff --git 
a/maven-compat/src/main/java/org/apache/maven/artifact/repository/DefaultArtifactRepository.java
 
b/maven-compat/src/main/java/org/apache/maven/artifact/repository/DefaultArtifactRepository.java
index e0a5587..34d4222 100644
--- 
a/maven-compat/src/main/java/org/apache/maven/artifact/repository/DefaultArtifactRepository.java
+++ 
b/maven-compat/src/main/java/org/apache/maven/artifact/repository/DefaultArtifactRepository.java
@@ -256,7 +256,7 @@ public class DefaultArtifactRepository
 {
 if ( mirroredRepositories != null )
 {
-this.mirroredRepositories = mirroredRepositories;
+this.mirroredRepositories = Collections.unmodifiableList( 
mirroredRepositories );
 }
 else
 {

http://git-wip-us.apache.org/repos/asf/maven/blob/c7e9e448/maven-compat/src/main/java/org/apache/maven/repository/MetadataResolutionResult.java

maven git commit: [MNG-2199] Support version ranges in parent elements

2015-12-13 Thread schulte

Repository: maven
Updated Branches:
  refs/heads/master 20b741691 -> 893efe3a9


[MNG-2199] Support version ranges in parent elements

o Updated to make local and remote parent model resolution consistent.
  'MavenProject.getParentArtifact()' now returns the same artifact
  no matter where the parent has been read from and the 'ModelBuilder'
  will disallow empty versions and version expressions in local child
  modules when using parent version ranges the same way as is done
  for remote parent models.
o Added test cases to 'maven-core' testing parent version range
  resolution for local and remote parent models.


Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/893efe3a
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/893efe3a
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/893efe3a

Branch: refs/heads/master
Commit: 893efe3a9c49952d916b0eac66973581cd2702cd
Parents: 20b7416
Author: Christian Schulte <schu...@apache.org>
Authored: Sun Dec 13 15:55:21 2015 +0100
Committer: Christian Schulte <schu...@apache.org>
Committed: Sun Dec 13 16:04:58 2015 +0100

--
 .../maven/project/DefaultProjectBuilder.java|  30 -
 .../project/DefaultProjectBuildingRequest.java  |   2 -
 .../maven/project/ProjectBuildingRequest.java   |   2 -
 .../project/AbstractMavenProjectTestCase.java   |  11 ++
 .../project/DefaultMavenProjectBuilderTest.java | 130 +++
 .../repository/TestRepositoryConnector.java |  38 ++
 .../org/apache/apache/1/apache-1.pom|  82 
 .../org/apache/apache/maven-metadata.xml|  13 ++
 .../pom.xml |  12 ++
 .../pom.xml |  11 ++
 .../parent-version-range-external-valid/pom.xml |  11 ++
 .../child/pom.xml   |  12 ++
 .../pom.xml |   7 +
 .../child/pom.xml   |  11 ++
 .../pom.xml |   7 +
 .../child/pom.xml   |  11 ++
 .../parent-version-range-local-valid/pom.xml|   7 +
 .../model/building/DefaultModelBuilder.java |  28 +++-
 18 files changed, 411 insertions(+), 14 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/893efe3a/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java
--
diff --git 
a/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java 
b/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java
index 5c8e707..e29efa4 100644
--- 
a/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java
+++ 
b/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java
@@ -43,7 +43,6 @@ import org.apache.maven.model.DependencyManagement;
 import org.apache.maven.model.DeploymentRepository;
 import org.apache.maven.model.Extension;
 import org.apache.maven.model.Model;
-import org.apache.maven.model.Parent;
 import org.apache.maven.model.Plugin;
 import org.apache.maven.model.Profile;
 import org.apache.maven.model.ReportPlugin;
@@ -613,11 +612,32 @@ public class DefaultProjectBuilder
 project.setModel( model );
 project.setOriginalModel( result.getRawModel() );
 project.setFile( model.getPomFile() );
-Parent p = model.getParent();
-if ( p != null )
+
+Model parentModel = null;
+if ( !result.getModelIds().get( 1 ).isEmpty() )
+{
+// Note: The parent model already got resolved by the ModelBuilder 
based on model.getParent().
+parentModel = result.getRawModel( result.getModelIds().get( 1 ) );
+}
+
+if ( parentModel != null )
 {
-project.setParentArtifact( repositorySystem.createProjectArtifact( 
p.getGroupId(), p.getArtifactId(),
-   
p.getVersion() ) );
+String parentGroupId = parentModel.getGroupId();
+if ( parentGroupId == null && parentModel.getParent() != null )
+{
+parentGroupId = parentModel.getParent().getGroupId();
+}
+
+String parentVersion = parentModel.getVersion();
+if ( parentVersion == null && parentModel.getParent() != null )
+{
+parentVersion = parentModel.getParent().getVersion();
+}
+
+project.setParentArtifact( repositorySystem.createProjectArtifact( 
parentGroupId,
+   
parentModel.getArtifactId(),
+

maven-integration-testing git commit: [MNG-2199] Support version ranges in parent elements

2015-12-13 Thread schulte

Repository: maven-integration-testing
Updated Branches:
  refs/heads/master 30ecf2e07 -> ed5ffbe5a


[MNG-2199] Support version ranges in parent elements

o Updated an incorrect test case. The project was invalid
  but the corresponding validation was missing in Maven.


Project: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/repo
Commit: 
http://git-wip-us.apache.org/repos/asf/maven-integration-testing/commit/ed5ffbe5
Tree: 
http://git-wip-us.apache.org/repos/asf/maven-integration-testing/tree/ed5ffbe5
Diff: 
http://git-wip-us.apache.org/repos/asf/maven-integration-testing/diff/ed5ffbe5

Branch: refs/heads/master
Commit: ed5ffbe5afc0be21f750f8cb8c95b6e9a3f3bd0c
Parents: 30ecf2e
Author: Christian Schulte <schu...@apache.org>
Authored: Sun Dec 13 17:10:11 2015 +0100
Committer: Christian Schulte <schu...@apache.org>
Committed: Sun Dec 13 17:10:11 2015 +0100

--
 .../mng-2199-parent-version-range/local-parent/module/pom.xml  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/ed5ffbe5/core-it-suite/src/test/resources/mng-2199-parent-version-range/local-parent/module/pom.xml
--
diff --git 
a/core-it-suite/src/test/resources/mng-2199-parent-version-range/local-parent/module/pom.xml
 
b/core-it-suite/src/test/resources/mng-2199-parent-version-range/local-parent/module/pom.xml
index 85769ce..fc6931c 100644
--- 
a/core-it-suite/src/test/resources/mng-2199-parent-version-range/local-parent/module/pom.xml
+++ 
b/core-it-suite/src/test/resources/mng-2199-parent-version-range/local-parent/module/pom.xml
@@ -9,5 +9,5 @@
   
 
   local-parent-module
-
+  1

svn commit: r1719676 - in /maven/doxia/doxia/trunk: doxia-core/src/main/java/org/apache/maven/doxia/parser/ doxia-core/src/main/java/org/apache/maven/doxia/sink/ doxia-core/src/test/java/org/apache/ma

2015-12-12 Thread schulte

Author: schulte
Date: Sat Dec 12 12:36:57 2015
New Revision: 1719676

URL: http://svn.apache.org/viewvc?rev=1719676=rev
Log:
[DOXIA-532] Updated handling of comments.

o Updated to process comments as is without any trimming or addition of 
whitespace.


Modified:

maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/parser/AbstractXmlParser.java

maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/parser/XhtmlBaseParser.java

maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/sink/XhtmlBaseSink.java

maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/sink/XhtmlBaseSinkTest.java

maven/doxia/doxia/trunk/doxia-modules/doxia-module-apt/src/main/java/org/apache/maven/doxia/module/apt/AptParser.java

maven/doxia/doxia/trunk/doxia-modules/doxia-module-apt/src/main/java/org/apache/maven/doxia/module/apt/AptSink.java

maven/doxia/doxia/trunk/doxia-modules/doxia-module-apt/src/test/java/org/apache/maven/doxia/module/apt/AptSinkTest.java

maven/doxia/doxia/trunk/doxia-modules/doxia-module-docbook-simple/src/main/java/org/apache/maven/doxia/module/docbook/DocBookParser.java

maven/doxia/doxia/trunk/doxia-modules/doxia-module-docbook-simple/src/main/java/org/apache/maven/doxia/module/docbook/DocBookSink.java

maven/doxia/doxia/trunk/doxia-modules/doxia-module-docbook-simple/src/test/java/org/apache/maven/doxia/module/docbook/DocBookSinkTest.java

maven/doxia/doxia/trunk/doxia-modules/doxia-module-fml/src/main/java/org/apache/maven/doxia/module/fml/FmlParser.java

maven/doxia/doxia/trunk/doxia-modules/doxia-module-fo/src/main/java/org/apache/maven/doxia/module/fo/FoSink.java

maven/doxia/doxia/trunk/doxia-modules/doxia-module-fo/src/test/java/org/apache/maven/doxia/module/fo/FoSinkTest.java

maven/doxia/doxia/trunk/doxia-modules/doxia-module-latex/src/main/java/org/apache/maven/doxia/module/latex/LatexSink.java

maven/doxia/doxia/trunk/doxia-modules/doxia-module-latex/src/test/java/org/apache/maven/doxia/module/latex/LatexSinkTest.java

maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/src/test/java/org/apache/maven/doxia/module/xdoc/XdocSinkTest.java

maven/doxia/doxia/trunk/doxia-modules/doxia-module-xhtml/src/test/java/org/apache/maven/doxia/module/xhtml/XhtmlSinkTest.java

Modified: 
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/parser/AbstractXmlParser.java
URL: 
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/parser/AbstractXmlParser.java?rev=1719676=1719675=1719676=diff
==
--- 
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/parser/AbstractXmlParser.java
 (original)
+++ 
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/parser/AbstractXmlParser.java
 Sat Dec 12 12:36:57 2015
@@ -371,7 +371,7 @@ public abstract class AbstractXmlParser
 protected void handleComment( XmlPullParser parser, Sink sink )
 throws XmlPullParserException
 {
-sink.comment( getText( parser ).trim() );
+sink.comment( getText( parser ) );
 }
 
 /**

Modified: 
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/parser/XhtmlBaseParser.java
URL: 
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/parser/XhtmlBaseParser.java?rev=1719676=1719675=1719676=diff
==
--- 
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/parser/XhtmlBaseParser.java
 (original)
+++ 
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/parser/XhtmlBaseParser.java
 Sat Dec 12 12:36:57 2015
@@ -789,9 +789,9 @@ public class XhtmlBaseParser
 protected void handleComment( XmlPullParser parser, Sink sink )
 throws XmlPullParserException
 {
-String text = getText( parser ).trim();
+String text = getText( parser );
 
-if ( "PB".equals( text ) )
+if ( "PB".equals( text.trim() ) )
 {
 sink.pageBreak();
 }

Modified: 
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/sink/XhtmlBaseSink.java
URL: 
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/sink/XhtmlBaseSink.java?rev=1719676=1719675=1719676=diff
==
--- 
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/sink/XhtmlBaseSink.java
 (original)
+++ 
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/sink/XhtmlBaseSink.java
 Sat Dec 12 12:36:57 2015
@@ -1779,7 +1779,7 @@ public class XhtmlBaseSink
 @Override
 public void pageBreak()
 {
-comment( "PB&q

svn commit: r1719653 - in /maven/doxia/doxia/trunk: doxia-core/src/main/java/org/apache/maven/doxia/markup/ doxia-core/src/main/java/org/apache/maven/doxia/parser/ doxia-core/src/main/java/org/apache/

2015-12-12 Thread schulte

Author: schulte
Date: Sat Dec 12 11:23:49 2015
New Revision: 1719653

URL: http://svn.apache.org/viewvc?rev=1719653=rev
Log:
[DOXIA-532] Support for server side includes.

o Reverted last commit. See 
http://mail-archives.apache.org/mod_mbox/maven-dev/201512.mbox/%3C2693618.GQqBs1V6AS%40herve-desktop%3E


Modified:

maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/markup/Markup.java

maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/parser/AbstractXmlParser.java

maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/sink/RandomAccessSink.java

maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/sink/SinkAdapter.java

maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/sink/XhtmlBaseSink.java

maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/parser/XhtmlBaseParserTest.java

maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/sink/SinkEventTestingSink.java

maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/sink/TextSink.java

maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/sink/WellformednessCheckingSink.java

maven/doxia/doxia/trunk/doxia-modules/doxia-module-apt/src/main/java/org/apache/maven/doxia/module/apt/AptParser.java

maven/doxia/doxia/trunk/doxia-modules/doxia-module-apt/src/main/java/org/apache/maven/doxia/module/apt/AptSink.java

maven/doxia/doxia/trunk/doxia-modules/doxia-module-apt/src/test/java/org/apache/maven/doxia/module/apt/AptParserTest.java

maven/doxia/doxia/trunk/doxia-modules/doxia-module-apt/src/test/resources/test/comments.apt

maven/doxia/doxia/trunk/doxia-modules/doxia-module-docbook-simple/src/main/java/org/apache/maven/doxia/module/docbook/DocBookSink.java

maven/doxia/doxia/trunk/doxia-modules/doxia-module-fml/src/main/java/org/apache/maven/doxia/module/fml/FmlParser.java

maven/doxia/doxia/trunk/doxia-modules/doxia-module-fo/src/main/java/org/apache/maven/doxia/module/fo/FoSink.java

maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/test/resources/   
(props changed)

maven/doxia/doxia/trunk/doxia-sink-api/src/main/java/org/apache/maven/doxia/sink/Sink.java
maven/doxia/doxia/trunk/doxia-test-docs/src/main/resources/doxia-site/fml/  
 (props changed)
maven/doxia/doxia/trunk/doxia-test-docs/src/main/resources/doxia-site/xdoc/ 
  (props changed)

maven/doxia/doxia/trunk/doxia-test-docs/src/main/resources/maven-ant-plugin/fml/
   (props changed)

maven/doxia/doxia/trunk/doxia-test-docs/src/main/resources/maven-antrun-plugin/fml/
   (props changed)

maven/doxia/doxia/trunk/doxia-test-docs/src/main/resources/maven-assembly-plugin/fml/
   (props changed)

maven/doxia/doxia/trunk/doxia-test-docs/src/main/resources/maven-changelog-plugin/fml/
   (props changed)

maven/doxia/doxia/trunk/doxia-test-docs/src/main/resources/maven-changes-plugin/fml/
   (props changed)

maven/doxia/doxia/trunk/doxia-test-docs/src/main/resources/maven-changes-plugin/xdoc/
   (props changed)

maven/doxia/doxia/trunk/doxia-test-docs/src/main/resources/maven-checkstyle-plugin/fml/
   (props changed)

maven/doxia/doxia/trunk/doxia-test-docs/src/main/resources/maven-clean-plugin/fml/
   (props changed)

maven/doxia/doxia/trunk/doxia-test-docs/src/main/resources/maven-compiler-plugin/fml/
   (props changed)

maven/doxia/doxia/trunk/doxia-test-docs/src/main/resources/maven-dependency-plugin/fml/
   (props changed)

maven/doxia/doxia/trunk/doxia-test-docs/src/main/resources/maven-deploy-plugin/fml/
   (props changed)

maven/doxia/doxia/trunk/doxia-test-docs/src/main/resources/maven-doap-plugin/fml/
   (props changed)

maven/doxia/doxia/trunk/doxia-test-docs/src/main/resources/maven-docck-plugin/fml/
   (props changed)

maven/doxia/doxia/trunk/doxia-test-docs/src/main/resources/maven-ear-plugin/fml/
   (props changed)

maven/doxia/doxia/trunk/doxia-test-docs/src/main/resources/maven-eclipse-plugin/fml/
   (props changed)

maven/doxia/doxia/trunk/doxia-test-docs/src/main/resources/maven-ejb-plugin/fml/
   (props changed)

maven/doxia/doxia/trunk/doxia-test-docs/src/main/resources/maven-gpg-plugin/fml/
   (props changed)

maven/doxia/doxia/trunk/doxia-test-docs/src/main/resources/maven-help-plugin/fml/
   (props changed)

maven/doxia/doxia/trunk/doxia-test-docs/src/main/resources/maven-idea-plugin/fml/
   (props changed)

maven/doxia/doxia/trunk/doxia-test-docs/src/main/resources/maven-install-plugin/fml/
   (props changed)

maven/doxia/doxia/trunk/doxia-test-docs/src/main/resources/maven-invoker-plugin/fml/
   (props changed)

maven/doxia/doxia/trunk/doxia-test-docs/src/main/resources/maven-jar-plugin/fml/
   (props changed)

maven/doxia/doxia/trunk/doxia-test-docs/src/main/resources/maven-javadoc-plugin/fml/
   (props changed)

maven/doxia

svn commit: r1719715 - in /maven/doxia/doxia/trunk: doxia-core/src/main/java/org/apache/maven/doxia/sink/ doxia-core/src/test/java/org/apache/maven/doxia/sink/ doxia-modules/doxia-module-apt/src/test/

2015-12-12 Thread schulte

Author: schulte
Date: Sat Dec 12 17:16:29 2015
New Revision: 1719715

URL: http://svn.apache.org/viewvc?rev=1719715=rev
Log:
[DOXIA-532] Updated handling of comments.

o Updated to correctly write comments ending with '-'.


Modified:

maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/sink/XhtmlBaseSink.java

maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/sink/AbstractSinkTest.java

maven/doxia/doxia/trunk/doxia-modules/doxia-module-apt/src/test/java/org/apache/maven/doxia/module/apt/AptSinkTest.java

maven/doxia/doxia/trunk/doxia-modules/doxia-module-docbook-simple/src/main/java/org/apache/maven/doxia/module/docbook/DocBookSink.java

maven/doxia/doxia/trunk/doxia-modules/doxia-module-docbook-simple/src/test/java/org/apache/maven/doxia/module/docbook/DocBookSinkTest.java

maven/doxia/doxia/trunk/doxia-modules/doxia-module-fo/src/main/java/org/apache/maven/doxia/module/fo/FoSink.java

maven/doxia/doxia/trunk/doxia-modules/doxia-module-fo/src/test/java/org/apache/maven/doxia/module/fo/FoSinkTest.java

maven/doxia/doxia/trunk/doxia-modules/doxia-module-latex/src/test/java/org/apache/maven/doxia/module/latex/LatexSinkTest.java

maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/src/test/java/org/apache/maven/doxia/module/xdoc/XdocSinkTest.java

maven/doxia/doxia/trunk/doxia-modules/doxia-module-xhtml/src/test/java/org/apache/maven/doxia/module/xhtml/XhtmlSinkTest.java

Modified: 
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/sink/XhtmlBaseSink.java
URL: 
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/sink/XhtmlBaseSink.java?rev=1719715=1719714=1719715=diff
==
--- 
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/sink/XhtmlBaseSink.java
 (original)
+++ 
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/sink/XhtmlBaseSink.java
 Sat Dec 12 17:16:29 2015
@@ -1880,32 +1880,34 @@ public class XhtmlBaseSink
 @Override
 public void comment( String comment )
 {
-String cmt = comment;
-
-if ( StringUtils.isNotEmpty( cmt ) && cmt.contains( "--" ) )
+if ( comment != null )
 {
-String originalComment = cmt;
+final String originalComment = comment;
+
 // http://www.w3.org/TR/2000/REC-xml-20001006#sec-comments
-while ( cmt.contains( "--" ) )
+while ( comment.contains( "--" ) )
 {
-cmt = StringUtils.replace( cmt, "--", "- -" );
+comment = comment.replace( "--", "- -" );
 }
 
-if ( cmt.endsWith( "-" ) )
+if ( comment.endsWith( "-" ) )
 {
-cmt += " ";
+comment += " ";
 }
 
-getLog().warn( "[Xhtml Sink] Modified invalid comment: '" + 
originalComment + "' to '" + cmt + "'" );
-}
+if ( !originalComment.equals( comment ) )
+{
+getLog().warn( "[Xhtml Sink] Modified invalid comment '" + 
originalComment + "' to '" + comment + "'" );
+}
 
-StringBuilder buf = new StringBuilder( cmt.length() + 7 );
+final StringBuilder buffer = new StringBuilder( comment.length() + 
7 );
 
-buf.append( LESS_THAN ).append( BANG ).append( MINUS ).append( MINUS );
-buf.append( cmt );
-buf.append( MINUS ).append( MINUS ).append( GREATER_THAN );
+buffer.append( LESS_THAN ).append( BANG ).append( MINUS ).append( 
MINUS );
+buffer.append( comment );
+buffer.append( MINUS ).append( MINUS ).append( GREATER_THAN );
 
-write( buf.toString() );
+write( buffer.toString() );
+}
 }
 
 /**

Modified: 
maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/sink/AbstractSinkTest.java
URL: 
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/sink/AbstractSinkTest.java?rev=1719715=1719714=1719715=diff
==
--- 
maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/sink/AbstractSinkTest.java
 (original)
+++ 
maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/sink/AbstractSinkTest.java
 Sat Dec 12 17:16:29 2015
@@ -61,7 +61,7 @@ public abstract class AbstractSinkTest
 
 /**
  * Ability to wrap the xmlFragment with a roottag and namespaces, when 
required
- * 
+ *
  * @param xmlFragment
  * @return valid XML
  */
@@ -70,6 +70,36 @@ public abstract class AbstractSinkTest
 return

[1/2] maven-integration-testing git commit: o Updated to run the ITs using the POSIX locale.

2015-12-12 Thread schulte

Repository: maven-integration-testing
Updated Branches:
  refs/heads/master fba72aed2 -> a6aca2894


o Updated to run the ITs using the POSIX locale.


Project: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/repo
Commit: 
http://git-wip-us.apache.org/repos/asf/maven-integration-testing/commit/fc323c48
Tree: 
http://git-wip-us.apache.org/repos/asf/maven-integration-testing/tree/fc323c48
Diff: 
http://git-wip-us.apache.org/repos/asf/maven-integration-testing/diff/fc323c48

Branch: refs/heads/master
Commit: fc323c48aca97cec66fe12a07bd913bfbb235e96
Parents: fba72ae
Author: Christian Schulte <schu...@apache.org>
Authored: Sat Dec 12 19:21:06 2015 +0100
Committer: Christian Schulte <schu...@apache.org>
Committed: Sat Dec 12 19:21:06 2015 +0100

--
 run-its.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/fc323c48/run-its.sh
--
diff --git a/run-its.sh b/run-its.sh
index 76de23d..cc79c2a 100755
--- a/run-its.sh
+++ b/run-its.sh
@@ -21,8 +21,8 @@
 
 # How I run the ITs from a clean slate. Though I do this with a primed Nexus 
instance. JvZ.
 
-mvn clean install -Prun-its,embedded -Dmaven.repo.local=`pwd`/repo
+env LANG=C mvn clean install -Prun-its,embedded -Dmaven.repo.local=`pwd`/repo
 
 # If behind a proxy try this
 
-# mvn clean install -Prun-its,embedded -Dmaven.repo.local=`pwd`/repo 
-Dproxy.active=true -Dproxy.type=http -Dproxy.host= -Dproxy.port= 
-Dproxy.user= -Dproxy.pass=
+# env LANG=C mvn clean install -Prun-its,embedded 
-Dmaven.repo.local=`pwd`/repo -Dproxy.active=true -Dproxy.type=http 
-Dproxy.host= -Dproxy.port= -Dproxy.user= -Dproxy.pass=

[2/2] maven-integration-testing git commit: [MNG-2199] Support version ranges in parent elements

2015-12-12 Thread schulte

[MNG-2199] Support version ranges in parent elements

o Updated the ITs to correctly detect parent resolution failures.


Project: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/repo
Commit: 
http://git-wip-us.apache.org/repos/asf/maven-integration-testing/commit/a6aca289
Tree: 
http://git-wip-us.apache.org/repos/asf/maven-integration-testing/tree/a6aca289
Diff: 
http://git-wip-us.apache.org/repos/asf/maven-integration-testing/diff/a6aca289

Branch: refs/heads/master
Commit: a6aca2894ab5a2849190cb802052710204081bf5
Parents: fc323c4
Author: Christian Schulte <schu...@apache.org>
Authored: Sat Dec 12 19:25:15 2015 +0100
Committer: Christian Schulte <schu...@apache.org>
Committed: Sat Dec 12 19:33:58 2015 +0100

--
 .../apache/maven/it/MavenITmng2199ParentVersionRangeTest.java  | 6 ++
 1 file changed, 6 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/a6aca289/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2199ParentVersionRangeTest.java
--
diff --git 
a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2199ParentVersionRangeTest.java
 
b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2199ParentVersionRangeTest.java
index 16ac91c..a11bc99 100644
--- 
a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2199ParentVersionRangeTest.java
+++ 
b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2199ParentVersionRangeTest.java
@@ -43,6 +43,9 @@ public class MavenITmng2199ParentVersionRangeTest
 
 verifier.executeGoal( "verify" );
 verifier.verifyErrorFreeLog();
+
+final List lines = verifier.loadFile( new File( testDir, 
"log.txt" ), false );
+assertFalse( "Unxpected error message found.", indexOf( lines, 
".*Failed to build parent project.*" ) >= 0 );
 }
 finally
 {
@@ -64,6 +67,9 @@ public class MavenITmng2199ParentVersionRangeTest
 
 verifier.executeGoal( "verify" );
 verifier.verifyErrorFreeLog();
+
+final List lines = verifier.loadFile( new File( testDir, 
"log.txt" ), false );
+assertFalse( "Unxpected error message found.", indexOf( lines, 
".*Failed to build parent project.*" ) >= 0 );
 }
 finally
 {

maven git commit: [MNG-2199] Support version ranges in parent elements

2015-12-12 Thread schulte

Repository: maven
Updated Branches:
  refs/heads/master 8c863b01a -> 62629c9bc


[MNG-2199] Support version ranges in parent elements

o Updated to remove version range resolution logic obsolete since 3.2.3.


Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/62629c9b
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/62629c9b
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/62629c9b

Branch: refs/heads/master
Commit: 62629c9bc537800f4019cbb5d643d274c9378f04
Parents: 8c863b0
Author: Christian Schulte <schu...@apache.org>
Authored: Sat Dec 12 21:03:42 2015 +0100
Committer: Christian Schulte <schu...@apache.org>
Committed: Sat Dec 12 21:03:42 2015 +0100

--
 .../maven/project/DefaultProjectBuilder.java| 41 
 .../project/DefaultProjectBuildingRequest.java  | 17 +++-
 .../maven/project/ProjectBuildingRequest.java   | 16 +++-
 3 files changed, 29 insertions(+), 45 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/62629c9b/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java
--
diff --git 
a/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java 
b/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java
index 9d51a6d..5c8e707 100644
--- 
a/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java
+++ 
b/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java
@@ -73,9 +73,6 @@ import org.eclipse.aether.repository.RemoteRepository;
 import org.eclipse.aether.repository.WorkspaceRepository;
 import org.eclipse.aether.resolution.ArtifactRequest;
 import org.eclipse.aether.resolution.ArtifactResult;
-import org.eclipse.aether.resolution.VersionRangeRequest;
-import org.eclipse.aether.resolution.VersionRangeResolutionException;
-import org.eclipse.aether.resolution.VersionRangeResult;
 
 /**
  */
@@ -298,44 +295,6 @@ public class DefaultProjectBuilder
 
 boolean localProject;
 
-if ( request.isResolveVersionRanges() )
-{
-VersionRangeRequest versionRangeRequest = new VersionRangeRequest( 
pomArtifact, config.repositories, null );
-
-try
-{
-VersionRangeResult versionRangeResult =
-repoSystem.resolveVersionRange( config.session, 
versionRangeRequest );
-
-if ( versionRangeResult.getHighestVersion() == null )
-{
-throw new ProjectBuildingException(
-artifact.getId(), "Error resolving project artifact: 
No versions matched the requested range",
-(Throwable) null );
-
-}
-
-if ( versionRangeResult.getVersionConstraint() != null
- && 
versionRangeResult.getVersionConstraint().getRange() != null
- && 
versionRangeResult.getVersionConstraint().getRange().getUpperBound() == null )
-{
-throw new ProjectBuildingException(
-artifact.getId(),
-"Error resolving project artifact: The requested 
version range does not specify an upper bound",
-(Throwable) null );
-
-}
-
-pomArtifact = pomArtifact.setVersion( 
versionRangeResult.getHighestVersion().toString() );
-}
-catch ( VersionRangeResolutionException e )
-{
-throw new ProjectBuildingException(
-artifact.getId(), "Error resolving project artifact: " + 
e.getMessage(), e );
-
-}
-}
-
 try
 {
 ArtifactRequest pomRequest = new ArtifactRequest();

http://git-wip-us.apache.org/repos/asf/maven/blob/62629c9b/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingRequest.java
--
diff --git 
a/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingRequest.java
 
b/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingRequest.java
index f439240..5a22afe 100644
--- 
a/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingRequest.java
+++ 
b/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingRequest.java
@@ -62,6 +62,7 @@ public class DefaultProjectBuildingRequest
 
 private boolean resolveDependencies;
 
+@Deprecated
 private boolean resolveVersionRanges;
 
 private RepositoryMerging repositoryMerging = 
RepositoryMerging.POM_DOMINANT;
@@ -221,14 +222,26 @@ public class Defa

maven git commit: [MNG-2199] Support version ranges in parent elements

2015-12-12 Thread schulte

Repository: maven
Updated Branches:
  refs/heads/master 0ff45140a -> 8c863b01a


[MNG-2199] Support version ranges in parent elements

o Updated to write resolved parent version ranges into the effective model when 
not read locally using 'relativePath'.


Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/8c863b01
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/8c863b01
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/8c863b01

Branch: refs/heads/master
Commit: 8c863b01af76d990b7650add5cb98efda4c83533
Parents: 0ff4514
Author: Christian Schulte <schu...@apache.org>
Authored: Sat Dec 12 20:28:56 2015 +0100
Committer: Christian Schulte <schu...@apache.org>
Committed: Sat Dec 12 20:28:56 2015 +0100

--
 .../java/org/apache/maven/model/building/DefaultModelBuilder.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/8c863b01/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 a6a8725..6e4d24f 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
@@ -983,7 +983,8 @@ public class DefaultModelBuilder
 {
 problems.setSource( childModel );
 
-Parent parent = childModel.getParent().clone();
+// Note: The 'ModelResolver' will update the version property for any 
parent version ranges.
+Parent parent = childModel.getParent();
 
 String groupId = parent.getGroupId();
 String artifactId = parent.getArtifactId();

maven git commit: Updated to ensure 'MavenProject.getManagedVersionMap()' consistently returns an immutable map.

2015-12-13 Thread schulte

Repository: maven
Updated Branches:
  refs/heads/master 893efe3a9 -> ab130cf9f


Updated to ensure 'MavenProject.getManagedVersionMap()' consistently returns an 
immutable map.


Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/ab130cf9
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/ab130cf9
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/ab130cf9

Branch: refs/heads/master
Commit: ab130cf9f0de7f2aa697ec2fb0b993a8e61c44cb
Parents: 893efe3
Author: Christian Schulte <schu...@apache.org>
Authored: Mon Dec 14 04:57:47 2015 +0100
Committer: Christian Schulte <schu...@apache.org>
Committed: Mon Dec 14 04:59:35 2015 +0100

--
 .../main/java/org/apache/maven/project/DefaultProjectBuilder.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/ab130cf9/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java
--
diff --git 
a/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java 
b/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java
index e29efa4..fb15c87 100644
--- 
a/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java
+++ 
b/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java
@@ -786,7 +786,7 @@ public class DefaultProjectBuilder
 List deps;
 DependencyManagement dependencyManagement = 
project.getDependencyManagement();
 if ( ( dependencyManagement != null ) && ( ( deps = 
dependencyManagement.getDependencies() ) != null )
-&& ( deps.size() > 0 ) )
+ && ( deps.size() > 0 ) )
 {
 map = new HashMap<>();
 for ( Dependency d : dependencyManagement.getDependencies() )
@@ -798,6 +798,7 @@ public class DefaultProjectBuilder
 map.put( d.getManagementKey(), artifact );
 }
 }
+map = Collections.unmodifiableMap( map );
 }
 else
 {

svn commit: r1719483 - in /maven/doxia/doxia/trunk: doxia-core/src/main/java/org/apache/maven/doxia/markup/ doxia-core/src/main/java/org/apache/maven/doxia/parser/ doxia-core/src/main/java/org/apache/

2015-12-11 Thread schulte

Author: schulte
Date: Fri Dec 11 18:01:19 2015
New Revision: 1719483

URL: http://svn.apache.org/viewvc?rev=1719483=rev
Log:
[DOXIA-532] Support for server side includes.

o Updated to handle comments starting with a '#' character to represent SSI 
expressions.


Modified:

maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/markup/Markup.java

maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/parser/AbstractXmlParser.java

maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/sink/RandomAccessSink.java

maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/sink/SinkAdapter.java

maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/sink/XhtmlBaseSink.java

maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/parser/XhtmlBaseParserTest.java

maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/sink/SinkEventTestingSink.java

maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/sink/TextSink.java

maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/sink/WellformednessCheckingSink.java

maven/doxia/doxia/trunk/doxia-modules/doxia-module-apt/src/main/java/org/apache/maven/doxia/module/apt/AptParser.java

maven/doxia/doxia/trunk/doxia-modules/doxia-module-apt/src/main/java/org/apache/maven/doxia/module/apt/AptSink.java

maven/doxia/doxia/trunk/doxia-modules/doxia-module-apt/src/test/java/org/apache/maven/doxia/module/apt/AptParserTest.java

maven/doxia/doxia/trunk/doxia-modules/doxia-module-apt/src/test/resources/test/comments.apt

maven/doxia/doxia/trunk/doxia-modules/doxia-module-docbook-simple/src/main/java/org/apache/maven/doxia/module/docbook/DocBookSink.java

maven/doxia/doxia/trunk/doxia-modules/doxia-module-fml/src/main/java/org/apache/maven/doxia/module/fml/FmlParser.java

maven/doxia/doxia/trunk/doxia-modules/doxia-module-fo/src/main/java/org/apache/maven/doxia/module/fo/FoSink.java

maven/doxia/doxia/trunk/doxia-sink-api/src/main/java/org/apache/maven/doxia/sink/Sink.java

Modified: 
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/markup/Markup.java
URL: 
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/markup/Markup.java?rev=1719483=1719482=1719483=diff
==
--- 
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/markup/Markup.java
 (original)
+++ 
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/markup/Markup.java
 Fri Dec 11 18:01:19 2015
@@ -80,4 +80,8 @@ public interface Markup
 
 /** semicolon character: ';' */
 char SEMICOLON = ';';
+
+/** hash character: '#' */
+char HASH = '#';
+
 }

Modified: 
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/parser/AbstractXmlParser.java
URL: 
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/parser/AbstractXmlParser.java?rev=1719483=1719482=1719483=diff
==
--- 
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/parser/AbstractXmlParser.java
 (original)
+++ 
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/parser/AbstractXmlParser.java
 Fri Dec 11 18:01:19 2015
@@ -260,7 +260,7 @@ public abstract class AbstractXmlParser
 }
 else if ( eventType == XmlPullParser.COMMENT )
 {
-handleComment( parser, sink );
+handleCommentOrSsi( parser, sink );
 }
 else if ( eventType == XmlPullParser.ENTITY_REF )
 {
@@ -359,6 +359,31 @@ public abstract class AbstractXmlParser
 }
 
 /**
+ * Decides whether a comment is a SSI directive and delegates to the
+ * corresponding method.
+ *
+ * @param parser A parser, not null.
+ * @param sink the sink to receive the events. Not null.
+ *
+ * @throws org.codehaus.plexus.util.xml.pull.XmlPullParserException if 
there's a problem parsing the model
+ * @since 1.7
+ */
+private void handleCommentOrSsi( XmlPullParser parser, Sink sink )
+throws XmlPullParserException
+{
+final String text = getText( parser ).trim();
+
+if ( text.indexOf( HASH ) == 0 )
+{
+handleSsi( parser, sink );
+}
+else
+{
+handleComment( parser, sink );
+}
+}
+
+/**
  * Handles comments.
  *
  * This is a default implementation, all data are emitted as comment
@@ -375,6 +400,23 @@ public abstract class AbstractXmlParser
 }
 
 /**
+ * Handles SSI directives.
+ *
+ * This is a default implementation, all data are emitted as SSI
+ * events

svn commit: r1720589 - /maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java

2015-12-17 Thread schulte

Author: schulte
Date: Thu Dec 17 15:07:02 2015
New Revision: 1720589

URL: http://svn.apache.org/viewvc?rev=1720589=rev
Log:
[MJAVADOC-355] Encoding problem if platform encoding used to run Maven is 
different from default platform encoding.

o Updated to pass '-J-Dfile.encoding' to 'javadoc' invocations.


Modified:

maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java

Modified: 
maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java?rev=1720589=1720588=1720589=diff
==
--- 
maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java
 (original)
+++ 
maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java
 Thu Dec 17 15:07:02 2015
@@ -2001,6 +2001,8 @@ public abstract class AbstractJavadocMoj
 }
 }
 
+cmd.createArg().setValue( "-J-Dfile.encoding=" + 
ReaderFactory.FILE_ENCODING );
+
 List arguments = new ArrayList();
 
 // 
--

svn commit: r1720607 - in /maven/plugins/trunk/maven-jarsigner-plugin: pom.xml src/main/java/org/apache/maven/plugins/jarsigner/AbstractJarsignerMojo.java

2015-12-17 Thread schulte

Author: schulte
Date: Thu Dec 17 16:11:58 2015
New Revision: 1720607

URL: http://svn.apache.org/viewvc?rev=1720607=rev
Log:
[MJARSIGNER-17] The plugin should pass proxy information to the jarsigner 
command.

o Updated to pass the active proxy from the Maven settings to 'jarsigner'.
o Updated to pass the 'file.encoding' the plugin is executed with to 
'jarsigner'.


Modified:
maven/plugins/trunk/maven-jarsigner-plugin/pom.xml

maven/plugins/trunk/maven-jarsigner-plugin/src/main/java/org/apache/maven/plugins/jarsigner/AbstractJarsignerMojo.java

Modified: maven/plugins/trunk/maven-jarsigner-plugin/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-jarsigner-plugin/pom.xml?rev=1720607=1720606=1720607=diff
==
--- maven/plugins/trunk/maven-jarsigner-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-jarsigner-plugin/pom.xml Thu Dec 17 16:11:58 2015
@@ -86,6 +86,11 @@ under the License.
   ${mavenVersion}
 
 
+  org.apache.maven
+  maven-settings
+  ${mavenVersion}
+
+
   org.apache.maven.plugin-tools
   maven-plugin-annotations
   provided

Modified: 
maven/plugins/trunk/maven-jarsigner-plugin/src/main/java/org/apache/maven/plugins/jarsigner/AbstractJarsignerMojo.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-jarsigner-plugin/src/main/java/org/apache/maven/plugins/jarsigner/AbstractJarsignerMojo.java?rev=1720607=1720606=1720607=diff
==
--- 
maven/plugins/trunk/maven-jarsigner-plugin/src/main/java/org/apache/maven/plugins/jarsigner/AbstractJarsignerMojo.java
 (original)
+++ 
maven/plugins/trunk/maven-jarsigner-plugin/src/main/java/org/apache/maven/plugins/jarsigner/AbstractJarsignerMojo.java
 Thu Dec 17 16:11:58 2015
@@ -26,6 +26,7 @@ import org.apache.maven.plugin.MojoExecu
 import org.apache.maven.plugins.annotations.Component;
 import org.apache.maven.plugins.annotations.Parameter;
 import org.apache.maven.project.MavenProject;
+import org.apache.maven.settings.Settings;
 import org.apache.maven.shared.jarsigner.JarSigner;
 import org.apache.maven.shared.jarsigner.JarSignerRequest;
 import org.apache.maven.shared.jarsigner.JarSignerUtil;
@@ -42,11 +43,13 @@ import org.sonatype.plexus.components.se
 import java.io.File;
 import java.io.IOException;
 import java.text.MessageFormat;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.HashSet;
 import java.util.List;
 import java.util.ResourceBundle;
+import org.apache.maven.shared.utils.ReaderFactory;
 
 /**
  * Maven Jarsigner Plugin base class.
@@ -217,6 +220,14 @@ public abstract class AbstractJarsignerM
 private MavenProject project;
 
 /**
+ * The Maven settings.
+ *
+ * @since 1.5
+ */
+@Parameter( defaultValue = "${settings}", readonly = true, required = true 
)
+private Settings settings;
+
+/**
  * Location of the working directory.
  *
  * @since 1.3
@@ -495,9 +506,61 @@ public abstract class AbstractJarsignerM
 request.setProviderName( providerName );
 request.setWorkingDirectory( workingDirectory );
 request.setMaxMemory( maxMemory );
-request.setArguments( arguments );
 request.setProtectedAuthenticationPath( protectedAuthenticationPath );
 
+// Preserves 'file.encoding' the plugin is executed with.
+final List additionalArguments = new ArrayList();
+
+boolean fileEncodingSeen = false;
+
+if ( this.arguments != null )
+{
+for ( final String argument : this.arguments )
+{
+if ( argument.trim().startsWith( "-J-Dfile.encoding=" ) )
+{
+fileEncodingSeen = true;
+}
+
+additionalArguments.add( argument );
+}
+}
+
+if ( !fileEncodingSeen )
+{
+additionalArguments.add( "-J-Dfile.encoding=" + 
ReaderFactory.FILE_ENCODING );
+}
+
+// Adds proxy information.
+if ( this.settings != null && this.settings.getActiveProxy() != null
+ && StringUtils.isNotEmpty( 
this.settings.getActiveProxy().getHost() ) )
+{
+additionalArguments.add( "-J-Dhttp.proxyHost=" + 
this.settings.getActiveProxy().getHost() );
+additionalArguments.add( "-J-Dhttps.proxyHost=" + 
this.settings.getActiveProxy().getHost() );
+additionalArguments.add( "-J-Dftp.proxyHost=" + 
this.settings.getActiveProxy().getHost() );
+
+if ( this.settings.getActiveProxy().getPort() > 0 )
+{
+additionalArguments.add( "-J-Dhttp.proxyPort=" + 
this.settings.getActiveProxy().getPort() );
+

svn commit: r1720609 - /maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java

2015-12-17 Thread schulte

Author: schulte
Date: Thu Dec 17 16:15:10 2015
New Revision: 1720609

URL: http://svn.apache.org/viewvc?rev=1720609=rev
Log:
[MJAVADOC-355] Encoding problem if platform encoding used to run Maven is 
different from default platform encoding. 

o Updated to preserve user supplied 'file.enconding' values.


Modified:

maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java

Modified: 
maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java?rev=1720609=1720608=1720609=diff
==
--- 
maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java
 (original)
+++ 
maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java
 Thu Dec 17 16:15:10 2015
@@ -1984,12 +1984,16 @@ public abstract class AbstractJavadocMoj
 // Wrap Javadoc JVM args
 // 
--
 
+boolean fileEncodingSeen = false;
+
 addMemoryArg( cmd, "-Xmx", this.maxmemory );
 addMemoryArg( cmd, "-Xms", this.minmemory );
 addProxyArg( cmd );
 
 if ( StringUtils.isNotEmpty( additionalJOption ) )
 {
+fileEncodingSeen = this.additionalJOption.contains( 
"-J-Dfile.encoding=" );
+
 cmd.createArg().setValue( additionalJOption );
 }
 
@@ -1997,11 +2001,18 @@ public abstract class AbstractJavadocMoj
 {
 for ( String jo : additionalJOptions )
 {
+if ( !fileEncodingSeen )
+{
+fileEncodingSeen = jo.contains( "-J-Dfile.encoding=" );
+}
 cmd.createArg().setValue( jo );
 }
 }
 
-cmd.createArg().setValue( "-J-Dfile.encoding=" + 
ReaderFactory.FILE_ENCODING );
+if ( !fileEncodingSeen )
+{
+cmd.createArg().setValue( "-J-Dfile.encoding=" + 
ReaderFactory.FILE_ENCODING );
+}
 
 List arguments = new ArrayList();

maven git commit: [MNG-5868] Adding serval times the same artifact via MavenProjectHelper (attachArtifact) does not produce a failure

2015-12-17 Thread schulte

Repository: maven
Updated Branches:
  refs/heads/master 56543e464 -> 020e35816


[MNG-5868] Adding serval times the same artifact via MavenProjectHelper 
(attachArtifact) does not produce a failure

o Updated method 'MavenProject.getAttachedArtifacts' to return an
  unmodifiable list.
o Updated method 'MavenProject.addAttachedArtifact' to throw a
  'DuplicateArtifactAttachmentException', if the same artifact already
  is attached.
o Updated all 'attachArtifact' methods of interface 'MavenProjectHelper'
  to also throw a 'DuplicateArtifactAttachmentException', if the
  same artifact already is attached.

This commit reduces the chances of 'hacking' the list of
attached artifacts in unspecified ways. Such 'hacks' will
now lead to 'RuntimeException's and will no longer work.
Depending on what this leads to, plugins need to be
updated and new methods may need to be added to
'MavenProjectHelper' for any use-cases no longer
supported. Reverting this commit to stay compatible
to unspecified behaviour should be the last option
considered.


Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/020e3581
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/020e3581
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/020e3581

Branch: refs/heads/master
Commit: 020e35816f184c10c3f87f103336fed4516f7af6
Parents: 56543e4
Author: Christian Schulte <schu...@apache.org>
Authored: Thu Dec 17 22:43:47 2015 +0100
Committer: Christian Schulte <schu...@apache.org>
Committed: Thu Dec 17 22:43:47 2015 +0100

--
 .../project/DefaultMavenProjectHelper.java  |  7 ---
 .../org/apache/maven/project/MavenProject.java  | 66 +---
 .../maven/project/MavenProjectHelper.java   | 12 +++-
 3 files changed, 65 insertions(+), 20 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/020e3581/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectHelper.java
--
diff --git 
a/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectHelper.java
 
b/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectHelper.java
index 2cce9f6..223e920 100644
--- 
a/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectHelper.java
+++ 
b/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectHelper.java
@@ -91,13 +91,6 @@ public class DefaultMavenProjectHelper
 attachArtifact( project, artifact );
 }
 
-/**
- * Add an attached artifact or replace the file for an existing artifact.
- *
- * @see 
MavenProject#addAttachedArtifact(org.apache.maven.artifact.Artifact)
- * @param project project reference.
- * @param artifact artifact to add or replace.
- */
 public void attachArtifact( MavenProject project, Artifact artifact )
 {
 project.addAttachedArtifact( artifact );

http://git-wip-us.apache.org/repos/asf/maven/blob/020e3581/maven-core/src/main/java/org/apache/maven/project/MavenProject.java
--
diff --git 
a/maven-core/src/main/java/org/apache/maven/project/MavenProject.java 
b/maven-core/src/main/java/org/apache/maven/project/MavenProject.java
index 9c936e1..5710250 100644
--- a/maven-core/src/main/java/org/apache/maven/project/MavenProject.java
+++ b/maven-core/src/main/java/org/apache/maven/project/MavenProject.java
@@ -260,7 +260,7 @@ public class MavenProject
 
 /**
  * Sets project {@code file} without changing project {@code basedir}.
- * 
+ *
  * @since 3.2.4
  */
 public void setPomFile( File file )
@@ -909,19 +909,65 @@ public class MavenProject
 }
 
 /**
- * Add or replace an artifact. This method is now deprecated. Use the 
@{MavenProjectHelper} to attach artifacts to a
- * project. In spite of the 'throws' declaration on this API, this method 
has never thrown an exception since Maven
- * 3.0.x. Historically, it logged and ignored a second addition of the 
same g/a/v/c/t. Now it replaces the file for
- * the artifact, so that plugins (e.g. shade) can change the pathname of 
the file for a particular set of
- * coordinates.
+ * Adds an artifact to the list of attached artifacts.
+ *
+ * @param artifact The artifact to add.
+ *
+ * @throws DuplicateArtifactAttachmentException if the same artifact 
already is attached to this project.
  *
- * @param artifact the artifact to add or replace.
- * @throws DuplicateArtifactAttachmentException
+ * @see #isArtifactAttached(org.apache.maven.artifact.Artifact)
+ * @see #getAttachedArtifacts()
+ *
+ * @deprecated Please use {@link MavenProjectHelper} to attach artifacts 
to a project.
  */
+

[2/2] maven git commit: [MNG-5868] Adding serval times the same artifact via MavenProjectHelper (attachArtifact) does not produce a failure

2015-12-17 Thread schulte

[MNG-5868] Adding serval times the same artifact via MavenProjectHelper 
(attachArtifact) does not produce a failure

o Updated to restore the behaviour consensus had been
  reached in MNG-5387.
o Kept 'MavenProject.getAttachedArtifacts' to return an
  unmodifiable list.


Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/5f048234
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/5f048234
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/5f048234

Branch: refs/heads/master
Commit: 5f048234ff44dbf70fcad9f17834c64866f452e1
Parents: 536350f
Author: Christian Schulte <schu...@apache.org>
Authored: Fri Dec 18 00:27:26 2015 +0100
Committer: Christian Schulte <schu...@apache.org>
Committed: Fri Dec 18 00:30:02 2015 +0100

--
 .../project/DefaultMavenProjectHelper.java  |  7 
 .../org/apache/maven/project/MavenProject.java  | 39 +++-
 2 files changed, 29 insertions(+), 17 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/5f048234/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectHelper.java
--
diff --git 
a/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectHelper.java
 
b/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectHelper.java
index 2cce9f6..223e920 100644
--- 
a/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectHelper.java
+++ 
b/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectHelper.java
@@ -91,13 +91,6 @@ public class DefaultMavenProjectHelper
 attachArtifact( project, artifact );
 }
 
-/**
- * Add an attached artifact or replace the file for an existing artifact.
- *
- * @see 
MavenProject#addAttachedArtifact(org.apache.maven.artifact.Artifact)
- * @param project project reference.
- * @param artifact artifact to add or replace.
- */
 public void attachArtifact( MavenProject project, Artifact artifact )
 {
 project.addAttachedArtifact( artifact );

http://git-wip-us.apache.org/repos/asf/maven/blob/5f048234/maven-core/src/main/java/org/apache/maven/project/MavenProject.java
--
diff --git 
a/maven-core/src/main/java/org/apache/maven/project/MavenProject.java 
b/maven-core/src/main/java/org/apache/maven/project/MavenProject.java
index 9c936e1..8337834 100644
--- a/maven-core/src/main/java/org/apache/maven/project/MavenProject.java
+++ b/maven-core/src/main/java/org/apache/maven/project/MavenProject.java
@@ -909,19 +909,38 @@ public class MavenProject
 }
 
 /**
- * Add or replace an artifact. This method is now deprecated. Use the 
@{MavenProjectHelper} to attach artifacts to a
- * project. In spite of the 'throws' declaration on this API, this method 
has never thrown an exception since Maven
- * 3.0.x. Historically, it logged and ignored a second addition of the 
same g/a/v/c/t. Now it replaces the file for
- * the artifact, so that plugins (e.g. shade) can change the pathname of 
the file for a particular set of
- * coordinates.
+ * Adds or replaces an artifact.
  *
- * @param artifact the artifact to add or replace.
- * @throws DuplicateArtifactAttachmentException
+ * @param artifact The artifact to add or replace.
+ *
+ * @deprecated Please use {@link MavenProjectHelper}
+ * @see https://issues.apache.org/jira/browse/MNG-5868
+ * @see https://issues.apache.org/jira/browse/MNG-5387
+ * @see https://issues.apache.org/jira/browse/MNG-4013
+ * @see https://issues.apache.org/jira/browse/MNG-3119
  */
+@Deprecated
 public void addAttachedArtifact( Artifact artifact )
-throws DuplicateArtifactAttachmentException
 {
-getAttachedArtifacts().add( artifact );
+getAttachedArtifacts();
+assert this.attachedArtifacts != null : "Unexpected missing attached 
artifacts.";
+
+boolean replaced = false;
+for ( int i = 0, s0 = this.attachedArtifacts.size(); i < s0; i++ )
+{
+final Artifact a = this.attachedArtifacts.get( i );
+
+if ( a.equals( artifact ) )
+{
+this.attachedArtifacts.set( i, artifact );
+replaced = true;
+}
+}
+
+if ( !replaced )
+{
+this.attachedArtifacts.add( artifact );
+}
 }
 
 public List getAttachedArtifacts()
@@ -930,7 +949,7 @@ public class MavenProject
 {
 attachedArtifacts = new ArrayList<>();
 }
-return attachedArtifacts;
+return Collections.unmodifiableList( attachedArtifacts );
 }
 
 public Xpp3D

[1/2] maven git commit: Revert "[MNG-5868] Adding serval times the same artifact via MavenProjectHelper (attachArtifact) does not produce a failure"

2015-12-17 Thread schulte

Repository: maven
Updated Branches:
  refs/heads/master 020e35816 -> 5f048234f


Revert "[MNG-5868] Adding serval times the same artifact via MavenProjectHelper 
(attachArtifact) does not produce a failure"

This reverts commit 020e35816f184c10c3f87f103336fed4516f7af6.

Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/536350f5
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/536350f5
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/536350f5

Branch: refs/heads/master
Commit: 536350f5c5960e6c639305acde79e3fc81a91dd4
Parents: 020e358
Author: Christian Schulte <schu...@apache.org>
Authored: Fri Dec 18 00:12:22 2015 +0100
Committer: Christian Schulte <schu...@apache.org>
Committed: Fri Dec 18 00:12:22 2015 +0100

--
 .../project/DefaultMavenProjectHelper.java  |  7 +++
 .../org/apache/maven/project/MavenProject.java  | 66 +++-
 .../maven/project/MavenProjectHelper.java   | 12 +---
 3 files changed, 20 insertions(+), 65 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/536350f5/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectHelper.java
--
diff --git 
a/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectHelper.java
 
b/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectHelper.java
index 223e920..2cce9f6 100644
--- 
a/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectHelper.java
+++ 
b/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectHelper.java
@@ -91,6 +91,13 @@ public class DefaultMavenProjectHelper
 attachArtifact( project, artifact );
 }
 
+/**
+ * Add an attached artifact or replace the file for an existing artifact.
+ *
+ * @see 
MavenProject#addAttachedArtifact(org.apache.maven.artifact.Artifact)
+ * @param project project reference.
+ * @param artifact artifact to add or replace.
+ */
 public void attachArtifact( MavenProject project, Artifact artifact )
 {
 project.addAttachedArtifact( artifact );

http://git-wip-us.apache.org/repos/asf/maven/blob/536350f5/maven-core/src/main/java/org/apache/maven/project/MavenProject.java
--
diff --git 
a/maven-core/src/main/java/org/apache/maven/project/MavenProject.java 
b/maven-core/src/main/java/org/apache/maven/project/MavenProject.java
index 5710250..9c936e1 100644
--- a/maven-core/src/main/java/org/apache/maven/project/MavenProject.java
+++ b/maven-core/src/main/java/org/apache/maven/project/MavenProject.java
@@ -260,7 +260,7 @@ public class MavenProject
 
 /**
  * Sets project {@code file} without changing project {@code basedir}.
- *
+ * 
  * @since 3.2.4
  */
 public void setPomFile( File file )
@@ -909,65 +909,19 @@ public class MavenProject
 }
 
 /**
- * Adds an artifact to the list of attached artifacts.
- *
- * @param artifact The artifact to add.
- *
- * @throws DuplicateArtifactAttachmentException if the same artifact 
already is attached to this project.
+ * Add or replace an artifact. This method is now deprecated. Use the 
@{MavenProjectHelper} to attach artifacts to a
+ * project. In spite of the 'throws' declaration on this API, this method 
has never thrown an exception since Maven
+ * 3.0.x. Historically, it logged and ignored a second addition of the 
same g/a/v/c/t. Now it replaces the file for
+ * the artifact, so that plugins (e.g. shade) can change the pathname of 
the file for a particular set of
+ * coordinates.
  *
- * @see #isArtifactAttached(org.apache.maven.artifact.Artifact)
- * @see #getAttachedArtifacts()
- *
- * @deprecated Please use {@link MavenProjectHelper} to attach artifacts 
to a project.
+ * @param artifact the artifact to add or replace.
+ * @throws DuplicateArtifactAttachmentException
  */
-@Deprecated
 public void addAttachedArtifact( Artifact artifact )
 throws DuplicateArtifactAttachmentException
 {
-if ( artifact == null )
-{
-throw new NullPointerException( "artifact" );
-}
-
-// MNG-5868: The following is the former Javadoc comment of this method. I 
added method 'isArtifactAttached' to provide
-//   a way for people to test for a possible 
'DuplicateArtifactAttachmentException' and updated this method to
-//   throw that exception. Regarding the former comment: "Now it 
replaces the file for the artifact, so that
-//   plugins (e.g. shade) can change the pathname of the file for a 
particular set of coordinates." is not what
-//   thi

svn commit: r1719739 - /maven/project/KEYS

2015-12-12 Thread schulte

Author: schulte
Date: Sat Dec 12 21:53:21 2015
New Revision: 1719739

URL: http://svn.apache.org/viewvc?rev=1719739=rev
Log:
o Updated to add the PGP key of 'schu...@apache.org'.


Modified:
maven/project/KEYS

Modified: maven/project/KEYS
URL: 
http://svn.apache.org/viewvc/maven/project/KEYS?rev=1719739=1719738=1719739=diff
==
--- maven/project/KEYS (original)
+++ maven/project/KEYS Sat Dec 12 21:53:21 2015
@@ -2805,3 +2805,62 @@ hYyLuaqrIDV8CNZe+K6H17TLgo9JDpz+0jEU/2W3
 VyXnSvgpAMnPzbJMUWHOwkbXDpXp9PiXta4z
 =wlrw
 -END PGP PUBLIC KEY BLOCK-
+
+pub   4096R/38D8C6C5 2015-12-12 [expires: 2016-12-11]
+uid  Christian Schulte <schu...@apache.org>
+sig 338D8C6C5 2015-12-12  Christian Schulte <schu...@apache.org>
+sub   4096R/8AC0961E 2015-12-12 [expires: 2016-12-11]
+sig  38D8C6C5 2015-12-12  Christian Schulte <schu...@apache.org>
+
+-BEGIN PGP PUBLIC KEY BLOCK-
+Version: GnuPG v1
+
+mQINBFZskjgBEADCWAyCSImnd+VCDlZYhnD7U3FmeaJwIUxfE9C2VJuMUfLwsV0P
+zY6KGhCFYyzfVsxawTt3RqKANhXT24u3HnCeOzOK5iccn/OgT8USbV1AZpSV/773
+rTiEiBwG2Eo3mXdHS2gvwcmWnfwWGuTxBfDIO2/hNNnLgPnL1ojioqPEejA/cske
+9ziuejhrFgGqHXp7DKUbk7G8iUF3K+EnN5Um3y6iLSq0VIBLj328VSkNGqzMe4+x
+VlQcUfy/H8WfERq3aaaIy9iOa79xRbhFK8vJwiKsvfDm79W4V+/7jispKM4VUTmd
+0yHoLclVXj3Sbi9X3WTa9OO9fBqGL86qSUY85b1mVRi7R35qkxCYjJKd1gCM9qPa
+AMOMG1m16ohOC/Nj/LZbM2AmVIqi7G7wdskNT6CedQtZQI5vPGTNMNI53TRviOME
+5ZHbdDIO7wFTYS7YVyXfgEh6qWmGFbUZn0zgecQAx6azWHDRvmuwUT/q3W2Rep1y
+ttyqmqYRWO3pGHYN2lBLv1tVpcI/BWugdh2l/h6jeTd928WNfYcb8eiezGN+ZrKd
+5fd9/C/6YY3x5ebDT9uFdadwC0Aux0vgbYhgqqobEmFl6U25txj2bA/foCbhlrdE
+AE2qFDmlAac0BynITaTrRnvB4BegqZXVk2KVG8QLWNjQ5c65dmvd9ABXHwARAQAB
+tCZDaHJpc3RpYW4gU2NodWx0ZSA8c2NodWx0ZUBhcGFjaGUub3JnPokCPgQTAQIA
+KAUCVmySOAIbAwUJAeEzgAYLCQgHAwIGFQgCCQoLBBYCAwECHgECF4AACgkQEF3j
+YDjYxsWF7g//YLumYwRi2MskuRV3f7oz1+76jaYmMO9+Zodo1MRosm0/DH9k5Ryq
+7Dc7NZ90jMZX+15QXBQw3WRKidiv+QrHVlZIR0WRBB2xqTJUtH2QgTEc5RHi4vNB
+rRzASqpxZrZgLRLFe/lYpZhHRhwWtoJx/QnGT0u6I5l9jbM2DpqikMPAb4NkiYBH
+w0ettbtVEQo+oRFZViNIcIb+noAMXlaJyVWg+PaPzWxKLk/C+PLCRWka2Wxs1mKQ
+jaYU9xiJDZUN4AxeWjlUECOHnL5gnwjaOTx5x2S7Xnly0PYfjar3B2siizZIil9z
+mTK/YGfp/HvHVyzQdxNpEShy9YP10AguJ32oJbaJgSnu5lMQZ4NyRYmG+2ESoMhB
+4QjkMafXGQ0LTvnU6TSvLA6Pkgv759GOI948ag5L1pIlbhpCUAePGp/O77JApd7l
+0kHPgsPa6i6jqusdhRVNnFarqNZwHWzW9Hde0yalJCTdZQiuNYox1SIzWPUN0OBB
+5eZUeZB0fsu5cRSTxNRaBJmZpjRih4ewyNb9sYPFUa5kvFUTX2vX1yQEDxM9fj8I
+rdW7blA2rpkA+ZwbSCG+ojgOelVEBjfFOPoKETUZhUukh5AlmEtAX7MwfTqAEhdM
+vh8LaFpFAK82YgBci8RC0yLXNEVU7U1R3nIrbgFMedr900vG8J32fF25Ag0EVmyS
+OAEQANQBO/kj7OPEEt+WI6EP2POEgj6OnSXIS5b6Alqp5BZZoE2oEGSh8BSaufL/
+/CUnUky7nx6OqqSzdEaXFL8GIIrgmccgBX2IQSq8pez5i2ubAdluJgRlQXmzOSf+
+IfAHhPnhG98iF+3pdD6z5s0TelzyKfcMNCBpDrQVeHJPjTkM56eO0rOhGSohu4eT
+6s7Doeo+XDd+uDRfkGJ4HYnYv7djnNLfMRDnT1kj7IZZOBzFCHPUzS5obFHbJnzT
++BlfITcME96dT0IZy+KuSN50g80bAyj0swvjxsDvenCr/WiKU8PSgKX7Bz6tdYfd
+kp4LnprItECodseKUXF/uU00FFuFe6yZzyL1fbVwMU/WQ4uMM4bmD92s+8DaAHtd
+aZ5ai5rolzrBqRB/Y2qzka3gdxknzfASHQJME8dK4R3UFIJG7bNjZZ1g423KWhrD
+31piDhxXe3aFJxH0YiwqOGVSuZFOMYb0cKlMzUZ0Rs+8klGSFa5dZqzi2FJ/9bjy
+KUIMWP/xzWvrBC33JdMhtcKaUg1zLSfp9pDnARc5rOKlakmQGUvVjhk1a5sjlnPq
+H7+IdqjZuuaQchZDI+y7q5nnxcwoKBAYo7eYs+cIzI3EIRr9nN5pKf2Gv/83Wgn0
+f6Y0bvQkt+V3Km2EIJ8Vv8x81qAMSA8IAYDXRkD1wKQAgAQPABEBAAGJAiUEGAEC
+AA8FAlZskjgCGwwFCQHhM4AACgkQEF3jYDjYxsXJdQ/9GlbhfrE6aaYGEqKjiUoV
+VydhUufeQBk+Wk8LhNar5Z7elQ309Tt0gXjU8up/vuEY0k+Hg6KThnrprOtU4VFU
+ayESzShuJyV0DENVZVhoaflNGCc/vyfTljK+MzVcxw7PoTKAUSw99jRIVDHEa4wD
+ZiKK96ktf2ebvgQ9bmA8aDeuGUjos17+JpmjcvdhuLLuqAHl0FiQtW4ovs2BJC59
+0d3PF1wVSKXylTKTy2Y5beHPJKBwvG6/cZin5fWH8t0pCtFkKXgB6Kw3AV6qfMuu
+0lSn+qJaPmZyAZ3UBvU+QdaJOb8EaL23LGndwt02vRL5u6WGgGOSiHunrPSds9vp
+uBr5NFpA8OYl8vN8C6vgW8EOxKFpt+LEsLlWIT+mKWVkTxDiNGwoI37MBHp4Nw3b
+wOCRZWlrEmuh7znWGKEhIekVqX+XIk/T7xPaVKIu0Zkbtaq0yBMzjQ9lBCUG2suz
+votgphgjdocQIe1eMrd+Vg1sGNcz1MkqT6r/qiNBtzSHZmbSzF9XZGK2DDzBzjie
+sdfurhVp3NRCiWQkfuBmaSEwhjYUfwZYHey0d7KgMMQztqnR+7mW9IyrHs65zYon
+UULWiY7Admp+aWTE3hmQY1ztzzlbaT3Ezb77sZRT/O1yfwgsM4vU+NrWPK8qJna2
+JQ6v7zYk/Wo9odWBxrvoJ3o=
+=Jdgg
+-END PGP PUBLIC KEY BLOCK-

maven-integration-testing git commit: o Updated to set LC_ALL=C in addition to LANG=C to run the ITs using the POSIX locale.

2015-12-12 Thread schulte

Repository: maven-integration-testing
Updated Branches:
  refs/heads/master a6aca2894 -> 30ecf2e07


o Updated to set LC_ALL=C in addition to LANG=C to run the ITs using the POSIX 
locale.


Project: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/repo
Commit: 
http://git-wip-us.apache.org/repos/asf/maven-integration-testing/commit/30ecf2e0
Tree: 
http://git-wip-us.apache.org/repos/asf/maven-integration-testing/tree/30ecf2e0
Diff: 
http://git-wip-us.apache.org/repos/asf/maven-integration-testing/diff/30ecf2e0

Branch: refs/heads/master
Commit: 30ecf2e0769db0624f18170d928d5e5213d50457
Parents: a6aca28
Author: Christian Schulte <schu...@apache.org>
Authored: Sat Dec 12 22:58:21 2015 +0100
Committer: Christian Schulte <schu...@apache.org>
Committed: Sat Dec 12 22:58:21 2015 +0100

--
 run-its.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/30ecf2e0/run-its.sh
--
diff --git a/run-its.sh b/run-its.sh
index cc79c2a..d251099 100755
--- a/run-its.sh
+++ b/run-its.sh
@@ -21,8 +21,8 @@
 
 # How I run the ITs from a clean slate. Though I do this with a primed Nexus 
instance. JvZ.
 
-env LANG=C mvn clean install -Prun-its,embedded -Dmaven.repo.local=`pwd`/repo
+env LANG=C LC_ALL=C mvn clean install -Prun-its,embedded 
-Dmaven.repo.local=`pwd`/repo
 
 # If behind a proxy try this
 
-# env LANG=C mvn clean install -Prun-its,embedded 
-Dmaven.repo.local=`pwd`/repo -Dproxy.active=true -Dproxy.type=http 
-Dproxy.host= -Dproxy.port= -Dproxy.user= -Dproxy.pass=
+# env LANG=C LC_ALL=C mvn clean install -Prun-its,embedded 
-Dmaven.repo.local=`pwd`/repo -Dproxy.active=true -Dproxy.type=http 
-Dproxy.host= -Dproxy.port= -Dproxy.user= -Dproxy.pass=

maven git commit: [MNG-5629] ClosedChannelException from DefaultUpdateCheckManager.read

2015-12-11 Thread schulte

Repository: maven
Updated Branches:
  refs/heads/master fde3b28fb -> 7cd7bd864


[MNG-5629] ClosedChannelException from DefaultUpdateCheckManager.read

o Updated to stop producing 'ClosedChannelException's when reading tracking 
files.
o Updated to use 'Long.MAX_VALUE' as the size of any locked regions to prevent 
writing beyond locked regions.


Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/7cd7bd86
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/7cd7bd86
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/7cd7bd86

Branch: refs/heads/master
Commit: 7cd7bd8648dd4755f4ef1b09e031f03d8bdc59b2
Parents: fde3b28
Author: Christian Schulte <schu...@apache.org>
Authored: Fri Dec 11 21:42:09 2015 +0100
Committer: Christian Schulte <schu...@apache.org>
Committed: Fri Dec 11 21:48:29 2015 +0100

--
 .../legacy/DefaultUpdateCheckManager.java   | 61 
 1 file changed, 24 insertions(+), 37 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/7cd7bd86/maven-compat/src/main/java/org/apache/maven/repository/legacy/DefaultUpdateCheckManager.java
--
diff --git 
a/maven-compat/src/main/java/org/apache/maven/repository/legacy/DefaultUpdateCheckManager.java
 
b/maven-compat/src/main/java/org/apache/maven/repository/legacy/DefaultUpdateCheckManager.java
index dfc463b..2c26f71 100644
--- 
a/maven-compat/src/main/java/org/apache/maven/repository/legacy/DefaultUpdateCheckManager.java
+++ 
b/maven-compat/src/main/java/org/apache/maven/repository/legacy/DefaultUpdateCheckManager.java
@@ -28,15 +28,12 @@ import org.apache.maven.repository.Proxy;
 import org.codehaus.plexus.component.annotations.Component;
 import org.codehaus.plexus.logging.AbstractLogEnabled;
 import org.codehaus.plexus.logging.Logger;
-import org.codehaus.plexus.util.IOUtil;
 
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.RandomAccessFile;
-import java.nio.ByteBuffer;
+import java.nio.channels.Channels;
 import java.nio.channels.FileChannel;
 import java.nio.channels.FileLock;
 import java.util.Date;
@@ -242,18 +239,12 @@ public class DefaultUpdateCheckManager
 Properties props = new Properties();
 
 channel = new RandomAccessFile( touchfile, "rw" ).getChannel();
-lock = channel.lock( 0, channel.size(), false );
+lock = channel.lock();
 
 if ( touchfile.canRead() )
 {
 getLogger().debug( "Reading resolution-state from: " + 
touchfile );
-ByteBuffer buffer = ByteBuffer.allocate( (int) 
channel.size() );
-
-channel.read( buffer );
-buffer.flip();
-
-ByteArrayInputStream stream = new ByteArrayInputStream( 
buffer.array() );
-props.load( stream );
+props.load( Channels.newInputStream( channel ) );
 }
 
 props.setProperty( key, Long.toString( 
System.currentTimeMillis() ) );
@@ -267,18 +258,15 @@ public class DefaultUpdateCheckManager
 props.remove( key + ERROR_KEY_SUFFIX );
 }
 
-ByteArrayOutputStream stream = new ByteArrayOutputStream();
-
 getLogger().debug( "Writing resolution-state to: " + touchfile 
);
-props.store( stream, "Last modified on: " + new Date() );
+channel.position( 0 );
+props.store( Channels.newOutputStream( channel ), "Last 
modified on: " + new Date() );
 
-byte[] data = stream.toByteArray();
-ByteBuffer buffer = ByteBuffer.allocate( data.length );
-buffer.put( data );
-buffer.flip();
+lock.release();
+lock = null;
 
-channel.position( 0 );
-channel.write( buffer );
+channel.close();
+channel = null;
 }
 catch ( IOException e )
 {
@@ -359,27 +347,26 @@ public class DefaultUpdateCheckManager
 
 synchronized ( touchfile.getAbsolutePath().intern() )
 {
+FileInputStream in = null;
 FileLock lock = null;
-FileChannel channel = null;
+
 try
 {
 Properties props = new Properties();
 
-FileInputStream stream = new FileInputStream( touchfile );
-try
-{
-channel = stream.getChannel();
-lock = c

maven git commit: [MNG-5359] Declared execution in PluginMgmt gets bound to lifecycle (regression)

2015-12-20 Thread schulte

Repository: maven
Updated Branches:
  refs/heads/master cc006b544 -> 029af3a39


[MNG-5359] Declared execution in PluginMgmt gets bound to lifecycle (regression)

o Updated to use a 'LifecycleMappingNotFoundException' instead of returning 
'null'.
o Updated to also inject lifecycle plugins for project default goals.


Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/029af3a3
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/029af3a3
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/029af3a3

Branch: refs/heads/master
Commit: 029af3a394b37610ecfb97c07b4f62895f7d2eb7
Parents: cc006b5
Author: Christian Schulte <schu...@apache.org>
Authored: Mon Dec 21 01:09:38 2015 +0100
Committer: Christian Schulte <schu...@apache.org>
Committed: Mon Dec 21 02:19:47 2015 +0100

--
 .../lifecycle/DefaultLifecycleExecutor.java |  3 +
 .../lifecycle/LifeCyclePluginAnalyzer.java  | 10 ++-
 .../maven/lifecycle/LifecycleExecutor.java  |  3 +-
 .../LifecycleMappingNotFoundException.java  | 45 +++
 .../DefaultLifecyclePluginAnalyzer.java | 27 ---
 .../DefaultLifecycleBindingsInjector.java   | 79 +---
 6 files changed, 123 insertions(+), 44 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/029af3a3/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java
--
diff --git 
a/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java
 
b/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java
index 6f994b3..8d0405c 100644
--- 
a/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java
+++ 
b/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java
@@ -100,7 +100,10 @@ public class DefaultLifecycleExecutor
 // TODO: This whole method could probably removed by injecting 
lifeCyclePluginAnalyzer straight into client site.
 // TODO: But for some reason the whole plexus appcontext refuses to start 
when I try this.
 
+@Override
+@Deprecated
 public Set getPluginsBoundByDefaultToAllLifecycles( String 
packaging )
+throws LifecycleMappingNotFoundException
 {
 return 
lifeCyclePluginAnalyzer.getPluginsBoundByDefaultToAllLifecycles( packaging );
 }

http://git-wip-us.apache.org/repos/asf/maven/blob/029af3a3/maven-core/src/main/java/org/apache/maven/lifecycle/LifeCyclePluginAnalyzer.java
--
diff --git 
a/maven-core/src/main/java/org/apache/maven/lifecycle/LifeCyclePluginAnalyzer.java
 
b/maven-core/src/main/java/org/apache/maven/lifecycle/LifeCyclePluginAnalyzer.java
index 1d4e7f8..ef17560 100644
--- 
a/maven-core/src/main/java/org/apache/maven/lifecycle/LifeCyclePluginAnalyzer.java
+++ 
b/maven-core/src/main/java/org/apache/maven/lifecycle/LifeCyclePluginAnalyzer.java
@@ -30,7 +30,8 @@ public interface LifeCyclePluginAnalyzer
 {
 
 @Deprecated
-Set getPluginsBoundByDefaultToAllLifecycles( String packaging );
+Set getPluginsBoundByDefaultToAllLifecycles( String packaging )
+throws LifecycleMappingNotFoundException;
 
 /**
  * Gets the lifecycle {@code Plugin}s for a given packaging and set of 
phases.
@@ -38,11 +39,12 @@ public interface LifeCyclePluginAnalyzer
  * @param packaging The packaging to get plugins for.
  * @param phases The phases to get plugins for.
  *
- * @return All lifecycle {@code Plugin}s for the given {@code packaging} 
and {@code phases}
- * or {@code null}, if {@code packaging} does not identify a supported 
packaging.
+ * @return All lifecycle {@code Plugin}s for the given {@code packaging} 
and {@code phases}.
  *
+ * @throws LifecycleMappingNotFoundException if {@code packaging} does not 
identify a supported packaging.
  * @since 3.4
  */
-Set getPlugins( String packaging, Set phases );
+Set getPlugins( String packaging, Set phases )
+throws LifecycleMappingNotFoundException;
 
 }

http://git-wip-us.apache.org/repos/asf/maven/blob/029af3a3/maven-core/src/main/java/org/apache/maven/lifecycle/LifecycleExecutor.java
--
diff --git 
a/maven-core/src/main/java/org/apache/maven/lifecycle/LifecycleExecutor.java 
b/maven-core/src/main/java/org/apache/maven/lifecycle/LifecycleExecutor.java
index 15c9c54..9e74ba2 100644
--- a/maven-core/src/main/java/org/apache/maven/lifecycle/LifecycleExecutor.java
+++ b/maven-core/src/main/java/org/apache/maven/lifecycle/LifecycleExecutor.java
@@ -54,7 +54,8 @@ public interface LifecycleExecutor
  * @deprecated Please use {@link LifeCycl

[1/2] maven-integration-testing git commit: [MNG-5359] Declared execution in PluginMgmt gets bound to lifecycle (regression)

2015-12-20 Thread schulte

Repository: maven-integration-testing
Updated Branches:
  refs/heads/master 8db2b86be -> 0fdf7c282


[MNG-5359] Declared execution in PluginMgmt gets bound to lifecycle (regression)

o Updated to remove non-existent plugin versions from the test pom.


Project: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/repo
Commit: 
http://git-wip-us.apache.org/repos/asf/maven-integration-testing/commit/2e10d60a
Tree: 
http://git-wip-us.apache.org/repos/asf/maven-integration-testing/tree/2e10d60a
Diff: 
http://git-wip-us.apache.org/repos/asf/maven-integration-testing/diff/2e10d60a

Branch: refs/heads/master
Commit: 2e10d60ac3d9652201c713219de5de89ea621d3b
Parents: 8db2b86
Author: Christian Schulte <schu...@apache.org>
Authored: Mon Dec 21 02:41:27 2015 +0100
Committer: Christian Schulte <schu...@apache.org>
Committed: Mon Dec 21 02:41:27 2015 +0100

--
 core-it-suite/src/test/resources/mng-5359/pom.xml | 15 ---
 1 file changed, 15 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/2e10d60a/core-it-suite/src/test/resources/mng-5359/pom.xml
--
diff --git a/core-it-suite/src/test/resources/mng-5359/pom.xml 
b/core-it-suite/src/test/resources/mng-5359/pom.xml
index 8b13d9d..29f8331 100644
--- a/core-it-suite/src/test/resources/mng-5359/pom.xml
+++ b/core-it-suite/src/test/resources/mng-5359/pom.xml
@@ -53,21 +53,6 @@ under the License.
 
   
 
-
-  org.apache.maven.plugins
-  maven-compiler-plugin
-  2.5.1
-
-
-  org.apache.maven.plugins
-  maven-install-plugin
-  2.4
-
-
-  org.apache.maven.plugins
-  maven-jar-plugin
-  2.4
-

[2/2] maven-integration-testing git commit: [MNG-5581] Provide a way to customize lifecycle mapping logic

2015-12-20 Thread schulte

[MNG-5581] Provide a way to customize lifecycle mapping logic

o Updated to make test work with Maven >= 3.4.


Project: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/repo
Commit: 
http://git-wip-us.apache.org/repos/asf/maven-integration-testing/commit/0fdf7c28
Tree: 
http://git-wip-us.apache.org/repos/asf/maven-integration-testing/tree/0fdf7c28
Diff: 
http://git-wip-us.apache.org/repos/asf/maven-integration-testing/diff/0fdf7c28

Branch: refs/heads/master
Commit: 0fdf7c282a2916a03ea612c3aa43df400b3f6a51
Parents: 2e10d60
Author: Christian Schulte <schu...@apache.org>
Authored: Mon Dec 21 02:43:11 2015 +0100
Committer: Christian Schulte <schu...@apache.org>
Committed: Mon Dec 21 02:43:11 2015 +0100

--
 .../apache/maven/it/MavenITmng5581LifecycleMappingDelegate.java   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/0fdf7c28/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5581LifecycleMappingDelegate.java
--
diff --git 
a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5581LifecycleMappingDelegate.java
 
b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5581LifecycleMappingDelegate.java
index f923550..5facdec 100644
--- 
a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5581LifecycleMappingDelegate.java
+++ 
b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5581LifecycleMappingDelegate.java
@@ -62,7 +62,8 @@ public class MavenITmng5581LifecycleMappingDelegate
 verifier.verifyErrorFreeLog();
 
 // run custom "test-only" build phase
-verifier.executeGoal( "test-only" );
+// See MNG-5359 for why the default lifecycle needs to be run as well.
+verifier.executeGoal( "validate test-only" );
 verifier.resetStreams();
 verifier.verifyErrorFreeLog();
 verifier.verifyTextInLog( "maven-surefire-plugin" );

maven git commit: [MNG-5359] Declared execution in PluginMgmt gets bound to lifecycle (regression)

2015-12-21 Thread schulte

Repository: maven
Updated Branches:
  refs/heads/master 029af3a39 -> d5ba185c1


[MNG-5359] Declared execution in PluginMgmt gets bound to lifecycle (regression)

o Updated to support 'LifecycleMappingDelegates' (MNG-5581).


Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/d5ba185c
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/d5ba185c
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/d5ba185c

Branch: refs/heads/master
Commit: d5ba185c1ab926b53acb0947c8a13ad74eac55e6
Parents: 029af3a
Author: Christian Schulte <schu...@apache.org>
Authored: Tue Dec 22 00:15:13 2015 +0100
Committer: Christian Schulte <schu...@apache.org>
Committed: Tue Dec 22 00:43:13 2015 +0100

--
 .../lifecycle/LifecycleMappingDelegate.java | 11 +
 .../DefaultLifecycleMappingDelegate.java| 12 +
 .../DefaultLifecyclePluginAnalyzer.java | 48 +++-
 3 files changed, 70 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/d5ba185c/maven-core/src/main/java/org/apache/maven/lifecycle/LifecycleMappingDelegate.java
--
diff --git 
a/maven-core/src/main/java/org/apache/maven/lifecycle/LifecycleMappingDelegate.java
 
b/maven-core/src/main/java/org/apache/maven/lifecycle/LifecycleMappingDelegate.java
index f070198..0b4465f 100644
--- 
a/maven-core/src/main/java/org/apache/maven/lifecycle/LifecycleMappingDelegate.java
+++ 
b/maven-core/src/main/java/org/apache/maven/lifecycle/LifecycleMappingDelegate.java
@@ -21,6 +21,7 @@ package org.apache.maven.lifecycle;
 
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 
 import org.apache.maven.execution.MavenSession;
 import org.apache.maven.plugin.InvalidPluginDescriptorException;
@@ -45,6 +46,16 @@ import org.apache.maven.project.MavenProject;
  */
 public interface LifecycleMappingDelegate
 {
+
+/**
+ * Gets a set of lifecycle identifiers of lifecycles this delegate is 
requiring to operate.
+ *
+ * @return An unmodifiable set of lifecycle identifiers of lifecycles this 
delegate is requiring to operate.
+ *
+ * @since 3.4
+ */
+Set getRequiredLifecycles();
+
 Map<String, List> calculateLifecycleMappings( MavenSession 
session, MavenProject project,
  Lifecycle 
lifecycle, String lifecyclePhase )
 throws PluginNotFoundException, PluginResolutionException, 
PluginDescriptorParsingException,

http://git-wip-us.apache.org/repos/asf/maven/blob/d5ba185c/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecycleMappingDelegate.java
--
diff --git 
a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecycleMappingDelegate.java
 
b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecycleMappingDelegate.java
index 8348530..46b9a9a 100644
--- 
a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecycleMappingDelegate.java
+++ 
b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecycleMappingDelegate.java
@@ -20,9 +20,12 @@ package org.apache.maven.lifecycle.internal;
  */
 
 import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashSet;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 import java.util.TreeMap;
 
 import org.apache.maven.execution.MavenSession;
@@ -51,6 +54,15 @@ public class DefaultLifecycleMappingDelegate
 @Requirement
 private BuildPluginManager pluginManager;
 
+@Override
+public Set getRequiredLifecycles()
+{
+// The default delegate requires the default lifecycle to operate.
+final Set requiredLifecycles = new HashSet<>();
+requiredLifecycles.add( "default" );
+return Collections.unmodifiableSet( requiredLifecycles );
+}
+
 public Map<String, List> calculateLifecycleMappings( 
MavenSession session, MavenProject project,
 
Lifecycle lifecycle, String lifecyclePhase )
 throws PluginNotFoundException, PluginResolutionException, 
PluginDescriptorParsingException,

http://git-wip-us.apache.org/repos/asf/maven/blob/d5ba185c/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecyclePluginAnalyzer.java
--
diff --git 
a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecyclePluginAnalyzer.java
 
b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecyclePlugin

maven-integration-testing git commit: [MNG-5581] Provide a way to customize lifecycle mapping logic

2015-12-21 Thread schulte

Repository: maven-integration-testing
Updated Branches:
  refs/heads/master ea3d3f939 -> da436b95b


[MNG-5581] Provide a way to customize lifecycle mapping logic

o Updated the test 'LifecycleMappingDelegate' to implement Maven 3.4 API.


Project: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/repo
Commit: 
http://git-wip-us.apache.org/repos/asf/maven-integration-testing/commit/da436b95
Tree: 
http://git-wip-us.apache.org/repos/asf/maven-integration-testing/tree/da436b95
Diff: 
http://git-wip-us.apache.org/repos/asf/maven-integration-testing/diff/da436b95

Branch: refs/heads/master
Commit: da436b95bbc151cf8c8d3ea24320e0a64080f808
Parents: ea3d3f9
Author: Christian Schulte <schu...@apache.org>
Authored: Tue Dec 22 00:30:31 2015 +0100
Committer: Christian Schulte <schu...@apache.org>
Committed: Tue Dec 22 00:30:31 2015 +0100

--
 .../maven/it/MavenITmng5581LifecycleMappingDelegate.java |  4 +---
 .../extension/pom.xml|  1 +
 .../TestLifecycleMappingDelegate.java| 11 +++
 3 files changed, 13 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/da436b95/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5581LifecycleMappingDelegate.java
--
diff --git 
a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5581LifecycleMappingDelegate.java
 
b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5581LifecycleMappingDelegate.java
index b70304a..f923550 100644
--- 
a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5581LifecycleMappingDelegate.java
+++ 
b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5581LifecycleMappingDelegate.java
@@ -20,7 +20,6 @@ package org.apache.maven.it;
  */
 
 import java.io.File;
-import java.util.Arrays;
 import java.util.List;
 
 import org.apache.maven.it.util.ResourceExtractor;
@@ -63,8 +62,7 @@ public class MavenITmng5581LifecycleMappingDelegate
 verifier.verifyErrorFreeLog();
 
 // run custom "test-only" build phase
-// See MNG-5359 for why the default lifecycle needs to be run as well.
-verifier.executeGoals( Arrays.asList( "validate", "test-only" ) );
+verifier.executeGoal( "test-only" );
 verifier.resetStreams();
 verifier.verifyErrorFreeLog();
 verifier.verifyTextInLog( "maven-surefire-plugin" );

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/da436b95/core-it-suite/src/test/resources/mng-5581-lifecycle-mapping-delegate/extension/pom.xml
--
diff --git 
a/core-it-suite/src/test/resources/mng-5581-lifecycle-mapping-delegate/extension/pom.xml
 
b/core-it-suite/src/test/resources/mng-5581-lifecycle-mapping-delegate/extension/pom.xml
index 5dd8e43..373da00 100644
--- 
a/core-it-suite/src/test/resources/mng-5581-lifecycle-mapping-delegate/extension/pom.xml
+++ 
b/core-it-suite/src/test/resources/mng-5581-lifecycle-mapping-delegate/extension/pom.xml
@@ -28,6 +28,7 @@ under the License.
   0.1
 
   
+
 3.2.1
   
 

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/da436b95/core-it-suite/src/test/resources/mng-5581-lifecycle-mapping-delegate/extension/src/main/java/org/apache/maven/its/mng5581/lifecyclemappingdelegate/TestLifecycleMappingDelegate.java
--
diff --git 
a/core-it-suite/src/test/resources/mng-5581-lifecycle-mapping-delegate/extension/src/main/java/org/apache/maven/its/mng5581/lifecyclemappingdelegate/TestLifecycleMappingDelegate.java
 
b/core-it-suite/src/test/resources/mng-5581-lifecycle-mapping-delegate/extension/src/main/java/org/apache/maven/its/mng5581/lifecyclemappingdelegate/TestLifecycleMappingDelegate.java
index 9c5c5e4..2f03dc2 100644
--- 
a/core-it-suite/src/test/resources/mng-5581-lifecycle-mapping-delegate/extension/src/main/java/org/apache/maven/its/mng5581/lifecyclemappingdelegate/TestLifecycleMappingDelegate.java
+++ 
b/core-it-suite/src/test/resources/mng-5581-lifecycle-mapping-delegate/extension/src/main/java/org/apache/maven/its/mng5581/lifecyclemappingdelegate/TestLifecycleMappingDelegate.java
@@ -12,10 +12,12 @@ package 
org.apache.maven.its.mng5581.lifecyclemappingdelegate;
 
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.HashSet;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 
+import java.util.Set;
 import javax.inject.Named;
 
 import org.apache.maven.execution.MavenSession;
@@ -34,6 +36,15 @@ import org.apache.maven.project.MavenProject;
 @Named("test-only")
 public class TestLifecy

[2/2] maven-integration-testing git commit: [MNG-5359] Declared execution in PluginMgmt gets bound to lifecycle (regression)

2015-12-21 Thread schulte

[MNG-5359] Declared execution in PluginMgmt gets bound to lifecycle (regression)

o Updated to use remote capable verifier.


Project: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/repo
Commit: 
http://git-wip-us.apache.org/repos/asf/maven-integration-testing/commit/ea3d3f93
Tree: 
http://git-wip-us.apache.org/repos/asf/maven-integration-testing/tree/ea3d3f93
Diff: 
http://git-wip-us.apache.org/repos/asf/maven-integration-testing/diff/ea3d3f93

Branch: refs/heads/master
Commit: ea3d3f939913782725ddb09da1e536f116c5267e
Parents: d673c4b
Author: Christian Schulte <schu...@apache.org>
Authored: Mon Dec 21 18:45:24 2015 +0100
Committer: Christian Schulte <schu...@apache.org>
Committed: Mon Dec 21 18:56:18 2015 +0100

--
 ...anPluginExecutionDeclarationInPluginMgmtTest.java |  2 +-
 core-it-suite/src/test/resources/mng-5359/pom.xml| 15 +++
 2 files changed, 16 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/ea3d3f93/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5359CleanPluginExecutionDeclarationInPluginMgmtTest.java
--
diff --git 
a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5359CleanPluginExecutionDeclarationInPluginMgmtTest.java
 
b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5359CleanPluginExecutionDeclarationInPluginMgmtTest.java
index a2d1bae..73bdbcf 100644
--- 
a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5359CleanPluginExecutionDeclarationInPluginMgmtTest.java
+++ 
b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5359CleanPluginExecutionDeclarationInPluginMgmtTest.java
@@ -43,7 +43,7 @@ public class 
MavenITmng5359CleanPluginExecutionDeclarationInPluginMgmtTest
 {
 File testDir = ResourceExtractor.simpleExtractResources( getClass(), 
"/mng-5359" );
 
-Verifier verifier = newVerifier( testDir.getAbsolutePath() );
+Verifier verifier = newVerifier( testDir.getAbsolutePath(), "remote" );
 
 verifier.setAutoclean( false );
 verifier.deleteDirectory( "target" );

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/ea3d3f93/core-it-suite/src/test/resources/mng-5359/pom.xml
--
diff --git a/core-it-suite/src/test/resources/mng-5359/pom.xml 
b/core-it-suite/src/test/resources/mng-5359/pom.xml
index 29f8331..8b13d9d 100644
--- a/core-it-suite/src/test/resources/mng-5359/pom.xml
+++ b/core-it-suite/src/test/resources/mng-5359/pom.xml
@@ -53,6 +53,21 @@ under the License.
 
   
 
+
+  org.apache.maven.plugins
+  maven-compiler-plugin
+  2.5.1
+
+
+  org.apache.maven.plugins
+  maven-install-plugin
+  2.4
+
+
+  org.apache.maven.plugins
+  maven-jar-plugin
+  2.4
+

[1/2] maven-integration-testing git commit: [MNG-5581] Provide a way to customize lifecycle mapping logic

2015-12-21 Thread schulte

Repository: maven-integration-testing
Updated Branches:
  refs/heads/master 0fdf7c282 -> ea3d3f939


[MNG-5581] Provide a way to customize lifecycle mapping logic

o Updated to correctly use the verifier with multiple goals.


Project: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/repo
Commit: 
http://git-wip-us.apache.org/repos/asf/maven-integration-testing/commit/d673c4bb
Tree: 
http://git-wip-us.apache.org/repos/asf/maven-integration-testing/tree/d673c4bb
Diff: 
http://git-wip-us.apache.org/repos/asf/maven-integration-testing/diff/d673c4bb

Branch: refs/heads/master
Commit: d673c4bbf70b7eea10bfc218e4ef5b95e233bd98
Parents: 0fdf7c2
Author: Christian Schulte <schu...@apache.org>
Authored: Mon Dec 21 18:52:27 2015 +0100
Committer: Christian Schulte <schu...@apache.org>
Committed: Mon Dec 21 18:56:16 2015 +0100

--
 .../apache/maven/it/MavenITmng5581LifecycleMappingDelegate.java   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/d673c4bb/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5581LifecycleMappingDelegate.java
--
diff --git 
a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5581LifecycleMappingDelegate.java
 
b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5581LifecycleMappingDelegate.java
index 5facdec..b70304a 100644
--- 
a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5581LifecycleMappingDelegate.java
+++ 
b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5581LifecycleMappingDelegate.java
@@ -20,6 +20,7 @@ package org.apache.maven.it;
  */
 
 import java.io.File;
+import java.util.Arrays;
 import java.util.List;
 
 import org.apache.maven.it.util.ResourceExtractor;
@@ -63,7 +64,7 @@ public class MavenITmng5581LifecycleMappingDelegate
 
 // run custom "test-only" build phase
 // See MNG-5359 for why the default lifecycle needs to be run as well.
-verifier.executeGoal( "validate test-only" );
+verifier.executeGoals( Arrays.asList( "validate", "test-only" ) );
 verifier.resetStreams();
 verifier.verifyErrorFreeLog();
 verifier.verifyTextInLog( "maven-surefire-plugin" );

svn commit: r1721474 - /maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/mojo/ShadeMojo.java

2015-12-22 Thread schulte

Author: schulte
Date: Tue Dec 22 23:38:04 2015
New Revision: 1721474

URL: http://svn.apache.org/viewvc?rev=1721474=rev
Log:
[MSHADE-195] createSourcesJar with source:jar-no-fork causes sources.jar to be 
deployed twice, causing the build to fail

o Updated to use correct source artifact type.


Modified:

maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/mojo/ShadeMojo.java

Modified: 
maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/mojo/ShadeMojo.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/mojo/ShadeMojo.java?rev=1721474=1721473=1721474=diff
==
--- 
maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/mojo/ShadeMojo.java
 (original)
+++ 
maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/mojo/ShadeMojo.java
 Tue Dec 22 23:38:04 2015
@@ -495,7 +495,8 @@ public class ShadeMojo
   outputJar );
 if ( createSourcesJar )
 {
-projectHelper.attachArtifact( project, "jar", 
shadedClassifierName + "-sources", sourcesJar );
+projectHelper.attachArtifact( project, "java-source", 
shadedClassifierName + "-sources",
+  sourcesJar );
 }
 }
 else if ( !renamed )
@@ -513,7 +514,7 @@ public class ShadeMojo
 
 replaceFile( shadedSources, sourcesJar );
 
-projectHelper.attachArtifact( project, "jar", 
"sources", shadedSources );
+projectHelper.attachArtifact( project, 
"java-source", "sources", shadedSources );
 }
 
 if ( shadeTestJar )

maven git commit: [MNG-5823] mvnDebug doesn't work with M2_HOME with spaces - missing quotes

2015-12-19 Thread schulte

Repository: maven
Updated Branches:
  refs/heads/master c188a1955 -> ab7b5ab47


[MNG-5823] mvnDebug doesn't work with M2_HOME with spaces - missing quotes

o Updated to add missing quotes also to 'mvnyjp'.


Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/ab7b5ab4
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/ab7b5ab4
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/ab7b5ab4

Branch: refs/heads/master
Commit: ab7b5ab4703a05a8b0923c2e336e7165d9c2180d
Parents: c188a19
Author: Christian Schulte <schu...@apache.org>
Authored: Sat Dec 19 18:36:53 2015 +0100
Committer: Christian Schulte <schu...@apache.org>
Committed: Sat Dec 19 18:36:53 2015 +0100

--
 apache-maven/src/bin/mvnyjp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/ab7b5ab4/apache-maven/src/bin/mvnyjp
--
diff --git a/apache-maven/src/bin/mvnyjp b/apache-maven/src/bin/mvnyjp
index 9ec6275..3ddec42 100755
--- a/apache-maven/src/bin/mvnyjp
+++ b/apache-maven/src/bin/mvnyjp
@@ -39,4 +39,4 @@ if [ ! -f "$YJPLIB" ]; then
   exit 1
 fi
 
-env 
MAVEN_OPTS="-agentpath:$YJPLIB=onexit=snapshot,onexit=memory,tracing,onlylocal 
$MAVEN_OPTS" `dirname $`/mvn "$@"
+env 
MAVEN_OPTS="-agentpath:$YJPLIB=onexit=snapshot,onexit=memory,tracing,onlylocal 
$MAVEN_OPTS" "`dirname "$0"`/mvn" "$@"

maven git commit: [MNG-5368] UnsupportedOperationException thrown when version range is not correct in dependencyManagement definitions

2015-12-19 Thread schulte

Repository: maven
Updated Branches:
  refs/heads/master 6aa015d11 -> f2a8a4580


[MNG-5368] UnsupportedOperationException thrown when version range is not 
correct in dependencyManagement definitions

o Updated to log an error message for any caught 
'InvalidVersionSpecificationException's.


Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/f2a8a458
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/f2a8a458
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/f2a8a458

Branch: refs/heads/master
Commit: f2a8a4580f417a59afe34e425df150740429a5ea
Parents: 6aa015d
Author: Christian Schulte <schu...@apache.org>
Authored: Sat Dec 19 17:37:11 2015 +0100
Committer: Christian Schulte <schu...@apache.org>
Committed: Sat Dec 19 17:44:32 2015 +0100

--
 .../legacy/LegacyRepositorySystem.java  | 24 
 1 file changed, 19 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/f2a8a458/maven-compat/src/main/java/org/apache/maven/repository/legacy/LegacyRepositorySystem.java
--
diff --git 
a/maven-compat/src/main/java/org/apache/maven/repository/legacy/LegacyRepositorySystem.java
 
b/maven-compat/src/main/java/org/apache/maven/repository/legacy/LegacyRepositorySystem.java
index 866968b..ba34096 100644
--- 
a/maven-compat/src/main/java/org/apache/maven/repository/legacy/LegacyRepositorySystem.java
+++ 
b/maven-compat/src/main/java/org/apache/maven/repository/legacy/LegacyRepositorySystem.java
@@ -144,6 +144,9 @@ public class LegacyRepositorySystem
 }
 catch ( InvalidVersionSpecificationException e )
 {
+// MNG-5368: Log a message instead of returning 'null' silently.
+this.logger.error( String.format( "Invalid version specification 
'%s' creating dependency artifact '%s'.",
+  d.getVersion(), d ), e );
 return null;
 }
 
@@ -180,6 +183,11 @@ public class LegacyRepositorySystem
 }
 catch ( InvalidVersionSpecificationException e )
 {
+// MNG-5368: Log a message instead of returning 'null' silently.
+this.logger.error( String.format(
+"Invalid version specification '%s' creating extension 
artifact '%s:%s:%s'.",
+version, groupId, artifactId, version, e ) );
+
 return null;
 }
 
@@ -193,18 +201,24 @@ public class LegacyRepositorySystem
 
 public Artifact createPluginArtifact( Plugin plugin )
 {
+String version = plugin.getVersion();
+if ( StringUtils.isEmpty( version ) )
+{
+version = "RELEASE";
+}
+
 VersionRange versionRange;
 try
 {
-String version = plugin.getVersion();
-if ( StringUtils.isEmpty( version ) )
-{
-version = "RELEASE";
-}
 versionRange = VersionRange.createFromVersionSpec( version );
 }
 catch ( InvalidVersionSpecificationException e )
 {
+// MNG-5368: Log a message instead of returning 'null' silently.
+this.logger.error( String.format(
+"Invalid version specification '%s' creating plugin artifact 
'%s'.",
+version, plugin, e ) );
+
 return null;
 }

maven git commit: [MNG-5823] mvnDebug doesn't work with M2_HOME with spaces - missing quotes

2015-12-19 Thread schulte

Repository: maven
Updated Branches:
  refs/heads/master f2a8a4580 -> c188a1955


[MNG-5823] mvnDebug doesn't work with M2_HOME with spaces - missing quotes

o Updated to add missing quotes.


Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/c188a195
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/c188a195
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/c188a195

Branch: refs/heads/master
Commit: c188a195562695454a244cb2a9b374d22d1812d5
Parents: f2a8a45
Author: Christian Schulte <schu...@apache.org>
Authored: Sat Dec 19 18:06:23 2015 +0100
Committer: Christian Schulte <schu...@apache.org>
Committed: Sat Dec 19 18:06:23 2015 +0100

--
 apache-maven/src/bin/mvnDebug | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/c188a195/apache-maven/src/bin/mvnDebug
--
diff --git a/apache-maven/src/bin/mvnDebug b/apache-maven/src/bin/mvnDebug
index d5e88aa..caf0b45 100755
--- a/apache-maven/src/bin/mvnDebug
+++ b/apache-maven/src/bin/mvnDebug
@@ -38,4 +38,4 @@ MAVEN_DEBUG_OPTS="-Xdebug 
-Xrunjdwp:transport=dt_socket,server=y,suspend=y,addre
 
 echo Preparing to Execute Maven in Debug Mode
 
-env MAVEN_OPTS="$MAVEN_OPTS" MAVEN_DEBUG_OPTS="$MAVEN_DEBUG_OPTS" `dirname 
$0`/mvn "$@"
+env MAVEN_OPTS="$MAVEN_OPTS" MAVEN_DEBUG_OPTS="$MAVEN_DEBUG_OPTS" "`dirname 
"$0"`/mvn" "$@"

maven git commit: [MNG-5837] "mvn" script invokes /bin/sh but requires /bin/bash functions Submitted by: Joseph Walton <j...@kafsemo.org>

2015-12-18 Thread schulte

Repository: maven
Updated Branches:
  refs/heads/master 5f048234f -> d980040ff


[MNG-5837] "mvn" script invokes /bin/sh but requires /bin/bash functions
Submitted by: Joseph Walton <j...@kafsemo.org>

Use backticks instead of $(..) for the scripting added in MNG-5767.
Solaris's /bin/sh isn't POSIX-compliant enough to recognise the first
form.

'local' is not POSIX, but supported by most shells. However, it's not
supported by Solaris's /bin/sh, so use a subshell instead.

This closes #50.


Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/d980040f
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/d980040f
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/d980040f

Branch: refs/heads/master
Commit: d980040ffd4e4ad9343171140270c1725c19a6fe
Parents: 5f04823
Author: Christian Schulte <schu...@apache.org>
Authored: Fri Dec 18 20:39:26 2015 +0100
Committer: Christian Schulte <schu...@apache.org>
Committed: Fri Dec 18 20:52:42 2015 +0100

--
 apache-maven/src/bin/mvn  | 16 
 apache-maven/src/bin/mvnDebug |  2 +-
 apache-maven/src/bin/mvnyjp   |  2 +-
 3 files changed, 10 insertions(+), 10 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/d980040f/apache-maven/src/bin/mvn
--
diff --git a/apache-maven/src/bin/mvn b/apache-maven/src/bin/mvn
index 6875628..293c97a 100755
--- a/apache-maven/src/bin/mvn
+++ b/apache-maven/src/bin/mvn
@@ -197,29 +197,29 @@ fi
 # traverses directory structure from process work directory to filesystem root
 # first directory with .mvn subdirectory is considered project base directory
 find_maven_basedir() {
-  local basedir
-  local wdir
-  basedir="$(pwd)"
-  wdir="$(pwd)"
+(
+  basedir="`pwd`"
+  wdir="`pwd`"
   while [ "$wdir" != '/' ] ; do
 if [ -d "$wdir"/.mvn ] ; then
   basedir=$wdir
   break
 fi
-wdir="$(cd "$wdir/.."; pwd)"
+wdir="`cd "$wdir/.."; pwd`"
   done
   echo "${basedir}"
+)
 }
 
 # concatenates all lines of a file
 concat_lines() {
   if [ -f "$1" ]; then
-echo "$(tr -s '\n' ' ' < "$1")"
+echo "`tr -s '\n' ' ' < "$1"`"
   fi
 }
 
-MAVEN_PROJECTBASEDIR="${MAVEN_BASEDIR:-$(find_maven_basedir)}"
-MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") 
$MAVEN_OPTS"
+MAVEN_PROJECTBASEDIR="${MAVEN_BASEDIR:-`find_maven_basedir`}"
+MAVEN_OPTS="`concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config"` $MAVEN_OPTS"
 
 # For Cygwin, switch project base directory path to Windows format before
 # executing Maven. Otherwise this will cause Maven not to consider it.

http://git-wip-us.apache.org/repos/asf/maven/blob/d980040f/apache-maven/src/bin/mvnDebug
--
diff --git a/apache-maven/src/bin/mvnDebug b/apache-maven/src/bin/mvnDebug
index a1077ce..d5e88aa 100755
--- a/apache-maven/src/bin/mvnDebug
+++ b/apache-maven/src/bin/mvnDebug
@@ -38,4 +38,4 @@ MAVEN_DEBUG_OPTS="-Xdebug 
-Xrunjdwp:transport=dt_socket,server=y,suspend=y,addre
 
 echo Preparing to Execute Maven in Debug Mode
 
-env MAVEN_OPTS="$MAVEN_OPTS" MAVEN_DEBUG_OPTS="$MAVEN_DEBUG_OPTS" $(dirname 
$0)/mvn "$@"
+env MAVEN_OPTS="$MAVEN_OPTS" MAVEN_DEBUG_OPTS="$MAVEN_DEBUG_OPTS" `dirname 
$0`/mvn "$@"

http://git-wip-us.apache.org/repos/asf/maven/blob/d980040f/apache-maven/src/bin/mvnyjp
--
diff --git a/apache-maven/src/bin/mvnyjp b/apache-maven/src/bin/mvnyjp
index ef4f8e1..9ec6275 100755
--- a/apache-maven/src/bin/mvnyjp
+++ b/apache-maven/src/bin/mvnyjp
@@ -39,4 +39,4 @@ if [ ! -f "$YJPLIB" ]; then
   exit 1
 fi
 
-env 
MAVEN_OPTS="-agentpath:$YJPLIB=onexit=snapshot,onexit=memory,tracing,onlylocal 
$MAVEN_OPTS" $(dirname $0)/mvn "$@"
+env 
MAVEN_OPTS="-agentpath:$YJPLIB=onexit=snapshot,onexit=memory,tracing,onlylocal 
$MAVEN_OPTS" `dirname $`/mvn "$@"

maven git commit: [MNG-5538] mvn start script causes cygwin warning

2015-12-18 Thread schulte

Repository: maven
Updated Branches:
  refs/heads/master 5ca3ca550 -> 6aa015d11


[MNG-5538] mvn start script causes cygwin warning

s/CLASSWORDS_JAR/CLASSWORLDS_JAR/g

o Updated to correct untested pull request.


Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/6aa015d1
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/6aa015d1
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/6aa015d1

Branch: refs/heads/master
Commit: 6aa015d116fc6d98329c5ee020073d11cf3cb8d4
Parents: 5ca3ca5
Author: Christian Schulte <schu...@apache.org>
Authored: Sat Dec 19 01:55:04 2015 +0100
Committer: Christian Schulte <schu...@apache.org>
Committed: Sat Dec 19 01:55:04 2015 +0100

--
 apache-maven/src/bin/mvn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/6aa015d1/apache-maven/src/bin/mvn
--
diff --git a/apache-maven/src/bin/mvn b/apache-maven/src/bin/mvn
index b5a9b68..c815839 100755
--- a/apache-maven/src/bin/mvn
+++ b/apache-maven/src/bin/mvn
@@ -183,7 +183,7 @@ if [ -z "$JAVA_HOME" ] ; then
 fi
 
 CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher
-CLASSWORDS_JAR=`echo "${M2_HOME}"/boot/plexus-classworlds-*.jar`
+CLASSWORLDS_JAR=`echo "${M2_HOME}"/boot/plexus-classworlds-*.jar`
 
 # For Cygwin, switch paths to Windows format before running java
 if $cygwin; then

maven git commit: [MNG-5538] mvn start script causes cygwin warning

2015-12-18 Thread schulte

Repository: maven
Updated Branches:
  refs/heads/master dc7b41455 -> 5ca3ca550


[MNG-5538] mvn start script causes cygwin warning

This closes #27.


Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/5ca3ca55
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/5ca3ca55
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/5ca3ca55

Branch: refs/heads/master
Commit: 5ca3ca55086d125366b58a3d58c1df77604dedbf
Parents: dc7b414
Author: Arlo Louis O'Keeffe <mailtoa...@gmail.com>
Authored: Wed Oct 29 09:07:45 2014 +0100
Committer: Christian Schulte <schu...@apache.org>
Committed: Sat Dec 19 00:42:02 2015 +0100

--
 apache-maven/src/bin/mvn | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/5ca3ca55/apache-maven/src/bin/mvn
--
diff --git a/apache-maven/src/bin/mvn b/apache-maven/src/bin/mvn
index 293c97a..b5a9b68 100755
--- a/apache-maven/src/bin/mvn
+++ b/apache-maven/src/bin/mvn
@@ -183,6 +183,7 @@ if [ -z "$JAVA_HOME" ] ; then
 fi
 
 CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher
+CLASSWORDS_JAR=`echo "${M2_HOME}"/boot/plexus-classworlds-*.jar`
 
 # For Cygwin, switch paths to Windows format before running java
 if $cygwin; then
@@ -192,6 +193,8 @@ if $cygwin; then
 JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"`
   [ -n "$CLASSPATH" ] &&
 CLASSPATH=`cygpath --path --windows "$CLASSPATH"`
+  [ -n "$CLASSWORLDS_JAR" ] &&
+CLASSWORLDS_JAR=`cygpath --path --windows "$CLASSWORLDS_JAR"`
 fi
 
 # traverses directory structure from process work directory to filesystem root
@@ -238,7 +241,7 @@ export MAVEN_CMD_LINE_ARGS
 exec "$JAVACMD" \
   $MAVEN_OPTS \
   $MAVEN_DEBUG_OPTS \
-  -classpath "${M2_HOME}"/boot/plexus-classworlds-*.jar \
+  -classpath "${CLASSWORLDS_JAR}" \
   "-Dclassworlds.conf=${M2_HOME}/bin/m2.conf" \
   "-Dmaven.home=${M2_HOME}" 
"-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \
   ${CLASSWORLDS_LAUNCHER} "$@"

maven git commit: [MNG-5868] Adding serval times the same artifact via MavenProjectHelper (attachArtifact) does not produce a failure

2015-12-18 Thread schulte

Repository: maven
Updated Branches:
  refs/heads/master d980040ff -> dc7b41455


[MNG-5868] Adding serval times the same artifact via MavenProjectHelper 
(attachArtifact) does not produce a failure

o Updated to log an information message when an existing attached
  artifact got replaced.


Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/dc7b4145
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/dc7b4145
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/dc7b4145

Branch: refs/heads/master
Commit: dc7b41455499e7f6b58fbbd05472142f052c
Parents: d980040
Author: Christian Schulte <schu...@apache.org>
Authored: Fri Dec 18 23:41:52 2015 +0100
Committer: Christian Schulte <schu...@apache.org>
Committed: Fri Dec 18 23:41:52 2015 +0100

--
 .../org/apache/maven/project/DefaultMavenProjectHelper.java| 6 ++
 1 file changed, 6 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/dc7b4145/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectHelper.java
--
diff --git 
a/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectHelper.java
 
b/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectHelper.java
index 223e920..54c15bb 100644
--- 
a/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectHelper.java
+++ 
b/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectHelper.java
@@ -93,7 +93,13 @@ public class DefaultMavenProjectHelper
 
 public void attachArtifact( MavenProject project, Artifact artifact )
 {
+final int size = project.getAttachedArtifacts().size();
 project.addAttachedArtifact( artifact );
+
+if ( project.getAttachedArtifacts().size() == size && 
this.getLogger().isInfoEnabled() )
+{
+this.getLogger().info( String.format( "Replaced artifact %s.", 
artifact ) );
+}
 }
 
 public void addResource( MavenProject project, String resourceDirectory, 
List includes,

maven git commit: [MNG-5359] Declared execution in PluginMgmt gets bound to lifecycle (regression)

2015-12-20 Thread schulte

Repository: maven
Updated Branches:
  refs/heads/master ab7b5ab47 -> e84405162


[MNG-5359] Declared execution in PluginMgmt gets bound to lifecycle (regression)

o Updated to add lifecycle plugins only if a phase of the
  lifecycle is requested to be executed.


Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/e8440516
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/e8440516
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/e8440516

Branch: refs/heads/master
Commit: e84405162b8a228aaced264f48ec6a3e8ed261e8
Parents: ab7b5ab
Author: Christian Schulte <schu...@apache.org>
Authored: Sun Dec 20 19:32:57 2015 +0100
Committer: Christian Schulte <schu...@apache.org>
Committed: Sun Dec 20 19:32:57 2015 +0100

--
 .../project/DefaultMavenProjectBuilder.java |  1 +
 .../project/EmptyLifecyclePluginAnalyzer.java   |  6 ++
 .../execution/DefaultMavenExecutionRequest.java |  1 +
 .../maven/lifecycle/DefaultLifecycles.java  |  4 +-
 .../lifecycle/LifeCyclePluginAnalyzer.java  | 15 +
 .../maven/lifecycle/LifecycleExecutor.java  | 15 ++---
 .../DefaultLifecyclePluginAnalyzer.java | 63 
 .../DefaultLifecycleBindingsInjector.java   | 42 +
 .../maven/project/DefaultProjectBuilder.java|  1 +
 .../project/DefaultProjectBuildingRequest.java  | 17 ++
 .../maven/project/ProjectBuildingRequest.java   | 20 +++
 .../lifecycle/EmptyLifecyclePluginAnalyzer.java |  7 ++-
 .../stub/LifeCyclePluginAnalyzerStub.java   |  6 ++
 .../building/DefaultModelBuildingRequest.java   | 17 ++
 .../building/FilterModelBuildingRequest.java| 15 -
 .../model/building/ModelBuildingRequest.java| 19 ++
 .../model/plugin/DefaultReportingConverter.java |  6 ++
 17 files changed, 228 insertions(+), 27 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/e8440516/maven-compat/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
--
diff --git 
a/maven-compat/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
 
b/maven-compat/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
index 7bc5a5c..6834a17 100644
--- 
a/maven-compat/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
+++ 
b/maven-compat/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
@@ -101,6 +101,7 @@ public class DefaultMavenProjectBuilder
 {
 request.setActiveProfileIds( req.getActiveProfiles() );
 request.setInactiveProfileIds( req.getInactiveProfiles() );
+request.setGoals( request.getGoals() );
 }
 }
 }

http://git-wip-us.apache.org/repos/asf/maven/blob/e8440516/maven-compat/src/test/java/org/apache/maven/project/EmptyLifecyclePluginAnalyzer.java
--
diff --git 
a/maven-compat/src/test/java/org/apache/maven/project/EmptyLifecyclePluginAnalyzer.java
 
b/maven-compat/src/test/java/org/apache/maven/project/EmptyLifecyclePluginAnalyzer.java
index 672e07b..925e346 100644
--- 
a/maven-compat/src/test/java/org/apache/maven/project/EmptyLifecyclePluginAnalyzer.java
+++ 
b/maven-compat/src/test/java/org/apache/maven/project/EmptyLifecyclePluginAnalyzer.java
@@ -57,6 +57,12 @@ public class EmptyLifecyclePluginAnalyzer
 return plugins;
 }
 
+@Override
+public Set getPlugins( final String packaging, final Set 
phases )
+{
+return Collections.emptySet();
+}
+
 private Plugin newPlugin( String artifactId, String... goals )
 {
 Plugin plugin = new Plugin();

http://git-wip-us.apache.org/repos/asf/maven/blob/e8440516/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java
--
diff --git 
a/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java
 
b/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java
index 71a6894..218b4ec 100644
--- 
a/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java
+++ 
b/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java
@@ -1105,6 +1105,7 @@ public class DefaultMavenExecutionRequest
 projectBuildingRequest.setProfiles( getProfiles() );
 projectBuildingRequest.setProcessPlugins( true );
 projectBuildingRequest.setBuildStartTime( getStartTime() );
+projectBuildingRequest.setGoals( getGoals() );
 }
 
 return projectBuildingRequest;

http://git-wip-us.apache.org/repos

maven-integration-testing git commit: [MNG-5359] Declared execution in PluginMgmt gets bound to lifecycle (regression)

2015-12-20 Thread schulte

Repository: maven-integration-testing
Updated Branches:
  refs/heads/master ed5ffbe5a -> ee6c80a2b


[MNG-5359] Declared execution in PluginMgmt gets bound to lifecycle (regression)

o Updated to add integration test.


Project: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/repo
Commit: 
http://git-wip-us.apache.org/repos/asf/maven-integration-testing/commit/ee6c80a2
Tree: 
http://git-wip-us.apache.org/repos/asf/maven-integration-testing/tree/ee6c80a2
Diff: 
http://git-wip-us.apache.org/repos/asf/maven-integration-testing/diff/ee6c80a2

Branch: refs/heads/master
Commit: ee6c80a2bc8cb9d49b2e5390b66218ccb30ea745
Parents: ed5ffbe
Author: Christian Schulte <schu...@apache.org>
Authored: Sun Dec 20 19:34:40 2015 +0100
Committer: Christian Schulte <schu...@apache.org>
Committed: Sun Dec 20 19:34:40 2015 +0100

--
 .../apache/maven/it/IntegrationTestSuite.java   |  1 +
 ...ginExecutionDeclarationInPluginMgmtTest.java | 58 +++
 .../src/test/resources/mng-5359/pom.xml | 74 
 .../java/org/apache/maven/its/mng5359/App.java  | 13 
 4 files changed, 146 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/ee6c80a2/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java
--
diff --git 
a/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java 
b/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java
index 48051c9..bd1f77b 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java
@@ -106,6 +106,7 @@ public class IntegrationTestSuite
 // 
-
 // suite.addTestSuite( MavenIT0108SnapshotUpdateTest.class ); -- 
MNG-3137
 
+suite.addTestSuite( 
MavenITmng5359CleanPluginExecutionDeclarationInPluginMgmtTest.class );
 suite.addTestSuite( 
MavenITmng5898BuildMultimoduleWithEARFailsToResolveWARTest.class );
 suite.addTestSuite( MavenITmng5840ParentVersionRanges.class );
 suite.addTestSuite( MavenITmng5840RelativePathReactorMatching.class );

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/ee6c80a2/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5359CleanPluginExecutionDeclarationInPluginMgmtTest.java
--
diff --git 
a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5359CleanPluginExecutionDeclarationInPluginMgmtTest.java
 
b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5359CleanPluginExecutionDeclarationInPluginMgmtTest.java
new file mode 100644
index 000..ef011e6
--- /dev/null
+++ 
b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5359CleanPluginExecutionDeclarationInPluginMgmtTest.java
@@ -0,0 +1,58 @@
+package org.apache.maven.it;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import org.apache.maven.it.util.ResourceExtractor;
+
+import java.io.File;
+
+/**
+ * This is a test set for http://jira.codehaus.org/browse/MNG-5359;>MNG-5359.
+ *
+ * @author Anders Hammar
+ */
+public class MavenITmng5359CleanPluginExecutionDeclarationInPluginMgmtTest
+extends AbstractMavenIntegrationTestCase
+{
+
+public MavenITmng5359CleanPluginExecutionDeclarationInPluginMgmtTest()
+{
+// Might work with versions before 2.0.11, but not verified
+super( "[2.0.11,3.0-alpha-1),(3.0.4,),[3.4,)" );
+}
+
+public void testit()
+throws Exception
+{
+File testDir = ResourceExtractor.simpleExtractResources( getClass(), 
"/mng-5359" );
+
+Verifier verifier = newVerifier( testDir.getAbsolutePath() );
+
+verifier.setAutoclean( false );
+verifier.deleteDirectory( "target" );
+verifier.deleteArtifact

maven git commit: [MNG-5359] Declared execution in PluginMgmt gets bound to lifecycle (regression)

2015-12-21 Thread schulte

Repository: maven
Updated Branches:
  refs/heads/master d5ba185c1 -> 901b1e8e4


[MNG-5359] Declared execution in PluginMgmt gets bound to lifecycle (regression)

o Updated 'LifeCyclePluginAnalyzer' to use a lesser confusing method name.
o Moved logic from 'DefaultLifecycleBindingsInjector' to 
'DefaultLifecyclePluginAnalyzer'.
o Added various TODOs to 'DefaultLifecyclePluginAnalyzer'.
o Is anyone reading this?


Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/901b1e8e
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/901b1e8e
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/901b1e8e

Branch: refs/heads/master
Commit: 901b1e8e4c9df50ccc12bf8759589c7c82400aae
Parents: d5ba185
Author: Christian Schulte <schu...@apache.org>
Authored: Tue Dec 22 07:32:41 2015 +0100
Committer: Christian Schulte <schu...@apache.org>
Committed: Tue Dec 22 07:32:41 2015 +0100

--
 .../project/EmptyLifecyclePluginAnalyzer.java   |   4 +-
 .../lifecycle/LifeCyclePluginAnalyzer.java  |  14 +-
 .../DefaultLifecycleMappingDelegate.java|   7 +-
 .../DefaultLifecyclePluginAnalyzer.java | 208 ---
 .../DefaultLifecycleBindingsInjector.java   |  45 +---
 .../lifecycle/EmptyLifecyclePluginAnalyzer.java |   5 +-
 .../stub/LifeCyclePluginAnalyzerStub.java   |  12 +-
 7 files changed, 161 insertions(+), 134 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/901b1e8e/maven-compat/src/test/java/org/apache/maven/project/EmptyLifecyclePluginAnalyzer.java
--
diff --git 
a/maven-compat/src/test/java/org/apache/maven/project/EmptyLifecyclePluginAnalyzer.java
 
b/maven-compat/src/test/java/org/apache/maven/project/EmptyLifecyclePluginAnalyzer.java
index 925e346..ead0157 100644
--- 
a/maven-compat/src/test/java/org/apache/maven/project/EmptyLifecyclePluginAnalyzer.java
+++ 
b/maven-compat/src/test/java/org/apache/maven/project/EmptyLifecyclePluginAnalyzer.java
@@ -24,6 +24,7 @@ import java.util.LinkedHashSet;
 import java.util.Set;
 
 import org.apache.maven.lifecycle.LifeCyclePluginAnalyzer;
+import org.apache.maven.model.Model;
 import org.apache.maven.model.Plugin;
 import org.apache.maven.model.PluginExecution;
 
@@ -33,6 +34,7 @@ import org.apache.maven.model.PluginExecution;
 public class EmptyLifecyclePluginAnalyzer
 implements LifeCyclePluginAnalyzer
 {
+
 public Set getPluginsBoundByDefaultToAllLifecycles( String 
packaging )
 {
 Set plugins;
@@ -58,7 +60,7 @@ public class EmptyLifecyclePluginAnalyzer
 }
 
 @Override
-public Set getPlugins( final String packaging, final Set 
phases )
+public Set getDefaultBuildPlugins( final Model model, final 
Set goals )
 {
 return Collections.emptySet();
 }

http://git-wip-us.apache.org/repos/asf/maven/blob/901b1e8e/maven-core/src/main/java/org/apache/maven/lifecycle/LifeCyclePluginAnalyzer.java
--
diff --git 
a/maven-core/src/main/java/org/apache/maven/lifecycle/LifeCyclePluginAnalyzer.java
 
b/maven-core/src/main/java/org/apache/maven/lifecycle/LifeCyclePluginAnalyzer.java
index ef17560..536e167 100644
--- 
a/maven-core/src/main/java/org/apache/maven/lifecycle/LifeCyclePluginAnalyzer.java
+++ 
b/maven-core/src/main/java/org/apache/maven/lifecycle/LifeCyclePluginAnalyzer.java
@@ -20,6 +20,8 @@ package org.apache.maven.lifecycle;
  */
 
 import java.util.Set;
+
+import org.apache.maven.model.Model;
 import org.apache.maven.model.Plugin;
 
 /**
@@ -34,17 +36,17 @@ public interface LifeCyclePluginAnalyzer
 throws LifecycleMappingNotFoundException;
 
 /**
- * Gets the lifecycle {@code Plugin}s for a given packaging and set of 
phases.
+ * Gets a set of default build {@code Plugin}s for a given {@code Model} 
and a Maven execution with the given goals.
  *
- * @param packaging The packaging to get plugins for.
- * @param phases The phases to get plugins for.
+ * @param model The model to get the default build {@code Plugin}s for.
+ * @param goals A set of goals of the current Maven invokation.
  *
- * @return All lifecycle {@code Plugin}s for the given {@code packaging} 
and {@code phases}.
+ * @return A set of default build {@code Plugin}s for {@code Model}.
  *
- * @throws LifecycleMappingNotFoundException if {@code packaging} does not 
identify a supported packaging.
+ * @throws LifecycleMappingNotFoundException if {@code model} does not 
declare a supported packaging.
  * @since 3.4
  */
-Set getPlugins( String packaging, Set phases )
+Set getDefaultBuildPlugins( Model model, Set goals )
 throws LifecycleMappingNotFoundException;
 
 }

maven git commit: [MNG-5359] Declared execution in PluginMgmt gets bound to lifecycle (regression)

2015-12-20 Thread schulte

Repository: maven
Updated Branches:
  refs/heads/master e84405162 -> cc006b544


[MNG-5359] Declared execution in PluginMgmt gets bound to lifecycle (regression)

o Updated to restore reporting of unsupported packagings.


Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/cc006b54
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/cc006b54
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/cc006b54

Branch: refs/heads/master
Commit: cc006b544f0e21683d955e2175b06e864e64329f
Parents: e844051
Author: Christian Schulte <schu...@apache.org>
Authored: Sun Dec 20 21:35:37 2015 +0100
Committer: Christian Schulte <schu...@apache.org>
Committed: Sun Dec 20 21:35:37 2015 +0100

--
 .../lifecycle/LifeCyclePluginAnalyzer.java  |  3 ++-
 .../DefaultLifecyclePluginAnalyzer.java | 20 +---
 .../DefaultLifecycleBindingsInjector.java   | 12 +++-
 3 files changed, 26 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/cc006b54/maven-core/src/main/java/org/apache/maven/lifecycle/LifeCyclePluginAnalyzer.java
--
diff --git 
a/maven-core/src/main/java/org/apache/maven/lifecycle/LifeCyclePluginAnalyzer.java
 
b/maven-core/src/main/java/org/apache/maven/lifecycle/LifeCyclePluginAnalyzer.java
index 770e013..1d4e7f8 100644
--- 
a/maven-core/src/main/java/org/apache/maven/lifecycle/LifeCyclePluginAnalyzer.java
+++ 
b/maven-core/src/main/java/org/apache/maven/lifecycle/LifeCyclePluginAnalyzer.java
@@ -38,7 +38,8 @@ public interface LifeCyclePluginAnalyzer
  * @param packaging The packaging to get plugins for.
  * @param phases The phases to get plugins for.
  *
- * @return All lifecycle {@code Plugin}s for the given {@code packaging} 
and {@code phases}.
+ * @return All lifecycle {@code Plugin}s for the given {@code packaging} 
and {@code phases}
+ * or {@code null}, if {@code packaging} does not identify a supported 
packaging.
  *
  * @since 3.4
  */

http://git-wip-us.apache.org/repos/asf/maven/blob/cc006b54/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecyclePluginAnalyzer.java
--
diff --git 
a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecyclePluginAnalyzer.java
 
b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecyclePluginAnalyzer.java
index 555498d..27159e4 100644
--- 
a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecyclePluginAnalyzer.java
+++ 
b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecyclePluginAnalyzer.java
@@ -139,6 +139,12 @@ public class DefaultLifecyclePluginAnalyzer
 }
 
 final LifecycleMapping lifecycleMappingForPackaging = 
this.lifecycleMappings.get( packaging );
+
+if ( lifecycleMappingForPackaging == null )
+{
+return null;
+}
+
 final Map<Plugin, Plugin> plugins = new LinkedHashMap<>();
 
 for ( final Lifecycle lifecycle : this.getOrderedLifecycles() )
@@ -215,25 +221,25 @@ public class DefaultLifecyclePluginAnalyzer
 List mojos = goals.getMojos();
 if ( mojos != null )
 {
-
+
 for ( int i = 0; i < mojos.size(); i++ )
 {
 LifecycleMojo mojo = mojos.get( i );
-
+
 GoalSpec gs = parseGoalSpec( mojo.getGoal() );
-
+
 if ( gs == null )
 {
 logger.warn( "Ignored invalid goal specification '" + 
mojo.getGoal()
 + "' from lifecycle mapping for phase " + phase );
 continue;
 }
-
+
 Plugin plugin = new Plugin();
 plugin.setGroupId( gs.groupId );
 plugin.setArtifactId( gs.artifactId );
 plugin.setVersion( gs.version );
-
+
 Plugin existing = plugins.get( plugin );
 if ( existing != null )
 {
@@ -247,14 +253,14 @@ public class DefaultLifecyclePluginAnalyzer
 {
 plugins.put( plugin, plugin );
 }
-
+
 PluginExecution execution = new PluginExecution();
 execution.setId( getExecutionId( plugin, gs.goal ) );
 execution.setPhase( phase );
 execution.setPriority( i - mojos.size() );
 execution.getGoals().add( gs.goal );
 execution.setConfiguration( mojo.getConfiguration() );
-
+

maven-integration-testing git commit: [MNG-5359] Declared execution in PluginMgmt gets bound to lifecycle (regression)

2015-12-20 Thread schulte

Repository: maven-integration-testing
Updated Branches:
  refs/heads/master ee6c80a2b -> 8db2b86be


[MNG-5359] Declared execution in PluginMgmt gets bound to lifecycle (regression)

o Updated range of Maven versions the test should run with.


Project: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/repo
Commit: 
http://git-wip-us.apache.org/repos/asf/maven-integration-testing/commit/8db2b86b
Tree: 
http://git-wip-us.apache.org/repos/asf/maven-integration-testing/tree/8db2b86b
Diff: 
http://git-wip-us.apache.org/repos/asf/maven-integration-testing/diff/8db2b86b

Branch: refs/heads/master
Commit: 8db2b86bef79c114562483a088ce15483edd8500
Parents: ee6c80a
Author: Christian Schulte <schu...@apache.org>
Authored: Sun Dec 20 21:40:29 2015 +0100
Committer: Christian Schulte <schu...@apache.org>
Committed: Sun Dec 20 21:40:29 2015 +0100

--
 ...enITmng5359CleanPluginExecutionDeclarationInPluginMgmtTest.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/8db2b86b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5359CleanPluginExecutionDeclarationInPluginMgmtTest.java
--
diff --git 
a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5359CleanPluginExecutionDeclarationInPluginMgmtTest.java
 
b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5359CleanPluginExecutionDeclarationInPluginMgmtTest.java
index ef011e6..a2d1bae 100644
--- 
a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5359CleanPluginExecutionDeclarationInPluginMgmtTest.java
+++ 
b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5359CleanPluginExecutionDeclarationInPluginMgmtTest.java
@@ -35,7 +35,7 @@ public class 
MavenITmng5359CleanPluginExecutionDeclarationInPluginMgmtTest
 public MavenITmng5359CleanPluginExecutionDeclarationInPluginMgmtTest()
 {
 // Might work with versions before 2.0.11, but not verified
-super( "[2.0.11,3.0-alpha-1),(3.0.4,),[3.4,)" );
+super( "[2.0.11,3.0-alpha-1),[3.4,)" );
 }
 
 public void testit()

maven-integration-testing git commit: [MNG-5971] Imported dependencies should be available to inheritance processing

2016-06-09 Thread schulte

Repository: maven-integration-testing
Updated Branches:
  refs/heads/master 8874003bd -> d889c215a


[MNG-5971] Imported dependencies should be available to inheritance processing

o Updated to test inherited ${project.groupId} and ${project.version} 
expressions
  are working correctly in dependency management import declarations.


Project: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/repo
Commit: 
http://git-wip-us.apache.org/repos/asf/maven-integration-testing/commit/d889c215
Tree: 
http://git-wip-us.apache.org/repos/asf/maven-integration-testing/tree/d889c215
Diff: 
http://git-wip-us.apache.org/repos/asf/maven-integration-testing/diff/d889c215

Branch: refs/heads/master
Commit: d889c215aa88a9e230d0b06b455baa8fde3fb803
Parents: 8874003
Author: Christian Schulte <schu...@apache.org>
Authored: Thu Jun 9 10:06:18 2016 +0200
Committer: Christian Schulte <schu...@apache.org>
Committed: Thu Jun 9 10:06:18 2016 +0200

--
 ...venITmng5971HierarchicalImportScopeTest.java | 35 +
 .../mng-5971/properties/1/2/3/4/pom.xml | 47 
 .../resources/mng-5971/properties/1/2/3/pom.xml | 51 +
 .../resources/mng-5971/properties/1/2/pom.xml   | 50 
 .../resources/mng-5971/properties/1/pom.xml | 50 
 .../test/resources/mng-5971/properties/pom.xml  | 80 
 6 files changed, 313 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/d889c215/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5971HierarchicalImportScopeTest.java
--
diff --git 
a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5971HierarchicalImportScopeTest.java
 
b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5971HierarchicalImportScopeTest.java
index 6d4df01..31524f3 100644
--- 
a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5971HierarchicalImportScopeTest.java
+++ 
b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5971HierarchicalImportScopeTest.java
@@ -118,6 +118,41 @@ public class MavenITmng5971HierarchicalImportScopeTest
 assertTrue( contains( dependencies, 
"org.apache.maven.its.mng5971:dependency:jar:3" ) );
 }
 
+public void testInheritanceProcessingWithProjectBasedProperties()
+throws Exception
+{
+final File testDir = ResourceExtractor.simpleExtractResources( 
getClass(), "/mng-5971/properties" );
+
+final Verifier verifier = newVerifier( testDir.getAbsolutePath() );
+verifier.setAutoclean( false );
+verifier.filterFile( "../settings-template.xml", "settings.xml", 
"UTF-8",
+ (Map) verifier.newDefaultFilterProperties() );
+
+verifier.addCliOption( "-s" );
+verifier.addCliOption( "settings.xml" );
+verifier.executeGoals( Arrays.asList( new String[]
+{
+"clean", "verify"
+} ) );
+verifier.verifyErrorFreeLog();
+verifier.resetStreams();
+
+final List dependencies0 = verifier.loadLines( 
"target/compile.txt", "UTF-8" );
+assertTrue( contains( dependencies0, 
"org.apache.maven.its.mng5971:dependency:jar:0" ) );
+
+final List dependencies1 = verifier.loadLines( 
"1/target/compile.txt", "UTF-8" );
+assertTrue( contains( dependencies1, 
"org.apache.maven.its.mng5971:dependency:jar:1" ) );
+
+final List dependencies2 = verifier.loadLines( 
"1/2/target/compile.txt", "UTF-8" );
+assertTrue( contains( dependencies2, 
"org.apache.maven.its.mng5971:dependency:jar:2" ) );
+
+final List dependencies3 = verifier.loadLines( 
"1/2/3/target/compile.txt", "UTF-8" );
+assertTrue( contains( dependencies3, 
"org.apache.maven.its.mng5971:dependency:jar:3" ) );
+
+final List dependencies4 = verifier.loadLines( 
"1/2/3/4/target/compile.txt", "UTF-8" );
+assertTrue( contains( dependencies4, 
"org.apache.maven.its.mng5971:dependency:jar:3" ) );
+}
+
 private static boolean contains( final List lines, final String 
pattern )
 {
 for ( int i = 0, l0 = lines.size(); i < l0; i++ )

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/d889c215/core-it-suite/src/test/resources/mng-5971/properties/1/2/3/4/pom.xml
--
diff --git 
a/core-it-suite/src/test/resources/mng-5971/properties/1/2/3/4/pom.xml 
b/core-it-suite/src/test/resources/mng-5971/properties/1/2/3/4/pom.xml
new file mode 100644
index 00

maven git commit: [MNG-5971] Imported dependencies should be available to inheritance processing

2016-06-09 Thread schulte

Repository: maven
Updated Branches:
  refs/heads/master b2a8aaded -> a6d52372a


[MNG-5971] Imported dependencies should be available to inheritance processing

o Updated to support inherited ${project.groupId} and ${project.version} 
expressions
  in dependency management import declarations.


Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/a6d52372
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/a6d52372
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/a6d52372

Branch: refs/heads/master
Commit: a6d52372afddb56a5ca6cc1ef095c32f622eddb6
Parents: b2a8aad
Author: Christian Schulte <schu...@apache.org>
Authored: Thu Jun 9 10:03:00 2016 +0200
Committer: Christian Schulte <schu...@apache.org>
Committed: Thu Jun 9 10:03:00 2016 +0200

--
 .../maven/model/building/DefaultModelBuilder.java  | 17 +++--
 1 file changed, 15 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/a6d52372/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 df9d2bd..014e401 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
@@ -755,8 +755,10 @@ public class DefaultModelBuilder
  final DefaultModelProblemCollector problems )
 {
 // [MNG-5971] Imported dependencies should be available to inheritance 
processing
+// It's not possible to support all ${project.xyz} properties in 
dependency management import declarations
+// because import processing is performed before the final inheritance 
processing is performed. So the set of
+// ${project.xyz} properties supported in dependency management import 
declarations is limited.
 
-// Creates an intermediate model with only property and repository 
inheritance.
 final List intermediateLineage = new ArrayList<>( 
lineage.size() );
 
 for ( int i = 0, s0 = lineage.size(); i < s0; i++ )
@@ -769,6 +771,17 @@ public class DefaultModelBuilder
 final Model parent = intermediateLineage.get( i + 1 );
 final Model child = intermediateLineage.get( i );
 
+if ( child.getGroupId() == null )
+{
+// Support ${project.groupId} in dependency management import 
declarations.
+child.setGroupId( parent.getGroupId() );
+}
+if ( child.getVersion() == null )
+{
+// Support ${project.version} in dependency management import 
declarations.
+child.setVersion( parent.getVersion() );
+}
+
 final Properties properties = new Properties();
 properties.putAll( parent.getProperties() );
 properties.putAll( child.getProperties() );
@@ -838,7 +851,7 @@ public class DefaultModelBuilder
 }
 
 // Imports dependencies into the original model using the repositories 
of the intermediate model.
-for ( int i = 0, s0 = lineage.size(), superModelIdx = lineage.size() - 
1; i < s0; i++ )
+for ( int i = 0, s0 = lineage.size(); i < s0; i++ )
 {
 final Model model = lineage.get( i );
 this.configureResolver( lenientRequest.getModelResolver(), 
intermediateLineage.get( i ), problems, true );

[2/2] maven git commit: [MNG-6006] Import Aether to Maven codebase

2016-06-12 Thread schulte

[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/d7e05621
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/d7e05621
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/d7e05621

Branch: refs/heads/MNG-6006
Commit: d7e056214ac4d57c5d0f2b66f3cb1a104084524d
Parents: 2859eb0
Author: Christian Schulte <schu...@apache.org>
Authored: Fri Jun 10 16:50:33 2016 +0200
Committer: Christian Schulte <schu...@apache.org>
Committed: Sun Jun 12 15:29:41 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/d7e05621/apache-maven/pom.xml
--
diff --git a/apache-maven/pom.xml b/apache-maven/pom.xml
index 9405df8..8d55eeb 100644
--- a/apache-maven/pom.xml
+++ b/apache-maven/pom.xml
@@ -84,11 +84,11 @@ under the License.
   wagon-file
 
 
-  org.eclipse.aether
+  org.apache.maven.aether
   aether-connector-basic
 
 
-  org.eclipse.aether
+  org.apache.maven.aether
   aether-transport-wagon
 
 

http://git-wip-us.apache.org/repos/asf/maven/blob/d7e05621/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.
   maven-repository-metadata
 
 
-  org.eclipse.aether
+  org.apache.maven.aether
   aether-api
 
 
-  org.eclipse.aether
+  org.apache.maven.aether
   aether-spi
 
 
-  org.eclipse.aether
+  org.apache.maven.aether
   aether-util
 
 
-  org.eclipse.aether
+  org.apache.maven.aether
   aether-impl
 
 
@@ -88,12 +88,12 @@ under the License.
 
 
 
-  org.eclipse.aether
+  org.apache.maven.aether
   aether-connector-basic
   test
 
 
-  org.eclipse.aether
+  org.apache.maven.aether
   aether-transport-wagon
   test
 

http://git-wip-us.apache.org/repos/asf/maven/blob/d7e05621/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.
   test
 
 
-  org.eclipse.aether
+  org.apache.maven.aether
   aether-connector-basic
   test
 
 
-  org.eclipse.aether
+  org.apache.maven.aether
   aether-transport-wagon
   test
 

http://git-wip-us.apache.org/repos/asf/maven/blob/d7e05621/maven-core/pom.xml
--
diff --git a/maven-core/pom.xml b/maven-core/pom.xml
index 30d91f0..0103444 100644
--- a/maven-core/pom.xml
+++ b/maven-core/pom.xml
@@ -73,15 +73,15 @@ under the License.
   maven-aether-provider
 
 
-  org.eclipse.aether
+  org.apache.maven.aether
   aether-impl
 
 
-  org.eclipse.aether
+  org.apache.maven.aether
   aether-api
 
 
-  org.eclipse.aether
+  org.apache.maven.aether
   aether-util
 
 

http://git-wip-us.apache.org/repos/asf/maven/blob/d7e05621/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 11135ee..8f0737c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -64,7 +64,7 @@ under the License.
 1.7
 1.8.3
 1.3
-1.1.0
+1.2.0-SNAPSHOT
 
 
 
@@ -319,32 +319,32 @@ under the License.
   
   
   
-org.eclipse.aether
+org.apache.maven.aether
 aether-api
 ${aetherVersion}
   
   
-org.eclipse.aether
+org.apache.maven.aether
 aether-spi
 ${aetherVersion}
   
   
-org.eclipse.aether
+org.apache.maven.aether
 aether-impl
 ${aetherVersion}
   
   
-org.eclipse.aether
+org.apache.maven.aether
 aether-util
 ${aetherVersion}
   
   
-org.eclipse.aether
+org.apache.maven.aether
 aether-connector-basic
 ${aetherVersion}
   
   
-org.eclipse.aether
+org.apache.maven.aether
 aether-transport-wagon
 ${aetherVersion}

[1/2] maven git commit: [MNG-5227] The 'optional' flag of a dependency should be manageable.

2016-06-12 Thread schulte

Repository: maven
Updated Branches:
  refs/heads/master 644ac9c40 -> 335531865


[MNG-5227] The 'optional' flag of a dependency should be manageable.

This reverts commit 2fb5fd5e6b7ebded597329d1e87e255fb368ba73.


Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/0931a8fe
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/0931a8fe
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/0931a8fe

Branch: refs/heads/master
Commit: 0931a8fe0aa43a95a34d7dacb5050df6746c1b55
Parents: 644ac9c
Author: Christian Schulte <schu...@apache.org>
Authored: Sun Jun 12 16:46:43 2016 +0200
Committer: Christian Schulte <schu...@apache.org>
Committed: Sun Jun 12 16:46:43 2016 +0200

--
 .../model/management/DefaultDependencyManagementInjector.java | 7 +++
 1 file changed, 7 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/0931a8fe/maven-model-builder/src/main/java/org/apache/maven/model/management/DefaultDependencyManagementInjector.java
--
diff --git 
a/maven-model-builder/src/main/java/org/apache/maven/model/management/DefaultDependencyManagementInjector.java
 
b/maven-model-builder/src/main/java/org/apache/maven/model/management/DefaultDependencyManagementInjector.java
index 731cdd8..e611973 100644
--- 
a/maven-model-builder/src/main/java/org/apache/maven/model/management/DefaultDependencyManagementInjector.java
+++ 
b/maven-model-builder/src/main/java/org/apache/maven/model/management/DefaultDependencyManagementInjector.java
@@ -82,6 +82,13 @@ public class DefaultDependencyManagementInjector
 }
 
 @Override
+protected void mergeDependency_Optional( Dependency target, Dependency 
source, boolean sourceDominant,
+ Map<Object, Object> context )
+{
+// optional flag is not managed
+}
+
+@Override
 protected void mergeDependency_Exclusions( Dependency target, 
Dependency source, boolean sourceDominant,
Map<Object, Object> context 
)
 {

[2/2] maven git commit: [MNG-5967] Dependency updates.

2016-06-12 Thread schulte

[MNG-5967] Dependency updates.

o Downgraded to latest Aether release @Eclipse giving up on bugfixes already 
pushed to central.


Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/33553186
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/33553186
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/33553186

Branch: refs/heads/master
Commit: 3355318652081478c22b6085422578ab8eac7708
Parents: 0931a8f
Author: Christian Schulte <schu...@apache.org>
Authored: Sun Jun 12 16:48:43 2016 +0200
Committer: Christian Schulte <schu...@apache.org>
Committed: Sun Jun 12 16:48:43 2016 +0200

--
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/33553186/pom.xml
--
diff --git a/pom.xml b/pom.xml
index a9af928..4a22e9d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -64,7 +64,7 @@ under the License.
 1.7
 1.8.3
 1.3
-1.1.0
+1.0.2.v20150114

maven-integration-testing git commit: [MNG-5227] Make 'optional' flag of a dependency manageable.

2016-06-12 Thread schulte

Repository: maven-integration-testing
Updated Branches:
  refs/heads/master d889c215a -> 99318c36e


[MNG-5227] Make 'optional' flag of a dependency manageable.

o Updated to run with Maven >= 3.5.


Project: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/repo
Commit: 
http://git-wip-us.apache.org/repos/asf/maven-integration-testing/commit/99318c36
Tree: 
http://git-wip-us.apache.org/repos/asf/maven-integration-testing/tree/99318c36
Diff: 
http://git-wip-us.apache.org/repos/asf/maven-integration-testing/diff/99318c36

Branch: refs/heads/master
Commit: 99318c36edc3ff7030f784d5d6f41066ce5e034e
Parents: d889c21
Author: Christian Schulte <schu...@apache.org>
Authored: Sun Jun 12 17:07:05 2016 +0200
Committer: Christian Schulte <schu...@apache.org>
Committed: Sun Jun 12 17:07:05 2016 +0200

--
 .../it/MavenITmng5227DependencyOptionalFlagManagementTest.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/99318c36/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5227DependencyOptionalFlagManagementTest.java
--
diff --git 
a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5227DependencyOptionalFlagManagementTest.java
 
b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5227DependencyOptionalFlagManagementTest.java
index 3dc0ad8..f009307 100644
--- 
a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5227DependencyOptionalFlagManagementTest.java
+++ 
b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5227DependencyOptionalFlagManagementTest.java
@@ -37,7 +37,7 @@ public class 
MavenITmng5227DependencyOptionalFlagManagementTest
 
 public MavenITmng5227DependencyOptionalFlagManagementTest()
 {
-super( "[3.4,)" );
+super( "[3.5,)" );
 }
 
 /**

[2/2] maven-aether git commit: Bugfix: DefaultDependencyCollector does not correctly handle dependency management. Blocks MNG-5227. Bugfix: ScopeDependencySelector incorrectly excludes direct dependen

2016-06-10 Thread schulte

Bugfix: DefaultDependencyCollector does not correctly handle dependency 
management. Blocks MNG-5227.
Bugfix: ScopeDependencySelector incorrectly excludes direct dependencies. See 
MPLUGIN-296 for an example.
Bugfix: Exceptions are suppressed incorrectly when closing resources.
Enhancement: Calculation of debug statistics in nanoseconds based on 
System.nanoTime. Blocks MNG-5729.
Feature: Addition of TransitiveDependencyManager. Blocks MNG-5761.
Maintenance: Dependency updates.

Comitting this now so that things are part of whatever refactorings are going 
to be performed.


Project: http://git-wip-us.apache.org/repos/asf/maven-aether/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-aether/commit/1ee92862
Tree: http://git-wip-us.apache.org/repos/asf/maven-aether/tree/1ee92862
Diff: http://git-wip-us.apache.org/repos/asf/maven-aether/diff/1ee92862

Branch: refs/heads/master
Commit: 1ee92862c67ec98564c4d8be1207355960f1dd5d
Parents: 11a061b
Author: Christian Schulte <schu...@apache.org>
Authored: Thu Jan 28 17:25:19 2016 +0100
Committer: Christian Schulte <schu...@apache.org>
Committed: Fri Jun 10 15:54:18 2016 +0200

--
 aether-api/pom.xml  |   4 +-
 aether-connector-basic/pom.xml  |   4 +-
 .../connector/basic/ChecksumCalculator.java |   9 +-
 .../aether/connector/basic/PartialFile.java |  42 +--
 aether-impl/pom.xml |   4 +-
 .../impl/DefaultDependencyCollector.java|  14 +-
 .../internal/impl/DefaultFileProcessor.java |  73 +++--
 .../aether/internal/impl/SimpleDigest.java  |   2 +-
 .../internal/impl/TrackingFileManager.java  |  33 +-
 .../impl/DefaultDependencyCollectorTest.java| 232 ++
 .../artifact-descriptions/managed/gid_0_ver.ini |   4 +
 .../artifact-descriptions/managed/gid_1_ver.ini |   4 +
 .../managed/gid_2_managed-by-0.ini  |   4 +
 .../managed/gid_3_managed-by-1.ini  |   4 +
 .../managed/gid_4_managed-by-2.ini  |   2 +
 .../managed/gid_5_managed-by-3.ini  |   1 +
 .../managed/management-tree.txt |   6 +
 .../selection/managed/all-nodes.txt |   4 +
 .../selection/managed/direct-of-root.txt|   1 +
 .../managed/gid_direct-of-root_ver.ini  |   2 +
 .../selection/managed/gid_root_ver.ini  |   2 +
 .../managed/gid_transitive-of-root_ver.ini  |   2 +
 ...gid_transitive-of-transitive-of-root_ver.ini |   1 +
 .../selection/managed/transitive-of-root.txt|   2 +
 .../transitive-of-transitive-of-root.txt|   3 +
 .../optional/gid_direct-of-root_ver.ini |   2 +
 .../selection/optional/gid_root_ver.ini |   2 +
 .../optional/gid_transitive-of-root_ver.ini |   1 +
 .../selection/optional/no-selector-tree.txt |   3 +
 .../optional/optional-exclusion-tree.txt|   2 +
 .../selection/scope/all-nodes.txt   |   4 +
 .../selection/scope/gid_direct-of-root_ver.ini  |   2 +
 .../selection/scope/gid_root_ver.ini|   2 +
 .../scope/gid_transitive-of-root_ver.ini|   2 +
 ...gid_transitive-of-transitive-of-root_ver.ini |   1 +
 .../transitive-of-root-scope-exclusion-tree.txt |   2 +
 ...ive-of-transitive-of-root-exclusion-tree.txt |   3 +
 aether-spi/pom.xml  |   4 +-
 .../transport/AbstractTransporter.java  | 107 ---
 aether-test-util/pom.xml|   4 +-
 .../test/util/DependencyGraphParser.java|  16 +-
 .../test/util/IniArtifactDataReader.java|  25 +-
 .../internal/test/util/TestFileProcessor.java   |  14 +-
 .../internal/test/util/TestFileUtils.java   |  20 +-
 aether-transport-classpath/pom.xml  |   4 +-
 aether-transport-file/pom.xml   |   4 +-
 aether-transport-http/pom.xml   |  12 +-
 aether-transport-wagon/pom.xml  |   8 +-
 .../transport/wagon/WagonTransporter.java   |  66 ++--
 aether-util/pom.xml |   4 +-
 .../org/eclipse/aether/util/ChecksumUtils.java  |  59 ++--
 .../manager/TransitiveDependencyManager.java| 321 +++
 .../graph/selector/ScopeDependencySelector.java |  34 +-
 .../graph/transformer/ConflictIdSorter.java |   6 +-
 .../util/graph/transformer/ConflictMarker.java  |   6 +-
 .../graph/transformer/ConflictResolver.java |   4 +-
 pom.xml |  14 +-
 57 files changed, 963 insertions(+), 254 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven-aether/blob/1ee92862/aether-api/pom.xml
--
diff --git a/aether-api/pom.xml b/aether-api/pom.xml
index c894a08..ff9860c 100644
--- a/aether-api/pom.xml
+++ b/aether-api/pom.xml
@@

[1/2] maven-aether git commit: Bugfix: DefaultDependencyCollector does not correctly handle dependency management. Blocks MNG-5227. Bugfix: ScopeDependencySelector incorrectly excludes direct dependen

2016-06-10 Thread schulte

Repository: maven-aether
Updated Branches:
  refs/heads/master 11a061b66 -> 1ee92862c


http://git-wip-us.apache.org/repos/asf/maven-aether/blob/1ee92862/aether-util/src/main/java/org/eclipse/aether/util/graph/manager/TransitiveDependencyManager.java
--
diff --git 
a/aether-util/src/main/java/org/eclipse/aether/util/graph/manager/TransitiveDependencyManager.java
 
b/aether-util/src/main/java/org/eclipse/aether/util/graph/manager/TransitiveDependencyManager.java
new file mode 100644
index 000..aeac09f
--- /dev/null
+++ 
b/aether-util/src/main/java/org/eclipse/aether/util/graph/manager/TransitiveDependencyManager.java
@@ -0,0 +1,321 @@
+package org.eclipse.aether.util.graph.manager;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.LinkedHashSet;
+import java.util.Map;
+import org.eclipse.aether.artifact.Artifact;
+import org.eclipse.aether.artifact.ArtifactProperties;
+import org.eclipse.aether.collection.DependencyCollectionContext;
+import org.eclipse.aether.collection.DependencyManagement;
+import org.eclipse.aether.collection.DependencyManager;
+import org.eclipse.aether.graph.Dependency;
+import org.eclipse.aether.graph.Exclusion;
+import org.eclipse.aether.util.artifact.JavaScopes;
+
+/**
+ * A dependency manager supporting transitive dependency management.
+ *
+ * @author Christian Schulte
+ * @since 1.2
+ */
+public final class TransitiveDependencyManager
+implements DependencyManager
+{
+
+private final int depth;
+
+private final Map<Object, String> managedVersions;
+
+private final Map<Object, String> managedScopes;
+
+private final Map<Object, Boolean> managedOptionals;
+
+private final Map<Object, String> managedLocalPaths;
+
+private final Map<Object, Collection> managedExclusions;
+
+private int hashCode;
+
+/**
+ * Creates a new dependency manager without any management information.
+ */
+public TransitiveDependencyManager()
+{
+this( 0, Collections.<Object, String>emptyMap(), Collections.<Object, 
String>emptyMap(),
+  Collections.<Object, Boolean>emptyMap(), Collections.<Object, 
String>emptyMap(),
+  Collections.<Object, Collection>emptyMap() );
+}
+
+private TransitiveDependencyManager( final int depth,
+ final Map<Object, String> 
managedVersions,
+ final Map<Object, String> 
managedScopes,
+ final Map<Object, Boolean> 
managedOptionals,
+ final Map<Object, String> 
managedLocalPaths,
+ final Map<Object, 
Collection> managedExclusions )
+{
+super();
+this.depth = depth;
+this.managedVersions = managedVersions;
+this.managedScopes = managedScopes;
+this.managedOptionals = managedOptionals;
+this.managedLocalPaths = managedLocalPaths;
+this.managedExclusions = managedExclusions;
+}
+
+public DependencyManager deriveChildManager( final 
DependencyCollectionContext context )
+{
+Map<Object, String> versions = this.managedVersions;
+Map<Object, String> scopes = this.managedScopes;
+Map<Object, Boolean> optionals = this.managedOptionals;
+Map<Object, String> localPaths = this.managedLocalPaths;
+Map<Object, Collection> exclusions = this.managedExclusions;
+
+for ( Dependency managedDependency : context.getManagedDependencies() )
+{
+Artifact artifact = managedDependency.getArtifact();
+Object key = getKey( artifact );
+
+String version = artifact.getVersion();
+if ( version.length() > 0 && !versions.containsKey( key ) )
+{
+if ( versions == this.managedVersions )
+{
+versions = ne

maven git commit: [MNG-5971] Imported dependencies should be available to inheritance processing

2016-06-14 Thread schulte

Repository: maven
Updated Branches:
  refs/heads/master c15e5c334 -> ded1379eb


[MNG-5971] Imported dependencies should be available to inheritance processing

o Updated to revert changes to the value returned by 'ModelProblem.getSource'.
  This value should be the path to the POM the 'ModelProblem' corresponds to.
  It was changed to hold additional information (the path to the imported POM).
  Most of the time those POM files will not be part of the reactor and the
  location will always be the path of the POM in the local repository. During
  preliminary testing it turned out that at leat m2eclipse relies on that
  value to represent a single path. There may be other tools depending on
  this. Those tools should not need to start parsing the value without gaining
  any benefit.


Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/ded1379e
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/ded1379e
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/ded1379e

Branch: refs/heads/master
Commit: ded1379ebf5d5ee943d52cf12e6d368b5d54ce70
Parents: c15e5c3
Author: Christian Schulte <schu...@apache.org>
Authored: Tue Jun 14 19:48:02 2016 +0200
Committer: Christian Schulte <schu...@apache.org>
Committed: Tue Jun 14 19:48:02 2016 +0200

--
 .../model/building/DefaultModelProblemCollector.java| 12 +---
 1 file changed, 5 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/ded1379e/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelProblemCollector.java
--
diff --git 
a/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelProblemCollector.java
 
b/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelProblemCollector.java
index 16740dc..e46cc98 100644
--- 
a/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelProblemCollector.java
+++ 
b/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelProblemCollector.java
@@ -160,13 +160,11 @@ class DefaultModelProblemCollector
 }
 }
 
-modelId = modelId != null
-  ? this.getModelId() + " [" + modelId + "]"
-  : this.getModelId();
-
-src = src != null
-  ? this.getSource() + " [" + src + "]"
-  : this.getSource();
+if ( modelId == null )
+{
+modelId = getModelId();
+src = getSource();
+}
 
 if ( line <= 0 && column <= 0 && req.getException() instanceof 
ModelParseException )
 {

maven git commit: o Updated to remove errors reported by Checkstyle.

2016-06-14 Thread schulte

Repository: maven
Updated Branches:
  refs/heads/master e7a783db1 -> cdc87a909


o Updated to remove errors reported by Checkstyle.


Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/cdc87a90
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/cdc87a90
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/cdc87a90

Branch: refs/heads/master
Commit: cdc87a909c3160fe521e73aae4ec2c7ef756ca38
Parents: e7a783d
Author: Christian Schulte <schu...@apache.org>
Authored: Tue Jun 14 21:26:56 2016 +0200
Committer: Christian Schulte <schu...@apache.org>
Committed: Tue Jun 14 21:28:00 2016 +0200

--
 .../UnknownRepositoryLayoutException.java   |  3 +-
 .../DefaultArtifactRepositoryFactory.java   |  4 +-
 .../repository/layout/FlatRepositoryLayout.java |  6 +-
 .../artifact/resolver/ArtifactResolver.java | 62 +++---
 .../resolver/DefaultArtifactResolver.java   | 12 ++-
 .../profiles/activation/ProfileActivator.java   |  4 +-
 .../org/apache/maven/project/ProjectUtils.java  | 15 ++--
 .../AbstractStringBasedModelInterpolator.java   | 22 +++--
 .../StringSearchModelInterpolator.java  | 14 ++--
 .../project/path/DefaultPathTranslator.java | 10 +--
 .../repository/MetadataResolutionResult.java| 26 +++---
 .../repository/legacy/DefaultWagonManager.java  | 85 +---
 .../legacy/LegacyRepositorySystem.java  | 31 ---
 .../maven/repository/legacy/WagonManager.java   |  6 +-
 .../repository/ArtifactRepositoryFactory.java   |  6 +-
 .../DefaultLegacyArtifactCollector.java | 84 +++
 .../resolver/LegacyArtifactCollector.java   |  9 ++-
 .../repository/metadata/MetadataGraph.java  |  3 +-
 .../repository/metadata/MetadataGraphEdge.java  |  3 +-
 .../MetadataGraphTransformationException.java   |  4 +-
 .../usability/plugin/ExpressionDocumenter.java  | 18 +++--
 21 files changed, 247 insertions(+), 180 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/cdc87a90/maven-compat/src/main/java/org/apache/maven/artifact/UnknownRepositoryLayoutException.java
--
diff --git 
a/maven-compat/src/main/java/org/apache/maven/artifact/UnknownRepositoryLayoutException.java
 
b/maven-compat/src/main/java/org/apache/maven/artifact/UnknownRepositoryLayoutException.java
index cb0af7f..e23bea9 100644
--- 
a/maven-compat/src/main/java/org/apache/maven/artifact/UnknownRepositoryLayoutException.java
+++ 
b/maven-compat/src/main/java/org/apache/maven/artifact/UnknownRepositoryLayoutException.java
@@ -19,12 +19,11 @@ package org.apache.maven.artifact;
  * under the License.
  */
 
-import org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout;
 import 
org.codehaus.plexus.component.repository.exception.ComponentLookupException;
 
 /**
  * Exception which is meant to occur when a layout specified for a particular
- * repository doesn't have a corresponding {@link ArtifactRepositoryLayout}
+ * repository doesn't have a corresponding {@link 
org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout}
  * component in the current container.
  *
  * @author jdcasey

http://git-wip-us.apache.org/repos/asf/maven/blob/cdc87a90/maven-compat/src/main/java/org/apache/maven/artifact/repository/DefaultArtifactRepositoryFactory.java
--
diff --git 
a/maven-compat/src/main/java/org/apache/maven/artifact/repository/DefaultArtifactRepositoryFactory.java
 
b/maven-compat/src/main/java/org/apache/maven/artifact/repository/DefaultArtifactRepositoryFactory.java
index 658dbda..0f69835 100644
--- 
a/maven-compat/src/main/java/org/apache/maven/artifact/repository/DefaultArtifactRepositoryFactory.java
+++ 
b/maven-compat/src/main/java/org/apache/maven/artifact/repository/DefaultArtifactRepositoryFactory.java
@@ -81,7 +81,9 @@ public class DefaultArtifactRepositoryFactory
 
ArtifactRepositoryPolicy snapshots,
 
ArtifactRepositoryPolicy releases )
 {
-return injectSession( factory.createArtifactRepository( id, url, 
repositoryLayout, snapshots, releases ), true );
+return injectSession( factory.createArtifactRepository( id, url, 
repositoryLayout, snapshots, releases ),
+  true );
+
 }
 
 public void setGlobalUpdatePolicy( String updatePolicy )

http://git-wip-us.apache.org/repos/asf/maven/blob/cdc87a90/maven-compat/src/main/java/org/apache/maven/artifact/repository/layout/FlatRepositoryLayout.java
--
diff --git 
a/maven-compat/src/main/java/org/apache/maven/arti

svn commit: r1745959 - in /maven/plugins/trunk/maven-dependency-plugin: ./ src/main/java/org/apache/maven/plugins/dependency/ src/main/java/org/apache/maven/plugins/dependency/fromConfiguration/ src/m

2016-05-28 Thread schulte

Author: schulte
Date: Sun May 29 00:24:57 2016
New Revision: 1745959

URL: http://svn.apache.org/viewvc?rev=1745959=rev
Log:
[MDEP-436] German umlauts in outputDirectory and destFileName getting garbled

o Applied patch with minor modifications to only set the encoding on ZIP
  type UnArchivers.

This closes #85


Modified:
maven/plugins/trunk/maven-dependency-plugin/pom.xml

maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugins/dependency/AbstractDependencyMojo.java

maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugins/dependency/fromConfiguration/AbstractFromConfigurationMojo.java

maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugins/dependency/fromConfiguration/ArtifactItem.java

maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugins/dependency/fromConfiguration/UnpackMojo.java

maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugins/dependency/fromDependencies/UnpackDependenciesMojo.java

Modified: maven/plugins/trunk/maven-dependency-plugin/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/pom.xml?rev=1745959=1745958=1745959=diff
==
--- maven/plugins/trunk/maven-dependency-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-dependency-plugin/pom.xml Sun May 29 00:24:57 2016
@@ -75,6 +75,9 @@ under the License.
 
   Holger Mense
 
+
+  Markus Karg
+
   
 
   

Modified: 
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugins/dependency/AbstractDependencyMojo.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugins/dependency/AbstractDependencyMojo.java?rev=1745959=1745958=1745959=diff
==
--- 
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugins/dependency/AbstractDependencyMojo.java
 (original)
+++ 
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugins/dependency/AbstractDependencyMojo.java
 Sun May 29 00:24:57 2016
@@ -37,6 +37,7 @@ import org.codehaus.plexus.archiver.Arch
 import org.codehaus.plexus.archiver.UnArchiver;
 import org.codehaus.plexus.archiver.manager.ArchiverManager;
 import org.codehaus.plexus.archiver.manager.NoSuchArchiverException;
+import org.codehaus.plexus.archiver.zip.ZipUnArchiver;
 import 
org.codehaus.plexus.components.io.fileselectors.IncludeExcludeFileSelector;
 import org.codehaus.plexus.util.FileUtils;
 import org.codehaus.plexus.util.ReflectionUtils;
@@ -176,10 +177,10 @@ public abstract class AbstractDependency
 }
 }
 
-protected void unpack( Artifact artifact, File location )
+protected void unpack( Artifact artifact, File location, String encoding )
 throws MojoExecutionException
 {
-unpack( artifact, location, null, null );
+unpack( artifact, location, null, null, encoding );
 }
 
 /**
@@ -191,15 +192,17 @@ public abstract class AbstractDependency
  * ***.properties
  * @param excludes Comma separated list of file patterns to exclude i.e. 
***.xml,
  * ***.properties
+ * @param encoding Encoding of artifact. Set {@code null} for default 
encoding.
  */
-protected void unpack( Artifact artifact, File location, String includes, 
String excludes )
+protected void unpack( Artifact artifact, File location, String includes, 
String excludes, String encoding )
 throws MojoExecutionException
 {
-unpack( artifact, artifact.getType(), location, includes, excludes );
+unpack( artifact, artifact.getType(), location, includes, excludes, 
encoding );
 }
-
-protected void unpack( Artifact artifact, String type, File location, 
String includes, String excludes )
-throws MojoExecutionException
+
+protected void unpack( Artifact artifact, String type, File location, 
String includes, String excludes,
+   String encoding )
+throws MojoExecutionException
 {
 File file = artifact.getFile(); 
 try
@@ -228,6 +231,12 @@ public abstract class AbstractDependency
 getLog().debug( "Found unArchiver by extension: " + unArchiver 
);
 }
 
+if ( encoding != null && unArchiver instanceof ZipUnArchiver )
+{
+( (ZipUnArchiver) unArchiver ).setEncoding( encoding );
+getLog().info( "Unpacks '" + type + "' with encoding '" + 
encoding + "'." );
+}
+
 unArchiver.setUseJvmChmod( useJvmChmod );
 
 unArchiver.setIgnorePermissions( ignorePermissions );

Modified: 
maven/plugins/trunk/

maven git commit: o Updated to add a note about issues blocking an upgrade of SLF4J.

2016-05-30 Thread schulte

Repository: maven
Updated Branches:
  refs/heads/master bd825c535 -> 4e5e5861b


o Updated to add a note about issues blocking an upgrade of SLF4J.


Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/4e5e5861
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/4e5e5861
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/4e5e5861

Branch: refs/heads/master
Commit: 4e5e5861b3405630e58e374bdf4abde7e0d80aa6
Parents: bd825c5
Author: Christian Schulte <schu...@apache.org>
Authored: Tue May 31 03:13:48 2016 +0200
Committer: Christian Schulte <schu...@apache.org>
Committed: Tue May 31 03:13:48 2016 +0200

--
 pom.xml | 3 +++
 1 file changed, 3 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/4e5e5861/pom.xml
--
diff --git a/pom.xml b/pom.xml
index bf3aa61..8000c47 100644
--- a/pom.xml
+++ b/pom.xml
@@ -65,6 +65,9 @@ under the License.
 1.8.3
 1.3
 1.1.0
+
+
+
 1.7.16
 
true

svn commit: r1746018 - in /maven/plugins/trunk/maven-dependency-plugin: pom.xml src/it/projects/setup-custom-ear-lifecycle/manager/pom.xml src/it/projects/setup-custom-ear-lifecycle/plugin/pom.xml

2016-05-29 Thread schulte

Author: schulte
Date: Sun May 29 15:29:01 2016
New Revision: 1746018

URL: http://svn.apache.org/viewvc?rev=1746018=rev
Log:
[MDEP-527] Upgrade of 'plexus-archiver' to version 3.3.


Modified:
maven/plugins/trunk/maven-dependency-plugin/pom.xml

maven/plugins/trunk/maven-dependency-plugin/src/it/projects/setup-custom-ear-lifecycle/manager/pom.xml

maven/plugins/trunk/maven-dependency-plugin/src/it/projects/setup-custom-ear-lifecycle/plugin/pom.xml

Modified: maven/plugins/trunk/maven-dependency-plugin/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/pom.xml?rev=1746018=1746017=1746018=diff
==
--- maven/plugins/trunk/maven-dependency-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-dependency-plugin/pom.xml Sun May 29 15:29:01 2016
@@ -175,7 +175,7 @@ under the License.
 
   org.codehaus.plexus
   plexus-archiver
-  3.2
+  3.3
 
 
   org.codehaus.plexus

Modified: 
maven/plugins/trunk/maven-dependency-plugin/src/it/projects/setup-custom-ear-lifecycle/manager/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/it/projects/setup-custom-ear-lifecycle/manager/pom.xml?rev=1746018=1746017=1746018=diff
==
--- 
maven/plugins/trunk/maven-dependency-plugin/src/it/projects/setup-custom-ear-lifecycle/manager/pom.xml
 (original)
+++ 
maven/plugins/trunk/maven-dependency-plugin/src/it/projects/setup-custom-ear-lifecycle/manager/pom.xml
 Sun May 29 15:29:01 2016
@@ -20,21 +20,21 @@ under the License.
 
 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/xsd/maven-4.0.0.xsd;>
   4.0.0
-  
+
   
 org.apache.maven.plugins.dependency.its
 maven-custom-ear
 1.0
   
-  
+
   maven-custom-ear-manager
-  
+
   
 
   org.codehaus.plexus
   plexus-archiver
-  2.6.3
+  3.3
 
   
-  
+
 

Modified: 
maven/plugins/trunk/maven-dependency-plugin/src/it/projects/setup-custom-ear-lifecycle/plugin/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/it/projects/setup-custom-ear-lifecycle/plugin/pom.xml?rev=1746018=1746017=1746018=diff
==
--- 
maven/plugins/trunk/maven-dependency-plugin/src/it/projects/setup-custom-ear-lifecycle/plugin/pom.xml
 (original)
+++ 
maven/plugins/trunk/maven-dependency-plugin/src/it/projects/setup-custom-ear-lifecycle/plugin/pom.xml
 Sun May 29 15:29:01 2016
@@ -20,16 +20,16 @@ under the License.
 
 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/xsd/maven-4.0.0.xsd;>
   4.0.0
-  
+
   
 org.apache.maven.plugins.dependency.its
 maven-custom-ear
 1.0
   
-  
+
   maven-custom-ear-plugin
   maven-plugin
-  
+
   
 
   
@@ -56,9 +56,9 @@ under the License.
   
 
   
-  
+
   
-  
 
@@ -88,5 +88,5 @@ under the License.
   provided
 
   
-  
+

svn commit: r1746016 - /maven/plugins/trunk/maven-acr-plugin/pom.xml

2016-05-29 Thread schulte

Author: schulte
Date: Sun May 29 15:24:45 2016
New Revision: 1746016

URL: http://svn.apache.org/viewvc?rev=1746016=rev
Log:
[MACR-34] Upgrade of 'plexus-archiver' to version 3.3.


Modified:
maven/plugins/trunk/maven-acr-plugin/pom.xml

Modified: maven/plugins/trunk/maven-acr-plugin/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-acr-plugin/pom.xml?rev=1746016=1746015=1746016=diff
==
--- maven/plugins/trunk/maven-acr-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-acr-plugin/pom.xml Sun May 29 15:24:45 2016
@@ -104,7 +104,7 @@ under the License.
 
   org.codehaus.plexus
   plexus-archiver
-  3.2
+  3.3
 
 
   commons-io

svn commit: r1746019 - /maven/plugins/trunk/maven-jar-plugin/pom.xml

2016-05-29 Thread schulte

Author: schulte
Date: Sun May 29 15:32:16 2016
New Revision: 1746019

URL: http://svn.apache.org/viewvc?rev=1746019=rev
Log:
[MJAR-227] Upgrade of 'plexus-archiver' to version 3.3.


Modified:
maven/plugins/trunk/maven-jar-plugin/pom.xml

Modified: maven/plugins/trunk/maven-jar-plugin/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-jar-plugin/pom.xml?rev=1746019=1746018=1746019=diff
==
--- maven/plugins/trunk/maven-jar-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-jar-plugin/pom.xml Sun May 29 15:32:16 2016
@@ -104,7 +104,7 @@ under the License.
 
   org.codehaus.plexus
   plexus-archiver
-  3.2
+  3.3
 
 
   org.codehaus.plexus

svn commit: r1746020 - /maven/plugins/trunk/maven-javadoc-plugin/pom.xml

2016-05-29 Thread schulte

Author: schulte
Date: Sun May 29 15:34:22 2016
New Revision: 1746020

URL: http://svn.apache.org/viewvc?rev=1746020=rev
Log:
[MJAVADOC-454] Upgrade of 'plexus-archiver' to version 3.3.


Modified:
maven/plugins/trunk/maven-javadoc-plugin/pom.xml

Modified: maven/plugins/trunk/maven-javadoc-plugin/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/pom.xml?rev=1746020=1746019=1746020=diff
==
--- maven/plugins/trunk/maven-javadoc-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/pom.xml Sun May 29 15:34:22 2016
@@ -225,7 +225,7 @@ under the License.
 
   org.codehaus.plexus
   plexus-archiver
-  3.2
+  3.3
 
 
   org.codehaus.plexus

svn commit: r1746024 - /maven/plugins/trunk/maven-source-plugin/pom.xml

2016-05-29 Thread schulte

Author: schulte
Date: Sun May 29 15:40:53 2016
New Revision: 1746024

URL: http://svn.apache.org/viewvc?rev=1746024=rev
Log:
[MSOURCES-98] Upgrade of 'plexus-archiver' to version 3.3.


Modified:
maven/plugins/trunk/maven-source-plugin/pom.xml

Modified: maven/plugins/trunk/maven-source-plugin/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-source-plugin/pom.xml?rev=1746024=1746023=1746024=diff
==
--- maven/plugins/trunk/maven-source-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-source-plugin/pom.xml Sun May 29 15:40:53 2016
@@ -114,7 +114,7 @@ under the License.
 
   org.codehaus.plexus
   plexus-archiver
-  3.2
+  3.3
 
 
   org.codehaus.plexus

svn commit: r1746023 - /maven/plugins/trunk/maven-site-plugin/pom.xml

2016-05-29 Thread schulte

Author: schulte
Date: Sun May 29 15:39:25 2016
New Revision: 1746023

URL: http://svn.apache.org/viewvc?rev=1746023=rev
Log:
[MSITE-777] Upgrade of 'plexus-archiver' to version 3.3.


Modified:
maven/plugins/trunk/maven-site-plugin/pom.xml

Modified: maven/plugins/trunk/maven-site-plugin/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/pom.xml?rev=1746023=1746022=1746023=diff
==
--- maven/plugins/trunk/maven-site-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-site-plugin/pom.xml Sun May 29 15:39:25 2016
@@ -276,7 +276,7 @@ under the License.
 
   org.codehaus.plexus
   plexus-archiver
-  3.2
+  3.3

svn commit: r1746025 - /maven/plugins/trunk/maven-war-plugin/pom.xml

2016-05-29 Thread schulte

Author: schulte
Date: Sun May 29 15:42:34 2016
New Revision: 1746025

URL: http://svn.apache.org/viewvc?rev=1746025=rev
Log:
[MWAR-387] Upgrade of 'plexus-archiver' to version 3.3.


Modified:
maven/plugins/trunk/maven-war-plugin/pom.xml

Modified: maven/plugins/trunk/maven-war-plugin/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/pom.xml?rev=1746025=1746024=1746025=diff
==
--- maven/plugins/trunk/maven-war-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-war-plugin/pom.xml Sun May 29 15:42:34 2016
@@ -111,7 +111,7 @@
 
   org.codehaus.plexus
   plexus-archiver
-  3.2
+  3.3
 
 
   org.codehaus.plexus

svn commit: r1746017 - /maven/plugins/trunk/maven-assembly-plugin/pom.xml

2016-05-29 Thread schulte

Author: schulte
Date: Sun May 29 15:27:11 2016
New Revision: 1746017

URL: http://svn.apache.org/viewvc?rev=1746017=rev
Log:
[MASSEMBLY-808] Upgrade of 'plexus-archiver' to version 3.3.


Modified:
maven/plugins/trunk/maven-assembly-plugin/pom.xml

Modified: maven/plugins/trunk/maven-assembly-plugin/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/pom.xml?rev=1746017=1746016=1746017=diff
==
--- maven/plugins/trunk/maven-assembly-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/pom.xml Sun May 29 15:27:11 2016
@@ -135,7 +135,7 @@ under the License.
 
   org.codehaus.plexus
   plexus-archiver
-  3.2
+  3.3
 
 
   org.apache.maven.shared

svn commit: r1746021 - /maven/plugins/trunk/maven-rar-plugin/pom.xml

2016-05-29 Thread schulte

Author: schulte
Date: Sun May 29 15:36:10 2016
New Revision: 1746021

URL: http://svn.apache.org/viewvc?rev=1746021=rev
Log:
[MRAR-59] Upgrade of 'plexus-archiver' to version 3.3.


Modified:
maven/plugins/trunk/maven-rar-plugin/pom.xml

Modified: maven/plugins/trunk/maven-rar-plugin/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-rar-plugin/pom.xml?rev=1746021=1746020=1746021=diff
==
--- maven/plugins/trunk/maven-rar-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-rar-plugin/pom.xml Sun May 29 15:36:10 2016
@@ -109,7 +109,7 @@ under the License.
 
   org.codehaus.plexus
   plexus-archiver
-  3.2
+  3.3
 
 
   org.apache.maven

svn commit: r1746022 - /maven/plugins/trunk/maven-repository-plugin/pom.xml

2016-05-29 Thread schulte

Author: schulte
Date: Sun May 29 15:37:48 2016
New Revision: 1746022

URL: http://svn.apache.org/viewvc?rev=1746022=rev
Log:
[MREPOSITORY-39] Upgrade of 'plexus-archiver' to version 3.3.


Modified:
maven/plugins/trunk/maven-repository-plugin/pom.xml

Modified: maven/plugins/trunk/maven-repository-plugin/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-repository-plugin/pom.xml?rev=1746022=1746021=1746022=diff
==
--- maven/plugins/trunk/maven-repository-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-repository-plugin/pom.xml Sun May 29 15:37:48 2016
@@ -121,7 +121,7 @@ under the License.
 
   org.codehaus.plexus
   plexus-archiver
-  3.2
+  3.3
 
 
   org.codehaus.plexus

svn commit: r1746037 - in /maven/plugins/trunk/maven-dependency-plugin/src/it/projects/setup-custom-ear-lifecycle: manager/pom.xml plugin/pom.xml

2016-05-29 Thread schulte

Author: schulte
Date: Sun May 29 17:16:06 2016
New Revision: 1746037

URL: http://svn.apache.org/viewvc?rev=1746037=rev
Log:
[MDEP-527] Upgrade of 'plexus-archiver' to version 3.3.

o Downgraded 'plexus-archiver' to version used by IT.


Modified:

maven/plugins/trunk/maven-dependency-plugin/src/it/projects/setup-custom-ear-lifecycle/manager/pom.xml

maven/plugins/trunk/maven-dependency-plugin/src/it/projects/setup-custom-ear-lifecycle/plugin/pom.xml

Modified: 
maven/plugins/trunk/maven-dependency-plugin/src/it/projects/setup-custom-ear-lifecycle/manager/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/it/projects/setup-custom-ear-lifecycle/manager/pom.xml?rev=1746037=1746036=1746037=diff
==
--- 
maven/plugins/trunk/maven-dependency-plugin/src/it/projects/setup-custom-ear-lifecycle/manager/pom.xml
 (original)
+++ 
maven/plugins/trunk/maven-dependency-plugin/src/it/projects/setup-custom-ear-lifecycle/manager/pom.xml
 Sun May 29 17:16:06 2016
@@ -33,7 +33,7 @@ under the License.
 
   org.codehaus.plexus
   plexus-archiver
-  3.3
+  2.6.3
 
   
 

Modified: 
maven/plugins/trunk/maven-dependency-plugin/src/it/projects/setup-custom-ear-lifecycle/plugin/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/it/projects/setup-custom-ear-lifecycle/plugin/pom.xml?rev=1746037=1746036=1746037=diff
==
--- 
maven/plugins/trunk/maven-dependency-plugin/src/it/projects/setup-custom-ear-lifecycle/plugin/pom.xml
 (original)
+++ 
maven/plugins/trunk/maven-dependency-plugin/src/it/projects/setup-custom-ear-lifecycle/plugin/pom.xml
 Sun May 29 17:16:06 2016
@@ -78,7 +78,7 @@ under the License.
 
   org.codehaus.plexus
   plexus-archiver
-  3.3
+  2.6.3

maven-integration-testing git commit: [MNG-5527] Dependency management import should support relocations.

2016-06-22 Thread schulte

Repository: maven-integration-testing
Updated Branches:
  refs/heads/master 422fef9e4 -> cfc6098c1


[MNG-5527] Dependency management import should support relocations.


Project: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/repo
Commit: 
http://git-wip-us.apache.org/repos/asf/maven-integration-testing/commit/cfc6098c
Tree: 
http://git-wip-us.apache.org/repos/asf/maven-integration-testing/tree/cfc6098c
Diff: 
http://git-wip-us.apache.org/repos/asf/maven-integration-testing/diff/cfc6098c

Branch: refs/heads/master
Commit: cfc6098c1f65027f1245c74dd353ade1c2ad3d1a
Parents: 422fef9
Author: Christian Schulte <schu...@apache.org>
Authored: Wed Jun 22 17:41:42 2016 +0200
Committer: Christian Schulte <schu...@apache.org>
Committed: Wed Jun 22 17:55:30 2016 +0200

--
 .../apache/maven/it/IntegrationTestSuite.java   |  1 +
 ...pendencyManagementImportRelocationsTest.java | 74 
 .../test/resources/mng-5527/relocations/pom.xml | 72 +++
 .../its/mng5527/relocated1/bom/0/bom-0.pom  | 48 +
 .../its/mng5527/relocated2/bom/0/bom-0.pom  | 48 +
 .../its/mng5527/relocated3/bom/0/bom-0.pom  | 39 +++
 .../resources/mng-5527/settings-template.xml| 43 
 7 files changed, 325 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/cfc6098c/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java
--
diff --git 
a/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java 
b/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java
index 504b028..706297c 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java
@@ -106,6 +106,7 @@ public class IntegrationTestSuite
 // 
-
 // suite.addTestSuite( MavenIT0108SnapshotUpdateTest.class ); -- 
MNG-3137
 
+suite.addTestSuite( 
MavenITmng5527DependencyManagementImportRelocationsTest.class );
 suite.addTestSuite( 
MavenITmng5600DependencyManagementImportExclusionsTest.class );
 suite.addTestSuite( MavenITmng5971HierarchicalImportScopeTest.class );
 suite.addTestSuite( MavenITmng5958LifecyclePhaseBinaryCompat.class );

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/cfc6098c/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5527DependencyManagementImportRelocationsTest.java
--
diff --git 
a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5527DependencyManagementImportRelocationsTest.java
 
b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5527DependencyManagementImportRelocationsTest.java
new file mode 100644
index 000..1ce7b8f
--- /dev/null
+++ 
b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5527DependencyManagementImportRelocationsTest.java
@@ -0,0 +1,74 @@
+package org.apache.maven.it;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import java.io.File;
+import java.util.Arrays;
+import java.util.Map;
+import java.util.Properties;
+
+import org.apache.maven.it.util.ResourceExtractor;
+
+import static junit.framework.Assert.assertEquals;
+
+/**
+ * [MNG-5527] Dependency management import should support relocations.
+ *
+ * @author Christian Schulte
+ */
+public class MavenITmng5527DependencyManagementImportRelocationsTest
+extends AbstractMavenIntegrationTestCase
+{
+
+public MavenITmng5527DependencyManagementImportRelocationsTest()
+{
+super( "[3.4,)" );
+}
+
+public void testCanExcludeDependenciesFromImport()
+throws Exception
+{
+final File testDir = ResourceExtractor.simpleExtractResources( 
getClass(), "/mng-5527/relocations&qu

maven git commit: [MNG-3507] added color to Maven execution output messages

2016-06-16 Thread schulte

Repository: maven
Updated Branches:
  refs/heads/master 09bfdee69 -> 7d89f0583


[MNG-3507] added color to Maven execution output messages

This reverts commits
  7e1b961edd44c7d2843b1b7cd01cea5a1cd1a70d
  71e4ff8e358dd43fb52f2e760b82ef7ab39f1dbb


Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/7d89f058
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/7d89f058
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/7d89f058

Branch: refs/heads/master
Commit: 7d89f0583f504615bd87956897971d4b3edeff92
Parents: 09bfdee
Author: Christian Schulte <schu...@apache.org>
Authored: Thu Jun 16 21:48:01 2016 +0200
Committer: Christian Schulte <schu...@apache.org>
Committed: Thu Jun 16 21:48:46 2016 +0200

--
 .../lifecycle/LifecycleExecutionException.java  |  16 +--
 .../maven/cli/event/ExecutionEventLogger.java   | 106 ---
 .../apache/maven/cli/logging/Slf4jLogger.java   |  13 ++-
 .../cli/logging/impl/gossip/ColorRenderer.java  |  27 ++---
 4 files changed, 73 insertions(+), 89 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/7d89f058/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 35c7032..fd4bca0 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
@@ -80,27 +80,27 @@ public class LifecycleExecutionException
 {
 Ansi buffer = ansi( /*256*/ );
 
-buffer.fgRed().a( "Failed to execute goal" );
+buffer.a( "Failed to execute goal" ).reset();
 
 if ( execution != null )
 {
-buffer.a( ' ' ).a( execution.getGroupId() ).a( ':' ).a( 
execution.getArtifactId() ).
-a( ':' ).a( execution.getVersion() ).a( ':' ).a( 
execution.getGoal() ).
-a( " (" ).a( execution.getExecutionId() ).a( ')' );
-
+buffer.a( ' ' ).a( execution.getGroupId() ).a( ':' ).fgGreen().a( 
execution.getArtifactId() );
+buffer.a( ':' ).a( execution.getVersion() ).a( ':' ).a( 
execution.getGoal() ).reset();
+buffer.bold().a( " (" ).a( execution.getExecutionId() ).a( ')' 
).reset();
 }
 
 if ( project != null )
 {
-buffer.a( " on project " ).a( project.getArtifactId() );
+buffer.a( " on project " );
+buffer.fgCyan().a( project.getArtifactId() ).reset();
 }
 
 if ( cause != null )
 {
-buffer.a( ": " ).a( cause.getMessage() );
+buffer.a( ": " ).bold().fgRed().a( cause.getMessage() ).reset();
 }
 
-return buffer.reset().toString();
+return buffer.toString();
 }
 
 }

http://git-wip-us.apache.org/repos/asf/maven/blob/7d89f058/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 7180a43..ee57121 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
@@ -51,7 +51,7 @@ public class ExecutionEventLogger
 
 private static final int LINE_LENGTH = 72;
 private static final int MAX_PADDED_BUILD_TIME_DURATION_LENGTH = 9;
-private static final int MAX_PROJECT_NAME_LENGTH = LINE_LENGTH - 
MAX_PADDED_BUILD_TIME_DURATION_LENGTH - 12;
+private static final int MAX_PROJECT_NAME_LENGTH = 52;
 
 public ExecutionEventLogger()
 {
@@ -83,7 +83,7 @@ public class ExecutionEventLogger
 
 private void infoMain( String msg )
 {
-logger.info( ansi().fgBlue().a( msg ).reset().toString() );
+logger.info( ansi().bold().a( msg ).reset().toString() );
 }
 
 @Override
@@ -91,7 +91,7 @@ public class ExecutionEventLogger
 {
 if ( logger.isInfoEnabled() )
 {
-logger.info( ansi().fgBlue().a( "Scanning for projects..." 
).reset().toString() );
+logger.info( "Scanning for projects..." );
 }
 }
 
@@ -108,7 +108,7 @@ public class ExecutionEventLogger
 
 for ( MavenProject project : event.getSession().ge

[01/20] maven git commit: [MNG-6037] add support for Gossip slf4j provider Submitted by: Jason Dillon Applied with modifications since general Maven color support was extracted from logging in MNG-350

2016-06-17 Thread schulte

Repository: maven
Updated Branches:
  refs/heads/MNG-6006 1ac426708 -> 0d785b59c (forced update)


[MNG-6037] add support for Gossip slf4j provider
Submitted by: Jason Dillon
Applied with modifications since general Maven color support was
extracted from logging in MNG-3507
this closes #81

Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/427f18c3
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/427f18c3
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/427f18c3

Branch: refs/heads/MNG-6006
Commit: 427f18c3a3c4ee1e7e88895e5346260a0917a43a
Parents: 2859eb0
Author: HervÃ© Boutemy 
Authored: Sat Jun 11 13:09:36 2016 +0200
Committer: HervÃ© Boutemy 
Committed: Sat Jun 11 13:09:36 2016 +0200

--
 maven-embedder/pom.xml  |   5 +
 .../impl/gossip/ColorConsoleListener.java   |  72 +++
 .../cli/logging/impl/gossip/ColorRenderer.java  | 124 +++
 .../impl/gossip/GossipConfiguration.java|  63 ++
 .../com.planet57.gossip/config.properties   |  30 +
 .../maven/slf4j-configuration.properties|   1 +
 pom.xml |   9 ++
 7 files changed, 304 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/427f18c3/maven-embedder/pom.xml
--
diff --git a/maven-embedder/pom.xml b/maven-embedder/pom.xml
index 0c86310..eb72f93 100644
--- a/maven-embedder/pom.xml
+++ b/maven-embedder/pom.xml
@@ -97,6 +97,11 @@ under the License.
   logback-classic
   true
 
+
+  com.planet57.gossip
+  gossip-slf4j
+  true
+
 
 
   commons-cli

http://git-wip-us.apache.org/repos/asf/maven/blob/427f18c3/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/gossip/ColorConsoleListener.java
--
diff --git 
a/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/gossip/ColorConsoleListener.java
 
b/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/gossip/ColorConsoleListener.java
new file mode 100644
index 000..b9c97a9
--- /dev/null
+++ 
b/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/gossip/ColorConsoleListener.java
@@ -0,0 +1,72 @@
+package org.apache.maven.cli.logging.impl.gossip;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import java.io.PrintStream;
+
+import com.planet57.gossip.listener.ConsoleListener;
+import org.fusesource.jansi.AnsiConsole;
+import org.fusesource.jansi.internal.CLibrary;
+
+/**
+ * Specialized {@link com.planet57.gossip.listener.Listener} which is aware of 
ANSI streams.
+ *
+ * @author mailto:ja...@planet57.com;>Jason Dillon
+ * @since 3.4.0
+ */
+public class ColorConsoleListener
+extends ConsoleListener
+{
+private PrintStream out;
+
+/**
+ * Returns file descriptor identifier for the configured stream.
+ */
+private int getFileno()
+{
+switch ( getStream() )
+{
+case OUT:
+return CLibrary.STDOUT_FILENO;
+
+case ERR:
+return CLibrary.STDERR_FILENO;
+
+default:
+throw new InternalError();
+}
+}
+
+/**
+ * Returns an ANSI aware wrapped stream.
+ *
+ * Needed so that jansi (limited) logic to detect supported streams is 
applied and copes with
+ * redirection of stream to file to strip out ANSI sequences.
+ */
+@Override
+protected PrintStream getOut()
+{
+if ( out == null )
+{
+out = new PrintStream( AnsiConsole.wrapOutputStream( 
super.getOut(), getFileno() ) );
+}
+return out;
+}
+}

http://git-wip-us.apache.org/repos/asf/maven/blob/427f18c3/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/gossip/ColorRenderer.java
--
diff --git

[05/20] maven git commit: [MNG-3507] forgot bold for skipped yellow messages

2016-06-17 Thread schulte

[MNG-3507] forgot bold for skipped yellow messages

Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/9fff5599
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/9fff5599
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/9fff5599

Branch: refs/heads/MNG-6006
Commit: 9fff55993e849379a2b58b4ec6947c7a79860eb3
Parents: 3355318
Author: HervÃ© Boutemy 
Authored: Sun Jun 12 17:57:26 2016 +0200
Committer: HervÃ© Boutemy 
Committed: Sun Jun 12 17:57:26 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/9fff5599/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 5af7406..ee57121 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
@@ -161,7 +161,7 @@ public class ExecutionEventLogger
 
 if ( buildSummary == null )
 {
-buffer.append( ansi().fgYellow().a( "SKIPPED" ).reset() );
+buffer.append( ansi().bold().fgYellow().a( "SKIPPED" ).reset() 
);
 }
 else if ( buildSummary instanceof BuildSuccess )
 {

[07/20] maven git commit: [MNG-3507] enhanced error hints with color

2016-06-17 Thread schulte

[MNG-3507] enhanced error hints with color

Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/92334a1d
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/92334a1d
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/92334a1d

Branch: refs/heads/MNG-6006
Commit: 92334a1dd9f2f3df77b3c039be7742ea19a8ee81
Parents: 050936c
Author: HervÃ© Boutemy 
Authored: Sun Jun 12 19:30:48 2016 +0200
Committer: HervÃ© Boutemy 
Committed: Sun Jun 12 19:30:48 2016 +0200

--
 .../src/main/java/org/apache/maven/cli/MavenCli.java   | 13 +
 1 file changed, 9 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/92334a1d/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 15dc575..38caf83 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
@@ -19,6 +19,8 @@ package org.apache.maven.cli;
  * under the License.
  */
 
+import static org.fusesource.jansi.Ansi.ansi;
+
 import java.io.BufferedInputStream;
 import java.io.Console;
 import java.io.File;
@@ -1011,11 +1013,13 @@ public class MavenCli
 
 if ( !cliRequest.showErrors )
 {
-slf4jLogger.error( "To see the full stack trace of the errors, 
re-run Maven with the -e switch." );
+slf4jLogger.error( "To see the full stack trace of the errors, 
re-run Maven with the "
++ ansi().bold().a( "-e" ).reset() + " switch." );
 }
 if ( !slf4jLogger.isDebugEnabled() )
 {
-slf4jLogger.error( "Re-run Maven using the -X switch to enable 
full debug logging." );
+slf4jLogger.error( "Re-run Maven using the " + 
ansi().bold().a( "-X" ).reset()
++ " switch to enable full debug logging." );
 }
 
 if ( !references.isEmpty() )
@@ -1026,7 +1030,7 @@ public class MavenCli
 
 for ( Map.Entry entry : references.entrySet() )
 {
-slf4jLogger.error( entry.getValue() + " " + entry.getKey() 
);
+slf4jLogger.error( ansi().bold().a( entry.getValue() 
).reset() + " " + entry.getKey() );
 }
 }
 
@@ -1034,7 +1038,8 @@ public class MavenCli
 {
 slf4jLogger.error( "" );
 slf4jLogger.error( "After correcting the problems, you can 
resume the build with the command" );
-slf4jLogger.error( "  mvn  -rf :" + 
project.getArtifactId() );
+slf4jLogger.error( ansi().bold().a( "  mvn  -rf :" )
+   .a( project.getArtifactId() 
).reset().toString() );
 }
 
 if ( MavenExecutionRequest.REACTOR_FAIL_NEVER.equals( 
cliRequest.request.getReactorFailureBehavior() ) )

[11/20] maven git commit: [MNG-6043] Colorization is disabled too late in batch mode

2016-06-17 Thread schulte

[MNG-6043] Colorization is disabled too late in batch mode


Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/ecdb0bc2
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/ecdb0bc2
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/ecdb0bc2

Branch: refs/heads/MNG-6006
Commit: ecdb0bc2ba3ebdad837b6794315b64c64854f5cf
Parents: ded1379
Author: Michael Osipov 
Authored: Tue Jun 14 20:26:13 2016 +0200
Committer: Michael Osipov 
Committed: Tue Jun 14 20:29:15 2016 +0200

--
 .../src/main/java/org/apache/maven/cli/MavenCli.java   | 6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/ecdb0bc2/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 045381b..b07fdc9 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
@@ -474,6 +474,11 @@ public class MavenCli
 // else fall back to default log level specified in conf
 // see https://issues.apache.org/jira/browse/MNG-2570
 
+if ( cliRequest.commandLine.hasOption( CLIManager.BATCH_MODE ) )
+{
+Ansi.setEnabled( false );
+}
+
 if ( cliRequest.commandLine.hasOption( CLIManager.LOG_FILE ) )
 {
 File logFile = new File( cliRequest.commandLine.getOptionValue( 
CLIManager.LOG_FILE ) );
@@ -1304,7 +1309,6 @@ public class MavenCli
 if ( commandLine.hasOption( CLIManager.BATCH_MODE ) )
 {
 request.setInteractiveMode( false );
-Ansi.setEnabled( false );
 }
 
 boolean noSnapshotUpdates = false;

svn commit: r1749581 - in /maven/jxr/trunk/maven-jxr-plugin/src/main/java/org/apache/maven/plugin/jxr: AggregatorJxrReport.java AggregatorJxrTestReport.java

2016-06-21 Thread schulte

Author: schulte
Date: Tue Jun 21 18:00:39 2016
New Revision: 1749581

URL: http://svn.apache.org/viewvc?rev=1749581=rev
Log:
[JXR-132] Aggregator reports should not require modules to be 
installed/deployed.


Modified:

maven/jxr/trunk/maven-jxr-plugin/src/main/java/org/apache/maven/plugin/jxr/AggregatorJxrReport.java

maven/jxr/trunk/maven-jxr-plugin/src/main/java/org/apache/maven/plugin/jxr/AggregatorJxrTestReport.java

Modified: 
maven/jxr/trunk/maven-jxr-plugin/src/main/java/org/apache/maven/plugin/jxr/AggregatorJxrReport.java
URL: 
http://svn.apache.org/viewvc/maven/jxr/trunk/maven-jxr-plugin/src/main/java/org/apache/maven/plugin/jxr/AggregatorJxrReport.java?rev=1749581=1749580=1749581=diff
==
--- 
maven/jxr/trunk/maven-jxr-plugin/src/main/java/org/apache/maven/plugin/jxr/AggregatorJxrReport.java
 (original)
+++ 
maven/jxr/trunk/maven-jxr-plugin/src/main/java/org/apache/maven/plugin/jxr/AggregatorJxrReport.java
 Tue Jun 21 18:00:39 2016
@@ -19,14 +19,17 @@ package org.apache.maven.plugin.jxr;
  * under the License.
  */
 
+import org.apache.maven.plugins.annotations.Execute;
+import org.apache.maven.plugins.annotations.LifecyclePhase;
 import org.apache.maven.plugins.annotations.Mojo;
 
 /**
  * Generates a combined JXR report in an aggregating project.
- * 
+ *
  * @since 2.3
  */
 @Mojo( name = "aggregate", aggregator = true )
+@Execute( phase = LifecyclePhase.COMPILE )
 public class AggregatorJxrReport
 extends JxrReport
 {

Modified: 
maven/jxr/trunk/maven-jxr-plugin/src/main/java/org/apache/maven/plugin/jxr/AggregatorJxrTestReport.java
URL: 
http://svn.apache.org/viewvc/maven/jxr/trunk/maven-jxr-plugin/src/main/java/org/apache/maven/plugin/jxr/AggregatorJxrTestReport.java?rev=1749581=1749580=1749581=diff
==
--- 
maven/jxr/trunk/maven-jxr-plugin/src/main/java/org/apache/maven/plugin/jxr/AggregatorJxrTestReport.java
 (original)
+++ 
maven/jxr/trunk/maven-jxr-plugin/src/main/java/org/apache/maven/plugin/jxr/AggregatorJxrTestReport.java
 Tue Jun 21 18:00:39 2016
@@ -19,14 +19,17 @@ package org.apache.maven.plugin.jxr;
  * under the License.
  */
 
+import org.apache.maven.plugins.annotations.Execute;
+import org.apache.maven.plugins.annotations.LifecyclePhase;
 import org.apache.maven.plugins.annotations.Mojo;
 
 /**
  * Generates a combined JXR report for test code in an aggregating project.
- * 
+ *
  * @since 2.3
  */
 @Mojo( name = "test-aggregate", aggregator = true )
+@Execute( phase = LifecyclePhase.TEST_COMPILE )
 public class AggregatorJxrTestReport
 extends JxrTestReport
 {

svn commit: r1749577 - /maven/jxr/trunk/pom.xml

2016-06-21 Thread schulte

Author: schulte
Date: Tue Jun 21 17:50:56 2016
New Revision: 1749577

URL: http://svn.apache.org/viewvc?rev=1749577=rev
Log:
[JXR-129] Upgrade of plexus-utils to 3.0.24.


Modified:
maven/jxr/trunk/pom.xml

Modified: maven/jxr/trunk/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/jxr/trunk/pom.xml?rev=1749577=1749576=1749577=diff
==
--- maven/jxr/trunk/pom.xml (original)
+++ maven/jxr/trunk/pom.xml Tue Jun 21 17:50:56 2016
@@ -88,7 +88,7 @@ under the License.
   
 org.codehaus.plexus
 plexus-utils
-3.0.20
+3.0.24

svn commit: r1749578 - /maven/jxr/trunk/maven-jxr/pom.xml

2016-06-21 Thread schulte

Author: schulte
Date: Tue Jun 21 17:52:54 2016
New Revision: 1749578

URL: http://svn.apache.org/viewvc?rev=1749578=rev
Log:
[JXR-130] Upgrade of commons-io to 2.5.


Modified:
maven/jxr/trunk/maven-jxr/pom.xml

Modified: maven/jxr/trunk/maven-jxr/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/jxr/trunk/maven-jxr/pom.xml?rev=1749578=1749577=1749578=diff
==
--- maven/jxr/trunk/maven-jxr/pom.xml (original)
+++ maven/jxr/trunk/maven-jxr/pom.xml Tue Jun 21 17:52:54 2016
@@ -90,7 +90,7 @@ under the License.
 
   commons-io
   commons-io
-  2.0.1
+  2.5
 
 
   commons-lang

svn commit: r1749579 - in /maven/jxr/trunk/maven-jxr-plugin/src/main/java/org/apache/maven/plugin/jxr: JxrReport.java JxrTestReport.java

2016-06-21 Thread schulte

Author: schulte
Date: Tue Jun 21 17:59:34 2016
New Revision: 1749579

URL: http://svn.apache.org/viewvc?rev=1749579=rev
Log:
[JXR-131] Reports 'jxr' and 'test-jxr' do not contain generated sources.


Modified:

maven/jxr/trunk/maven-jxr-plugin/src/main/java/org/apache/maven/plugin/jxr/JxrReport.java

maven/jxr/trunk/maven-jxr-plugin/src/main/java/org/apache/maven/plugin/jxr/JxrTestReport.java

Modified: 
maven/jxr/trunk/maven-jxr-plugin/src/main/java/org/apache/maven/plugin/jxr/JxrReport.java
URL: 
http://svn.apache.org/viewvc/maven/jxr/trunk/maven-jxr-plugin/src/main/java/org/apache/maven/plugin/jxr/JxrReport.java?rev=1749579=1749578=1749579=diff
==
--- 
maven/jxr/trunk/maven-jxr-plugin/src/main/java/org/apache/maven/plugin/jxr/JxrReport.java
 (original)
+++ 
maven/jxr/trunk/maven-jxr-plugin/src/main/java/org/apache/maven/plugin/jxr/JxrReport.java
 Tue Jun 21 17:59:34 2016
@@ -19,16 +19,18 @@ package org.apache.maven.plugin.jxr;
  * under the License.
  */
 
-import org.apache.maven.plugins.annotations.Mojo;
-import org.apache.maven.plugins.annotations.Parameter;
-import org.apache.maven.project.MavenProject;
-
 import java.io.File;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Locale;
 
+import org.apache.maven.plugins.annotations.Execute;
+import org.apache.maven.plugins.annotations.LifecyclePhase;
+import org.apache.maven.plugins.annotations.Mojo;
+import org.apache.maven.plugins.annotations.Parameter;
+import org.apache.maven.project.MavenProject;
+
 /**
  * Creates an html-based, cross referenced version of Java source code
  * for a project.
@@ -37,6 +39,7 @@ import java.util.Locale;
  * @version $Id$
  */
 @Mojo( name = "jxr" )
+@Execute( phase = LifecyclePhase.GENERATE_SOURCES )
 public class JxrReport
 extends AbstractJxrReport
 {

Modified: 
maven/jxr/trunk/maven-jxr-plugin/src/main/java/org/apache/maven/plugin/jxr/JxrTestReport.java
URL: 
http://svn.apache.org/viewvc/maven/jxr/trunk/maven-jxr-plugin/src/main/java/org/apache/maven/plugin/jxr/JxrTestReport.java?rev=1749579=1749578=1749579=diff
==
--- 
maven/jxr/trunk/maven-jxr-plugin/src/main/java/org/apache/maven/plugin/jxr/JxrTestReport.java
 (original)
+++ 
maven/jxr/trunk/maven-jxr-plugin/src/main/java/org/apache/maven/plugin/jxr/JxrTestReport.java
 Tue Jun 21 17:59:34 2016
@@ -19,15 +19,17 @@ package org.apache.maven.plugin.jxr;
  * under the License.
  */
 
-import org.apache.maven.plugins.annotations.Mojo;
-import org.apache.maven.plugins.annotations.Parameter;
-import org.apache.maven.project.MavenProject;
-
 import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Locale;
 
+import org.apache.maven.plugins.annotations.Execute;
+import org.apache.maven.plugins.annotations.LifecyclePhase;
+import org.apache.maven.plugins.annotations.Mojo;
+import org.apache.maven.plugins.annotations.Parameter;
+import org.apache.maven.project.MavenProject;
+
 /**
  * Creates an html-based, cross referenced version of Java source code
  * for a project's test sources.
@@ -37,6 +39,7 @@ import java.util.Locale;
  * @version $Id$
  */
 @Mojo( name = "test-jxr" )
+@Execute( phase = LifecyclePhase.GENERATE_TEST_SOURCES )
 public class JxrTestReport
 extends AbstractJxrReport
 {

maven git commit: [MNG-5527] Relocation does not work for imported poms

2016-06-21 Thread schulte

Repository: maven
Updated Branches:
  refs/heads/master c6fb60b54 -> d3761d465


[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/master
Commit: d3761d46551e2eb8e29d476b4ae52fcf4ab3d4bc
Parents: c6fb60b
Author: Christian Schulte <schu...@apache.org>
Authored: Tue Jun 21 21:35:40 2016 +0200
Committer: Christian Schulte <schu...@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 importMngts = null;
 
 for ( Iterator 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 );

[2/7] maven git commit: [MNG-3507] activate color (since not done by AnsiUtils)

2016-06-21 Thread schulte

[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 
Authored: Tue Jun 21 08:29:49 2016 +0200
Committer: HervÃ© Boutemy 
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();

[3/7] maven git commit: [MNG-3705] fixed mojo execution id color display

2016-06-21 Thread schulte

[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 
Authored: Tue Jun 21 08:36:12 2016 +0200
Committer: HervÃ© Boutemy 
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();
 }
 }

[4/7] maven git commit: [MNG-5527] Relocation does not work for imported poms

2016-06-21 Thread schulte

[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 <schu...@apache.org>
Authored: Tue Jun 21 21:35:40 2016 +0200
Committer: Christian Schulte <schu...@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 importMngts = null;
 
 for ( Iterator 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

[1/7] maven git commit: [MNG-3705] added maven-project-utils to dependencies graph [Forced Update!]

2016-06-21 Thread schulte

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 
Authored: Mon Jun 20 18:56:03 2016 +0200
Committer: HervÃ© Boutemy 
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 @@
   
   http://www.slf4j.org/manual.html; />
   http://commons.apache.org/cli/; />
-  http://fusesource.github.io/jansi/; />
-  https://github.com/fusesource/jansi-native; />
+  https://maven.apache.org/shared/maven-shared-utils/; />
+  http://fusesource.github.io/jansi/; />
+  https://github.com/fusesource/jansi-native; />
   https://maven.apache.org/wagon/wagon-provider-api/; />
   https://github.com/codehaus-plexus/plexus-sec-dispatcher; />
   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

[5/7] maven git commit: [MNG-5527] Relocation does not work for imported poms

2016-06-21 Thread schulte

[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 <schu...@apache.org>
Authored: Wed Jun 22 01:21:00 2016 +0200
Committer: Christian Schulte <schu...@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() );
 }

[6/7] maven git commit: [MNG-6006] Import Aether to Maven codebase

2016-06-21 Thread schulte

[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 <schu...@apache.org>
Authored: Fri Jun 10 16:50:33 2016 +0200
Committer: Christian Schulte <schu...@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.
   wagon-file
 
 
-  org.eclipse.aether
+  org.apache.maven.aether
   aether-connector-basic
 
 
-  org.eclipse.aether
+  org.apache.maven.aether
   aether-transport-wagon
 
 

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.
   maven-repository-metadata
 
 
-  org.eclipse.aether
+  org.apache.maven.aether
   aether-api
 
 
-  org.eclipse.aether
+  org.apache.maven.aether
   aether-spi
 
 
-  org.eclipse.aether
+  org.apache.maven.aether
   aether-util
 
 
-  org.eclipse.aether
+  org.apache.maven.aether
   aether-impl
 
 
@@ -88,12 +88,12 @@ under the License.
 
 
 
-  org.eclipse.aether
+  org.apache.maven.aether
   aether-connector-basic
   test
 
 
-  org.eclipse.aether
+  org.apache.maven.aether
   aether-transport-wagon
   test
 

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.
   test
 
 
-  org.eclipse.aether
+  org.apache.maven.aether
   aether-connector-basic
   test
 
 
-  org.eclipse.aether
+  org.apache.maven.aether
   aether-transport-wagon
   test
 

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.
   maven-aether-provider
 
 
-  org.eclipse.aether
+  org.apache.maven.aether
   aether-impl
 
 
-  org.eclipse.aether
+  org.apache.maven.aether
   aether-api
 
 
-  org.eclipse.aether
+  org.apache.maven.aether
   aether-util
 
 

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.
 1.7
 1.8.3
 1.3
-1.0.2.v20150114
+1.2.0-SNAPSHOT
 
 
 
@@ -328,32 +328,32 @@ under the License.
   
   
   
-org.eclipse.aether
+org.apache.maven.aether
 aether-api
 ${aetherVersion}
   
   
-org.eclipse.aether
+org.apache.maven.aether
 aether-spi
 ${aetherVersion}
   
   
-org.eclipse.aether
+org.apache.maven.aether
 aether-impl
 ${aetherVersion}
   
   
-org.eclipse.aether
+org.apache.maven.aether
 aether-util
 ${aetherVersion}
   
   
-org.eclipse.aether
+org.apache.maven.aether
 aether-connector-basic
 ${aetherVersion}
   
   
-org.eclipse.aether
+org.apache.maven.aether
 aether-transport-wagon
 ${aetherVersion}

[7/7] maven git commit: [MNG-5761] Dependency management is not transitive.

2016-06-21 Thread schulte

[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 <schu...@apache.org>
Authored: Fri Jun 10 16:55:30 2016 +0200
Committer: Christian Schulte <schu...@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" ),

[3/3] maven git commit: [MNG-5761] Dependency management is not transitive.

2016-06-21 Thread schulte

[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/7a5e8827
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/7a5e8827
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/7a5e8827

Branch: refs/heads/MNG-6006
Commit: 7a5e8827bf8040389aee12794e4ff5b617154891
Parents: 4e83b51
Author: Christian Schulte <schu...@apache.org>
Authored: Fri Jun 10 16:55:30 2016 +0200
Committer: Christian Schulte <schu...@apache.org>
Committed: Wed Jun 22 02:00:03 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/7a5e8827/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/7a5e8827/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" ),

[2/3] maven git commit: [MNG-6006] Import Aether to Maven codebase

2016-06-21 Thread schulte

[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/4e83b51f
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/4e83b51f
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/4e83b51f

Branch: refs/heads/MNG-6006
Commit: 4e83b51f042d9ec0d090d92af0d7478c36076614
Parents: 4e7088f
Author: Christian Schulte <schu...@apache.org>
Authored: Fri Jun 10 16:50:33 2016 +0200
Committer: Christian Schulte <schu...@apache.org>
Committed: Wed Jun 22 02:00:03 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/4e83b51f/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.
   wagon-file
 
 
-  org.eclipse.aether
+  org.apache.maven.aether
   aether-connector-basic
 
 
-  org.eclipse.aether
+  org.apache.maven.aether
   aether-transport-wagon
 
 

http://git-wip-us.apache.org/repos/asf/maven/blob/4e83b51f/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.
   maven-repository-metadata
 
 
-  org.eclipse.aether
+  org.apache.maven.aether
   aether-api
 
 
-  org.eclipse.aether
+  org.apache.maven.aether
   aether-spi
 
 
-  org.eclipse.aether
+  org.apache.maven.aether
   aether-util
 
 
-  org.eclipse.aether
+  org.apache.maven.aether
   aether-impl
 
 
@@ -88,12 +88,12 @@ under the License.
 
 
 
-  org.eclipse.aether
+  org.apache.maven.aether
   aether-connector-basic
   test
 
 
-  org.eclipse.aether
+  org.apache.maven.aether
   aether-transport-wagon
   test
 

http://git-wip-us.apache.org/repos/asf/maven/blob/4e83b51f/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.
   test
 
 
-  org.eclipse.aether
+  org.apache.maven.aether
   aether-connector-basic
   test
 
 
-  org.eclipse.aether
+  org.apache.maven.aether
   aether-transport-wagon
   test
 

http://git-wip-us.apache.org/repos/asf/maven/blob/4e83b51f/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.
   maven-aether-provider
 
 
-  org.eclipse.aether
+  org.apache.maven.aether
   aether-impl
 
 
-  org.eclipse.aether
+  org.apache.maven.aether
   aether-api
 
 
-  org.eclipse.aether
+  org.apache.maven.aether
   aether-util
 
 

http://git-wip-us.apache.org/repos/asf/maven/blob/4e83b51f/pom.xml
--
diff --git a/pom.xml b/pom.xml
index e53a2ee..9c324d0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -64,7 +64,7 @@ under the License.
 1.7
 1.8.3
 1.3
-1.0.2.v20150114
+1.2.0-SNAPSHOT
 
 
 
@@ -328,32 +328,32 @@ under the License.
   
   
   
-org.eclipse.aether
+org.apache.maven.aether
 aether-api
 ${aetherVersion}
   
   
-org.eclipse.aether
+org.apache.maven.aether
 aether-spi
 ${aetherVersion}
   
   
-org.eclipse.aether
+org.apache.maven.aether
 aether-impl
 ${aetherVersion}
   
   
-org.eclipse.aether
+org.apache.maven.aether
 aether-util
 ${aetherVersion}
   
   
-org.eclipse.aether
+org.apache.maven.aether
 aether-connector-basic
 ${aetherVersion}
   
   
-org.eclipse.aether
+org.apache.maven.aether
 aether-transport-wagon
 ${aetherVersion}

[1/3] maven git commit: [MNG-5967] Dependency updates. [Forced Update!]

2016-06-21 Thread schulte

Repository: maven
Updated Branches:
  refs/heads/MNG-6006 43cd84df6 -> 7a5e8827b (forced update)


[MNG-5967] Dependency updates.


Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/4e7088ff
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/4e7088ff
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/4e7088ff

Branch: refs/heads/MNG-6006
Commit: 4e7088ffe0f185ed5dcf7d1748acee9876fa6b50
Parents: de817fd
Author: Christian Schulte <schu...@apache.org>
Authored: Wed Jun 22 01:39:02 2016 +0200
Committer: Christian Schulte <schu...@apache.org>
Committed: Wed Jun 22 01:39:02 2016 +0200

--
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/4e7088ff/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 2547ed5..e53a2ee 100644
--- a/pom.xml
+++ b/pom.xml
@@ -53,11 +53,11 @@ under the License.
 1.3.1
 3.4
 4.12
-1.6
+1.7
 1.22
 3.0.24
 19.0
-4.0
+4.1.0
 0.3.3
 2.10
 1.4

maven git commit: [MNG-5527] Relocation does not work for imported poms

2016-06-21 Thread schulte

Repository: maven
Updated Branches:
  refs/heads/master d3761d465 -> de817fd82


[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/master
Commit: de817fd82253c6191b02044e33795acf4ff076d9
Parents: d3761d4
Author: Christian Schulte <schu...@apache.org>
Authored: Wed Jun 22 01:21:00 2016 +0200
Committer: Christian Schulte <schu...@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() );
 }

maven git commit: [MNG-5967] Dependency updates.

2016-06-21 Thread schulte

Repository: maven
Updated Branches:
  refs/heads/master de817fd82 -> 4e7088ffe


[MNG-5967] Dependency updates.


Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/4e7088ff
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/4e7088ff
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/4e7088ff

Branch: refs/heads/master
Commit: 4e7088ffe0f185ed5dcf7d1748acee9876fa6b50
Parents: de817fd
Author: Christian Schulte <schu...@apache.org>
Authored: Wed Jun 22 01:39:02 2016 +0200
Committer: Christian Schulte <schu...@apache.org>
Committed: Wed Jun 22 01:39:02 2016 +0200

--
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/4e7088ff/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 2547ed5..e53a2ee 100644
--- a/pom.xml
+++ b/pom.xml
@@ -53,11 +53,11 @@ under the License.
 1.3.1
 3.4
 4.12
-1.6
+1.7
 1.22
 3.0.24
 19.0
-4.0
+4.1.0
 0.3.3
 2.10
 1.4

maven git commit: [MNG-5600] Dependency management import should support exclusions.

2016-06-19 Thread schulte

Repository: maven
Updated Branches:
  refs/heads/master 7d89f0583 -> 162c7403e


[MNG-5600] Dependency management import should support exclusions.


Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/162c7403
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/162c7403
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/162c7403

Branch: refs/heads/master
Commit: 162c7403e1411b2898653b85db20d3cc9cb4a0fe
Parents: 7d89f05
Author: Christian Schulte <schu...@apache.org>
Authored: Sun Jun 19 16:32:25 2016 +0200
Committer: Christian Schulte <schu...@apache.org>
Committed: Sun Jun 19 19:13:08 2016 +0200

--
 .../model/building/DefaultModelBuilder.java | 65 +++-
 1 file changed, 49 insertions(+), 16 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/162c7403/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 014e401..5970dc4 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
@@ -19,6 +19,18 @@ package org.apache.maven.model.building;
  * under the License.
  */
 
+import java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+
 import org.apache.commons.lang3.Validate;
 import org.apache.maven.artifact.versioning.DefaultArtifactVersion;
 import 
org.apache.maven.artifact.versioning.InvalidVersionSpecificationException;
@@ -27,6 +39,7 @@ import org.apache.maven.model.Activation;
 import org.apache.maven.model.Build;
 import org.apache.maven.model.Dependency;
 import org.apache.maven.model.DependencyManagement;
+import org.apache.maven.model.Exclusion;
 import org.apache.maven.model.InputLocation;
 import org.apache.maven.model.InputSource;
 import org.apache.maven.model.Model;
@@ -62,18 +75,6 @@ import org.apache.maven.model.validation.ModelValidator;
 import org.codehaus.plexus.component.annotations.Component;
 import org.codehaus.plexus.component.annotations.Requirement;
 
-import java.io.File;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-
 import static org.apache.maven.model.building.Result.error;
 import static org.apache.maven.model.building.Result.newResult;
 
@@ -1443,14 +1444,46 @@ public class DefaultModelBuilder
 importModel = importResult.getEffectiveModel();
 }
 
-importMngt = importModel.getDependencyManagement();
+importMngt = importModel.getDependencyManagement() != null
+ ? 
importModel.getDependencyManagement().clone()
+ : new DependencyManagement();
 
-if ( importMngt == null )
+// [MNG-5600] Dependency management import should support 
exclusions.
+if ( !dependency.getExclusions().isEmpty() )
 {
-importMngt = new DependencyManagement();
+for ( final Exclusion exclusion : 
dependency.getExclusions() )
+{
+if ( exclusion.getGroupId() != null && 
exclusion.getArtifactId() != null )
+{
+for ( final Iterator dependencies 
= importMngt.getDependencies().iterator();
+  dependencies.hasNext(); )
+{
+final Dependency candidate = 
dependencies.next();
+
+if ( ( exclusion.getGroupId().equals( "*" )
+   || exclusion.getGroupId().equals( 
candidate.getGroupId() ) )
+ && ( 
exclusion.getArtifactId().equals( "*" )
+  || 
exclusion.getArtifactId().equals( candidate.getArtifactId() ) ) )
+{
+

maven-integration-testing git commit: [MNG-5600] Dependency management import should support exclusions.

2016-06-19 Thread schulte

Repository: maven-integration-testing
Updated Branches:
  refs/heads/master 0de891599 -> 422fef9e4


[MNG-5600] Dependency management import should support exclusions.


Project: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/repo
Commit: 
http://git-wip-us.apache.org/repos/asf/maven-integration-testing/commit/422fef9e
Tree: 
http://git-wip-us.apache.org/repos/asf/maven-integration-testing/tree/422fef9e
Diff: 
http://git-wip-us.apache.org/repos/asf/maven-integration-testing/diff/422fef9e

Branch: refs/heads/master
Commit: 422fef9e493589a3b3009cb921ee3dfb03d5b2b8
Parents: 0de8915
Author: Christian Schulte <schu...@apache.org>
Authored: Sun Jun 19 17:18:51 2016 +0200
Committer: Christian Schulte <schu...@apache.org>
Committed: Sun Jun 19 19:28:04 2016 +0200

--
 .../apache/maven/it/IntegrationTestSuite.java   |  1 +
 ...ependencyManagementImportExclusionsTest.java | 82 +++
 .../test/resources/mng-5600/exclusions/pom.xml  | 84 
 .../apache/maven/its/mng5600/bom/0/bom-0.pom| 44 ++
 .../resources/mng-5600/settings-template.xml| 43 ++
 5 files changed, 254 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/422fef9e/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java
--
diff --git 
a/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java 
b/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java
index 67680a9..504b028 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java
@@ -106,6 +106,7 @@ public class IntegrationTestSuite
 // 
-
 // suite.addTestSuite( MavenIT0108SnapshotUpdateTest.class ); -- 
MNG-3137
 
+suite.addTestSuite( 
MavenITmng5600DependencyManagementImportExclusionsTest.class );
 suite.addTestSuite( MavenITmng5971HierarchicalImportScopeTest.class );
 suite.addTestSuite( MavenITmng5958LifecyclePhaseBinaryCompat.class );
 suite.addTestSuite( 
MavenITmng4463DependencyManagementImportVersionRanges.class );

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/422fef9e/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5600DependencyManagementImportExclusionsTest.java
--
diff --git 
a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5600DependencyManagementImportExclusionsTest.java
 
b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5600DependencyManagementImportExclusionsTest.java
new file mode 100644
index 000..4d5d9c5
--- /dev/null
+++ 
b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5600DependencyManagementImportExclusionsTest.java
@@ -0,0 +1,82 @@
+package org.apache.maven.it;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+import java.io.File;
+import java.util.Arrays;
+import java.util.Map;
+import java.util.Properties;
+
+import org.apache.maven.it.util.ResourceExtractor;
+
+import static junit.framework.Assert.assertEquals;
+
+/**
+ * [MNG-5600] Dependency management import should support exclusions.
+ *
+ * @author Christian Schulte
+ */
+public class MavenITmng5600DependencyManagementImportExclusionsTest
+extends AbstractMavenIntegrationTestCase
+{
+
+public MavenITmng5600DependencyManagementImportExclusionsTest()
+{
+super( "[3.4,)" );
+}
+
+public void testCanExcludeDependenciesFromImport()
+throws Exception
+{
+final File testDir = ResourceExtractor.simpleExtractResources( 
getClass(), "/mng-5600/exclusions" );
+
+final Verifier verifier = newVerifier( testDir.getAbsolutePath() );
+verifier.setAutoclean( false );
+verifier.filterFi

[03/20] maven git commit: [MNG-5227] The 'optional' flag of a dependency should be manageable.

2016-06-17 Thread schulte

[MNG-5227] The 'optional' flag of a dependency should be manageable.

This reverts commit 2fb5fd5e6b7ebded597329d1e87e255fb368ba73.


Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/0931a8fe
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/0931a8fe
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/0931a8fe

Branch: refs/heads/MNG-6006
Commit: 0931a8fe0aa43a95a34d7dacb5050df6746c1b55
Parents: 644ac9c
Author: Christian Schulte <schu...@apache.org>
Authored: Sun Jun 12 16:46:43 2016 +0200
Committer: Christian Schulte <schu...@apache.org>
Committed: Sun Jun 12 16:46:43 2016 +0200

--
 .../model/management/DefaultDependencyManagementInjector.java | 7 +++
 1 file changed, 7 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/0931a8fe/maven-model-builder/src/main/java/org/apache/maven/model/management/DefaultDependencyManagementInjector.java
--
diff --git 
a/maven-model-builder/src/main/java/org/apache/maven/model/management/DefaultDependencyManagementInjector.java
 
b/maven-model-builder/src/main/java/org/apache/maven/model/management/DefaultDependencyManagementInjector.java
index 731cdd8..e611973 100644
--- 
a/maven-model-builder/src/main/java/org/apache/maven/model/management/DefaultDependencyManagementInjector.java
+++ 
b/maven-model-builder/src/main/java/org/apache/maven/model/management/DefaultDependencyManagementInjector.java
@@ -82,6 +82,13 @@ public class DefaultDependencyManagementInjector
 }
 
 @Override
+protected void mergeDependency_Optional( Dependency target, Dependency 
source, boolean sourceDominant,
+ Map<Object, Object> context )
+{
+// optional flag is not managed
+}
+
+@Override
 protected void mergeDependency_Exclusions( Dependency target, 
Dependency source, boolean sourceDominant,
Map<Object, Object> context 
)
 {

[04/20] maven git commit: [MNG-5967] Dependency updates.

2016-06-17 Thread schulte

[MNG-5967] Dependency updates.

o Downgraded to latest Aether release @Eclipse giving up on bugfixes already 
pushed to central.


Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/33553186
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/33553186
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/33553186

Branch: refs/heads/MNG-6006
Commit: 3355318652081478c22b6085422578ab8eac7708
Parents: 0931a8f
Author: Christian Schulte <schu...@apache.org>
Authored: Sun Jun 12 16:48:43 2016 +0200
Committer: Christian Schulte <schu...@apache.org>
Committed: Sun Jun 12 16:48:43 2016 +0200

--
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/33553186/pom.xml
--
diff --git a/pom.xml b/pom.xml
index a9af928..4a22e9d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -64,7 +64,7 @@ under the License.
 1.7
 1.8.3
 1.3
-1.1.0
+1.0.2.v20150114

[14/20] maven git commit: [MNG-6046] upgrade JAnsi from 1.12 to 1.13

2016-06-17 Thread schulte

[MNG-6046] upgrade JAnsi from 1.12 to 1.13

now color should not make BSD users unable to use Maven
thank you to JAnsi maintainers for merging PRs and doing the release

Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/bcaad566
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/bcaad566
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/bcaad566

Branch: refs/heads/MNG-6006
Commit: bcaad5668ead035e2c2cae7971b9ebed33fa82b9
Parents: cdc87a9
Author: HervÃ© Boutemy 
Authored: Thu Jun 16 08:42:18 2016 +0200
Committer: HervÃ© Boutemy 
Committed: Thu Jun 16 08:42:18 2016 +0200

--
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/bcaad566/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 4a22e9d..6698f94 100644
--- a/pom.xml
+++ b/pom.xml
@@ -278,7 +278,7 @@ under the License.
   
 org.fusesource.jansi
 jansi
-1.12
+1.13
   
   
 org.slf4j

[02/20] maven git commit: [MNG-6038] use Gossip slf4j provider (with level color support)

2016-06-17 Thread schulte

[MNG-6038] use Gossip slf4j provider (with level color support)

Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/644ac9c4
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/644ac9c4
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/644ac9c4

Branch: refs/heads/MNG-6006
Commit: 644ac9c40ad41bf61e3b099918af33b8eb950621
Parents: 427f18c
Author: HervÃ© Boutemy 
Authored: Sat Jun 11 13:26:05 2016 +0200
Committer: HervÃ© Boutemy 
Committed: Sat Jun 11 13:26:05 2016 +0200

--
 apache-maven/pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/644ac9c4/apache-maven/pom.xml
--
diff --git a/apache-maven/pom.xml b/apache-maven/pom.xml
index 9405df8..37751cc 100644
--- a/apache-maven/pom.xml
+++ b/apache-maven/pom.xml
@@ -92,8 +92,8 @@ under the License.
   aether-transport-wagon
 
 
-  org.slf4j
-  slf4j-simple
+  com.planet57.gossip
+  gossip-slf4j

[13/20] maven git commit: o Updated to remove errors reported by Checkstyle.

2016-06-17 Thread schulte

o Updated to remove errors reported by Checkstyle.


Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/cdc87a90
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/cdc87a90
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/cdc87a90

Branch: refs/heads/MNG-6006
Commit: cdc87a909c3160fe521e73aae4ec2c7ef756ca38
Parents: e7a783d
Author: Christian Schulte <schu...@apache.org>
Authored: Tue Jun 14 21:26:56 2016 +0200
Committer: Christian Schulte <schu...@apache.org>
Committed: Tue Jun 14 21:28:00 2016 +0200

--
 .../UnknownRepositoryLayoutException.java   |  3 +-
 .../DefaultArtifactRepositoryFactory.java   |  4 +-
 .../repository/layout/FlatRepositoryLayout.java |  6 +-
 .../artifact/resolver/ArtifactResolver.java | 62 +++---
 .../resolver/DefaultArtifactResolver.java   | 12 ++-
 .../profiles/activation/ProfileActivator.java   |  4 +-
 .../org/apache/maven/project/ProjectUtils.java  | 15 ++--
 .../AbstractStringBasedModelInterpolator.java   | 22 +++--
 .../StringSearchModelInterpolator.java  | 14 ++--
 .../project/path/DefaultPathTranslator.java | 10 +--
 .../repository/MetadataResolutionResult.java| 26 +++---
 .../repository/legacy/DefaultWagonManager.java  | 85 +---
 .../legacy/LegacyRepositorySystem.java  | 31 ---
 .../maven/repository/legacy/WagonManager.java   |  6 +-
 .../repository/ArtifactRepositoryFactory.java   |  6 +-
 .../DefaultLegacyArtifactCollector.java | 84 +++
 .../resolver/LegacyArtifactCollector.java   |  9 ++-
 .../repository/metadata/MetadataGraph.java  |  3 +-
 .../repository/metadata/MetadataGraphEdge.java  |  3 +-
 .../MetadataGraphTransformationException.java   |  4 +-
 .../usability/plugin/ExpressionDocumenter.java  | 18 +++--
 21 files changed, 247 insertions(+), 180 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/cdc87a90/maven-compat/src/main/java/org/apache/maven/artifact/UnknownRepositoryLayoutException.java
--
diff --git 
a/maven-compat/src/main/java/org/apache/maven/artifact/UnknownRepositoryLayoutException.java
 
b/maven-compat/src/main/java/org/apache/maven/artifact/UnknownRepositoryLayoutException.java
index cb0af7f..e23bea9 100644
--- 
a/maven-compat/src/main/java/org/apache/maven/artifact/UnknownRepositoryLayoutException.java
+++ 
b/maven-compat/src/main/java/org/apache/maven/artifact/UnknownRepositoryLayoutException.java
@@ -19,12 +19,11 @@ package org.apache.maven.artifact;
  * under the License.
  */
 
-import org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout;
 import 
org.codehaus.plexus.component.repository.exception.ComponentLookupException;
 
 /**
  * Exception which is meant to occur when a layout specified for a particular
- * repository doesn't have a corresponding {@link ArtifactRepositoryLayout}
+ * repository doesn't have a corresponding {@link 
org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout}
  * component in the current container.
  *
  * @author jdcasey

http://git-wip-us.apache.org/repos/asf/maven/blob/cdc87a90/maven-compat/src/main/java/org/apache/maven/artifact/repository/DefaultArtifactRepositoryFactory.java
--
diff --git 
a/maven-compat/src/main/java/org/apache/maven/artifact/repository/DefaultArtifactRepositoryFactory.java
 
b/maven-compat/src/main/java/org/apache/maven/artifact/repository/DefaultArtifactRepositoryFactory.java
index 658dbda..0f69835 100644
--- 
a/maven-compat/src/main/java/org/apache/maven/artifact/repository/DefaultArtifactRepositoryFactory.java
+++ 
b/maven-compat/src/main/java/org/apache/maven/artifact/repository/DefaultArtifactRepositoryFactory.java
@@ -81,7 +81,9 @@ public class DefaultArtifactRepositoryFactory
 
ArtifactRepositoryPolicy snapshots,
 
ArtifactRepositoryPolicy releases )
 {
-return injectSession( factory.createArtifactRepository( id, url, 
repositoryLayout, snapshots, releases ), true );
+return injectSession( factory.createArtifactRepository( id, url, 
repositoryLayout, snapshots, releases ),
+  true );
+
 }
 
 public void setGlobalUpdatePolicy( String updatePolicy )

http://git-wip-us.apache.org/repos/asf/maven/blob/cdc87a90/maven-compat/src/main/java/org/apache/maven/artifact/repository/layout/FlatRepositoryLayout.java
--
diff --git 
a/maven-compat/src/main/java/org/apache/maven/artifact/repository/layout/FlatRepositoryLayout.java
 
b/maven-compat/src/main/java/org/

[15/20] maven git commit: [MNG-3507] added color to Maven execution output messages

2016-06-17 Thread schulte

[MNG-3507] added color to Maven execution output messages

o Updated to stop using colors green, yellow or red for anything not status 
related.


Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/71e4ff8e
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/71e4ff8e
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/71e4ff8e

Branch: refs/heads/MNG-6006
Commit: 71e4ff8e358dd43fb52f2e760b82ef7ab39f1dbb
Parents: bcaad56
Author: Christian Schulte <schu...@apache.org>
Authored: Thu Jun 16 17:34:31 2016 +0200
Committer: Christian Schulte <schu...@apache.org>
Committed: Thu Jun 16 17:34:31 2016 +0200

--
 .../org/apache/maven/lifecycle/LifecycleExecutionException.java  | 2 +-
 .../java/org/apache/maven/cli/event/ExecutionEventLogger.java| 4 ++--
 .../org/apache/maven/cli/logging/impl/gossip/ColorRenderer.java  | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/71e4ff8e/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 fd4bca0..b94a7bc 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
@@ -84,7 +84,7 @@ public class LifecycleExecutionException
 
 if ( execution != null )
 {
-buffer.a( ' ' ).a( execution.getGroupId() ).a( ':' ).fgGreen().a( 
execution.getArtifactId() );
+buffer.a( ' ' ).a( execution.getGroupId() ).a( ':' ).a( 
execution.getArtifactId() );
 buffer.a( ':' ).a( execution.getVersion() ).a( ':' ).a( 
execution.getGoal() ).reset();
 buffer.bold().a( " (" ).a( execution.getExecutionId() ).a( ')' 
).reset();
 }

http://git-wip-us.apache.org/repos/asf/maven/blob/71e4ff8e/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 ee57121..7f5d65a 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
@@ -339,11 +339,11 @@ public class ExecutionEventLogger
 
 private void append( Ansi ansi, MojoExecution me )
 {
-ansi.fgGreen().a( me.getArtifactId() ).a( ':' ).a( me.getVersion() );
+ansi.fgBlue().a( me.getArtifactId() ).a( ':' ).a( me.getVersion() );
 ansi.a( ':' ).a( me.getGoal() ).reset();
 if ( me.getExecutionId() != null )
 {
-ansi.bold().a( " (" ).a( me.getExecutionId() ).a( ')' ).reset();
+ansi.fgBlue().bold().a( " (" ).a( me.getExecutionId() ).a( ')' 
).reset();
 }
 }
 

http://git-wip-us.apache.org/repos/asf/maven/blob/71e4ff8e/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/gossip/ColorRenderer.java
--
diff --git 
a/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/gossip/ColorRenderer.java
 
b/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/gossip/ColorRenderer.java
index 52e0489..0f135dd 100644
--- 
a/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/gossip/ColorRenderer.java
+++ 
b/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/gossip/ColorRenderer.java
@@ -72,7 +72,7 @@ extends com.planet57.gossip.render.PatternRenderer
 {
 StringBuilder tmp = new StringBuilder();
 super.renderName( event, tmp, shortName );
-buff.append( ansi().fgGreen().a( tmp ).reset() );
+buff.append( ansi().fgBlue().a( tmp ).reset() );
 }

[16/20] maven git commit: [MNG-3507] added color to Maven execution output messages

2016-06-17 Thread schulte

[MNG-3507] added color to Maven execution output messages

o Updated to stop combining color and bold and to provide more colored
  execution messages. The idea behind this is to distinguish between messages
  logged by Maven core and logged by plugins based on the color of the message.
  This means there are a lot of 'Logger.xyz' calls in core still to be ANSIfied.
  There really should be a separate 'Logger' used by Maven core and passed to
  Maven plugins to make this easier. Also things already are loosing the
  eye-catching effect the colors are good for. Everything beyond green,red and
  yellow already is too much, in my opinion. Feel free to revert the last two
  commits or improve on how Maven presents itself to users starting with 3.4
  until things reach a point everyone agrees to.


Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/7e1b961e
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/7e1b961e
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/7e1b961e

Branch: refs/heads/MNG-6006
Commit: 7e1b961edd44c7d2843b1b7cd01cea5a1cd1a70d
Parents: 71e4ff8
Author: Christian Schulte <schu...@apache.org>
Authored: Thu Jun 16 19:54:01 2016 +0200
Committer: Christian Schulte <schu...@apache.org>
Committed: Thu Jun 16 20:01:56 2016 +0200

--
 .../lifecycle/LifecycleExecutionException.java  |  16 +--
 .../maven/cli/event/ExecutionEventLogger.java   | 104 +++
 .../apache/maven/cli/logging/Slf4jLogger.java   |  13 +--
 .../cli/logging/impl/gossip/ColorRenderer.java  |  25 ++---
 4 files changed, 87 insertions(+), 71 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/7e1b961e/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 b94a7bc..35c7032 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
@@ -80,27 +80,27 @@ public class LifecycleExecutionException
 {
 Ansi buffer = ansi( /*256*/ );
 
-buffer.a( "Failed to execute goal" ).reset();
+buffer.fgRed().a( "Failed to execute goal" );
 
 if ( execution != null )
 {
-buffer.a( ' ' ).a( execution.getGroupId() ).a( ':' ).a( 
execution.getArtifactId() );
-buffer.a( ':' ).a( execution.getVersion() ).a( ':' ).a( 
execution.getGoal() ).reset();
-buffer.bold().a( " (" ).a( execution.getExecutionId() ).a( ')' 
).reset();
+buffer.a( ' ' ).a( execution.getGroupId() ).a( ':' ).a( 
execution.getArtifactId() ).
+a( ':' ).a( execution.getVersion() ).a( ':' ).a( 
execution.getGoal() ).
+a( " (" ).a( execution.getExecutionId() ).a( ')' );
+
 }
 
 if ( project != null )
 {
-buffer.a( " on project " );
-buffer.fgCyan().a( project.getArtifactId() ).reset();
+buffer.a( " on project " ).a( project.getArtifactId() );
 }
 
 if ( cause != null )
 {
-buffer.a( ": " ).bold().fgRed().a( cause.getMessage() ).reset();
+buffer.a( ": " ).a( cause.getMessage() );
 }
 
-return buffer.toString();
+return buffer.reset().toString();
 }
 
 }

http://git-wip-us.apache.org/repos/asf/maven/blob/7e1b961e/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 7f5d65a..7180a43 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
@@ -51,7 +51,7 @@ public class ExecutionEventLogger
 
 private static final int LINE_LENGTH = 72;
 private static final int MAX_PADDED_BUILD_TIME_DURATION_LENGTH = 9;
-private static final int MAX_PROJECT_NAME_LENGTH = 52;
+private static final int MAX_PROJECT_NAME_LENGTH = LINE_LENGTH - 
MAX_PADDED_BUILD_TIME_DURATION_LENGTH - 12;
 
 public ExecutionEventLogger()
 {
@@ -83,7 +83,7 @@ public class ExecutionEventLogger
 
 private void infoMain( String msg )
 {
-logger.info( ansi().bold().a(

[20/20] maven git commit: [MNG-5761] Dependency management is not transitive.

2016-06-17 Thread schulte

[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/0d785b59
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/0d785b59
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/0d785b59

Branch: refs/heads/MNG-6006
Commit: 0d785b59ce04c1adbb95aebd256e191ca188a40c
Parents: 5145c34
Author: Christian Schulte <schu...@apache.org>
Authored: Fri Jun 10 16:55:30 2016 +0200
Committer: Christian Schulte <schu...@apache.org>
Committed: Fri Jun 17 21:33: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/0d785b59/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/0d785b59/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" ),

[09/20] maven git commit: added slf4j-api and jansi dependencies

2016-06-17 Thread schulte

added slf4j-api and jansi dependencies

Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/c15e5c33
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/c15e5c33
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/c15e5c33

Branch: refs/heads/MNG-6006
Commit: c15e5c334352a7f5cb9d94d014c0aae4f6b3c415
Parents: c786ff3
Author: HervÃ© Boutemy 
Authored: Mon Jun 13 21:13:48 2016 +0200
Committer: HervÃ© Boutemy 
Committed: Mon Jun 13 22:08:46 2016 +0200

--
 src/site/resources/images/maven-deps.png | Bin 70791 -> 74014 bytes
 src/site/xdoc/index.xml  |   4 
 src/site/xdoc/maven-deps.odg | Bin 32242 -> 33675 bytes
 3 files changed, 4 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/c15e5c33/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 99f7a10..6f5d6db 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/c15e5c33/src/site/xdoc/index.xml
--
diff --git a/src/site/xdoc/index.xml b/src/site/xdoc/index.xml
index fb4b40f..5e97077 100644
--- a/src/site/xdoc/index.xml
+++ b/src/site/xdoc/index.xml
@@ -55,7 +55,10 @@
   
   
   
+  http://www.slf4j.org/manual.html; />
   http://commons.apache.org/cli/; />
+  http://fusesource.github.io/jansi/; />
+  https://github.com/fusesource/jansi-native; />
   https://maven.apache.org/wagon/wagon-provider-api/; />
   https://github.com/codehaus-plexus/plexus-sec-dispatcher; />
   https://github.com/codehaus-plexus/plexus-cipher; />
@@ -72,6 +75,7 @@
   
 
 
+
   
 
 

http://git-wip-us.apache.org/repos/asf/maven/blob/c15e5c33/src/site/xdoc/maven-deps.odg
--
diff --git a/src/site/xdoc/maven-deps.odg b/src/site/xdoc/maven-deps.odg
index 7923879..533eaa7 100644
Binary files a/src/site/xdoc/maven-deps.odg and b/src/site/xdoc/maven-deps.odg 
differ

1 2 3 4 5 6 7 8 9 10 >

1 - 100 of 2183 matches

Mail list logo