[2/2] maven git commit: o Updated to run the core ITs from the MNG-5359 branch.

[schulte]

o Updated to run the core ITs from the MNG-5359 branch.


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

Branch: refs/heads/MNG-5359-IT
Commit: 818209bf5c898fcac5d4a477c1eaefc7c507a0ae
Parents: 1f2bb8f
Author: Christian Schulte 
Authored: Sat Jan 21 19:35:54 2017 +0100
Committer: Christian Schulte 
Committed: Tue Jan 31 04:17:55 2017 +0100

--
 Jenkinsfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/818209bf/Jenkinsfile
--
diff --git a/Jenkinsfile b/Jenkinsfile
index 5b82d78..04747ac 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -19,7 +19,7 @@
 
 properties([buildDiscarder(logRotator(artifactNumToKeepStr: '5', numToKeepStr: 
env.BRANCH_NAME=='master'?'10':'5'))])
 
-def itBranch='master'
+def itBranch='MNG-5359'
 
 try {
 node('ubuntu') {

[1/2] maven git commit: o Updated to 3.5.1-SNAPSHOT to make the ITs run. [Forced Update!]

[schulte]

Repository: maven
Updated Branches:
  refs/heads/MNG-5359-IT 5bc21abda -> 818209bf5 (forced update)


o Updated to 3.5.1-SNAPSHOT to make the ITs run.


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

Branch: refs/heads/MNG-5359-IT
Commit: 1f2bb8f0aa6d1f470795f69baf80750021366d78
Parents: 72c6051
Author: Christian Schulte 
Authored: Tue Jan 31 04:17:19 2017 +0100
Committer: Christian Schulte 
Committed: Tue Jan 31 04:17:19 2017 +0100

--
 apache-maven/pom.xml  | 2 +-
 maven-aether-provider/pom.xml | 2 +-
 maven-artifact/pom.xml| 2 +-
 maven-builder-support/pom.xml | 2 +-
 maven-compat/pom.xml  | 2 +-
 maven-core/pom.xml| 2 +-
 maven-embedder/pom.xml| 2 +-
 maven-model-builder/pom.xml   | 2 +-
 maven-model/pom.xml   | 2 +-
 maven-plugin-api/pom.xml  | 2 +-
 maven-repository-metadata/pom.xml | 2 +-
 maven-settings-builder/pom.xml| 2 +-
 maven-settings/pom.xml| 2 +-
 maven-slf4j-provider/pom.xml  | 2 +-
 pom.xml   | 2 +-
 15 files changed, 15 insertions(+), 15 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/1f2bb8f0/apache-maven/pom.xml
--
diff --git a/apache-maven/pom.xml b/apache-maven/pom.xml
index ba7fda3..cd55f4b 100644
--- a/apache-maven/pom.xml
+++ b/apache-maven/pom.xml
@@ -25,7 +25,7 @@ under the License.
   
 org.apache.maven
 maven
-3.5.0-SNAPSHOT
+3.5.1-SNAPSHOT
   
 
   apache-maven

http://git-wip-us.apache.org/repos/asf/maven/blob/1f2bb8f0/maven-aether-provider/pom.xml
--
diff --git a/maven-aether-provider/pom.xml b/maven-aether-provider/pom.xml
index 0f3cb61..9f8206f 100644
--- a/maven-aether-provider/pom.xml
+++ b/maven-aether-provider/pom.xml
@@ -25,7 +25,7 @@ under the License.
   
 org.apache.maven
 maven
-3.5.0-SNAPSHOT
+3.5.1-SNAPSHOT
   
 
   maven-aether-provider

http://git-wip-us.apache.org/repos/asf/maven/blob/1f2bb8f0/maven-artifact/pom.xml
--
diff --git a/maven-artifact/pom.xml b/maven-artifact/pom.xml
index e3943c9..b13482b 100644
--- a/maven-artifact/pom.xml
+++ b/maven-artifact/pom.xml
@@ -25,7 +25,7 @@ under the License.
   
 org.apache.maven
 maven
-3.5.0-SNAPSHOT
+3.5.1-SNAPSHOT
   
 
   maven-artifact

http://git-wip-us.apache.org/repos/asf/maven/blob/1f2bb8f0/maven-builder-support/pom.xml
--
diff --git a/maven-builder-support/pom.xml b/maven-builder-support/pom.xml
index 39eb161..5eb7903 100644
--- a/maven-builder-support/pom.xml
+++ b/maven-builder-support/pom.xml
@@ -25,7 +25,7 @@ under the License.
   
 org.apache.maven
 maven
-3.5.0-SNAPSHOT
+3.5.1-SNAPSHOT
   
 
   maven-builder-support

http://git-wip-us.apache.org/repos/asf/maven/blob/1f2bb8f0/maven-compat/pom.xml
--
diff --git a/maven-compat/pom.xml b/maven-compat/pom.xml
index 3a0a45c..626628d 100644
--- a/maven-compat/pom.xml
+++ b/maven-compat/pom.xml
@@ -25,7 +25,7 @@ under the License.
   
 org.apache.maven
 maven
-3.5.0-SNAPSHOT
+3.5.1-SNAPSHOT
   
 
   maven-compat

http://git-wip-us.apache.org/repos/asf/maven/blob/1f2bb8f0/maven-core/pom.xml
--
diff --git a/maven-core/pom.xml b/maven-core/pom.xml
index d147dd8..e8274d0 100644
--- a/maven-core/pom.xml
+++ b/maven-core/pom.xml
@@ -25,7 +25,7 @@ under the License.
   
 org.apache.maven
 maven
-3.5.0-SNAPSHOT
+3.5.1-SNAPSHOT
   
 
   maven-core

http://git-wip-us.apache.org/repos/asf/maven/blob/1f2bb8f0/maven-embedder/pom.xml
--
diff --git a/maven-embedder/pom.xml b/maven-embedder/pom.xml
index 75b92c9..f9d7d1a 100644
--- a/maven-embedder/pom.xml
+++ b/maven-embedder/pom.xml
@@ -25,7 +25,7 @@ under the License.
   
 org.apache.maven
 maven
-3.5.0-SNAPSHOT
+3.5.1-SNAPSHOT
   
 
   maven-embedder

http://git-wip-us.apache.org/repos/asf/maven/blob/1f2bb8f0/maven-model-builder/pom.xml
--
diff --git a/maven-model-builder/pom.xml b/maven-model-builder/pom.xml
index fbfd417..7cef99b 100644
--- a/maven-model-builder/pom.xml
+++ b/maven-model-builder/pom.xml
@@ -25,7 +25,7 @@ under the 

maven git commit: o Updated to 3.5.1-SNAPSHOT to make the ITs run.

[schulte]

Repository: maven
Updated Branches:
  refs/heads/MNG-5359 72c605138 -> 1f2bb8f0a


o Updated to 3.5.1-SNAPSHOT to make the ITs run.


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

Branch: refs/heads/MNG-5359
Commit: 1f2bb8f0aa6d1f470795f69baf80750021366d78
Parents: 72c6051
Author: Christian Schulte 
Authored: Tue Jan 31 04:17:19 2017 +0100
Committer: Christian Schulte 
Committed: Tue Jan 31 04:17:19 2017 +0100

--
 apache-maven/pom.xml  | 2 +-
 maven-aether-provider/pom.xml | 2 +-
 maven-artifact/pom.xml| 2 +-
 maven-builder-support/pom.xml | 2 +-
 maven-compat/pom.xml  | 2 +-
 maven-core/pom.xml| 2 +-
 maven-embedder/pom.xml| 2 +-
 maven-model-builder/pom.xml   | 2 +-
 maven-model/pom.xml   | 2 +-
 maven-plugin-api/pom.xml  | 2 +-
 maven-repository-metadata/pom.xml | 2 +-
 maven-settings-builder/pom.xml| 2 +-
 maven-settings/pom.xml| 2 +-
 maven-slf4j-provider/pom.xml  | 2 +-
 pom.xml   | 2 +-
 15 files changed, 15 insertions(+), 15 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/1f2bb8f0/apache-maven/pom.xml
--
diff --git a/apache-maven/pom.xml b/apache-maven/pom.xml
index ba7fda3..cd55f4b 100644
--- a/apache-maven/pom.xml
+++ b/apache-maven/pom.xml
@@ -25,7 +25,7 @@ under the License.
   
 org.apache.maven
 maven
-3.5.0-SNAPSHOT
+3.5.1-SNAPSHOT
   
 
   apache-maven

http://git-wip-us.apache.org/repos/asf/maven/blob/1f2bb8f0/maven-aether-provider/pom.xml
--
diff --git a/maven-aether-provider/pom.xml b/maven-aether-provider/pom.xml
index 0f3cb61..9f8206f 100644
--- a/maven-aether-provider/pom.xml
+++ b/maven-aether-provider/pom.xml
@@ -25,7 +25,7 @@ under the License.
   
 org.apache.maven
 maven
-3.5.0-SNAPSHOT
+3.5.1-SNAPSHOT
   
 
   maven-aether-provider

http://git-wip-us.apache.org/repos/asf/maven/blob/1f2bb8f0/maven-artifact/pom.xml
--
diff --git a/maven-artifact/pom.xml b/maven-artifact/pom.xml
index e3943c9..b13482b 100644
--- a/maven-artifact/pom.xml
+++ b/maven-artifact/pom.xml
@@ -25,7 +25,7 @@ under the License.
   
 org.apache.maven
 maven
-3.5.0-SNAPSHOT
+3.5.1-SNAPSHOT
   
 
   maven-artifact

http://git-wip-us.apache.org/repos/asf/maven/blob/1f2bb8f0/maven-builder-support/pom.xml
--
diff --git a/maven-builder-support/pom.xml b/maven-builder-support/pom.xml
index 39eb161..5eb7903 100644
--- a/maven-builder-support/pom.xml
+++ b/maven-builder-support/pom.xml
@@ -25,7 +25,7 @@ under the License.
   
 org.apache.maven
 maven
-3.5.0-SNAPSHOT
+3.5.1-SNAPSHOT
   
 
   maven-builder-support

http://git-wip-us.apache.org/repos/asf/maven/blob/1f2bb8f0/maven-compat/pom.xml
--
diff --git a/maven-compat/pom.xml b/maven-compat/pom.xml
index 3a0a45c..626628d 100644
--- a/maven-compat/pom.xml
+++ b/maven-compat/pom.xml
@@ -25,7 +25,7 @@ under the License.
   
 org.apache.maven
 maven
-3.5.0-SNAPSHOT
+3.5.1-SNAPSHOT
   
 
   maven-compat

http://git-wip-us.apache.org/repos/asf/maven/blob/1f2bb8f0/maven-core/pom.xml
--
diff --git a/maven-core/pom.xml b/maven-core/pom.xml
index d147dd8..e8274d0 100644
--- a/maven-core/pom.xml
+++ b/maven-core/pom.xml
@@ -25,7 +25,7 @@ under the License.
   
 org.apache.maven
 maven
-3.5.0-SNAPSHOT
+3.5.1-SNAPSHOT
   
 
   maven-core

http://git-wip-us.apache.org/repos/asf/maven/blob/1f2bb8f0/maven-embedder/pom.xml
--
diff --git a/maven-embedder/pom.xml b/maven-embedder/pom.xml
index 75b92c9..f9d7d1a 100644
--- a/maven-embedder/pom.xml
+++ b/maven-embedder/pom.xml
@@ -25,7 +25,7 @@ under the License.
   
 org.apache.maven
 maven
-3.5.0-SNAPSHOT
+3.5.1-SNAPSHOT
   
 
   maven-embedder

http://git-wip-us.apache.org/repos/asf/maven/blob/1f2bb8f0/maven-model-builder/pom.xml
--
diff --git a/maven-model-builder/pom.xml b/maven-model-builder/pom.xml
index fbfd417..7cef99b 100644
--- a/maven-model-builder/pom.xml
+++ b/maven-model-builder/pom.xml
@@ -25,7 +25,7 @@ under the License.
   
 

[maven] Git Push Summary

[schulte]

Repository: maven
Updated Branches:
  refs/heads/MNG-5227+MNG-5935-IT [deleted] 1a2237669

[maven] Git Push Summary

[schulte]

Repository: maven
Updated Branches:
  refs/heads/MNG-5227+MNG-5935 [deleted] f3ee0b640

[maven-integration-testing] Git Push Summary

[schulte]

Repository: maven-integration-testing
Updated Branches:
  refs/heads/MNG-5227+MNG-5935 [deleted] 584c82a91

[maven-integration-testing] Git Push Summary

[schulte]

Repository: maven-integration-testing
Updated Branches:
  refs/heads/MNG-5971+MNG-6079 [deleted] 43ff70242

[3/5] maven-integration-testing git commit: Fixed RAT issue about missing license in run-its.bat file.

[schulte]

Fixed RAT issue about missing license in run-its.bat file.


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

Branch: refs/heads/MNG-5359
Commit: 98346dd52d1a9620896b3c9cd2b1e1d6d6cfff84
Parents: c4365ab
Author: Karl Heinz Marbaise 
Authored: Sun Jan 29 21:36:13 2017 +0100
Committer: Karl Heinz Marbaise 
Committed: Sun Jan 29 21:36:13 2017 +0100

--
 run-its.bat | 19 +++
 1 file changed, 19 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/98346dd5/run-its.bat
--
diff --git a/run-its.bat b/run-its.bat
index a738643..a932da9 100644
--- a/run-its.bat
+++ b/run-its.bat
@@ -1,5 +1,24 @@
 @REM How JvZ runs the ITs from a clean slate if it would be on Windows
 
+@REM
+@REM Licensed to the Apache Software Foundation (ASF) under one
+@REM or more contributor license agreements.  See the NOTICE file
+@REM distributed with this work for additional information
+@REM regarding copyright ownership.  The ASF licenses this file
+@REM to you under the Apache License, Version 2.0 (the
+@REM "License"); you may not use this file except in compliance
+@REM with the License.  You may obtain a copy of the License at
+@REM
+@REM   http://www.apache.org/licenses/LICENSE-2.0
+@REM
+@REM Unless required by applicable law or agreed to in writing,
+@REM software distributed under the License is distributed on an
+@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+@REM KIND, either express or implied.  See the License for the
+@REM specific language governing permissions and limitations
+@REM under the License.
+@REM
+
 mvn clean install -Prun-its,embedded -Dmaven.repo.local=%cd%/repo 
 
 @REM If behind a proxy try this..

[4/5] maven-integration-testing git commit: Fixed license header in run-its.bat file.

[schulte]

Fixed license header in run-its.bat file.


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

Branch: refs/heads/MNG-5359
Commit: 63bb5189a2875d57b7e2abed0c17e3fd95b902db
Parents: 98346dd
Author: Karl Heinz Marbaise 
Authored: Sun Jan 29 21:43:27 2017 +0100
Committer: Karl Heinz Marbaise 
Committed: Sun Jan 29 21:43:27 2017 +0100

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


http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/63bb5189/run-its.bat
--
diff --git a/run-its.bat b/run-its.bat
index a932da9..8bb9faf 100644
--- a/run-its.bat
+++ b/run-its.bat
@@ -1,5 +1,3 @@
-@REM How JvZ runs the ITs from a clean slate if it would be on Windows
-
 @REM
 @REM Licensed to the Apache Software Foundation (ASF) under one
 @REM or more contributor license agreements.  See the NOTICE file
@@ -19,6 +17,8 @@
 @REM under the License.
 @REM
 
+@REM How JvZ runs the ITs from a clean slate if it would be on Windows
+
 mvn clean install -Prun-its,embedded -Dmaven.repo.local=%cd%/repo 
 
 @REM If behind a proxy try this..

[2/5] maven-integration-testing git commit: [MNG-5958] restore binary compatibility of Lifecycle.setPhases

[schulte]

[MNG-5958] restore binary compatibility of Lifecycle.setPhases

Modify tests for MNG-5805

This closes #13 #18


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

Branch: refs/heads/MNG-5359
Commit: c4365abe20b58b2cbc174de812e43c7741dc10e1
Parents: 7e5b365
Author: Anton Tanasenko 
Authored: Thu Jan 7 04:01:28 2016 +0200
Committer: Christian Schulte 
Committed: Thu Jan 26 20:24:02 2017 +0100

--
 .../apache/maven/it/IntegrationTestSuite.java   |  2 +
 .../MavenITmng5805PkgTypeMojoConfiguration.java |  2 +-
 ...MavenITmng5805PkgTypeMojoConfiguration2.java | 30 +
 ...avenITmng5958LifecyclePhaseBinaryCompat.java | 45 +
 .../test/resources/bootstrap/group-3/pom.xml| 12 
 .../pom.xml | 40 +++
 .../mng-5958-lifecycle-phases/bad/pom.xml   | 53 +++
 .../mng-5958-lifecycle-phases/good/pom.xml  | 53 +++
 .../core-it-plugins/mng5805-extension2/pom.xml  | 37 ++
 .../resources/META-INF/plexus/components.xml| 71 
 .../core-it-plugins/mng5958-extension/pom.xml   | 45 +
 .../its/mng5958/AbstractLifecycleMapping.java   | 71 
 .../maven/its/mng5958/BadLifecycleMapping.java  | 45 +
 .../maven/its/mng5958/GoodLifecycleMapping.java | 40 +++
 .../resources/META-INF/plexus/components.xml| 62 +
 core-it-support/core-it-plugins/pom.xml |  2 +
 16 files changed, 609 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c4365abe/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 5536620..a91eeb0 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,10 +106,12 @@ public class IntegrationTestSuite
 // 
-
 // suite.addTestSuite( MavenIT0108SnapshotUpdateTest.class ); -- 
MNG-3137
 
+suite.addTestSuite( MavenITmng5958LifecyclePhaseBinaryCompat.class );
 suite.addTestSuite( 
MavenITmng5898BuildMultimoduleWithEARFailsToResolveWARTest.class );
 suite.addTestSuite( MavenITmng5840ParentVersionRanges.class );
 suite.addTestSuite( MavenITmng5840RelativePathReactorMatching.class );
 suite.addTestSuite( MavenITmng5805PkgTypeMojoConfiguration.class );
+suite.addTestSuite( MavenITmng5805PkgTypeMojoConfiguration2.class );
 suite.addTestSuite( MavenITmng5783PluginDependencyFiltering.class );
 suite.addTestSuite( MavenITmng5774ConfigurationProcessorsTest.class );
 suite.addTestSuite( MavenITmng5771CoreExtensionsTest.class );

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c4365abe/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5805PkgTypeMojoConfiguration.java
--
diff --git 
a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5805PkgTypeMojoConfiguration.java
 
b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5805PkgTypeMojoConfiguration.java
index ada7448..5335677 100644
--- 
a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5805PkgTypeMojoConfiguration.java
+++ 
b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5805PkgTypeMojoConfiguration.java
@@ -10,7 +10,7 @@ public class MavenITmng5805PkgTypeMojoConfiguration
 
 public MavenITmng5805PkgTypeMojoConfiguration()
 {
-super( "(3.3.3,)" );
+super( "(3.3.3,3.5.0)" );
 }
 
 public void testPkgTypeMojoConfiguration()

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c4365abe/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5805PkgTypeMojoConfiguration2.java
--
diff --git 
a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5805PkgTypeMojoConfiguration2.java
 
b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5805PkgTypeMojoConfiguration2.java
new file mode 100644
index 000..ca1c0e3
--- /dev/null
+++ 

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

[schulte]

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


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

Branch: refs/heads/MNG-5359
Commit: f2b167224f1a3379f70351ee4ac8e03480c60f3b
Parents: 63bb518
Author: Christian Schulte 
Authored: Sun Dec 20 19:34:40 2015 +0100
Committer: Christian Schulte 
Committed: Tue Jan 31 04:08:38 2017 +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/f2b16722/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 a91eeb0..4021ff2 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( MavenITmng5958LifecyclePhaseBinaryCompat.class );
 suite.addTestSuite( 
MavenITmng5898BuildMultimoduleWithEARFailsToResolveWARTest.class );
 suite.addTestSuite( MavenITmng5840ParentVersionRanges.class );

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/f2b16722/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..a8fde23
--- /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 https://issues.apache.org/jira/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.5.1,)" );
+}
+
+public void testit()
+throws Exception
+{
+File testDir = ResourceExtractor.simpleExtractResources( getClass(), 
"/mng-5359" );
+
+Verifier verifier = newVerifier( testDir.getAbsolutePath(), "remote" );
+
+verifier.setAutoclean( false );
+verifier.deleteDirectory( "target" );
+verifier.deleteArtifacts( "org.apache.maven.its.mng5359" );
+
+verifier.executeGoal( "install" ); // will fail if clean plugin is 
executed
+verifier.verifyErrorFreeLog();
+

[1/5] maven-integration-testing git commit: added license link [Forced Update!]

[schulte]

Repository: maven-integration-testing
Updated Branches:
  refs/heads/MNG-5359 ac356af62 -> f2b167224 (forced update)


added license link

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

Branch: refs/heads/MNG-5359
Commit: 7e5b365dc961a186ee2307825fdf1168d167117b
Parents: 6c86dc6
Author: Hervé Boutemy 
Authored: Tue Jan 24 23:41:59 2017 +0100
Committer: Hervé Boutemy 
Committed: Tue Jan 24 23:41:59 2017 +0100

--
 core-it-suite/src/site/site.xml | 1 +
 src/site/site.xml   | 6 +-
 2 files changed, 6 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/7e5b365d/core-it-suite/src/site/site.xml
--
diff --git a/core-it-suite/src/site/site.xml b/core-it-suite/src/site/site.xml
index e46df34..57e8a72 100644
--- a/core-it-suite/src/site/site.xml
+++ b/core-it-suite/src/site/site.xml
@@ -27,6 +27,7 @@ under the License.
   
   
   
+  http://www.apache.org/licenses/"/>
 
 
   

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/7e5b365d/src/site/site.xml
--
diff --git a/src/site/site.xml b/src/site/site.xml
index 9689d9b..7285498 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -38,9 +38,13 @@ under the License.
   
 
   
+
+  
+  
+  http://www.apache.org/licenses/"/>
+
 
 
 
-
   
 

[10/50] maven git commit: [MNG-5904] Remove the whole Ant build

[schulte]

[MNG-5904] Remove the whole Ant build


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

Branch: refs/heads/MNG-5359-IT
Commit: 8b661620521de63586f825257e9c08c37e251eb5
Parents: be5cacc
Author: Karl Heinz Marbaise 
Authored: Fri Dec 11 19:41:02 2015 +0100
Committer: Hervé Boutemy 
Committed: Tue Jan 24 18:40:07 2017 +0100

--
 README.md|   6 +-
 apache-maven/README.txt  |   2 +-
 apache-maven/pom.xml |  55 +++-
 apache-maven/src/main/assembly/bin.xml   |  74 +-
 apache-maven/src/main/assembly/component.xml |  89 +++
 apache-maven/src/main/assembly/dir.xml   |  30 +++
 apache-maven/src/main/assembly/src.xml   |   3 +-
 build.xml| 307 --
 maven-ant-tasks-2.1.1.jar| Bin 1314262 -> 0 bytes
 9 files changed, 184 insertions(+), 382 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/8b661620/README.md
--
diff --git a/README.md b/README.md
index a263dca..7a5ed4d 100644
--- a/README.md
+++ b/README.md
@@ -12,12 +12,12 @@ Maven is available under the [Apache License, Version 
2.0](http://www.apache.org
 If you want to bootstrap Maven, you'll need:
 
 - Java 1.7+
-- Ant 1.8 or later
+- Maven 3.0.5 or later
 
-Run Ant, specifying a location into which the completed Maven distro should be 
installed:
+Run Maven, specifying a location into which the completed Maven distro should 
be installed:
 
 ```
-ant -Dmaven.home="$HOME/apps/maven/apache-maven-3.3.x-SNAPSHOT"
+mvn -DdistributionTargetDir="$HOME/app/maven/apache-maven-3.5.x-SNAPSHOT" 
clean package
 ```
 
 Once the build completes, you should have a new Maven distro ready to roll in 
that directory!

http://git-wip-us.apache.org/repos/asf/maven/blob/8b661620/apache-maven/README.txt
--
diff --git a/apache-maven/README.txt b/apache-maven/README.txt
index b05080d..cbaa7d4 100644
--- a/apache-maven/README.txt
+++ b/apache-maven/README.txt
@@ -16,7 +16,7 @@
   Release Notes
   -
 
-  The full list of changes can be found at 
http://maven.apache.org/release-notes.html.
+  The full list of changes can be found at 
http://maven.apache.org/docs/history.html.
 
   System Requirements
   ---

http://git-wip-us.apache.org/repos/asf/maven/blob/8b661620/apache-maven/pom.xml
--
diff --git a/apache-maven/pom.xml b/apache-maven/pom.xml
index 2db95cf..735e5b8 100644
--- a/apache-maven/pom.xml
+++ b/apache-maven/pom.xml
@@ -151,7 +151,7 @@
 maven-assembly-plugin
 
   
-create-distro
+create-distro-packages
 package
 
   single
@@ -182,6 +182,59 @@
 
   
 
+  create-distribution-in-dir
+  
+
+  distributionTargetDir
+
+  
+  
+
+  
+org.apache.maven.plugins
+maven-clean-plugin
+
+  
+
+  clean
+
+clean-target-dir
+prepare-package
+
+  
+
+  ${distributionTargetDir}
+
+  
+
+  
+
+  
+  
+maven-assembly-plugin
+
+  
+create-distribution-dir
+package
+
+  single
+
+
+  ./
+  false
+  false
+  ${distributionTargetDir}
+  
+src/main/assembly/dir.xml
+  
+
+  
+
+  
+
+  
+
+
   apache-release
   
 

http://git-wip-us.apache.org/repos/asf/maven/blob/8b661620/apache-maven/src/main/assembly/bin.xml
--
diff --git a/apache-maven/src/main/assembly/bin.xml 
b/apache-maven/src/main/assembly/bin.xml
index ea14a9d..79723c2 100644
--- a/apache-maven/src/main/assembly/bin.xml
+++ b/apache-maven/src/main/assembly/bin.xml
@@ -17,78 +17,14 @@ specific language governing permissions and limitations
 under the License.
 -->
 
-

[48/50] maven git commit: [MNG-6003] Drastically reduce JAVA_HOME discovery code

[schulte]

[MNG-6003] Drastically reduce JAVA_HOME discovery code

All special handling has been removed. JAVA_HOME must be set properly by
the user if necessary. Error messages have been graciously borrowed from
the Tomcat start scripts.


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

Branch: refs/heads/MNG-5359-IT
Commit: 2678388ea2cebc43f58009720609523ae09176f7
Parents: d426bf9
Author: Michael Osipov 
Authored: Fri Apr 15 22:17:15 2016 +0200
Committer: Michael Osipov 
Committed: Mon Jan 30 19:57:17 2017 +0100

--
 apache-maven/src/bin/mvn | 84 ---
 apache-maven/src/bin/mvn.cmd | 53 
 2 files changed, 34 insertions(+), 103 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/2678388e/apache-maven/src/bin/mvn
--
diff --git a/apache-maven/src/bin/mvn b/apache-maven/src/bin/mvn
index 172f43b..4db1ad6 100755
--- a/apache-maven/src/bin/mvn
+++ b/apache-maven/src/bin/mvn
@@ -41,52 +41,12 @@ fi
 
 # OS specific support. $var _must_ be set to either true or false.
 cygwin=false;
-darwin=false;
 mingw=false;
 case "`uname`" in
   CYGWIN*) cygwin=true;;
   MINGW*) mingw=true;;
-  Darwin*) darwin=true
-   #
-   # Look for the Apple JDKs first to preserve the existing behaviour, 
and then look
-   # for the new JDKs provided by Oracle.
-   #
-   if [ -z "$JAVA_HOME" ] && [ -L 
/System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK ] ; then
- #
- # Apple JDKs
- #
- export 
JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK/Home
-   fi
-
-   if [ -z "$JAVA_HOME" ] && [ -L 
/System/Library/Java/JavaVirtualMachines/CurrentJDK ] ; then
- #
- # Apple JDKs
- #
- export 
JAVA_HOME=/System/Library/Java/JavaVirtualMachines/CurrentJDK/Contents/Home
-   fi
-
-   if [ -z "$JAVA_HOME" ] && [ -L 
"/Library/Java/JavaVirtualMachines/CurrentJDK" ] ; then
- #
- # Oracle JDKs
- #
- export 
JAVA_HOME=/Library/Java/JavaVirtualMachines/CurrentJDK/Contents/Home
-   fi
-
-   if [ -z "$JAVA_HOME" ] && [ -x "/usr/libexec/java_home" ]; then
- #
- # Apple JDKs
- #
- export JAVA_HOME=`/usr/libexec/java_home`
-   fi
-   ;;
 esac
 
-if [ -z "$JAVA_HOME" ] ; then
-  if [ -r /etc/gentoo-release ] ; then
-JAVA_HOME=`java-config --jre-home`
-  fi
-fi
-
 ## resolve links - $0 may be a link to Maven's home
 PRG="$0"
 
@@ -129,49 +89,19 @@ if $mingw ; then
   # TODO classpath?
 fi
 
-if [ -z "$JAVA_HOME" ]; then
-  javaExecutable="`which javac`"
-  if [ -n "$javaExecutable" ] && ! [ "`expr \"$javaExecutable\" : '\([^ 
]*\)'`" = "no" ]; then
-# readlink(1) is not available as standard on Solaris 10.
-readLink=`which readlink`
-if [ ! `expr "$readLink" : '\([^ ]*\)'` = "no" ]; then
-  if $darwin ; then
-javaHome="`dirname \"$javaExecutable\"`"
-javaExecutable="`cd \"$javaHome\" && pwd -P`/javac"
-  else
-javaExecutable="`readlink -f \"$javaExecutable\"`"
-  fi
-  javaHome="`dirname \"$javaExecutable\"`"
-  javaHome=`expr "$javaHome" : '\(.*\)/bin'`
-  JAVA_HOME="$javaHome"
-  export JAVA_HOME
-fi
-  fi
-fi
-
-if [ -z "$JAVACMD" ] ; then
-  if [ -n "$JAVA_HOME"  ] ; then
-if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
-  # IBM's JDK on AIX uses strange locations for the executables
-  JAVACMD="$JAVA_HOME/jre/sh/java"
-else
-  JAVACMD="$JAVA_HOME/bin/java"
-fi
-  else
-JAVACMD="`which java`"
-  fi
+if [ -z "$JAVA_HOME" ] ; then
+  JAVACMD="`which java`"
+else
+  JAVACMD="$JAVA_HOME/bin/java"
 fi
 
 if [ ! -x "$JAVACMD" ] ; then
-  echo "Error: JAVA_HOME is not defined correctly." >&2
-  echo "  We cannot execute $JAVACMD" >&2
+  echo "The JAVA_HOME environment variable is not defined correctly" >&2
+  echo "This environment variable is needed to run this program" >&2
+  echo "NB: JAVA_HOME should point to a JDK not a JRE" >&2
   exit 1
 fi
 
-if [ -z "$JAVA_HOME" ] ; then
-  echo "Warning: JAVA_HOME environment variable is not set."
-fi
-
 CLASSWORLDS_JAR=`echo "${MAVEN_HOME}"/boot/plexus-classworlds-*.jar`
 CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher
 

http://git-wip-us.apache.org/repos/asf/maven/blob/2678388e/apache-maven/src/bin/mvn.cmd

[30/50] maven git commit: [MNG-6147] MetadataResolutionResult#getGraph() contains duplicate if clause

[schulte]

[MNG-6147] MetadataResolutionResult#getGraph() contains duplicate if clause


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

Branch: refs/heads/MNG-5359-IT
Commit: f53f1547a16fb0f7e288de5c4684c599652ee601
Parents: 920f10a
Author: Michael Osipov 
Authored: Sat Jan 28 15:26:52 2017 +0100
Committer: Michael Osipov 
Committed: Sat Jan 28 17:09:30 2017 +0100

--
 .../maven/repository/metadata/MetadataResolutionResult.java  | 4 
 1 file changed, 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/f53f1547/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataResolutionResult.java
--
diff --git 
a/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataResolutionResult.java
 
b/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataResolutionResult.java
index 1d9e9c4..814b66c 100644
--- 
a/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataResolutionResult.java
+++ 
b/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataResolutionResult.java
@@ -119,10 +119,6 @@ public class MetadataResolutionResult
 {
 return conflictResolver.resolveConflicts( getGraph(), 
ArtifactScopeEnum.test );
 }
-else if ( requestType.equals( 
MetadataResolutionRequestTypeEnum.classpathRuntime ) )
-{
-return conflictResolver.resolveConflicts( getGraph(), 
ArtifactScopeEnum.test );
-}
 else if ( requestType.equals( MetadataResolutionRequestTypeEnum.graph 
) )
 {
 return getGraph();

[43/50] maven git commit: [MNG-5852] mvn shell script invokes /bin/sh but requires Bash functions

[schulte]

[MNG-5852] mvn shell script invokes /bin/sh but requires Bash functions

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

Branch: refs/heads/MNG-5359-IT
Commit: 135102022763eaa62fa1d0125adab7ff207ef2f4
Parents: 1d9708a
Author: Joseph Walton 
Authored: Mon Jan 30 11:13:16 2017 +0100
Committer: Michael Osipov 
Committed: Mon Jan 30 12:56:36 2017 +0100

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


http://git-wip-us.apache.org/repos/asf/maven/blob/13510202/apache-maven/src/bin/mvn
--
diff --git a/apache-maven/src/bin/mvn b/apache-maven/src/bin/mvn
index 4a7f610..172f43b 100755
--- a/apache-maven/src/bin/mvn
+++ b/apache-maven/src/bin/mvn
@@ -190,8 +190,7 @@ 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`"
   while [ "$wdir" != '/' ] ; do
@@ -202,6 +201,7 @@ find_maven_basedir() {
 wdir="`cd "$wdir/.."; pwd`"
   done
   echo "${basedir}"
+)
 }
 
 # concatenates all lines of a file

[33/50] maven git commit: [MNG-6163] Introduce CLASSWORLDS_JAR in shell startup scripts

[schulte]

[MNG-6163] Introduce CLASSWORLDS_JAR in shell startup scripts

This commit was previously for MNG-5538 and closes #27.


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

Branch: refs/heads/MNG-5359-IT
Commit: 4337d18af65df8d3221bdd1e393f13c5f4db9054
Parents: b928546
Author: Arlo Louis O'Keeffe 
Authored: Wed Oct 29 09:07:45 2014 +0100
Committer: Michael Osipov 
Committed: Sun Jan 29 16:00:35 2017 +0100

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


http://git-wip-us.apache.org/repos/asf/maven/blob/4337d18a/apache-maven/src/bin/mvn
--
diff --git a/apache-maven/src/bin/mvn b/apache-maven/src/bin/mvn
index f3acb73..567e469 100755
--- a/apache-maven/src/bin/mvn
+++ b/apache-maven/src/bin/mvn
@@ -182,6 +182,7 @@ if [ -z "$JAVA_HOME" ] ; then
   echo "Warning: JAVA_HOME environment variable is not set."
 fi
 
+CLASSWORLDS_JAR=`echo "${M2_HOME}"/boot/plexus-classworlds-*.jar`
 CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher
 
 # For Cygwin, switch paths to Windows format before running java
@@ -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}" \
   "-Dlibrary.jansi.path=${MAVEN_HOME}/lib/ext" \

[32/50] maven git commit: Remove Subversion keywords from LICENSE.vm

[schulte]

Remove Subversion keywords from LICENSE.vm


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

Branch: refs/heads/MNG-5359-IT
Commit: b9285469a587f7c4bdc777c50173ba3a0619cc9e
Parents: aecccf9
Author: Michael Osipov 
Authored: Sun Jan 29 15:14:27 2017 +0100
Committer: Michael Osipov 
Committed: Sun Jan 29 15:14:27 2017 +0100

--
 apache-maven/src/main/appended-resources/META-INF/LICENSE.vm | 2 --
 1 file changed, 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/b9285469/apache-maven/src/main/appended-resources/META-INF/LICENSE.vm
--
diff --git a/apache-maven/src/main/appended-resources/META-INF/LICENSE.vm 
b/apache-maven/src/main/appended-resources/META-INF/LICENSE.vm
index 1a46225..390fa42 100644
--- a/apache-maven/src/main/appended-resources/META-INF/LICENSE.vm
+++ b/apache-maven/src/main/appended-resources/META-INF/LICENSE.vm
@@ -16,8 +16,6 @@
 ## specific language governing permissions and limitations
 ## under the License.
 ##
-## $Date: 2008-03-09 23:17:06 -0700 (Sun, 09 Mar 2008) $ $Rev: 635446 $
-##
 
 Apache Maven includes a number of components and libraries with separate 
 copyright notices and license terms. Your use of those components are 

[45/50] maven git commit: [MNG-5962] mvn.cmd fails when the current directory has spaces in between

[schulte]

[MNG-5962] mvn.cmd fails when the current directory has spaces in between


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

Branch: refs/heads/MNG-5359-IT
Commit: 842b07be97fdb7d4f36e167f596eb185f9601169
Parents: 1351020
Author: Miriam Lee 
Authored: Thu Jan 14 13:56:36 2016 +0100
Committer: Michael Osipov 
Committed: Mon Jan 30 13:12:57 2017 +0100

--
 apache-maven/src/bin/mvn.cmd | 15 ---
 1 file changed, 8 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/842b07be/apache-maven/src/bin/mvn.cmd
--
diff --git a/apache-maven/src/bin/mvn.cmd b/apache-maven/src/bin/mvn.cmd
index 2321b9c..467269a 100644
--- a/apache-maven/src/bin/mvn.cmd
+++ b/apache-maven/src/bin/mvn.cmd
@@ -97,29 +97,30 @@ set MAVEN_CMD_LINE_ARGS=%*
 set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR%
 if not "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir
 
-set EXEC_DIR=%CD%
-set WDIR=%EXEC_DIR%
+set "EXEC_DIR=%CD%"
+set "WDIR=%EXEC_DIR%"
+
 :findBaseDir
 if exist "%WDIR%\.mvn" goto baseDirFound
 cd ..
 IF "%WDIR%"=="%CD%" goto baseDirNotFound
-set WDIR=%CD%
+set "WDIR=%CD%"
 goto findBaseDir
 
 :baseDirFound
-set MAVEN_PROJECTBASEDIR=%WDIR%
+set "MAVEN_PROJECTBASEDIR=%WDIR%"
 cd "%EXEC_DIR%"
 goto endDetectBaseDir
 
 :baseDirNotFound
 if "_%EXEC_DIR:~-1%"=="_\" set EXEC_DIR=%EXEC_DIR:~0,-1%
-
-set MAVEN_PROJECTBASEDIR=%EXEC_DIR%
+set "MAVEN_PROJECTBASEDIR=%EXEC_DIR%"
 cd "%EXEC_DIR%"
 
 :endDetectBaseDir
 
-if not exist "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto 
endReadAdditionalConfig
+set "jvmConfig=\.mvn\jvm.config"
+if not exist "%MAVEN_PROJECTBASEDIR%%jvmConfig%"  goto endReadAdditionalConfig
 
 @setlocal EnableExtensions EnableDelayedExpansion
 for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do 
set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a

[47/50] maven git commit: [MNG-6001] Replace %HOME% with %USERPROFILE% in mvn.cmd

[schulte]

[MNG-6001] Replace %HOME% with %USERPROFILE% in mvn.cmd


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

Branch: refs/heads/MNG-5359-IT
Commit: d426bf9c6e59f893499c623c3434ce8f61200d9f
Parents: 1bc69ff
Author: Michael Osipov 
Authored: Fri Apr 15 13:06:24 2016 +0200
Committer: Michael Osipov 
Committed: Mon Jan 30 13:23:07 2017 +0100

--
 apache-maven/src/bin/mvn.cmd | 11 ---
 1 file changed, 4 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/d426bf9c/apache-maven/src/bin/mvn.cmd
--
diff --git a/apache-maven/src/bin/mvn.cmd b/apache-maven/src/bin/mvn.cmd
index 0c2fd4b..aab3085 100644
--- a/apache-maven/src/bin/mvn.cmd
+++ b/apache-maven/src/bin/mvn.cmd
@@ -32,14 +32,11 @@
 @REM enable echoing my setting MAVEN_BATCH_ECHO to 'on'
 @if "%MAVEN_BATCH_ECHO%" == "on"  echo %MAVEN_BATCH_ECHO%
 
-@REM set %HOME% to equivalent of $HOME
-if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%")
-
 @REM Execute a user defined script before this one
 if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre
 @REM check for pre script, once with legacy .bat ending and once with .cmd 
ending
-if exist "%HOME%\mavenrc_pre.bat" call "%HOME%\mavenrc_pre.bat"
-if exist "%HOME%\mavenrc_pre.cmd" call "%HOME%\mavenrc_pre.cmd"
+if exist "%USERPROFILE%\mavenrc_pre.bat" call "%USERPROFILE%\mavenrc_pre.bat"
+if exist "%USERPROFILE%\mavenrc_pre.cmd" call "%USERPROFILE%\mavenrc_pre.cmd"
 :skipRcPre
 
 @setlocal
@@ -143,8 +140,8 @@ set ERROR_CODE=1
 
 if not "%MAVEN_SKIP_RC%" == "" goto skipRcPost
 @REM check for post script, once with legacy .bat ending and once with .cmd 
ending
-if exist "%HOME%\mavenrc_post.bat" call "%HOME%\mavenrc_post.bat"
-if exist "%HOME%\mavenrc_post.cmd" call "%HOME%\mavenrc_post.cmd"
+if exist "%USERPROFILE%\mavenrc_post.bat" call "%USERPROFILE%\mavenrc_post.bat"
+if exist "%USERPROFILE%\mavenrc_post.cmd" call "%USERPROFILE%\mavenrc_post.cmd"
 :skipRcPost
 
 @REM pause the script if MAVEN_BATCH_PAUSE is set to 'on'

[34/50] maven git commit: [MNG-5607] Don't use M2_HOME in mvn shell/command scripts anymore

[schulte]

[MNG-5607] Don't use M2_HOME in mvn shell/command scripts anymore

* Variable has been removed and replaced with an internal one which
  cannot be overriden from outside. From now on, it is an
  implementation detail which it should have been from the beginning.
* Cleaned up license header and style of the variable description
  section graciously borrowed from the Tomcat start scripts.


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

Branch: refs/heads/MNG-5359-IT
Commit: 065281c43d7435be204aa963e1f94d1128bb5351
Parents: 4337d18
Author: Michael Osipov 
Authored: Thu Apr 14 22:41:07 2016 +0200
Committer: Michael Osipov 
Committed: Sun Jan 29 16:53:44 2017 +0100

--
 apache-maven/src/bin/mvn| 94 +---
 apache-maven/src/bin/mvn.cmd| 63 +
 apache-maven/src/bin/mvnDebug   | 25 ++
 apache-maven/src/bin/mvnDebug.cmd   | 16 ++--
 apache-maven/src/bin/mvnyjp | 23 ++---
 .../java/org/apache/maven/cli/MavenCli.java |  3 +-
 6 files changed, 90 insertions(+), 134 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/065281c4/apache-maven/src/bin/mvn
--
diff --git a/apache-maven/src/bin/mvn b/apache-maven/src/bin/mvn
index 567e469..3a4dc26 100755
--- a/apache-maven/src/bin/mvn
+++ b/apache-maven/src/bin/mvn
@@ -1,5 +1,5 @@
 #!/bin/sh
-# 
+
 # 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
@@ -16,23 +16,16 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-# 
 
-# 
-# Maven2 Start Up Batch script
+# -
+# Apache Maven Startup Script
 #
-# Required ENV vars:
-# --
-#   JAVA_HOME - location of a JDK home dir
+# Environment Variable Prerequisites
 #
-# Optional ENV vars
-# -
-#   M2_HOME - location of maven2's installed home dir
-#   MAVEN_OPTS - parameters passed to the Java VM when running Maven
-# e.g. to debug Maven itself, use
-#   set MAVEN_OPTS=-Xdebug 
-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
-#   MAVEN_SKIP_RC - flag to disable loading of mavenrc files
-# 
+#   JAVA_HOME   Must point at your Java Development Kit installation.
+#   MAVEN_OPTS  (Optional) Java runtime options used when Maven is 
executed.
+#   MAVEN_SKIP_RC   (Optional) Flag to disable loading of mavenrc files.
+# -
 
 if [ -z "$MAVEN_SKIP_RC" ] ; then
 
@@ -46,12 +39,12 @@ if [ -z "$MAVEN_SKIP_RC" ] ; then
 
 fi
 
-# OS specific support.  $var _must_ be set to either true or false.
+# OS specific support. $var _must_ be set to either true or false.
 cygwin=false;
 darwin=false;
-mingw=false
+mingw=false;
 case "`uname`" in
-  CYGWIN*) cygwin=true ;;
+  CYGWIN*) cygwin=true;;
   MINGW*) mingw=true;;
   Darwin*) darwin=true
#
@@ -94,46 +87,43 @@ if [ -z "$JAVA_HOME" ] ; then
   fi
 fi
 
-if [ -z "$M2_HOME" ] ; then
-  ## resolve links - $0 may be a link to maven's home
-  PRG="$0"
+## resolve links - $0 may be a link to Maven's home
+PRG="$0"
 
-  # need this for relative symlinks
-  while [ -h "$PRG" ] ; do
-ls=`ls -ld "$PRG"`
-link=`expr "$ls" : '.*-> \(.*\)$'`
-if expr "$link" : '/.*' > /dev/null; then
-  PRG="$link"
-else
-  PRG="`dirname "$PRG"`/$link"
-fi
-  done
+# need this for relative symlinks
+while [ -h "$PRG" ] ; do
+  ls=`ls -ld "$PRG"`
+  link=`expr "$ls" : '.*-> \(.*\)$'`
+  if expr "$link" : '/.*' > /dev/null; then
+PRG="$link"
+  else
+PRG="`dirname "$PRG"`/$link"
+  fi
+done
 
-  saveddir=`pwd`
+saveddir=`pwd`
 
-  M2_HOME=`dirname "$PRG"`/..
+MAVEN_HOME=`dirname "$PRG"`/..
 
-  # make it fully qualified
-  M2_HOME=`cd "$M2_HOME" && pwd`
+# make it fully qualified
+MAVEN_HOME=`cd "$MAVEN_HOME" && pwd`
 
-  cd "$saveddir"
-  # echo Using m2 at $M2_HOME
-fi
+cd "$saveddir"
 
-# For Cygwin, ensure paths are in UNIX format before anything is touched
+# For 

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

[schulte]

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


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

Branch: refs/heads/MNG-5359-IT
Commit: 72c6051382c17eb72281c8ecf4ffb6b65c6b3ff1
Parents: 2678388
Author: Christian Schulte 
Authored: Sun Dec 20 19:32:57 2015 +0100
Committer: Christian Schulte 
Committed: Tue Jan 31 04:00:41 2017 +0100

--
 .../project/EmptyLifecyclePluginAnalyzer.java   |  27 ++-
 .../project/AbstractMavenProjectTestCase.xml|   2 +-
 .../lifecycle/DefaultLifecycleExecutor.java |  22 +-
 .../lifecycle/LifeCyclePluginAnalyzer.java  |  32 ---
 .../maven/lifecycle/LifecycleExecutor.java  |  20 +-
 .../LifecycleMappingNotFoundException.java  |  45 
 .../lifecycle/LifecyclePluginAnalyzer.java  |  59 ++
 .../DefaultLifecyclePluginAnalyzer.java | 207 ++-
 .../DefaultLifecycleBindingsInjector.java   |  40 ++--
 .../lifecycle/EmptyLifecyclePluginAnalyzer.java |  25 ++-
 .../LifecycleExecutorSubModulesTest.java|   4 +-
 .../stub/LifeCyclePluginAnalyzerStub.java   |  74 ---
 .../stub/LifecyclePluginAnalyzerStub.java   |  96 +
 .../project/AbstractMavenProjectTestCase.xml|   2 +-
 .../maven/project/PomConstructionTest.xml   |   2 +-
 15 files changed, 451 insertions(+), 206 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/72c60513/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..2e0d7ea 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
@@ -23,7 +23,9 @@ import java.util.Collections;
 import java.util.LinkedHashSet;
 import java.util.Set;
 
-import org.apache.maven.lifecycle.LifeCyclePluginAnalyzer;
+import org.apache.maven.lifecycle.LifecyclePluginAnalyzer;
+import org.apache.maven.model.Build;
+import org.apache.maven.model.Model;
 import org.apache.maven.model.Plugin;
 import org.apache.maven.model.PluginExecution;
 
@@ -31,8 +33,9 @@ import org.apache.maven.model.PluginExecution;
  * @author Benjamin Bentmann
  */
 public class EmptyLifecyclePluginAnalyzer
-implements LifeCyclePluginAnalyzer
+implements LifecyclePluginAnalyzer
 {
+
 public Set getPluginsBoundByDefaultToAllLifecycles( String 
packaging )
 {
 Set plugins;
@@ -57,6 +60,26 @@ public class EmptyLifecyclePluginAnalyzer
 return plugins;
 }
 
+@Override
+public Model getLifecycleModel( final Model model )
+{
+if ( model == null )
+{
+throw new NullPointerException( "model" );
+}
+
+final Model lifecycleModel = new Model();
+lifecycleModel.setBuild( new Build() );
+lifecycleModel.getBuild().setPluginManagement( model.getBuild() != null
+   ? 
model.getBuild().getPluginManagement()
+   : null );
+
+lifecycleModel.getBuild().getPlugins().
+addAll( this.getPluginsBoundByDefaultToAllLifecycles( 
model.getPackaging() ) );
+
+return lifecycleModel;
+}
+
 private Plugin newPlugin( String artifactId, String... goals )
 {
 Plugin plugin = new Plugin();

http://git-wip-us.apache.org/repos/asf/maven/blob/72c60513/maven-compat/src/test/resources/org/apache/maven/project/AbstractMavenProjectTestCase.xml
--
diff --git 
a/maven-compat/src/test/resources/org/apache/maven/project/AbstractMavenProjectTestCase.xml
 
b/maven-compat/src/test/resources/org/apache/maven/project/AbstractMavenProjectTestCase.xml
index bcc291e..7e02f5e 100644
--- 
a/maven-compat/src/test/resources/org/apache/maven/project/AbstractMavenProjectTestCase.xml
+++ 
b/maven-compat/src/test/resources/org/apache/maven/project/AbstractMavenProjectTestCase.xml
@@ -2,7 +2,7 @@
 
   
 
-  org.apache.maven.lifecycle.LifeCyclePluginAnalyzer
+  org.apache.maven.lifecycle.LifecyclePluginAnalyzer
   
org.apache.maven.project.EmptyLifecyclePluginAnalyzer
 
   

[41/50] maven git commit: [MNG-6068] Document default scope compile in XSD o Added information about default scope in XSD comment.

[schulte]

[MNG-6068] Document default scope compile in XSD
 o Added information about default scope in XSD comment.


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

Branch: refs/heads/MNG-5359-IT
Commit: 1f0493431be3bd0f25757b5ba0ed98b3a41b3374
Parents: 5a46234
Author: Karl Heinz Marbaise 
Authored: Mon Jul 18 11:56:40 2016 +0200
Committer: Karl Heinz Marbaise 
Committed: Mon Jan 30 09:21:49 2017 +0100

--
 maven-model/src/main/mdo/maven.mdo | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/1f049343/maven-model/src/main/mdo/maven.mdo
--
diff --git a/maven-model/src/main/mdo/maven.mdo 
b/maven-model/src/main/mdo/maven.mdo
index 5eba3ea..2f4ea0c 100644
--- a/maven-model/src/main/mdo/maven.mdo
+++ b/maven-model/src/main/mdo/maven.mdo
@@ -1398,7 +1398,7 @@
 It also assists in determining which artifacts to include in a 
distribution of
 this project. For more information, see
 https://maven.apache.org/guides/introduction/introduction-to-dependency-mechanism.html;>the
-dependency mechanism.
+dependency mechanism. If no scope is given the scope is 
compile.
 ]]>
   
   String

[28/50] maven git commit: [MNG-6105] properties.internal.SystemProperties.addSystemProperties() is not really thread-safe

[schulte]

[MNG-6105] properties.internal.SystemProperties.addSystemProperties() is not 
really thread-safe

Refactoring the current code setting system properties to synchronize correctly 
on the given ones: avoids ConcurrentModificationException and 
NullPointerException if the properties is modified by another thread.


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

Branch: refs/heads/MNG-5359-IT
Commit: 5b4b8bd94c87afd2a1527d6a860e9673bdaf4a22
Parents: 1e2a80e
Author: Guillaume Boué 
Authored: Sun Oct 16 01:40:46 2016 +0200
Committer: Guillaume Boué 
Committed: Sat Jan 28 14:07:59 2017 +0100

--
 .../internal/MavenRepositorySystemUtils.java| 14 +
 .../execution/DefaultMavenExecutionRequest.java |  4 +--
 .../project/DefaultProjectBuildingRequest.java  |  7 ++---
 .../properties/internal/SystemProperties.java   | 30 ++--
 .../building/DefaultModelBuildingRequest.java   |  5 +++-
 .../DefaultSettingsBuildingRequest.java |  7 ++---
 6 files changed, 42 insertions(+), 25 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/5b4b8bd9/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 5b240ef..1b11cb3 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
@@ -126,14 +126,18 @@ public final class MavenRepositorySystemUtils
 
 session.setArtifactDescriptorPolicy( new 
SimpleArtifactDescriptorPolicy( true, true ) );
 
+final Properties systemProperties = new Properties();
+
 // MNG-5670 guard against ConcurrentModificationException
-Properties sysProps = new Properties();
-for ( String key : System.getProperties().stringPropertyNames() )
+// MNG-6053 guard against key without value
+Properties sysProp = System.getProperties();
+synchronized ( sysProp )
 {
-sysProps.put( key, System.getProperty( key ) );
+systemProperties.putAll( sysProp );
 }
-session.setSystemProperties( sysProps );
-session.setConfigProperties( sysProps );
+
+session.setSystemProperties( systemProperties );
+session.setConfigProperties( systemProperties );
 
 return session;
 }

http://git-wip-us.apache.org/repos/asf/maven/blob/5b4b8bd9/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..d67061f 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
@@ -33,6 +33,7 @@ import org.apache.maven.eventspy.internal.EventSpyDispatcher;
 import org.apache.maven.model.Profile;
 import org.apache.maven.project.DefaultProjectBuildingRequest;
 import org.apache.maven.project.ProjectBuildingRequest;
+import org.apache.maven.properties.internal.SystemProperties;
 import org.apache.maven.settings.Mirror;
 import org.apache.maven.settings.Proxy;
 import org.apache.maven.settings.Server;
@@ -535,8 +536,7 @@ public class DefaultMavenExecutionRequest
 {
 if ( properties != null )
 {
-this.systemProperties = new Properties();
-this.systemProperties.putAll( properties );
+this.systemProperties = SystemProperties.copyProperties( 
properties );
 }
 else
 {

http://git-wip-us.apache.org/repos/asf/maven/blob/5b4b8bd9/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..f1b271b 100644
--- 

[36/50] maven git commit: [MNG-6092] warn if prerequisites.maven is used for non-plugin projects

[schulte]

[MNG-6092] warn if prerequisites.maven is used for non-plugin projects


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

Branch: refs/heads/MNG-5359-IT
Commit: 4604c49ee442fef48c0d3efe35fb85d2f0784131
Parents: 017dcaf
Author: Karl Heinz Marbaise 
Authored: Sat Oct 1 16:29:32 2016 +0200
Committer: Karl Heinz Marbaise 
Committed: Sun Jan 29 21:16:35 2017 +0100

--
 .../java/org/apache/maven/DefaultMaven.java | 62 +---
 1 file changed, 41 insertions(+), 21 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/4604c49e/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
--
diff --git a/maven-core/src/main/java/org/apache/maven/DefaultMaven.java 
b/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
index da17830..15b946e 100644
--- a/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
+++ b/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
@@ -42,6 +42,7 @@ import org.apache.maven.graph.GraphBuilder;
 import org.apache.maven.internal.aether.DefaultRepositorySystemSessionFactory;
 import org.apache.maven.lifecycle.internal.ExecutionEventCatapult;
 import org.apache.maven.lifecycle.internal.LifecycleStarter;
+import org.apache.maven.model.Prerequisites;
 import org.apache.maven.model.building.ModelProblem;
 import org.apache.maven.model.building.Result;
 import org.apache.maven.plugin.LegacySupport;
@@ -111,7 +112,7 @@ public class DefaultMaven
 }
 catch ( RuntimeException e )
 {
-//TODO Hack to make the cycle detection the same for the new graph 
builder
+// TODO Hack to make the cycle detection the same for the new 
graph builder
 if ( e.getCause() instanceof ProjectCycleException )
 {
 result = addExceptionToResult( new 
DefaultMavenExecutionResult(), e.getCause() );
@@ -160,7 +161,7 @@ public class DefaultMaven
 //
 @SuppressWarnings( "checkstyle:methodlength" )
 private MavenExecutionResult doExecute( MavenExecutionRequest request )
-{
+{
 request.setStartTime( new Date() );
 
 MavenExecutionResult result = new DefaultMavenExecutionResult();
@@ -203,11 +204,12 @@ public class DefaultMaven
 {
 try
 {
-for ( AbstractMavenLifecycleParticipant listener : 
getLifecycleParticipants( Collections
-.emptyList() ) )
+// CHECKSTYLE_OFF: LineLength
+for ( AbstractMavenLifecycleParticipant listener : 
getLifecycleParticipants( Collections.emptyList() ) )
 {
 listener.afterSessionStart( session );
 }
+// CHECKSTYLE_ON: LineLength
 }
 catch ( MavenExecutionException e )
 {
@@ -217,12 +219,11 @@ public class DefaultMaven
 eventCatapult.fire( ExecutionEvent.Type.ProjectDiscoveryStarted, 
session, null );
 
 Result graphResult = buildGraph( 
session, result );
-
+
 if ( graphResult.hasErrors() )
 {
-return addExceptionToResult( result,
- Iterables.toArray( 
graphResult.getProblems(), ModelProblem.class )[0]
- .getException() );
+return addExceptionToResult( result, Iterables.toArray( 
graphResult.getProblems(),
+
ModelProblem.class )[0].getException() );
 }
 
 try
@@ -283,14 +284,13 @@ public class DefaultMaven
 // Note that participants may affect the topological order of the 
projects but it is
 // not expected that a participant will add or remove projects from 
the session.
 //
-
+
 graphResult = buildGraph( session, result );
-
+
 if ( graphResult.hasErrors() )
 {
-return addExceptionToResult( result,
- Iterables.toArray( 
graphResult.getProblems(), ModelProblem.class )[0]
- .getException() );
+return addExceptionToResult( result, Iterables.toArray( 
graphResult.getProblems(),
+
ModelProblem.class )[0].getException() );
 }
 
 try
@@ -304,6 +304,8 @@ public class DefaultMaven
 
 result.setProject( session.getTopLevelProject() );
 
+validatePrerequisitesForNonMavenPluginProjects( 
session.getProjects() );
+
 

[24/50] maven git commit: [MNG-5946] Fix links etc. in README.txt which is part of the delivery - Changed consistently to https cause all links are available via https. - Fixed link to shutdown codeha

[schulte]

[MNG-5946] Fix links etc. in README.txt which is part of the delivery
- Changed consistently to https cause all links are available via https.
- Fixed link to shutdown codehaus jira
- Fixed link to git repository.


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

Branch: refs/heads/MNG-5359-IT
Commit: c794c2a393855ad4d247783876613f1bb289e77f
Parents: a99a789
Author: Karl Heinz Marbaise 
Authored: Fri Dec 11 19:52:38 2015 +0100
Committer: Karl Heinz Marbaise 
Committed: Wed Jan 25 21:15:39 2017 +0100

--
 apache-maven/README.txt | 14 +++---
 1 file changed, 7 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/c794c2a3/apache-maven/README.txt
--
diff --git a/apache-maven/README.txt b/apache-maven/README.txt
index 6a1bafd..935aa67 100644
--- a/apache-maven/README.txt
+++ b/apache-maven/README.txt
@@ -69,11 +69,11 @@
   Maven URLS
   --
 
-  Home Page:  http://maven.apache.org/
-  Downloads:  http://maven.apache.org/download.html
-  Release Notes:  http://maven.apache.org/release-notes.html
-  Mailing Lists:  http://maven.apache.org/mail-lists.html
-  Source Code:
https://git-wip-us.apache.org/repos/asf/maven.git/apache-maven
-  Issue Tracking: http://jira.codehaus.org/browse/MNG
+  Home Page:  https://maven.apache.org/
+  Downloads:  https://maven.apache.org/download.html
+  Release Notes:  https://maven.apache.org/docs/history.html
+  Mailing Lists:  https://maven.apache.org/mail-lists.html
+  Source Code:https://git-wip-us.apache.org/repos/asf/maven.git
+  Issue Tracking: https://issues.apache.org/jira/browse/MNG
   Wiki:   https://cwiki.apache.org/confluence/display/MAVEN/
-  Available Plugins:  http://maven.apache.org/plugins/index.html
+  Available Plugins:  https://maven.apache.org/plugins/index.html

[35/50] maven git commit: [MNG-5993] Confusing error message in case of missing/empty artifactId/groupId and version in pluginManagement

[schulte]

[MNG-5993] Confusing error message in case of missing/empty
 artifactId/groupId and version in pluginManagement


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

Branch: refs/heads/MNG-5359-IT
Commit: 017dcaf22a2cc1c6361dc64a02d1bdbdb799b95e
Parents: 065281c
Author: Karl Heinz Marbaise 
Authored: Fri Apr 1 22:53:37 2016 +0200
Committer: Karl Heinz Marbaise 
Committed: Sun Jan 29 21:12:49 2017 +0100

--
 .../internal/LifecyclePluginResolver.java   |  12 +-
 .../internal/DefaultPluginVersionResolver.java  |   6 +-
 .../model/validation/DefaultModelValidator.java | 170 +++
 .../validation/DefaultModelValidatorTest.java   |  73 ++--
 .../missing-artifactId-pluginManagement.xml |  39 +
 .../raw-model/missing-ga-pluginManagement.xml   |  39 +
 .../missing-groupId-pluginManagement.xml|  39 +
 .../missing-plugin-version-pluginManagement.xml |  40 +
 8 files changed, 321 insertions(+), 97 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/017dcaf2/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecyclePluginResolver.java
--
diff --git 
a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecyclePluginResolver.java
 
b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecyclePluginResolver.java
index 956e717..f02552a 100644
--- 
a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecyclePluginResolver.java
+++ 
b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecyclePluginResolver.java
@@ -19,6 +19,9 @@ package org.apache.maven.lifecycle.internal;
  * under the License.
  */
 
+import java.util.HashMap;
+import java.util.Map;
+
 import org.apache.maven.execution.MavenSession;
 import org.apache.maven.model.Plugin;
 import org.apache.maven.model.PluginManagement;
@@ -30,9 +33,6 @@ import org.apache.maven.project.MavenProject;
 import org.codehaus.plexus.component.annotations.Component;
 import org.codehaus.plexus.component.annotations.Requirement;
 
-import java.util.HashMap;
-import java.util.Map;
-
 /**
  * @since 3.0
  * @author Benjamin Bentmann
@@ -46,7 +46,6 @@ public class LifecyclePluginResolver
 @Requirement
 private PluginVersionResolver pluginVersionResolver;
 
-
 public LifecyclePluginResolver( PluginVersionResolver 
pluginVersionResolver )
 {
 this.pluginVersionResolver = pluginVersionResolver;
@@ -65,9 +64,8 @@ public class LifecyclePluginResolver
 {
 if ( plugin.getVersion() == null )
 {
-PluginVersionRequest request =
-new DefaultPluginVersionRequest( plugin, 
session.getRepositorySession(),
- 
project.getRemotePluginRepositories() );
+PluginVersionRequest request = new 
DefaultPluginVersionRequest( plugin, session.getRepositorySession(),
+   
 project.getRemotePluginRepositories() );
 plugin.setVersion( pluginVersionResolver.resolve( request 
).getVersion() );
 }
 versions.put( plugin.getKey(), plugin.getVersion() );

http://git-wip-us.apache.org/repos/asf/maven/blob/017dcaf2/maven-core/src/main/java/org/apache/maven/plugin/version/internal/DefaultPluginVersionResolver.java
--
diff --git 
a/maven-core/src/main/java/org/apache/maven/plugin/version/internal/DefaultPluginVersionResolver.java
 
b/maven-core/src/main/java/org/apache/maven/plugin/version/internal/DefaultPluginVersionResolver.java
index f11ee95..82e32fb 100644
--- 
a/maven-core/src/main/java/org/apache/maven/plugin/version/internal/DefaultPluginVersionResolver.java
+++ 
b/maven-core/src/main/java/org/apache/maven/plugin/version/internal/DefaultPluginVersionResolver.java
@@ -87,8 +87,6 @@ public class DefaultPluginVersionResolver
 public PluginVersionResult resolve( PluginVersionRequest request )
 throws PluginVersionResolutionException
 {
-logger.debug( "Resolving plugin version for " + request.getGroupId() + 
":" + request.getArtifactId() );
-
 PluginVersionResult result = resolveFromProject( request );
 
 if ( result == null )
@@ -103,8 +101,8 @@ public class DefaultPluginVersionResolver
 }
 else if ( logger.isDebugEnabled() )
 {
-logger.debug( "Resolved plugin version for " + 
request.getGroupId() + ":" + request.getArtifactId()
-

[42/50] maven git commit: [MNG-6068] Document default scope compile in XSD o Improved description.

[schulte]

[MNG-6068] Document default scope compile in XSD
 o Improved description.


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

Branch: refs/heads/MNG-5359-IT
Commit: 8c7ce555720ec205680a1ce71ede03a4bc49bedb
Parents: 1f04934
Author: Karl Heinz Marbaise 
Authored: Mon Jan 30 12:48:28 2017 +0100
Committer: Karl Heinz Marbaise 
Committed: Mon Jan 30 12:48:28 2017 +0100

--
 maven-model/src/main/mdo/maven.mdo | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/8c7ce555/maven-model/src/main/mdo/maven.mdo
--
diff --git a/maven-model/src/main/mdo/maven.mdo 
b/maven-model/src/main/mdo/maven.mdo
index 2f4ea0c..d830113 100644
--- a/maven-model/src/main/mdo/maven.mdo
+++ b/maven-model/src/main/mdo/maven.mdo
@@ -1398,7 +1398,7 @@
 It also assists in determining which artifacts to include in a 
distribution of
 this project. For more information, see
 https://maven.apache.org/guides/introduction/introduction-to-dependency-mechanism.html;>the
-dependency mechanism. If no scope is given the scope is 
compile.
+dependency mechanism. The default scope is 
compile.
 ]]>
   
   String

[40/50] maven git commit: [MNG-6014] Removing ArtifactHandler for ejb3 o Followup to MNG-5894 of Maven 3.3.9 where the maven-ejb3-plugin has been removed from life cycle. o Removed the ArtifactHandler

[schulte]

[MNG-6014] Removing ArtifactHandler for ejb3
 o Followup to MNG-5894 of Maven 3.3.9 where the maven-ejb3-plugin
   has been removed from life cycle.
 o Removed the ArtifactHandler for ejb3 cause without
   a bound life cycle it does not make sense.
 o Removed entry from artifact-handlers.apt site.


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

Branch: refs/heads/MNG-5359-IT
Commit: 5a462344f9e8aee3f1a423f0268ea27ce017c8c3
Parents: 46c1581
Author: Karl Heinz Marbaise 
Authored: Mon May 2 20:45:01 2016 +0200
Committer: Karl Heinz Marbaise 
Committed: Mon Jan 30 09:20:07 2017 +0100

--
 .../main/resources/META-INF/plexus/artifact-handlers.xml | 11 ---
 maven-core/src/site/apt/artifact-handlers.apt|  2 --
 2 files changed, 13 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/5a462344/maven-core/src/main/resources/META-INF/plexus/artifact-handlers.xml
--
diff --git 
a/maven-core/src/main/resources/META-INF/plexus/artifact-handlers.xml 
b/maven-core/src/main/resources/META-INF/plexus/artifact-handlers.xml
index f467252..2f26ce2 100644
--- a/maven-core/src/main/resources/META-INF/plexus/artifact-handlers.xml
+++ b/maven-core/src/main/resources/META-INF/plexus/artifact-handlers.xml
@@ -80,17 +80,6 @@ Artifact handlers are required by the dependency resolution 
mechanism.
 true
   
 
-
-  org.apache.maven.artifact.handler.ArtifactHandler
-  ejb3
-  
org.apache.maven.artifact.handler.DefaultArtifactHandler
-  
-ejb3
-true
-java
-false
-  
-
 
 

[44/50] maven git commit: [MNG-5829] mvn shell script fails with syntax error on Solaris 10

[schulte]

[MNG-5829] mvn shell script fails with syntax error on Solaris 10

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.

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

Branch: refs/heads/MNG-5359-IT
Commit: 1d9708a954e2d764f6ba933c4e9ba117afa9b4c4
Parents: 8c7ce55
Author: Joseph Walton 
Authored: Mon Jan 30 11:01:49 2017 +0100
Committer: Michael Osipov 
Committed: Mon Jan 30 12:56:36 2017 +0100

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


http://git-wip-us.apache.org/repos/asf/maven/blob/1d9708a9/apache-maven/src/bin/mvn
--
diff --git a/apache-maven/src/bin/mvn b/apache-maven/src/bin/mvn
index 3a4dc26..4a7f610 100755
--- a/apache-maven/src/bin/mvn
+++ b/apache-maven/src/bin/mvn
@@ -192,14 +192,14 @@ fi
 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}"
 }
@@ -207,12 +207,12 @@ find_maven_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/1d9708a9/apache-maven/src/bin/mvnDebug
--
diff --git a/apache-maven/src/bin/mvnDebug b/apache-maven/src/bin/mvnDebug
index 8d6e6a1..be495ff 100755
--- a/apache-maven/src/bin/mvnDebug
+++ b/apache-maven/src/bin/mvnDebug
@@ -31,4 +31,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/1d9708a9/apache-maven/src/bin/mvnyjp
--
diff --git a/apache-maven/src/bin/mvnyjp b/apache-maven/src/bin/mvnyjp
index b2dbe1d..a35eabf 100755
--- a/apache-maven/src/bin/mvnyjp
+++ b/apache-maven/src/bin/mvnyjp
@@ -32,4 +32,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 "$0"`/mvn" "$@"

[37/50] maven git commit: [MNG-6078] Can't overwrite properties which have been defined in .mvn/maven.config o Reversed the order of properties only to get the properties from command line at the end

[schulte]

[MNG-6078] Can't overwrite properties which have been defined in
.mvn/maven.config
 o Reversed the order of properties only to get the properties from
   command line at the end of the properties list which results
   in correct behaviour to be able to overwrite properties from
   command line for properties which have been defined in
   .mvn/maven.config file.


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

Branch: refs/heads/MNG-5359-IT
Commit: ca4303031357a7decaee8de770b71fb2c2fedd28
Parents: 4604c49
Author: Karl Heinz Marbaise 
Authored: Sun Aug 7 12:21:01 2016 +0200
Committer: Karl Heinz Marbaise 
Committed: Sun Jan 29 21:17:36 2017 +0100

--
 .../java/org/apache/maven/cli/MavenCli.java | 12 -
 .../java/org/apache/maven/cli/MavenCliTest.java | 53 ++--
 .../mavenConfigProperties/.mvn/maven.config |  3 ++
 3 files changed, 62 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/ca430303/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 633d533..a27517b 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
@@ -27,6 +27,7 @@ import com.google.inject.AbstractModule;
 import org.apache.commons.cli.CommandLine;
 import org.apache.commons.cli.ParseException;
 import org.apache.commons.cli.UnrecognizedOptionException;
+import org.apache.commons.lang3.ArrayUtils;
 import org.apache.maven.BuildAbort;
 import org.apache.maven.InternalErrorException;
 import org.apache.maven.Maven;
@@ -542,7 +543,9 @@ public class MavenCli
 }
 }
 
-private void properties( CliRequest cliRequest )
+//Needed to make this method package visible to make writing a unit test 
possible
+//Maybe it's better to move some of those methods to separate class (SoC).
+void properties( CliRequest cliRequest )
 {
 populateProperties( cliRequest.commandLine, 
cliRequest.systemProperties, cliRequest.userProperties );
 }
@@ -1581,9 +1584,14 @@ public class MavenCli
 if ( commandLine.hasOption( CLIManager.SET_SYSTEM_PROPERTY ) )
 {
 String[] defStrs = commandLine.getOptionValues( 
CLIManager.SET_SYSTEM_PROPERTY );
-
+
 if ( defStrs != null )
 {
+//The following is needed to get precedence
+//of properties which are defined on command line
+//over properties defined in the .mvn/maven.config. 
+ArrayUtils.reverse( defStrs );
+
 for ( String defStr : defStrs )
 {
 setCliProperty( defStr, userProperties );

http://git-wip-us.apache.org/repos/asf/maven/blob/ca430303/maven-embedder/src/test/java/org/apache/maven/cli/MavenCliTest.java
--
diff --git 
a/maven-embedder/src/test/java/org/apache/maven/cli/MavenCliTest.java 
b/maven-embedder/src/test/java/org/apache/maven/cli/MavenCliTest.java
index c8d75b1..d926624 100644
--- a/maven-embedder/src/test/java/org/apache/maven/cli/MavenCliTest.java
+++ b/maven-embedder/src/test/java/org/apache/maven/cli/MavenCliTest.java
@@ -21,10 +21,10 @@ package org.apache.maven.cli;
 
 import java.io.File;
 
-import junit.framework.TestCase;
-
 import org.apache.commons.cli.ParseException;
 
+import junit.framework.TestCase;
+
 public class MavenCliTest
 extends TestCase
 {
@@ -81,8 +81,8 @@ public class MavenCliTest
 // read .mvn/maven.config
 cli.initialize( request );
 cli.cli( request );
-assertEquals( "multithreaded", request.commandLine.getOptionValue( 
"builder" ) );
-assertEquals( "8", request.commandLine.getOptionValue( "threads" ) );
+assertEquals( "multithreaded", request.commandLine.getOptionValue( 
CLIManager.BUILDER ) );
+assertEquals( "8", request.commandLine.getOptionValue( 
CLIManager.THREADS ) );
 
 // override from command line
 request = new CliRequest( new String[] { "--builder", "foobar" }, null 
);
@@ -107,4 +107,49 @@ public class MavenCliTest
 
 }
 }
+
+/**
+ * Read .mvn/maven.config with the following definitions:
+ * 
+ *   -T 3
+ *   -Drevision=1.3.0
+ * 
+ * and check if the {@code -T 3} option can be 

[46/50] maven git commit: [MNG-5963] mvn.cmd does not return ERROR_CODE

[schulte]

[MNG-5963] mvn.cmd does not return ERROR_CODE


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

Branch: refs/heads/MNG-5359-IT
Commit: 1bc69ff93eb8bde73bf4b9872b78eb6f6be4865d
Parents: 842b07b
Author: Michael Osipov 
Authored: Wed Feb 3 23:13:55 2016 +0100
Committer: Michael Osipov 
Committed: Mon Jan 30 13:14:16 2017 +0100

--
 apache-maven/src/bin/mvn.cmd | 3 ---
 1 file changed, 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/1bc69ff9/apache-maven/src/bin/mvn.cmd
--
diff --git a/apache-maven/src/bin/mvn.cmd b/apache-maven/src/bin/mvn.cmd
index 467269a..0c2fd4b 100644
--- a/apache-maven/src/bin/mvn.cmd
+++ b/apache-maven/src/bin/mvn.cmd
@@ -46,9 +46,6 @@ if exist "%HOME%\mavenrc_pre.cmd" call 
"%HOME%\mavenrc_pre.cmd"
 
 set ERROR_CODE=0
 
-@REM To isolate internal variables from possible post scripts, we use another 
setlocal
-@setlocal
-
 @REM  START VALIDATION 
 if not "%JAVA_HOME%" == "" goto OkJHome
 

[38/50] maven git commit: [MNG-5815] "mvn.cmd" does not indicate failure properly when using "&&"

[schulte]

[MNG-5815] "mvn.cmd" does not indicate failure properly when using "&&"


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

Branch: refs/heads/MNG-5359-IT
Commit: fe586467ecbd63791001e7a6ddf8f18d4fac19b8
Parents: ca43030
Author: Michael Osipov 
Authored: Wed May 11 11:47:14 2016 +0200
Committer: Michael Osipov 
Committed: Sun Jan 29 21:51:20 2017 +0100

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


http://git-wip-us.apache.org/repos/asf/maven/blob/fe586467/apache-maven/src/bin/mvn.cmd
--
diff --git a/apache-maven/src/bin/mvn.cmd b/apache-maven/src/bin/mvn.cmd
index 3f170c3..2321b9c 100644
--- a/apache-maven/src/bin/mvn.cmd
+++ b/apache-maven/src/bin/mvn.cmd
@@ -154,4 +154,4 @@ if "%MAVEN_BATCH_PAUSE%" == "on" pause
 
 if "%MAVEN_TERMINATE_CMD%" == "on" exit %ERROR_CODE%
 
-exit /B %ERROR_CODE%
+cmd /C exit /B %ERROR_CODE%

[50/50] maven git commit: o Updated to run the core ITs from the MNG-5359 branch.

[schulte]

o Updated to run the core ITs from the MNG-5359 branch.


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

Branch: refs/heads/MNG-5359-IT
Commit: 5bc21abda7d82bbb63c089ade006c40702e145f4
Parents: 72c6051
Author: Christian Schulte 
Authored: Sat Jan 21 19:35:54 2017 +0100
Committer: Christian Schulte 
Committed: Tue Jan 31 04:01:36 2017 +0100

--
 Jenkinsfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/5bc21abd/Jenkinsfile
--
diff --git a/Jenkinsfile b/Jenkinsfile
index 5b82d78..04747ac 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -19,7 +19,7 @@
 
 properties([buildDiscarder(logRotator(artifactNumToKeepStr: '5', numToKeepStr: 
env.BRANCH_NAME=='master'?'10':'5'))])
 
-def itBranch='master'
+def itBranch='MNG-5359'
 
 try {
 node('ubuntu') {

[11/50] maven git commit: added standard license and download links

[schulte]

added standard license and download links

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

Branch: refs/heads/MNG-5359-IT
Commit: 733eedc4fb16b0ed0d9cf792dd644e659b738cd9
Parents: 21d1bfb
Author: Hervé Boutemy 
Authored: Tue Jan 24 19:22:28 2017 +0100
Committer: Hervé Boutemy 
Committed: Tue Jan 24 19:22:28 2017 +0100

--
 src/site/site.xml | 2 ++
 1 file changed, 2 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/733eedc4/src/site/site.xml
--
diff --git a/src/site/site.xml b/src/site/site.xml
index bcc6103..86d5ecb 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -49,6 +49,8 @@ under the License.
   
   
   
+  http://www.apache.org/licenses/"/>
+  
 
 
 

[01/50] maven git commit: [MNG-5954] Remove outdated maven-embedder/src/main/resources/META-INF/MANIFEST.MF [Forced Update!]

[schulte]

Repository: maven
Updated Branches:
  refs/heads/MNG-5359-IT fb392fa39 -> 5bc21abda (forced update)


[MNG-5954] Remove outdated 
maven-embedder/src/main/resources/META-INF/MANIFEST.MF


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

Branch: refs/heads/MNG-5359-IT
Commit: deefd9342b13f1fec786ddb00ff3b39299e6e11a
Parents: 355f4df
Author: Michael Osipov 
Authored: Tue Dec 29 00:11:29 2015 +0100
Committer: Michael Osipov 
Committed: Sun Jan 22 21:37:57 2017 +0100

--
 maven-embedder/src/main/resources/META-INF/MANIFEST.MF | 7 ---
 1 file changed, 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/deefd934/maven-embedder/src/main/resources/META-INF/MANIFEST.MF
--
diff --git a/maven-embedder/src/main/resources/META-INF/MANIFEST.MF 
b/maven-embedder/src/main/resources/META-INF/MANIFEST.MF
deleted file mode 100644
index 57576ed..000
--- a/maven-embedder/src/main/resources/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,7 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Maven 2.x Embedder Plug-in
-Bundle-Vendor: maven.org
-Bundle-SymbolicName: org.maven.ide.embedder
-Bundle-Version: ${bundleVersion}
-Bundle-ClassPath: .

[29/50] maven git commit: [MNG-6144] DefaultWagonManagerTest#testGetMissingJarForced() passed incorrect value

[schulte]

[MNG-6144] DefaultWagonManagerTest#testGetMissingJarForced() passed incorrect 
value

This closes #86


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

Branch: refs/heads/MNG-5359-IT
Commit: 920f10a561dee3c3bc34d356082dafd1457a8647
Parents: 5b4b8bd
Author: Michael Osipov 
Authored: Sun Oct 16 12:27:41 2016 +0200
Committer: Michael Osipov 
Committed: Sat Jan 28 17:09:30 2017 +0100

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


http://git-wip-us.apache.org/repos/asf/maven/blob/920f10a5/maven-compat/src/test/java/org/apache/maven/repository/legacy/DefaultWagonManagerTest.java
--
diff --git 
a/maven-compat/src/test/java/org/apache/maven/repository/legacy/DefaultWagonManagerTest.java
 
b/maven-compat/src/test/java/org/apache/maven/repository/legacy/DefaultWagonManagerTest.java
index b9bcf9b..aa5dd68 100644
--- 
a/maven-compat/src/test/java/org/apache/maven/repository/legacy/DefaultWagonManagerTest.java
+++ 
b/maven-compat/src/test/java/org/apache/maven/repository/legacy/DefaultWagonManagerTest.java
@@ -138,7 +138,7 @@ public class DefaultWagonManagerTest
 
 try
 {
-wagonManager.getArtifact( artifact, repo, null, false );
+wagonManager.getArtifact( artifact, repo, null, true );
 
 fail();
 }

[21/50] maven git commit: added link to 3.3.1 release notes for details on .mvn

[schulte]

added link to 3.3.1 release notes for details on .mvn

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

Branch: refs/heads/MNG-5359-IT
Commit: 4547ff73d84f189dea35f60dffafff9cf2f446ba
Parents: 8a8f7cd
Author: Hervé Boutemy 
Authored: Mon Nov 14 12:50:10 2016 +0100
Committer: Hervé Boutemy 
Committed: Wed Jan 25 00:09:30 2017 +0100

--
 maven-embedder/src/site/apt/index.apt.vm | 7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/4547ff73/maven-embedder/src/site/apt/index.apt.vm
--
diff --git a/maven-embedder/src/site/apt/index.apt.vm 
b/maven-embedder/src/site/apt/index.apt.vm
index 17220c9..e820765 100644
--- a/maven-embedder/src/site/apt/index.apt.vm
+++ b/maven-embedder/src/site/apt/index.apt.vm
@@ -20,7 +20,7 @@
  -
  Hervé Boutemy
  -
- 2015-03-12
+ 2016-11-14
  -
 
 ${project.name}
@@ -33,13 +33,14 @@ ${project.name}
 
  * {{{./logging.html}logging API}}.
 
- * since 3.3.0, per project settings can be defined by files in <<<.mvn/>>> 
directory:
+ * since 3.3.1 (see {{{/docs/3.3.1/release-notes.html#Core_Extensions}3.3.1 
release notes}} for more details),
+   per project settings can be defined by files in <<<.mvn/>>> directory:
 
* <<<.mvn/jvm.config>>> containing jvm options,
 
* <<<.mvn/maven.config>>> containing Maven command-line parameter,
 
-   * <<<.mvn/extensions.xml>>> containing {{{./core-extensions.html}a list of 
extensions}}.
+   * <<<.mvn/extensions.xml>>> containing {{{./core-extensions.html}a list of 
extensions}},
 
  * since 3.5.0, output is colorized by default, with color disabled in batch 
mode: see

{{{/shared/maven-shared-utils/apidocs/org/apache/maven/shared/utils/logging/package-summary.html}styled
 message API}}

[27/50] maven git commit: [MNG-5883] Silence unnecessary legacy local repository warning

[schulte]

[MNG-5883] Silence unnecessary legacy local repository warning

o Updated to decrease logging level from 'warning' to 'info'.


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

Branch: refs/heads/MNG-5359-IT
Commit: 1e2a80eced0f01c182458a2c7e7919634fa632f6
Parents: 6b31c4a
Author: Christian Schulte 
Authored: Mon Jan 25 02:40:03 2016 +0100
Committer: Christian Schulte 
Committed: Thu Jan 26 20:30:37 2017 +0100

--
 .../aether/DefaultRepositorySystemSessionFactory.java| 8 
 1 file changed, 4 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/1e2a80ec/maven-core/src/main/java/org/apache/maven/internal/aether/DefaultRepositorySystemSessionFactory.java
--
diff --git 
a/maven-core/src/main/java/org/apache/maven/internal/aether/DefaultRepositorySystemSessionFactory.java
 
b/maven-core/src/main/java/org/apache/maven/internal/aether/DefaultRepositorySystemSessionFactory.java
index 0c91cf9..a0c5444 100644
--- 
a/maven-core/src/main/java/org/apache/maven/internal/aether/DefaultRepositorySystemSessionFactory.java
+++ 
b/maven-core/src/main/java/org/apache/maven/internal/aether/DefaultRepositorySystemSessionFactory.java
@@ -132,16 +132,16 @@ public class DefaultRepositorySystemSessionFactory
 
 if ( request.isUseLegacyLocalRepository() )
 {
-logger.warn( "Disabling enhanced local repository: using legacy is 
strongly discouraged to ensure"
- + " build reproducibility." );
 try
 {
 session.setLocalRepositoryManager( 
simpleLocalRepoMgrFactory.newInstance( session, localRepo ) );
+logger.info( "Disabling enhanced local repository: using 
legacy is strongly discouraged to ensure"
+ + " build reproducibility." );
+
 }
 catch ( NoLocalRepositoryManagerException e )
 {
-
-logger.warn( "Failed to configure legacy local repository: 
back to default" );
+logger.error( "Failed to configure legacy local repository: 
falling back to default" );
 session.setLocalRepositoryManager( 
repoSystem.newLocalRepositoryManager( session, localRepo ) );
 }
 }

[22/50] maven git commit: added core its to projects' sources

[schulte]

added core its to projects' sources


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

Branch: refs/heads/MNG-5359-IT
Commit: 311fc62b7daca1d63596e2202598a0fd3e4d77e2
Parents: 4547ff7
Author: Hervé Boutemy 
Authored: Wed Nov 16 14:41:06 2016 +0100
Committer: Hervé Boutemy 
Committed: Wed Jan 25 00:09:42 2017 +0100

--
 doap_Maven.rdf | 6 ++
 1 file changed, 6 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/311fc62b/doap_Maven.rdf
--
diff --git a/doap_Maven.rdf b/doap_Maven.rdf
index a50b68f..9a043ce 100644
--- a/doap_Maven.rdf
+++ b/doap_Maven.rdf
@@ -190,6 +190,12 @@ under the License.
 https://git-wip-us.apache.org/repos/asf/maven.git"/>
   
 
+
+  
+https://git-wip-us.apache.org/repos/asf/maven-integration-testing.git"/>
+https://git-wip-us.apache.org/repos/asf/maven-integration-testing.git"/>
+  
+
 
   
 Apache Maven PMC

[26/50] maven git commit: [MNG-5958] restore binary compatibility of Lifecycle.setPhases

[schulte]

[MNG-5958] restore binary compatibility of Lifecycle.setPhases

While MNG-5805 restored binary compatibility of Lifecycle.getPhases
it didn't do the same for Lifecycle.setPhases. This breaks plugins
like flexmojos-maven-plugin which have their own lifecycle mapping
implementations.

This closes #77


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

Branch: refs/heads/MNG-5359-IT
Commit: 6b31c4a556f51cd1c2064fe773550c0acf14d307
Parents: f20a5d9
Author: Stuart McCulloch 
Authored: Wed Jan 6 11:23:06 2016 +
Committer: Christian Schulte 
Committed: Thu Jan 26 20:19:57 2017 +0100

--
 .../java/org/apache/maven/lifecycle/mapping/Lifecycle.java  | 9 +++--
 1 file changed, 7 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/6b31c4a5/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/Lifecycle.java
--
diff --git 
a/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/Lifecycle.java 
b/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/Lifecycle.java
index d2b6d6c..c14cf94 100644
--- a/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/Lifecycle.java
+++ b/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/Lifecycle.java
@@ -106,8 +106,13 @@ public class Lifecycle
 }
 
 @Deprecated
-public void setPhases( Map phases )
+public void setPhases( Map phases )
 {
-setLifecyclePhases( phases );
+Map lphases = new LinkedHashMap<>();
+for ( Map.Entry e: phases.entrySet() )
+{
+lphases.put( e.getKey(), new LifecyclePhase( e.getValue() ) );
+}
+setLifecyclePhases( lphases );
 }
 }

[12/50] maven git commit: [MNG-6030] ReactorModelCache do not used effectively after maven version 3.0.5 which cause a large memory footprint o Reintroduced ReactorModelCache reduces the memory footpr

[schulte]

[MNG-6030] ReactorModelCache do not used effectively after maven version 3.0.5 
which cause a large memory footprint
 o Reintroduced ReactorModelCache reduces the memory footprint.


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

Branch: refs/heads/MNG-5359-IT
Commit: cfb075ac706b25df630f3671f61f8d8313e0f138
Parents: 733eedc
Author: Karl Heinz Marbaise 
Authored: Tue May 31 21:39:31 2016 +0200
Committer: Karl Heinz Marbaise 
Committed: Tue Jan 24 20:19:10 2017 +0100

--
 .../maven/project/DefaultProjectBuilder.java   | 17 +++--
 1 file changed, 11 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/cfb075ac/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..d064ab4 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
@@ -116,14 +116,14 @@ public class DefaultProjectBuilder
 public ProjectBuildingResult build( File pomFile, ProjectBuildingRequest 
request )
 throws ProjectBuildingException
 {
-return build( pomFile, new FileModelSource( pomFile ), new 
InternalConfig( request, null ) );
+return build( pomFile, new FileModelSource( pomFile ), new 
InternalConfig( request, null, null ) );
 }
 
 @Override
 public ProjectBuildingResult build( ModelSource modelSource, 
ProjectBuildingRequest request )
 throws ProjectBuildingException
 {
-return build( null, modelSource, new InternalConfig( request, null ) );
+return build( null, modelSource, new InternalConfig( request, null, 
null ) );
 }
 
 private ProjectBuildingResult build( File pomFile, ModelSource 
modelSource, InternalConfig config )
@@ -275,7 +275,7 @@ public class DefaultProjectBuilder
 request.setUserProperties( configuration.getUserProperties() );
 request.setBuildStartTime( configuration.getBuildStartTime() );
 request.setModelResolver( resolver );
-request.setModelCache( new ReactorModelCache() );
+request.setModelCache( config.modelCache );
 
 return request;
 }
@@ -294,7 +294,7 @@ public class DefaultProjectBuilder
 org.eclipse.aether.artifact.Artifact pomArtifact = 
RepositoryUtils.toArtifact( artifact );
 pomArtifact = ArtifactDescriptorUtils.toPomArtifact( pomArtifact );
 
-InternalConfig config = new InternalConfig( request, null );
+InternalConfig config = new InternalConfig( request, null, null );
 
 boolean localProject;
 
@@ -394,7 +394,9 @@ public class DefaultProjectBuilder
 
 ReactorModelPool modelPool = new ReactorModelPool();
 
-InternalConfig config = new InternalConfig( request, modelPool );
+ReactorModelCache modelCache = new ReactorModelCache();
+
+InternalConfig config = new InternalConfig( request, modelPool, 
modelCache );
 
 Map projectIndex = new HashMap<>( 256 );
 
@@ -913,11 +915,14 @@ public class DefaultProjectBuilder
 public final List repositories;
 
 public final ReactorModelPool modelPool;
+
+public final ReactorModelCache modelCache;
 
-InternalConfig( ProjectBuildingRequest request, ReactorModelPool 
modelPool )
+InternalConfig( ProjectBuildingRequest request, ReactorModelPool 
modelPool, ReactorModelCache modelCache )
 {
 this.request = request;
 this.modelPool = modelPool;
+this.modelCache = modelCache;
 session =
 LegacyLocalRepositoryManager.overlay( 
request.getLocalRepository(), request.getRepositorySession(),
   repoSystem );

[15/50] maven git commit: updated urls (https, plexus) and license header formatting

[schulte]

updated urls (https, plexus) and license header formatting

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

Branch: refs/heads/MNG-5359-IT
Commit: 84085c0a9ce4febee8be124fe61f02cd40185d20
Parents: bc07e74
Author: Hervé Boutemy 
Authored: Sat May 28 13:28:23 2016 +0200
Committer: Hervé Boutemy 
Committed: Tue Jan 24 23:50:10 2017 +0100

--
 README.md   |  6 ++--
 apache-maven/README.txt |  6 ++--
 apache-maven/pom.xml| 32 ++
 apache-maven/src/conf/toolchains.xml|  2 +-
 maven-artifact/pom.xml  | 27 ++-
 maven-compat/pom.xml| 27 ++-
 .../maven/artifact/manager/WagonManager.java|  2 +-
 maven-core/pom.xml  | 27 ++-
 .../AbstractMavenLifecycleParticipant.java  |  2 +-
 maven-core/src/main/mdo/toolchains.mdo  |  4 +--
 maven-core/src/site/apt/index.apt   |  2 +-
 maven-embedder/pom.xml  | 27 ++-
 maven-embedder/src/site/apt/logging.apt |  6 ++--
 maven-model-builder/pom.xml | 27 ++-
 .../maven/model/io/xpp3/package-info.java   |  6 ++--
 maven-model/src/main/mdo/maven.mdo  | 20 +--
 maven-model/src/site/xdoc/navigation.xml| 35 
 .../org/apache/maven/plugin/AbstractMojo.java   |  8 ++---
 .../maven/plugin/descriptor/MojoDescriptor.java |  4 +--
 maven-settings/src/main/mdo/settings.mdo|  2 +-
 maven-settings/src/site/apt/index.apt   |  2 +-
 pom.xml | 34 ++-
 src/site/site.xml   |  6 ++--
 src/site/xdoc/index.xml | 16 -
 24 files changed, 174 insertions(+), 156 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/84085c0a/README.md
--
diff --git a/README.md b/README.md
index 7a5ed4d..33a4be4 100644
--- a/README.md
+++ b/README.md
@@ -1,11 +1,11 @@
 # Maven
 
-Maven is available under the [Apache License, Version 
2.0](http://www.apache.org/licenses/LICENSE-2.0.txt)
+Maven is available under the [Apache License, Version 
2.0](https://www.apache.org/licenses/LICENSE-2.0.txt)
 
 - [Maven Issue Tracker](https://issues.apache.org/jira/browse/MNG)
 - [Maven Wiki](https://cwiki.apache.org/confluence/display/MAVEN/Index)
-- [Building 
Maven](http://maven.apache.org/guides/development/guide-building-maven.html)
-- [Running Core ITs](http://maven.apache.org/core-its/core-it-suite/)
+- [Building 
Maven](https://maven.apache.org/guides/development/guide-building-maven.html)
+- [Running Core ITs](https://maven.apache.org/core-its/core-it-suite/)
 
 ## Bootstrapping Basics
 

http://git-wip-us.apache.org/repos/asf/maven/blob/84085c0a/apache-maven/README.txt
--
diff --git a/apache-maven/README.txt b/apache-maven/README.txt
index cbaa7d4..6a1bafd 100644
--- a/apache-maven/README.txt
+++ b/apache-maven/README.txt
@@ -11,12 +11,12 @@
   Documentation
   -
 
-  The most up-to-date documentation can be found at http://maven.apache.org/.
+  The most up-to-date documentation can be found at https://maven.apache.org/.
 
   Release Notes
   -
 
-  The full list of changes can be found at 
http://maven.apache.org/docs/history.html.
+  The full list of changes can be found at 
https://maven.apache.org/docs/history.html.
 
   System Requirements
   ---
@@ -59,7 +59,7 @@
 
   5) Run "mvn --version" to verify that it is correctly installed.
 
-  For complete documentation, see 
http://maven.apache.org/download.html#Installation
+  For complete documentation, see 
https://maven.apache.org/download.html#Installation
 
   Licensing
   -

http://git-wip-us.apache.org/repos/asf/maven/blob/84085c0a/apache-maven/pom.xml
--
diff --git a/apache-maven/pom.xml b/apache-maven/pom.xml
index b2fa989..ba7fda3 100644
--- a/apache-maven/pom.xml
+++ b/apache-maven/pom.xml
@@ -1,19 +1,23 @@
 
 
-  
+
 
 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

http://git-wip-us.apache.org/repos/asf/maven/blob/84085c0a/apache-maven/src/conf/toolchains.xml

[05/50] maven git commit: [MNG-5977] Improve output readability of our MavenTransferListener implementations

[schulte]

[MNG-5977] Improve output readability of our MavenTransferListener 
implementations

* Applied a general decimal formatter which automatically scales file sizes 
between [0,10) (one decimal digit) and [10,1000) (whole numbers) along with 
proper size and time units
* The progress meter will now properly
** tell the amount of transfers along with file names (in debug mode) and 
absolute progress by size
** visually seperate parallel transfers with " | "
* Optimized and reduced padding to the cases where it actually is necessary
* Padding has to be applied to every event which can succeed with progress 
update
* Synchronize all calls to console to avoid race conditions where output is 
terminated by a carriage return only. If no sync is done, SLF4J or 
INIT/SUCCEEDED update can interleave and overwrite the progress while being 
shorter as the progress itself.
* Replaced the concurrent hash map with a synchronized linked hash map to 
retain order of the progress meter. It will behave now like a queue.
* Work around a rounding bug existed upto Java 7
  See http://stackoverflow.com/q/22797964/696632 and Oracle's bugfix
  Announcement: 
http://www.oracle.com/technetwork/java/javase/8-compatibility-guide-2156366.html

Race conditions cannot be avoided if -T is employed since one does not have 
access to the output stream of a SLF4J backend to synchronize on.


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

Branch: refs/heads/MNG-5359-IT
Commit: 149cce7a867956efeaf72d527f61297bf2471b1e
Parents: deefd93
Author: Michael Osipov 
Authored: Thu Feb 18 00:28:50 2016 +0100
Committer: Michael Osipov <1983-01...@gmx.net>
Committed: Mon Jan 23 11:18:15 2017 +0100

--
 .../java/org/apache/maven/cli/MavenCli.java |  10 +-
 .../transfer/AbstractMavenTransferListener.java | 209 +++--
 .../transfer/ConsoleMavenTransferListener.java  | 112 ---
 .../transfer/Slf4jMavenTransferListener.java|  38 +--
 .../maven/cli/transfer/FileSizeFormatTest.java  | 313 +++
 5 files changed, 595 insertions(+), 87 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/149cce7a/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 176ce4d..2b9f099 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
@@ -1005,13 +1005,13 @@ public class MavenCli
 // present supplied by the user. The rule is that we only allow the 
execution of one ConfigurationProcessor.
 // If there is more than one then we execute the one supplied by the 
user, otherwise we execute the
 // the default SettingsXmlConfigurationProcessor.
-// 
+//
 int userSuppliedConfigurationProcessorCount = 
configurationProcessors.size() - 1;
 
 if ( userSuppliedConfigurationProcessorCount == 0 )
 {
 //
-// Our settings.xml source is historically how we have configured 
Maven from the CLI so we are going to 
+// Our settings.xml source is historically how we have configured 
Maven from the CLI so we are going to
 // have to honour its existence forever. So let's run it.
 //
 configurationProcessors.get( 
SettingsXmlConfigurationProcessor.HINT ).process( cliRequest );
@@ -1288,7 +1288,7 @@ public class MavenCli
 // If we're logging to a file then we don't want the console 
transfer listener as it will spew
 // download progress all over the place
 //
-transferListener = getConsoleTransferListener();
+transferListener = getConsoleTransferListener( 
cliRequest.commandLine.hasOption( CLIManager.DEBUG ) );
 }
 else
 {
@@ -1588,9 +1588,9 @@ public class MavenCli
 // Customizations available via the CLI
 //
 
-protected TransferListener getConsoleTransferListener()
+protected TransferListener getConsoleTransferListener( boolean 
printResourceNames )
 {
-return new ConsoleMavenTransferListener( System.out );
+return new ConsoleMavenTransferListener( System.out, 
printResourceNames );
 }
 
 protected TransferListener getBatchTransferListener()

http://git-wip-us.apache.org/repos/asf/maven/blob/149cce7a/maven-embedder/src/main/java/org/apache/maven/cli/transfer/AbstractMavenTransferListener.java

[31/50] maven git commit: [MNG-6145] Remove non-existent m2 include in component.xml

[schulte]

[MNG-6145] Remove non-existent m2 include in component.xml


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

Branch: refs/heads/MNG-5359-IT
Commit: aecccf9a2a0a5d2db1fcb602cc972284fd573a4a
Parents: f53f154
Author: Michael Osipov 
Authored: Fri Oct 7 21:39:24 2016 +0200
Committer: Michael Osipov 
Committed: Sat Jan 28 18:19:31 2017 +0100

--
 apache-maven/src/main/assembly/component.xml | 1 -
 1 file changed, 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/aecccf9a/apache-maven/src/main/assembly/component.xml
--
diff --git a/apache-maven/src/main/assembly/component.xml 
b/apache-maven/src/main/assembly/component.xml
index 8ccf02a..ca4dcb6 100644
--- a/apache-maven/src/main/assembly/component.xml
+++ b/apache-maven/src/main/assembly/component.xml
@@ -68,7 +68,6 @@ under the License.
   src/bin
   bin
   
-m2
 mvn
 mvnDebug
 

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

[schulte]

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


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

Branch: refs/heads/MNG-5359-IT
Commit: 46c1581474ed3b8110dbc7275172b92056b6e5dd
Parents: fe58646
Author: Tobias Oberlies 
Authored: Sat Dec 19 18:06:23 2015 +0100
Committer: Michael Osipov 
Committed: Sun Jan 29 22:56:10 2017 +0100

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


http://git-wip-us.apache.org/repos/asf/maven/blob/46c15814/apache-maven/src/bin/mvnDebug
--
diff --git a/apache-maven/src/bin/mvnDebug b/apache-maven/src/bin/mvnDebug
index 09f48d9..8d6e6a1 100755
--- a/apache-maven/src/bin/mvnDebug
+++ b/apache-maven/src/bin/mvnDebug
@@ -31,4 +31,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/46c15814/apache-maven/src/bin/mvnyjp
--
diff --git a/apache-maven/src/bin/mvnyjp b/apache-maven/src/bin/mvnyjp
index e08f77e..b2dbe1d 100755
--- a/apache-maven/src/bin/mvnyjp
+++ b/apache-maven/src/bin/mvnyjp
@@ -32,4 +32,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 "$0")/mvn" "$@"

[14/50] maven git commit: point to our documentation on plugins dependencies upgrade

[schulte]

point to our documentation on plugins dependencies upgrade

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

Branch: refs/heads/MNG-5359-IT
Commit: cfbad56f65b9d664c7967122b76a5389931080f8
Parents: 84085c0
Author: Hervé Boutemy 
Authored: Sun May 29 09:55:54 2016 +0200
Committer: Hervé Boutemy 
Committed: Tue Jan 24 23:50:10 2017 +0100

--
 maven-compat/src/site/apt/index.apt | 32 
 1 file changed, 32 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/cfbad56f/maven-compat/src/site/apt/index.apt
--
diff --git a/maven-compat/src/site/apt/index.apt 
b/maven-compat/src/site/apt/index.apt
new file mode 100644
index 000..a288cdc
--- /dev/null
+++ b/maven-compat/src/site/apt/index.apt
@@ -0,0 +1,32 @@
+~~ 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.
+
+ -
+ Introduction
+ -
+ Hervé Boutemy
+ -
+ 2016-05-29
+ -
+
+Maven Compat
+
+ Maven2 classes maintained as compatibility layer for plugins that need to 
keep Maven2 compatibility.
+
+ Plugins should avoid these classes and be updated to use only Maven3 
dependencies (and require Maven3): see
+ 
{{{https://cwiki.apache.org/confluence/display/MAVEN/Plugin+migration+to+Maven3+dependencies}
 Plugin migration to Maven3 dependencies}}
+ documentation to get hints on how to make the update.

[16/50] maven git commit: added README.md to rat excludes

[schulte]

added README.md to rat excludes

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

Branch: refs/heads/MNG-5359-IT
Commit: 9d432fb515c390beb593d8c4608775c46cfc03f9
Parents: cfbad56
Author: Hervé Boutemy 
Authored: Sat May 28 21:14:54 2016 +0200
Committer: Hervé Boutemy 
Committed: Wed Jan 25 00:00:43 2017 +0100

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


http://git-wip-us.apache.org/repos/asf/maven/blob/9d432fb5/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 3f9ce4f..5d1f57f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -581,6 +581,7 @@ under the License.
 .repository/** 
 .maven/spy.log 
 .java-version
+README.md
   
 
   

[25/50] maven git commit: [MNG-5931] Fixing documentation Removing references to ejb3-lifecycle and par-lifecycle cause they have been removed with Maven 3.3.9.

[schulte]

[MNG-5931] Fixing documentation
Removing references to ejb3-lifecycle and par-lifecycle
cause they have been removed with Maven 3.3.9.


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

Branch: refs/heads/MNG-5359-IT
Commit: f20a5d940bf055ea49c5cc1ecbdba07a3a27fbe6
Parents: c794c2a
Author: Karl Heinz Marbaise 
Authored: Wed Nov 18 03:48:06 2015 +0100
Committer: Karl Heinz Marbaise 
Committed: Wed Jan 25 21:30:02 2017 +0100

--
 maven-core/src/site/apt/default-bindings.apt.vm | 7 ---
 1 file changed, 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/f20a5d94/maven-core/src/site/apt/default-bindings.apt.vm
--
diff --git a/maven-core/src/site/apt/default-bindings.apt.vm 
b/maven-core/src/site/apt/default-bindings.apt.vm
index 02d6c4a..50c4654 100644
--- a/maven-core/src/site/apt/default-bindings.apt.vm
+++ b/maven-core/src/site/apt/default-bindings.apt.vm
@@ -42,10 +42,6 @@ Plugin Bindings for <<>> Lifecycle Reference
 
 
%{snippet|id=ejb-lifecycle|file=${project.basedir}/src/main/resources/META-INF/plexus/default-bindings.xml}
 
-* Plugin bindings for <<>> packaging
-
-%{snippet|id=ejb3-lifecycle|file=${project.basedir}/src/main/resources/META-INF/plexus/default-bindings.xml}
-
 * Plugin bindings for <<>> packaging
 
 
%{snippet|id=maven-plugin-lifecycle|file=${project.basedir}/src/main/resources/META-INF/plexus/default-bindings.xml}
@@ -62,6 +58,3 @@ Plugin Bindings for <<>> Lifecycle Reference
 
 
%{snippet|id=rar-lifecycle|file=${project.basedir}/src/main/resources/META-INF/plexus/default-bindings.xml}
 
-* Plugin bindings for <<>> packaging
-
-%{snippet|id=par-lifecycle|file=${project.basedir}/src/main/resources/META-INF/plexus/default-bindings.xml}

[07/50] maven git commit: Jenkins file notification email title improvement

[schulte]

Jenkins file notification email title improvement

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

Branch: refs/heads/MNG-5359-IT
Commit: 21d1bfb5a08ecf67a10b88a6fdbda98e7361376b
Parents: 94bc4de
Author: Hervé Boutemy 
Authored: Mon Jan 23 23:11:22 2017 +0100
Committer: Hervé Boutemy 
Committed: Tue Jan 24 18:40:07 2017 +0100

--
 Jenkinsfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/21d1bfb5/Jenkinsfile
--
diff --git a/Jenkinsfile b/Jenkinsfile
index 07ce2e6..5b82d78 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -131,7 +131,7 @@ parallel linuxJava7:{
 }
 } finally {
 node('ubuntu') {
-emailext body: "See ${env.BUILD_URL}", recipientProviders: [[$class: 
'CulpritsRecipientProvider'], [$class: 'FailingTestSuspectsRecipientProvider'], 
[$class: 'FirstFailingBuildSuspectsRecipientProvider']], replyTo: 
'd...@maven.apache.org', subject: "Maven Jenkinsfile finished with 
${currentBuild.result}", to: 'notificati...@maven.apache.org'
+emailext body: "See ${env.BUILD_URL}", recipientProviders: [[$class: 
'CulpritsRecipientProvider'], [$class: 'FailingTestSuspectsRecipientProvider'], 
[$class: 'FirstFailingBuildSuspectsRecipientProvider']], replyTo: 
'd...@maven.apache.org', subject: "${env.JOB_NAME} - build 
${env.BUILD_DISPLAY_NAME} - ${currentBuild.result}", to: 
'notificati...@maven.apache.org'
 }
 }
 

[13/50] maven git commit: [MNG-6017] Removing ArtifactHandler for par LifeCycle o Removed ArtifactHandler configuration for par lifeclyce which has been removed in Maven 3.3.9 See MNG-5892

[schulte]

[MNG-6017] Removing ArtifactHandler for par LifeCycle
 o Removed ArtifactHandler configuration for par lifeclyce
   which has been removed in Maven 3.3.9
   See MNG-5892


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

Branch: refs/heads/MNG-5359-IT
Commit: bc07e74d3c974dae60aad1024d4cd1c4d0714b3a
Parents: cfb075a
Author: Karl Heinz Marbaise 
Authored: Thu May 5 22:40:18 2016 +0200
Committer: Karl Heinz Marbaise 
Committed: Tue Jan 24 20:21:55 2017 +0100

--
 .../resources/META-INF/plexus/artifact-handlers.xml   | 14 --
 maven-core/src/site/apt/artifact-handlers.apt |  2 --
 2 files changed, 16 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/bc07e74d/maven-core/src/main/resources/META-INF/plexus/artifact-handlers.xml
--
diff --git 
a/maven-core/src/main/resources/META-INF/plexus/artifact-handlers.xml 
b/maven-core/src/main/resources/META-INF/plexus/artifact-handlers.xml
index 05795be..f467252 100644
--- a/maven-core/src/main/resources/META-INF/plexus/artifact-handlers.xml
+++ b/maven-core/src/main/resources/META-INF/plexus/artifact-handlers.xml
@@ -201,19 +201,5 @@ Artifact handlers are required by the dependency 
resolution mechanism.
   
 
 
-
-
-  org.apache.maven.artifact.handler.ArtifactHandler
-  par
-  
org.apache.maven.artifact.handler.DefaultArtifactHandler
-  
-par
-true
-java
-false
-  
-
   
 

http://git-wip-us.apache.org/repos/asf/maven/blob/bc07e74d/maven-core/src/site/apt/artifact-handlers.apt
--
diff --git a/maven-core/src/site/apt/artifact-handlers.apt 
b/maven-core/src/site/apt/artifact-handlers.apt
index 916161b..a7ffade 100644
--- a/maven-core/src/site/apt/artifact-handlers.apt
+++ b/maven-core/src/site/apt/artifact-handlers.apt
@@ -47,8 +47,6 @@ Default Artifact Handlers Reference
 
*+++---+---+-+---+
 | <<>>  | <= type>   | <= type>   |   | java  |   
  | <<>>|
 
*+++---+---+-+---+
-| <<>>  | <= type>   | <= type>   |   | java  |   
  | <<>>|
-*+++---+---+-+---+
 | <<>>  | <<>>  | <= type>   | <<>> | java  |   
  |   |
 
*+++---+---+-+---+
 | <<>>  | <<>>  | <= type>   | <<>> | java  | 
<<>>  |   |

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

[schulte]

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

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

Branch: refs/heads/MNG-5359-IT
Commit: b80915b8822b51aafa962a9ef53a61c0ac59033d
Parents: 8b66162
Author: Hervé Boutemy 
Authored: Sun Jun 5 13:11:45 2016 +0200
Committer: Hervé Boutemy 
Committed: Tue Jan 24 18:40:07 2017 +0100

--
 apache-maven/pom.xml|   4 +
 apache-maven/src/bin/mvn|   1 +
 apache-maven/src/bin/mvn.cmd|   2 +-
 maven-core/pom.xml  |   4 +
 .../lifecycle/LifecycleExecutionException.java  |  27 ++---
 .../main/resources/META-INF/maven/extension.xml |   3 +
 maven-embedder/pom.xml  |   4 +
 .../java/org/apache/maven/cli/CLIManager.java   |   4 +-
 .../org/apache/maven/cli/CLIReportingUtils.java |   6 +-
 .../java/org/apache/maven/cli/MavenCli.java |  87 --
 .../maven/cli/event/ExecutionEventLogger.java   | 117 ++-
 maven-embedder/src/site/apt/index.apt.vm|   5 +
 pom.xml |  10 ++
 13 files changed, 192 insertions(+), 82 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/b80915b8/apache-maven/pom.xml
--
diff --git a/apache-maven/pom.xml b/apache-maven/pom.xml
index 735e5b8..f7c28ed 100644
--- a/apache-maven/pom.xml
+++ b/apache-maven/pom.xml
@@ -91,6 +91,10 @@
   org.slf4j
   slf4j-simple
 
+
+  org.fusesource.jansi
+  jansi
+
   
 
   

http://git-wip-us.apache.org/repos/asf/maven/blob/b80915b8/apache-maven/src/bin/mvn
--
diff --git a/apache-maven/src/bin/mvn b/apache-maven/src/bin/mvn
index 6875628..f3acb73 100755
--- a/apache-maven/src/bin/mvn
+++ b/apache-maven/src/bin/mvn
@@ -241,4 +241,5 @@ exec "$JAVACMD" \
   -classpath "${M2_HOME}"/boot/plexus-classworlds-*.jar \
   "-Dclassworlds.conf=${M2_HOME}/bin/m2.conf" \
   "-Dmaven.home=${M2_HOME}" 
"-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \
+  "-Dlibrary.jansi.path=${MAVEN_HOME}/lib/ext" \
   ${CLASSWORLDS_LAUNCHER} "$@"

http://git-wip-us.apache.org/repos/asf/maven/blob/b80915b8/apache-maven/src/bin/mvn.cmd
--
diff --git a/apache-maven/src/bin/mvn.cmd b/apache-maven/src/bin/mvn.cmd
index d35c1d2..5ad99ae 100644
--- a/apache-maven/src/bin/mvn.cmd
+++ b/apache-maven/src/bin/mvn.cmd
@@ -154,7 +154,7 @@ for %%i in ("%M2_HOME%"\boot\plexus-classworlds-*) do set 
CLASSWORLDS_JAR="%%i"
 
 set CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher
 
-%MAVEN_JAVA_EXE% %JVM_CONFIG_MAVEN_PROPS% %MAVEN_OPTS% %MAVEN_DEBUG_OPTS% 
-classpath %CLASSWORLDS_JAR% "-Dclassworlds.conf=%M2_HOME%\bin\m2.conf" 
"-Dmaven.home=%M2_HOME%" 
"-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" 
%CLASSWORLDS_LAUNCHER% %MAVEN_CMD_LINE_ARGS%
+%MAVEN_JAVA_EXE% %JVM_CONFIG_MAVEN_PROPS% %MAVEN_OPTS% %MAVEN_DEBUG_OPTS% 
-classpath %CLASSWORLDS_JAR% "-Dclassworlds.conf=%M2_HOME%\bin\m2.conf" 
"-Dmaven.home=%M2_HOME%" 
"-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" 
"-Dlibrary.jansi.path=%MAVEN_HOME%\lib\ext" %CLASSWORLDS_LAUNCHER% 
%MAVEN_CMD_LINE_ARGS%
 if ERRORLEVEL 1 goto error
 goto end
 

http://git-wip-us.apache.org/repos/asf/maven/blob/b80915b8/maven-core/pom.xml
--
diff --git a/maven-core/pom.xml b/maven-core/pom.xml
index ac1968b..efff5c1 100644
--- a/maven-core/pom.xml
+++ b/maven-core/pom.xml
@@ -75,6 +75,10 @@
   org.eclipse.aether
   aether-util
 
+
+  org.apache.maven.shared
+  maven-shared-utils
+
 
 
   org.eclipse.sisu

http://git-wip-us.apache.org/repos/asf/maven/blob/b80915b8/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 349576c..62ae269 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
@@ -19,8 +19,11 @@ package org.apache.maven.lifecycle;
  * under the License.
  */
 
+import static 

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

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

Branch: refs/heads/MNG-5359-IT
Commit: a99a78984c1f20394abf6e76b6167b9e61e6163c
Parents: 311fc62
Author: Christian Schulte 
Authored: Tue Jun 14 21:26:56 2016 +0200
Committer: Hervé Boutemy 
Committed: Wed Jan 25 08:09:30 2017 +0100

--
 .../UnknownRepositoryLayoutException.java   |  2 +-
 .../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|  8 +-
 .../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, 236 insertions(+), 172 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/a99a7898/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 5abe110..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
@@ -23,7 +23,7 @@ import 
org.codehaus.plexus.component.repository.exception.ComponentLookupExcepti
 
 /**
  * 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/a99a7898/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/a99a7898/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/apache/maven/artifact/repository/layout/FlatRepositoryLayout.java
index 8553a31..58143e0 100644
--- 

[04/50] maven git commit: [MNG-6106] Remove maven.home setter from m2.conf

[schulte]

[MNG-6106] Remove maven.home setter from m2.conf


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

Branch: refs/heads/MNG-5359-IT
Commit: 5053a628c0a4eb069ab5512ad7491494207cb996
Parents: 8373c79
Author: Michael Osipov 
Authored: Sun Jan 22 12:33:50 2017 +0100
Committer: Michael Osipov 
Committed: Sun Jan 22 21:37:57 2017 +0100

--
 apache-maven/src/bin/m2.conf | 2 --
 1 file changed, 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/5053a628/apache-maven/src/bin/m2.conf
--
diff --git a/apache-maven/src/bin/m2.conf b/apache-maven/src/bin/m2.conf
index 213dc55..346554c 100644
--- a/apache-maven/src/bin/m2.conf
+++ b/apache-maven/src/bin/m2.conf
@@ -1,7 +1,5 @@
 main is org.apache.maven.cli.MavenCli from plexus.core
 
-set maven.home default ${user.home}/m2
-
 [plexus.core]
 load   ${maven.home}/conf/logging
 optionally ${maven.home}/lib/ext/*.jar

[18/50] maven git commit: improved documentation

[schulte]

improved documentation

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

Branch: refs/heads/MNG-5359-IT
Commit: 512fa6a45b73663ed5b5e0e896539d1084da36f3
Parents: 0b684af
Author: Hervé Boutemy 
Authored: Sun Oct 2 10:02:21 2016 +0200
Committer: Hervé Boutemy 
Committed: Wed Jan 25 00:07:55 2017 +0100

--
 maven-core/project-builder.txt  |   1 -
 .../src/main/java/org/apache/maven/Maven.java   |   3 +
 .../java/org/apache/maven/SessionScoped.java|   4 +-
 .../apache/maven/execution/MavenSession.java|   2 +
 .../maven/execution/ProjectDependencyGraph.java |   1 +
 .../org/apache/maven/graph/GraphBuilder.java|   5 +
 maven-core/src/site/apt/index.apt   |  23 ++-
 .../apt/scripting-support/marmalade-support.apt | 196 ---
 8 files changed, 26 insertions(+), 209 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/512fa6a4/maven-core/project-builder.txt
--
diff --git a/maven-core/project-builder.txt b/maven-core/project-builder.txt
deleted file mode 100644
index a9aab65..000
--- a/maven-core/project-builder.txt
+++ /dev/null
@@ -1 +0,0 @@
-Maven Project Builder and Maven Model Builder

http://git-wip-us.apache.org/repos/asf/maven/blob/512fa6a4/maven-core/src/main/java/org/apache/maven/Maven.java
--
diff --git a/maven-core/src/main/java/org/apache/maven/Maven.java 
b/maven-core/src/main/java/org/apache/maven/Maven.java
index 8563847..69f9fca 100644
--- a/maven-core/src/main/java/org/apache/maven/Maven.java
+++ b/maven-core/src/main/java/org/apache/maven/Maven.java
@@ -23,7 +23,10 @@ import org.apache.maven.execution.MavenExecutionRequest;
 import org.apache.maven.execution.MavenExecutionResult;
 
 /**
+ * The main Maven execution entry point, which will execute a full Maven 
execution session.
+ *
  * @author Jason van Zyl
+ * @see org.apache.maven.execution.MavenSession
  */
 public interface Maven
 {

http://git-wip-us.apache.org/repos/asf/maven/blob/512fa6a4/maven-core/src/main/java/org/apache/maven/SessionScoped.java
--
diff --git a/maven-core/src/main/java/org/apache/maven/SessionScoped.java 
b/maven-core/src/main/java/org/apache/maven/SessionScoped.java
index 63b1eb7..7738938 100644
--- a/maven-core/src/main/java/org/apache/maven/SessionScoped.java
+++ b/maven-core/src/main/java/org/apache/maven/SessionScoped.java
@@ -28,8 +28,8 @@ import java.lang.annotation.Target;
 import com.google.inject.ScopeAnnotation;
 
 /**
- * Indicates that annotated component should be instantiated before session 
starts and discarded after session execution
- * completes.
+ * Indicates that annotated component should be instantiated before session 
execution starts
+ * and discarded after session execution completes.
  *
  * @author Jason van Zyl
  * @since 3.2.0

http://git-wip-us.apache.org/repos/asf/maven/blob/512fa6a4/maven-core/src/main/java/org/apache/maven/execution/MavenSession.java
--
diff --git 
a/maven-core/src/main/java/org/apache/maven/execution/MavenSession.java 
b/maven-core/src/main/java/org/apache/maven/execution/MavenSession.java
index 864c49ad..d69bbba 100644
--- a/maven-core/src/main/java/org/apache/maven/execution/MavenSession.java
+++ b/maven-core/src/main/java/org/apache/maven/execution/MavenSession.java
@@ -39,6 +39,8 @@ import 
org.codehaus.plexus.component.repository.exception.ComponentLookupExcepti
 import org.eclipse.aether.RepositorySystemSession;
 
 /**
+ * A Maven execution session.
+ *
  * @author Jason van Zyl
  */
 public class MavenSession

http://git-wip-us.apache.org/repos/asf/maven/blob/512fa6a4/maven-core/src/main/java/org/apache/maven/execution/ProjectDependencyGraph.java
--
diff --git 
a/maven-core/src/main/java/org/apache/maven/execution/ProjectDependencyGraph.java
 
b/maven-core/src/main/java/org/apache/maven/execution/ProjectDependencyGraph.java
index 1db277d..0d5584b 100644
--- 
a/maven-core/src/main/java/org/apache/maven/execution/ProjectDependencyGraph.java
+++ 
b/maven-core/src/main/java/org/apache/maven/execution/ProjectDependencyGraph.java
@@ -27,6 +27,7 @@ import org.apache.maven.project.MavenProject;
  * Describes the inter-dependencies between projects in the reactor.
  *
  * @author Benjamin Bentmann
+ * @since 3.0-alpha
  */
 public interface ProjectDependencyGraph
 {

[02/50] maven git commit: [MNG-5975] Use Java 7's SimpleDateFormat in CLIReportingUtils#formatTimestamp

[schulte]

[MNG-5975] Use Java 7's SimpleDateFormat in CLIReportingUtils#formatTimestamp


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

Branch: refs/heads/MNG-5359-IT
Commit: 355f4dff03cea8cab0d7bdcb00fffa4e43b2c10b
Parents: a2358ba
Author: Michael Osipov 
Authored: Fri Feb 12 23:30:47 2016 +0100
Committer: Michael Osipov 
Committed: Sun Jan 22 21:37:57 2017 +0100

--
 .../org/apache/maven/cli/CLIReportingUtils.java | 32 ++--
 1 file changed, 10 insertions(+), 22 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/355f4dff/maven-embedder/src/main/java/org/apache/maven/cli/CLIReportingUtils.java
--
diff --git 
a/maven-embedder/src/main/java/org/apache/maven/cli/CLIReportingUtils.java 
b/maven-embedder/src/main/java/org/apache/maven/cli/CLIReportingUtils.java
index 2397d5d..214704b 100644
--- a/maven-embedder/src/main/java/org/apache/maven/cli/CLIReportingUtils.java
+++ b/maven-embedder/src/main/java/org/apache/maven/cli/CLIReportingUtils.java
@@ -19,15 +19,15 @@ package org.apache.maven.cli;
  * under the License.
  */
 
-import org.codehaus.plexus.util.Os;
-import org.slf4j.Logger;
-
 import java.io.IOException;
 import java.io.InputStream;
+import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.Locale;
 import java.util.Properties;
-import java.util.TimeZone;
+
+import org.codehaus.plexus.util.Os;
+import org.slf4j.Logger;
 
 /**
  * Utility class used to report errors, statistics, application version info, 
etc.
@@ -152,24 +152,8 @@ public final class CLIReportingUtils
 
 public static String formatTimestamp( long timestamp )
 {
-// Manual construction of the tz offset because only Java 7 is aware 
of ISO 8601 time zones
-TimeZone tz = TimeZone.getDefault();
-int offset = tz.getRawOffset();
-
-// Raw offset ignores DST, so check if we are in DST now and add the 
offset
-if ( tz.inDaylightTime( new Date( timestamp ) ) )
-{
-offset += tz.getDSTSavings();
-}
-
-// CHECKSTYLE_OFF: MagicNumber
-long m = Math.abs( ( offset / ONE_MINUTE ) % 60 );
-long h = Math.abs( ( offset / ONE_HOUR ) % 24 );
-// CHECKSTYLE_ON: MagicNumber
-
-int offsetDir = (int) Math.signum( (float) offset );
-char offsetSign = offsetDir >= 0 ? '+' : '-';
-return String.format( "%tFT% 0 )
 {
+// Length 11+ chars
 format = "%d d %02d:%02d h";
 }
 else if ( h > 0 )
 {
+// Length 7 chars
 format = "%2$02d:%3$02d h";
 }
 else if ( m > 0 )
 {
+// Length 9 chars
 format = "%3$02d:%4$02d min";
 }
 else
 {
+// Length 7-8 chars
 format = "%4$d.%5$03d s";
 }
 

[08/50] maven git commit: [MNG-6093] use monkey patched slf4j-simple provider with Maven color

[schulte]

[MNG-6093] use monkey patched slf4j-simple provider with Maven color

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

Branch: refs/heads/MNG-5359-IT
Commit: 94bc4de2ea54afa09a353034ed06edf0f68a8d87
Parents: b80915b
Author: Hervé Boutemy 
Authored: Thu Sep 22 17:46:53 2016 +0200
Committer: Hervé Boutemy 
Committed: Tue Jan 24 18:40:07 2017 +0100

--
 apache-maven/pom.xml|   4 +-
 .../maven/slf4j-configuration.properties|   1 +
 maven-slf4j-provider/pom.xml| 116 +++
 .../java/org/slf4j/impl/MavenSimpleLogger.java  | 115 ++
 .../slf4j/impl/MavenSimpleLoggerFactory.java|  44 +++
 .../src/main/script/patch-slf4j-simple.groovy   |  53 +
 maven-slf4j-provider/src/site/site.xml  |  36 ++
 pom.xml |   6 +
 src/site/xdoc/index.xml |   2 +
 9 files changed, 375 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/94bc4de2/apache-maven/pom.xml
--
diff --git a/apache-maven/pom.xml b/apache-maven/pom.xml
index f7c28ed..b2fa989 100644
--- a/apache-maven/pom.xml
+++ b/apache-maven/pom.xml
@@ -88,8 +88,8 @@
   aether-transport-wagon
 
 
-  org.slf4j
-  slf4j-simple
+  org.apache.maven
+  maven-slf4j-provider
 
 
   org.fusesource.jansi

http://git-wip-us.apache.org/repos/asf/maven/blob/94bc4de2/maven-embedder/src/main/resources/META-INF/maven/slf4j-configuration.properties
--
diff --git 
a/maven-embedder/src/main/resources/META-INF/maven/slf4j-configuration.properties
 
b/maven-embedder/src/main/resources/META-INF/maven/slf4j-configuration.properties
index 8741836..ae1bc39 100644
--- 
a/maven-embedder/src/main/resources/META-INF/maven/slf4j-configuration.properties
+++ 
b/maven-embedder/src/main/resources/META-INF/maven/slf4j-configuration.properties
@@ -18,5 +18,6 @@
 # key = Slf4j effective logger factory implementation
 # value = corresponding o.a.m.cli.logging.Slf4jConfiguration class
 org.slf4j.impl.SimpleLoggerFactory 
org.apache.maven.cli.logging.impl.Slf4jSimpleConfiguration
+org.slf4j.impl.MavenSimpleLoggerFactory 
org.apache.maven.cli.logging.impl.Slf4jSimpleConfiguration
 org.slf4j.helpers.Log4jLoggerFactory 
org.apache.maven.cli.logging.impl.Log4j2Configuration
 ch.qos.logback.classic.LoggerContext 
org.apache.maven.cli.logging.impl.LogbackConfiguration

http://git-wip-us.apache.org/repos/asf/maven/blob/94bc4de2/maven-slf4j-provider/pom.xml
--
diff --git a/maven-slf4j-provider/pom.xml b/maven-slf4j-provider/pom.xml
new file mode 100644
index 000..81af382
--- /dev/null
+++ b/maven-slf4j-provider/pom.xml
@@ -0,0 +1,116 @@
+
+
+
+
+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
+maven
+3.5.0-SNAPSHOT
+  
+
+  maven-slf4j-provider
+
+  Maven SLF4J Simple Provider
+  
+Maven SLF4J provider based on SLF4J's simple provider, monkey-patched to 
support Maven styled colors
+for levels and stacktraces rendering.
+  
+
+  
+
+  org.slf4j
+  slf4j-api
+
+
+  org.apache.maven.shared
+  maven-shared-utils
+
+  
+
+  
+
+  
+org.apache.maven.plugins
+maven-dependency-plugin
+
+  
+
+  org.slf4j
+  slf4j-simple
+  ${slf4jVersion}
+  jar
+  sources
+  false
+  
${project.build.directory}/generated-sources/slf4j-simple
+  org/slf4j/impl/*.java
+
+  
+
+
+  
+unzip-slf4j-simple
+
+  unpack
+
+  
+
+  
+  
+org.codehaus.mojo
+build-helper-maven-plugin
+1.12
+
+  
+add-slf4j-simple
+generate-sources
+
+  add-source
+
+
+  
+
${project.build.directory}/generated-sources/slf4j-simple
+  
+
+  
+
+  
+  
+org.codehaus.gmaven
+groovy-maven-plugin
+2.0
+
+  
+patch-slf4j-simple
+   

[03/50] maven git commit: [MNG-6081] Log refactoring - Method Invocation Replaced By Variable

[schulte]

[MNG-6081] Log refactoring - Method Invocation Replaced By Variable


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

Branch: refs/heads/MNG-5359-IT
Commit: a2358ba7bb9b5b8ccb4ca2b6ea66b637b88d6c09
Parents: 5053a62
Author: Nemo Chen 
Authored: Fri Oct 21 22:36:41 2016 +0200
Committer: Michael Osipov 
Committed: Sun Jan 22 21:37:57 2017 +0100

--
 .../apache/maven/artifact/resolver/DebugResolutionListener.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/a2358ba7/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DebugResolutionListener.java
--
diff --git 
a/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DebugResolutionListener.java
 
b/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DebugResolutionListener.java
index 43806b1..bd1ed9a 100644
--- 
a/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DebugResolutionListener.java
+++ 
b/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DebugResolutionListener.java
@@ -71,7 +71,7 @@ public class DebugResolutionListener
 
 if ( omittedVersion != null ? !omittedVersion.equals( keptVersion ) : 
keptVersion != null )
 {
-logger.debug( indent + omitted + " (removed - nearer found: " + 
kept.getVersion() + ")" );
+logger.debug( indent + omitted + " (removed - nearer found: " + 
keptVersion + ")" );
 }
 }
 
@@ -164,4 +164,4 @@ public class DebugResolutionListener
 }
 }
 
-}
\ No newline at end of file
+}

[06/50] maven git commit: [MNG-6102] Introduce ${maven.conf} in m2.conf

[schulte]

[MNG-6102] Introduce ${maven.conf} in m2.conf

Set maven.conf to default ${maven.home}/conf in ${maven.home}/bin/m2.conf
to have a canonical property pointing to global configuration files from
within Java code.

This also helps package maintainers to decouple the Maven installation
from a global configuration by solely modifying m2.conf instead of using
dirty hacks, if possible at all.


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

Branch: refs/heads/MNG-5359-IT
Commit: be5caccaff3d00ffca4b3cefe9665b6106bc44bf
Parents: 149cce7
Author: Michael Osipov 
Authored: Sun Oct 9 21:00:42 2016 +0200
Committer: Michael Osipov 
Committed: Mon Jan 23 20:54:54 2017 +0100

--
 apache-maven/src/bin/m2.conf | 4 +++-
 apache-maven/src/conf/settings.xml   | 2 +-
 apache-maven/src/conf/toolchains.xml | 2 +-
 .../org/apache/maven/settings/DefaultMavenSettingsBuilder.java   | 2 +-
 maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java  | 2 +-
 .../cli/configuration/SettingsXmlConfigurationProcessor.java | 4 ++--
 maven-embedder/src/site/apt/logging.apt  | 2 +-
 7 files changed, 10 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/be5cacca/apache-maven/src/bin/m2.conf
--
diff --git a/apache-maven/src/bin/m2.conf b/apache-maven/src/bin/m2.conf
index 346554c..2235f82 100644
--- a/apache-maven/src/bin/m2.conf
+++ b/apache-maven/src/bin/m2.conf
@@ -1,6 +1,8 @@
 main is org.apache.maven.cli.MavenCli from plexus.core
 
+set maven.conf default ${maven.home}/conf
+
 [plexus.core]
-load   ${maven.home}/conf/logging
+load   ${maven.conf}/logging
 optionally ${maven.home}/lib/ext/*.jar
 load   ${maven.home}/lib/*.jar

http://git-wip-us.apache.org/repos/asf/maven/blob/be5cacca/apache-maven/src/conf/settings.xml
--
diff --git a/apache-maven/src/conf/settings.xml 
b/apache-maven/src/conf/settings.xml
index 19d7a97..e27c579 100644
--- a/apache-maven/src/conf/settings.xml
+++ b/apache-maven/src/conf/settings.xml
@@ -32,7 +32,7 @@ under the License.
  |  2. Global Level. This settings.xml file provides configuration for all 
Maven
  | users on a machine (assuming they're all using the same 
Maven
  | installation). It's normally provided in
- | ${maven.home}/conf/settings.xml.
+ | ${maven.conf}/settings.xml.
  |
  | NOTE: This location can be overridden with the CLI option:
  |

http://git-wip-us.apache.org/repos/asf/maven/blob/be5cacca/apache-maven/src/conf/toolchains.xml
--
diff --git a/apache-maven/src/conf/toolchains.xml 
b/apache-maven/src/conf/toolchains.xml
index aefddd8..b737c17 100644
--- a/apache-maven/src/conf/toolchains.xml
+++ b/apache-maven/src/conf/toolchains.xml
@@ -32,7 +32,7 @@ under the License.
  |  2. Global Level. This toolchains.xml file provides configuration for all 
Maven
  | users on a machine (assuming they're all using the same 
Maven
  | installation). It's normally provided in
- | ${maven.home}/conf/toolchains.xml.
+ | ${maven.conf}/toolchains.xml.
  |
  | NOTE: This location can be overridden with the CLI option:
  |

http://git-wip-us.apache.org/repos/asf/maven/blob/be5cacca/maven-core/src/main/java/org/apache/maven/settings/DefaultMavenSettingsBuilder.java
--
diff --git 
a/maven-core/src/main/java/org/apache/maven/settings/DefaultMavenSettingsBuilder.java
 
b/maven-core/src/main/java/org/apache/maven/settings/DefaultMavenSettingsBuilder.java
index 820d886..207b9aa 100644
--- 
a/maven-core/src/main/java/org/apache/maven/settings/DefaultMavenSettingsBuilder.java
+++ 
b/maven-core/src/main/java/org/apache/maven/settings/DefaultMavenSettingsBuilder.java
@@ -66,7 +66,7 @@ public class DefaultMavenSettingsBuilder
 throws IOException, XmlPullParserException
 {
 File globalSettingsFile =
-getFile( "${maven.home}/conf/settings.xml", "maven.home",
+getFile( "${maven.conf}/settings.xml", "maven.conf",
  MavenSettingsBuilder.ALT_GLOBAL_SETTINGS_XML_LOCATION );
 
 SettingsBuildingRequest request = new DefaultSettingsBuildingRequest();

[20/50] maven git commit: removed now unused checkstyle suppress warnings

[schulte]

removed now unused checkstyle suppress warnings

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

Branch: refs/heads/MNG-5359-IT
Commit: 8a8f7cd53f08bd0847e6263f79894d18881dcd9d
Parents: 60e4fa6
Author: Hervé Boutemy 
Authored: Sun Oct 16 23:16:52 2016 +0200
Committer: Hervé Boutemy 
Committed: Wed Jan 25 00:09:01 2017 +0100

--
 maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java | 2 --
 1 file changed, 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/8a8f7cd5/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 8455848..c0b0dcf 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
@@ -1056,7 +1056,6 @@ public class MavenCli
 
 private static final String ANSI_RESET = "\u001B\u005Bm";
 
-@SuppressWarnings( "checkstyle:methodlength" )
 private void configure( CliRequest cliRequest )
 throws Exception
 {
@@ -1122,7 +1121,6 @@ public class MavenCli
 }
 }
 
-@SuppressWarnings( "checkstyle:methodlength" )
 private void toolchains( CliRequest cliRequest )
 throws Exception
 {

[19/50] maven git commit: updated notice

[schulte]

updated notice

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

Branch: refs/heads/MNG-5359-IT
Commit: 60e4fa650fc2e5b3b646c74f3eeab7d0381b8bcb
Parents: 512fa6a
Author: Hervé Boutemy 
Authored: Wed Oct 5 23:57:03 2016 +0200
Committer: Hervé Boutemy 
Committed: Wed Jan 25 00:08:12 2017 +0100

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


http://git-wip-us.apache.org/repos/asf/maven/blob/60e4fa65/maven-compat/src/main/java/org/apache/maven/project/MavenProjectBuilder.java
--
diff --git 
a/maven-compat/src/main/java/org/apache/maven/project/MavenProjectBuilder.java 
b/maven-compat/src/main/java/org/apache/maven/project/MavenProjectBuilder.java
index c44d8db..816b4a9 100644
--- 
a/maven-compat/src/main/java/org/apache/maven/project/MavenProjectBuilder.java
+++ 
b/maven-compat/src/main/java/org/apache/maven/project/MavenProjectBuilder.java
@@ -39,7 +39,8 @@ public interface MavenProjectBuilder
 MavenProject build( File pom, ProjectBuilderConfiguration configuration )
 throws ProjectBuildingException;
 
-//TODO maven-site-plugin -- Vincent, Dennis and Lukas are checking but 
this doesn't appear to be required anymore.
+//TODO maven-site-plugin -- not used by the plugin directly, but used by 
Doxia Integration Tool & MPIR
+// see DOXIASITETOOLS-167 & MPIR-349
 MavenProject build( File pom, ArtifactRepository localRepository, 
ProfileManager profileManager )
 throws ProjectBuildingException;
 

[17/50] maven git commit: added core extensions documentation

[schulte]

added core extensions documentation

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

Branch: refs/heads/MNG-5359-IT
Commit: 0b684af45ee85381a06a20cbdddb6b3fa0ff3b46
Parents: 9d432fb
Author: Hervé Boutemy 
Authored: Sat Jun 25 18:58:01 2016 +0200
Committer: Hervé Boutemy 
Committed: Wed Jan 25 00:04:31 2017 +0100

--
 .../main/resources/META-INF/maven/extension.xml |  7 +++--
 maven-core/src/site/apt/core-extensions.apt.vm  | 30 
 maven-core/src/site/apt/index.apt   |  2 +-
 maven-core/src/site/site.xml|  1 +
 4 files changed, 36 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/0b684af4/maven-core/src/main/resources/META-INF/maven/extension.xml
--
diff --git a/maven-core/src/main/resources/META-INF/maven/extension.xml 
b/maven-core/src/main/resources/META-INF/maven/extension.xml
index 07e60aa..f9cf07a 100644
--- a/maven-core/src/main/resources/META-INF/maven/extension.xml
+++ b/maven-core/src/main/resources/META-INF/maven/extension.xml
@@ -18,7 +18,7 @@ KIND, either express or implied.  See the License for the
 specific language governing permissions and limitations
 under the License.
 -->
-
+
 
   
 
@@ -161,7 +161,7 @@ under the License.
 org.fusesource.jansi:jansi
 
 
 org.sonatype.aether:aether-api
 org.sonatype.aether:aether-spi
@@ -174,4 +174,5 @@ under the License.
   | wagon from their plugin realm. 
  -->
   
-
\ No newline at end of file
+
+

http://git-wip-us.apache.org/repos/asf/maven/blob/0b684af4/maven-core/src/site/apt/core-extensions.apt.vm
--
diff --git a/maven-core/src/site/apt/core-extensions.apt.vm 
b/maven-core/src/site/apt/core-extensions.apt.vm
new file mode 100644
index 000..3d7abca
--- /dev/null
+++ b/maven-core/src/site/apt/core-extensions.apt.vm
@@ -0,0 +1,30 @@
+~~ 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.
+
+ ---
+ Maven Core Extensions Reference
+ ---
+ Hervé Boutemy
+ ---
+ 2016-06-25
+ ---
+
+Maven Core Extensions Reference
+
+  Maven core provides default extensions as defined in 
<<>>:
+
+%{snippet|id=core-extension|file=${project.basedir}/src/main/resources/META-INF/maven/extension.xml}

http://git-wip-us.apache.org/repos/asf/maven/blob/0b684af4/maven-core/src/site/apt/index.apt
--
diff --git a/maven-core/src/site/apt/index.apt 
b/maven-core/src/site/apt/index.apt
index 61d1772..966b57c 100644
--- a/maven-core/src/site/apt/index.apt
+++ b/maven-core/src/site/apt/index.apt
@@ -53,7 +53,7 @@ Maven Core
  
({{{./xref/org/apache/maven/classrealm/DefaultClassRealmManager.html}source}}), 
using
  {{{https://codehaus-plexus.github.io/plexus-classworlds/}Plexus Classworlds}},
 
- * {{{./extension.html}extension descriptor}},
+ * {{{./extension.html}extension descriptor}} and 
{{{./core-extensions.html}core extensions}},
 
  * <<>> component 
({{{./apidocs/org/apache/maven/exception/ExceptionHandler.html}javadoc}}),
  with its <<>> implementation

http://git-wip-us.apache.org/repos/asf/maven/blob/0b684af4/maven-core/src/site/site.xml
--
diff --git a/maven-core/src/site/site.xml b/maven-core/src/site/site.xml
index 2c38d2a..9eb3ad0 100644
--- a/maven-core/src/site/site.xml
+++ b/maven-core/src/site/site.xml
@@ -34,6 +34,7 @@ under the License.
   
   
   
+  
 
 
 

[14/50] maven git commit: [MNG-6017] Removing ArtifactHandler for par LifeCycle o Removed ArtifactHandler configuration for par lifeclyce which has been removed in Maven 3.3.9 See MNG-5892

[schulte]

[MNG-6017] Removing ArtifactHandler for par LifeCycle
 o Removed ArtifactHandler configuration for par lifeclyce
   which has been removed in Maven 3.3.9
   See MNG-5892


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

Branch: refs/heads/MNG-5359
Commit: bc07e74d3c974dae60aad1024d4cd1c4d0714b3a
Parents: cfb075a
Author: Karl Heinz Marbaise 
Authored: Thu May 5 22:40:18 2016 +0200
Committer: Karl Heinz Marbaise 
Committed: Tue Jan 24 20:21:55 2017 +0100

--
 .../resources/META-INF/plexus/artifact-handlers.xml   | 14 --
 maven-core/src/site/apt/artifact-handlers.apt |  2 --
 2 files changed, 16 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/bc07e74d/maven-core/src/main/resources/META-INF/plexus/artifact-handlers.xml
--
diff --git 
a/maven-core/src/main/resources/META-INF/plexus/artifact-handlers.xml 
b/maven-core/src/main/resources/META-INF/plexus/artifact-handlers.xml
index 05795be..f467252 100644
--- a/maven-core/src/main/resources/META-INF/plexus/artifact-handlers.xml
+++ b/maven-core/src/main/resources/META-INF/plexus/artifact-handlers.xml
@@ -201,19 +201,5 @@ Artifact handlers are required by the dependency 
resolution mechanism.
   
 
 
-
-
-  org.apache.maven.artifact.handler.ArtifactHandler
-  par
-  
org.apache.maven.artifact.handler.DefaultArtifactHandler
-  
-par
-true
-java
-false
-  
-
   
 

http://git-wip-us.apache.org/repos/asf/maven/blob/bc07e74d/maven-core/src/site/apt/artifact-handlers.apt
--
diff --git a/maven-core/src/site/apt/artifact-handlers.apt 
b/maven-core/src/site/apt/artifact-handlers.apt
index 916161b..a7ffade 100644
--- a/maven-core/src/site/apt/artifact-handlers.apt
+++ b/maven-core/src/site/apt/artifact-handlers.apt
@@ -47,8 +47,6 @@ Default Artifact Handlers Reference
 
*+++---+---+-+---+
 | <<>>  | <= type>   | <= type>   |   | java  |   
  | <<>>|
 
*+++---+---+-+---+
-| <<>>  | <= type>   | <= type>   |   | java  |   
  | <<>>|
-*+++---+---+-+---+
 | <<>>  | <<>>  | <= type>   | <<>> | java  |   
  |   |
 
*+++---+---+-+---+
 | <<>>  | <<>>  | <= type>   | <<>> | java  | 
<<>>  |   |

[08/50] maven git commit: Jenkins file notification email title improvement

[schulte]

Jenkins file notification email title improvement

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

Branch: refs/heads/MNG-5359
Commit: 21d1bfb5a08ecf67a10b88a6fdbda98e7361376b
Parents: 94bc4de
Author: Hervé Boutemy 
Authored: Mon Jan 23 23:11:22 2017 +0100
Committer: Hervé Boutemy 
Committed: Tue Jan 24 18:40:07 2017 +0100

--
 Jenkinsfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/21d1bfb5/Jenkinsfile
--
diff --git a/Jenkinsfile b/Jenkinsfile
index 07ce2e6..5b82d78 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -131,7 +131,7 @@ parallel linuxJava7:{
 }
 } finally {
 node('ubuntu') {
-emailext body: "See ${env.BUILD_URL}", recipientProviders: [[$class: 
'CulpritsRecipientProvider'], [$class: 'FailingTestSuspectsRecipientProvider'], 
[$class: 'FirstFailingBuildSuspectsRecipientProvider']], replyTo: 
'd...@maven.apache.org', subject: "Maven Jenkinsfile finished with 
${currentBuild.result}", to: 'notificati...@maven.apache.org'
+emailext body: "See ${env.BUILD_URL}", recipientProviders: [[$class: 
'CulpritsRecipientProvider'], [$class: 'FailingTestSuspectsRecipientProvider'], 
[$class: 'FirstFailingBuildSuspectsRecipientProvider']], replyTo: 
'd...@maven.apache.org', subject: "${env.JOB_NAME} - build 
${env.BUILD_DISPLAY_NAME} - ${currentBuild.result}", to: 
'notificati...@maven.apache.org'
 }
 }
 

[21/50] maven git commit: removed now unused checkstyle suppress warnings

[schulte]

removed now unused checkstyle suppress warnings

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

Branch: refs/heads/MNG-5359
Commit: 8a8f7cd53f08bd0847e6263f79894d18881dcd9d
Parents: 60e4fa6
Author: Hervé Boutemy 
Authored: Sun Oct 16 23:16:52 2016 +0200
Committer: Hervé Boutemy 
Committed: Wed Jan 25 00:09:01 2017 +0100

--
 maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java | 2 --
 1 file changed, 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/8a8f7cd5/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 8455848..c0b0dcf 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
@@ -1056,7 +1056,6 @@ public class MavenCli
 
 private static final String ANSI_RESET = "\u001B\u005Bm";
 
-@SuppressWarnings( "checkstyle:methodlength" )
 private void configure( CliRequest cliRequest )
 throws Exception
 {
@@ -1122,7 +1121,6 @@ public class MavenCli
 }
 }
 
-@SuppressWarnings( "checkstyle:methodlength" )
 private void toolchains( CliRequest cliRequest )
 throws Exception
 {

[26/50] maven git commit: [MNG-5931] Fixing documentation Removing references to ejb3-lifecycle and par-lifecycle cause they have been removed with Maven 3.3.9.

[schulte]

[MNG-5931] Fixing documentation
Removing references to ejb3-lifecycle and par-lifecycle
cause they have been removed with Maven 3.3.9.


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

Branch: refs/heads/MNG-5359
Commit: f20a5d940bf055ea49c5cc1ecbdba07a3a27fbe6
Parents: c794c2a
Author: Karl Heinz Marbaise 
Authored: Wed Nov 18 03:48:06 2015 +0100
Committer: Karl Heinz Marbaise 
Committed: Wed Jan 25 21:30:02 2017 +0100

--
 maven-core/src/site/apt/default-bindings.apt.vm | 7 ---
 1 file changed, 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/f20a5d94/maven-core/src/site/apt/default-bindings.apt.vm
--
diff --git a/maven-core/src/site/apt/default-bindings.apt.vm 
b/maven-core/src/site/apt/default-bindings.apt.vm
index 02d6c4a..50c4654 100644
--- a/maven-core/src/site/apt/default-bindings.apt.vm
+++ b/maven-core/src/site/apt/default-bindings.apt.vm
@@ -42,10 +42,6 @@ Plugin Bindings for <<>> Lifecycle Reference
 
 
%{snippet|id=ejb-lifecycle|file=${project.basedir}/src/main/resources/META-INF/plexus/default-bindings.xml}
 
-* Plugin bindings for <<>> packaging
-
-%{snippet|id=ejb3-lifecycle|file=${project.basedir}/src/main/resources/META-INF/plexus/default-bindings.xml}
-
 * Plugin bindings for <<>> packaging
 
 
%{snippet|id=maven-plugin-lifecycle|file=${project.basedir}/src/main/resources/META-INF/plexus/default-bindings.xml}
@@ -62,6 +58,3 @@ Plugin Bindings for <<>> Lifecycle Reference
 
 
%{snippet|id=rar-lifecycle|file=${project.basedir}/src/main/resources/META-INF/plexus/default-bindings.xml}
 
-* Plugin bindings for <<>> packaging
-
-%{snippet|id=par-lifecycle|file=${project.basedir}/src/main/resources/META-INF/plexus/default-bindings.xml}

[06/50] maven git commit: [MNG-5977] Improve output readability of our MavenTransferListener implementations

[schulte]

[MNG-5977] Improve output readability of our MavenTransferListener 
implementations

* Applied a general decimal formatter which automatically scales file sizes 
between [0,10) (one decimal digit) and [10,1000) (whole numbers) along with 
proper size and time units
* The progress meter will now properly
** tell the amount of transfers along with file names (in debug mode) and 
absolute progress by size
** visually seperate parallel transfers with " | "
* Optimized and reduced padding to the cases where it actually is necessary
* Padding has to be applied to every event which can succeed with progress 
update
* Synchronize all calls to console to avoid race conditions where output is 
terminated by a carriage return only. If no sync is done, SLF4J or 
INIT/SUCCEEDED update can interleave and overwrite the progress while being 
shorter as the progress itself.
* Replaced the concurrent hash map with a synchronized linked hash map to 
retain order of the progress meter. It will behave now like a queue.
* Work around a rounding bug existed upto Java 7
  See http://stackoverflow.com/q/22797964/696632 and Oracle's bugfix
  Announcement: 
http://www.oracle.com/technetwork/java/javase/8-compatibility-guide-2156366.html

Race conditions cannot be avoided if -T is employed since one does not have 
access to the output stream of a SLF4J backend to synchronize on.


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

Branch: refs/heads/MNG-5359
Commit: 149cce7a867956efeaf72d527f61297bf2471b1e
Parents: deefd93
Author: Michael Osipov 
Authored: Thu Feb 18 00:28:50 2016 +0100
Committer: Michael Osipov <1983-01...@gmx.net>
Committed: Mon Jan 23 11:18:15 2017 +0100

--
 .../java/org/apache/maven/cli/MavenCli.java |  10 +-
 .../transfer/AbstractMavenTransferListener.java | 209 +++--
 .../transfer/ConsoleMavenTransferListener.java  | 112 ---
 .../transfer/Slf4jMavenTransferListener.java|  38 +--
 .../maven/cli/transfer/FileSizeFormatTest.java  | 313 +++
 5 files changed, 595 insertions(+), 87 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/149cce7a/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 176ce4d..2b9f099 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
@@ -1005,13 +1005,13 @@ public class MavenCli
 // present supplied by the user. The rule is that we only allow the 
execution of one ConfigurationProcessor.
 // If there is more than one then we execute the one supplied by the 
user, otherwise we execute the
 // the default SettingsXmlConfigurationProcessor.
-// 
+//
 int userSuppliedConfigurationProcessorCount = 
configurationProcessors.size() - 1;
 
 if ( userSuppliedConfigurationProcessorCount == 0 )
 {
 //
-// Our settings.xml source is historically how we have configured 
Maven from the CLI so we are going to 
+// Our settings.xml source is historically how we have configured 
Maven from the CLI so we are going to
 // have to honour its existence forever. So let's run it.
 //
 configurationProcessors.get( 
SettingsXmlConfigurationProcessor.HINT ).process( cliRequest );
@@ -1288,7 +1288,7 @@ public class MavenCli
 // If we're logging to a file then we don't want the console 
transfer listener as it will spew
 // download progress all over the place
 //
-transferListener = getConsoleTransferListener();
+transferListener = getConsoleTransferListener( 
cliRequest.commandLine.hasOption( CLIManager.DEBUG ) );
 }
 else
 {
@@ -1588,9 +1588,9 @@ public class MavenCli
 // Customizations available via the CLI
 //
 
-protected TransferListener getConsoleTransferListener()
+protected TransferListener getConsoleTransferListener( boolean 
printResourceNames )
 {
-return new ConsoleMavenTransferListener( System.out );
+return new ConsoleMavenTransferListener( System.out, 
printResourceNames );
 }
 
 protected TransferListener getBatchTransferListener()

http://git-wip-us.apache.org/repos/asf/maven/blob/149cce7a/maven-embedder/src/main/java/org/apache/maven/cli/transfer/AbstractMavenTransferListener.java

[15/50] maven git commit: point to our documentation on plugins dependencies upgrade

[schulte]

point to our documentation on plugins dependencies upgrade

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

Branch: refs/heads/MNG-5359
Commit: cfbad56f65b9d664c7967122b76a5389931080f8
Parents: 84085c0
Author: Hervé Boutemy 
Authored: Sun May 29 09:55:54 2016 +0200
Committer: Hervé Boutemy 
Committed: Tue Jan 24 23:50:10 2017 +0100

--
 maven-compat/src/site/apt/index.apt | 32 
 1 file changed, 32 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/cfbad56f/maven-compat/src/site/apt/index.apt
--
diff --git a/maven-compat/src/site/apt/index.apt 
b/maven-compat/src/site/apt/index.apt
new file mode 100644
index 000..a288cdc
--- /dev/null
+++ b/maven-compat/src/site/apt/index.apt
@@ -0,0 +1,32 @@
+~~ 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.
+
+ -
+ Introduction
+ -
+ Hervé Boutemy
+ -
+ 2016-05-29
+ -
+
+Maven Compat
+
+ Maven2 classes maintained as compatibility layer for plugins that need to 
keep Maven2 compatibility.
+
+ Plugins should avoid these classes and be updated to use only Maven3 
dependencies (and require Maven3): see
+ 
{{{https://cwiki.apache.org/confluence/display/MAVEN/Plugin+migration+to+Maven3+dependencies}
 Plugin migration to Maven3 dependencies}}
+ documentation to get hints on how to make the update.

[18/50] maven git commit: added core extensions documentation

[schulte]

added core extensions documentation

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

Branch: refs/heads/MNG-5359
Commit: 0b684af45ee85381a06a20cbdddb6b3fa0ff3b46
Parents: 9d432fb
Author: Hervé Boutemy 
Authored: Sat Jun 25 18:58:01 2016 +0200
Committer: Hervé Boutemy 
Committed: Wed Jan 25 00:04:31 2017 +0100

--
 .../main/resources/META-INF/maven/extension.xml |  7 +++--
 maven-core/src/site/apt/core-extensions.apt.vm  | 30 
 maven-core/src/site/apt/index.apt   |  2 +-
 maven-core/src/site/site.xml|  1 +
 4 files changed, 36 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/0b684af4/maven-core/src/main/resources/META-INF/maven/extension.xml
--
diff --git a/maven-core/src/main/resources/META-INF/maven/extension.xml 
b/maven-core/src/main/resources/META-INF/maven/extension.xml
index 07e60aa..f9cf07a 100644
--- a/maven-core/src/main/resources/META-INF/maven/extension.xml
+++ b/maven-core/src/main/resources/META-INF/maven/extension.xml
@@ -18,7 +18,7 @@ KIND, either express or implied.  See the License for the
 specific language governing permissions and limitations
 under the License.
 -->
-
+
 
   
 
@@ -161,7 +161,7 @@ under the License.
 org.fusesource.jansi:jansi
 
 
 org.sonatype.aether:aether-api
 org.sonatype.aether:aether-spi
@@ -174,4 +174,5 @@ under the License.
   | wagon from their plugin realm. 
  -->
   
-
\ No newline at end of file
+
+

http://git-wip-us.apache.org/repos/asf/maven/blob/0b684af4/maven-core/src/site/apt/core-extensions.apt.vm
--
diff --git a/maven-core/src/site/apt/core-extensions.apt.vm 
b/maven-core/src/site/apt/core-extensions.apt.vm
new file mode 100644
index 000..3d7abca
--- /dev/null
+++ b/maven-core/src/site/apt/core-extensions.apt.vm
@@ -0,0 +1,30 @@
+~~ 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.
+
+ ---
+ Maven Core Extensions Reference
+ ---
+ Hervé Boutemy
+ ---
+ 2016-06-25
+ ---
+
+Maven Core Extensions Reference
+
+  Maven core provides default extensions as defined in 
<<>>:
+
+%{snippet|id=core-extension|file=${project.basedir}/src/main/resources/META-INF/maven/extension.xml}

http://git-wip-us.apache.org/repos/asf/maven/blob/0b684af4/maven-core/src/site/apt/index.apt
--
diff --git a/maven-core/src/site/apt/index.apt 
b/maven-core/src/site/apt/index.apt
index 61d1772..966b57c 100644
--- a/maven-core/src/site/apt/index.apt
+++ b/maven-core/src/site/apt/index.apt
@@ -53,7 +53,7 @@ Maven Core
  
({{{./xref/org/apache/maven/classrealm/DefaultClassRealmManager.html}source}}), 
using
  {{{https://codehaus-plexus.github.io/plexus-classworlds/}Plexus Classworlds}},
 
- * {{{./extension.html}extension descriptor}},
+ * {{{./extension.html}extension descriptor}} and 
{{{./core-extensions.html}core extensions}},
 
  * <<>> component 
({{{./apidocs/org/apache/maven/exception/ExceptionHandler.html}javadoc}}),
  with its <<>> implementation

http://git-wip-us.apache.org/repos/asf/maven/blob/0b684af4/maven-core/src/site/site.xml
--
diff --git a/maven-core/src/site/site.xml b/maven-core/src/site/site.xml
index 2c38d2a..9eb3ad0 100644
--- a/maven-core/src/site/site.xml
+++ b/maven-core/src/site/site.xml
@@ -34,6 +34,7 @@ under the License.
   
   
   
+  
 
 
 

[47/50] maven git commit: [MNG-5963] mvn.cmd does not return ERROR_CODE

[schulte]

[MNG-5963] mvn.cmd does not return ERROR_CODE


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

Branch: refs/heads/MNG-5359
Commit: 1bc69ff93eb8bde73bf4b9872b78eb6f6be4865d
Parents: 842b07b
Author: Michael Osipov 
Authored: Wed Feb 3 23:13:55 2016 +0100
Committer: Michael Osipov 
Committed: Mon Jan 30 13:14:16 2017 +0100

--
 apache-maven/src/bin/mvn.cmd | 3 ---
 1 file changed, 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/1bc69ff9/apache-maven/src/bin/mvn.cmd
--
diff --git a/apache-maven/src/bin/mvn.cmd b/apache-maven/src/bin/mvn.cmd
index 467269a..0c2fd4b 100644
--- a/apache-maven/src/bin/mvn.cmd
+++ b/apache-maven/src/bin/mvn.cmd
@@ -46,9 +46,6 @@ if exist "%HOME%\mavenrc_pre.cmd" call 
"%HOME%\mavenrc_pre.cmd"
 
 set ERROR_CODE=0
 
-@REM To isolate internal variables from possible post scripts, we use another 
setlocal
-@setlocal
-
 @REM  START VALIDATION 
 if not "%JAVA_HOME%" == "" goto OkJHome
 

[19/50] maven git commit: improved documentation

[schulte]

improved documentation

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

Branch: refs/heads/MNG-5359
Commit: 512fa6a45b73663ed5b5e0e896539d1084da36f3
Parents: 0b684af
Author: Hervé Boutemy 
Authored: Sun Oct 2 10:02:21 2016 +0200
Committer: Hervé Boutemy 
Committed: Wed Jan 25 00:07:55 2017 +0100

--
 maven-core/project-builder.txt  |   1 -
 .../src/main/java/org/apache/maven/Maven.java   |   3 +
 .../java/org/apache/maven/SessionScoped.java|   4 +-
 .../apache/maven/execution/MavenSession.java|   2 +
 .../maven/execution/ProjectDependencyGraph.java |   1 +
 .../org/apache/maven/graph/GraphBuilder.java|   5 +
 maven-core/src/site/apt/index.apt   |  23 ++-
 .../apt/scripting-support/marmalade-support.apt | 196 ---
 8 files changed, 26 insertions(+), 209 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/512fa6a4/maven-core/project-builder.txt
--
diff --git a/maven-core/project-builder.txt b/maven-core/project-builder.txt
deleted file mode 100644
index a9aab65..000
--- a/maven-core/project-builder.txt
+++ /dev/null
@@ -1 +0,0 @@
-Maven Project Builder and Maven Model Builder

http://git-wip-us.apache.org/repos/asf/maven/blob/512fa6a4/maven-core/src/main/java/org/apache/maven/Maven.java
--
diff --git a/maven-core/src/main/java/org/apache/maven/Maven.java 
b/maven-core/src/main/java/org/apache/maven/Maven.java
index 8563847..69f9fca 100644
--- a/maven-core/src/main/java/org/apache/maven/Maven.java
+++ b/maven-core/src/main/java/org/apache/maven/Maven.java
@@ -23,7 +23,10 @@ import org.apache.maven.execution.MavenExecutionRequest;
 import org.apache.maven.execution.MavenExecutionResult;
 
 /**
+ * The main Maven execution entry point, which will execute a full Maven 
execution session.
+ *
  * @author Jason van Zyl
+ * @see org.apache.maven.execution.MavenSession
  */
 public interface Maven
 {

http://git-wip-us.apache.org/repos/asf/maven/blob/512fa6a4/maven-core/src/main/java/org/apache/maven/SessionScoped.java
--
diff --git a/maven-core/src/main/java/org/apache/maven/SessionScoped.java 
b/maven-core/src/main/java/org/apache/maven/SessionScoped.java
index 63b1eb7..7738938 100644
--- a/maven-core/src/main/java/org/apache/maven/SessionScoped.java
+++ b/maven-core/src/main/java/org/apache/maven/SessionScoped.java
@@ -28,8 +28,8 @@ import java.lang.annotation.Target;
 import com.google.inject.ScopeAnnotation;
 
 /**
- * Indicates that annotated component should be instantiated before session 
starts and discarded after session execution
- * completes.
+ * Indicates that annotated component should be instantiated before session 
execution starts
+ * and discarded after session execution completes.
  *
  * @author Jason van Zyl
  * @since 3.2.0

http://git-wip-us.apache.org/repos/asf/maven/blob/512fa6a4/maven-core/src/main/java/org/apache/maven/execution/MavenSession.java
--
diff --git 
a/maven-core/src/main/java/org/apache/maven/execution/MavenSession.java 
b/maven-core/src/main/java/org/apache/maven/execution/MavenSession.java
index 864c49ad..d69bbba 100644
--- a/maven-core/src/main/java/org/apache/maven/execution/MavenSession.java
+++ b/maven-core/src/main/java/org/apache/maven/execution/MavenSession.java
@@ -39,6 +39,8 @@ import 
org.codehaus.plexus.component.repository.exception.ComponentLookupExcepti
 import org.eclipse.aether.RepositorySystemSession;
 
 /**
+ * A Maven execution session.
+ *
  * @author Jason van Zyl
  */
 public class MavenSession

http://git-wip-us.apache.org/repos/asf/maven/blob/512fa6a4/maven-core/src/main/java/org/apache/maven/execution/ProjectDependencyGraph.java
--
diff --git 
a/maven-core/src/main/java/org/apache/maven/execution/ProjectDependencyGraph.java
 
b/maven-core/src/main/java/org/apache/maven/execution/ProjectDependencyGraph.java
index 1db277d..0d5584b 100644
--- 
a/maven-core/src/main/java/org/apache/maven/execution/ProjectDependencyGraph.java
+++ 
b/maven-core/src/main/java/org/apache/maven/execution/ProjectDependencyGraph.java
@@ -27,6 +27,7 @@ import org.apache.maven.project.MavenProject;
  * Describes the inter-dependencies between projects in the reactor.
  *
  * @author Benjamin Bentmann
+ * @since 3.0-alpha
  */
 public interface ProjectDependencyGraph
 {

[16/50] maven git commit: updated urls (https, plexus) and license header formatting

[schulte]

updated urls (https, plexus) and license header formatting

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

Branch: refs/heads/MNG-5359
Commit: 84085c0a9ce4febee8be124fe61f02cd40185d20
Parents: bc07e74
Author: Hervé Boutemy 
Authored: Sat May 28 13:28:23 2016 +0200
Committer: Hervé Boutemy 
Committed: Tue Jan 24 23:50:10 2017 +0100

--
 README.md   |  6 ++--
 apache-maven/README.txt |  6 ++--
 apache-maven/pom.xml| 32 ++
 apache-maven/src/conf/toolchains.xml|  2 +-
 maven-artifact/pom.xml  | 27 ++-
 maven-compat/pom.xml| 27 ++-
 .../maven/artifact/manager/WagonManager.java|  2 +-
 maven-core/pom.xml  | 27 ++-
 .../AbstractMavenLifecycleParticipant.java  |  2 +-
 maven-core/src/main/mdo/toolchains.mdo  |  4 +--
 maven-core/src/site/apt/index.apt   |  2 +-
 maven-embedder/pom.xml  | 27 ++-
 maven-embedder/src/site/apt/logging.apt |  6 ++--
 maven-model-builder/pom.xml | 27 ++-
 .../maven/model/io/xpp3/package-info.java   |  6 ++--
 maven-model/src/main/mdo/maven.mdo  | 20 +--
 maven-model/src/site/xdoc/navigation.xml| 35 
 .../org/apache/maven/plugin/AbstractMojo.java   |  8 ++---
 .../maven/plugin/descriptor/MojoDescriptor.java |  4 +--
 maven-settings/src/main/mdo/settings.mdo|  2 +-
 maven-settings/src/site/apt/index.apt   |  2 +-
 pom.xml | 34 ++-
 src/site/site.xml   |  6 ++--
 src/site/xdoc/index.xml | 16 -
 24 files changed, 174 insertions(+), 156 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/84085c0a/README.md
--
diff --git a/README.md b/README.md
index 7a5ed4d..33a4be4 100644
--- a/README.md
+++ b/README.md
@@ -1,11 +1,11 @@
 # Maven
 
-Maven is available under the [Apache License, Version 
2.0](http://www.apache.org/licenses/LICENSE-2.0.txt)
+Maven is available under the [Apache License, Version 
2.0](https://www.apache.org/licenses/LICENSE-2.0.txt)
 
 - [Maven Issue Tracker](https://issues.apache.org/jira/browse/MNG)
 - [Maven Wiki](https://cwiki.apache.org/confluence/display/MAVEN/Index)
-- [Building 
Maven](http://maven.apache.org/guides/development/guide-building-maven.html)
-- [Running Core ITs](http://maven.apache.org/core-its/core-it-suite/)
+- [Building 
Maven](https://maven.apache.org/guides/development/guide-building-maven.html)
+- [Running Core ITs](https://maven.apache.org/core-its/core-it-suite/)
 
 ## Bootstrapping Basics
 

http://git-wip-us.apache.org/repos/asf/maven/blob/84085c0a/apache-maven/README.txt
--
diff --git a/apache-maven/README.txt b/apache-maven/README.txt
index cbaa7d4..6a1bafd 100644
--- a/apache-maven/README.txt
+++ b/apache-maven/README.txt
@@ -11,12 +11,12 @@
   Documentation
   -
 
-  The most up-to-date documentation can be found at http://maven.apache.org/.
+  The most up-to-date documentation can be found at https://maven.apache.org/.
 
   Release Notes
   -
 
-  The full list of changes can be found at 
http://maven.apache.org/docs/history.html.
+  The full list of changes can be found at 
https://maven.apache.org/docs/history.html.
 
   System Requirements
   ---
@@ -59,7 +59,7 @@
 
   5) Run "mvn --version" to verify that it is correctly installed.
 
-  For complete documentation, see 
http://maven.apache.org/download.html#Installation
+  For complete documentation, see 
https://maven.apache.org/download.html#Installation
 
   Licensing
   -

http://git-wip-us.apache.org/repos/asf/maven/blob/84085c0a/apache-maven/pom.xml
--
diff --git a/apache-maven/pom.xml b/apache-maven/pom.xml
index b2fa989..ba7fda3 100644
--- a/apache-maven/pom.xml
+++ b/apache-maven/pom.xml
@@ -1,19 +1,23 @@
 
 
-  
+
 
 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

http://git-wip-us.apache.org/repos/asf/maven/blob/84085c0a/apache-maven/src/conf/toolchains.xml

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

[schulte]

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

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

Branch: refs/heads/MNG-5359
Commit: b80915b8822b51aafa962a9ef53a61c0ac59033d
Parents: 8b66162
Author: Hervé Boutemy 
Authored: Sun Jun 5 13:11:45 2016 +0200
Committer: Hervé Boutemy 
Committed: Tue Jan 24 18:40:07 2017 +0100

--
 apache-maven/pom.xml|   4 +
 apache-maven/src/bin/mvn|   1 +
 apache-maven/src/bin/mvn.cmd|   2 +-
 maven-core/pom.xml  |   4 +
 .../lifecycle/LifecycleExecutionException.java  |  27 ++---
 .../main/resources/META-INF/maven/extension.xml |   3 +
 maven-embedder/pom.xml  |   4 +
 .../java/org/apache/maven/cli/CLIManager.java   |   4 +-
 .../org/apache/maven/cli/CLIReportingUtils.java |   6 +-
 .../java/org/apache/maven/cli/MavenCli.java |  87 --
 .../maven/cli/event/ExecutionEventLogger.java   | 117 ++-
 maven-embedder/src/site/apt/index.apt.vm|   5 +
 pom.xml |  10 ++
 13 files changed, 192 insertions(+), 82 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/b80915b8/apache-maven/pom.xml
--
diff --git a/apache-maven/pom.xml b/apache-maven/pom.xml
index 735e5b8..f7c28ed 100644
--- a/apache-maven/pom.xml
+++ b/apache-maven/pom.xml
@@ -91,6 +91,10 @@
   org.slf4j
   slf4j-simple
 
+
+  org.fusesource.jansi
+  jansi
+
   
 
   

http://git-wip-us.apache.org/repos/asf/maven/blob/b80915b8/apache-maven/src/bin/mvn
--
diff --git a/apache-maven/src/bin/mvn b/apache-maven/src/bin/mvn
index 6875628..f3acb73 100755
--- a/apache-maven/src/bin/mvn
+++ b/apache-maven/src/bin/mvn
@@ -241,4 +241,5 @@ exec "$JAVACMD" \
   -classpath "${M2_HOME}"/boot/plexus-classworlds-*.jar \
   "-Dclassworlds.conf=${M2_HOME}/bin/m2.conf" \
   "-Dmaven.home=${M2_HOME}" 
"-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \
+  "-Dlibrary.jansi.path=${MAVEN_HOME}/lib/ext" \
   ${CLASSWORLDS_LAUNCHER} "$@"

http://git-wip-us.apache.org/repos/asf/maven/blob/b80915b8/apache-maven/src/bin/mvn.cmd
--
diff --git a/apache-maven/src/bin/mvn.cmd b/apache-maven/src/bin/mvn.cmd
index d35c1d2..5ad99ae 100644
--- a/apache-maven/src/bin/mvn.cmd
+++ b/apache-maven/src/bin/mvn.cmd
@@ -154,7 +154,7 @@ for %%i in ("%M2_HOME%"\boot\plexus-classworlds-*) do set 
CLASSWORLDS_JAR="%%i"
 
 set CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher
 
-%MAVEN_JAVA_EXE% %JVM_CONFIG_MAVEN_PROPS% %MAVEN_OPTS% %MAVEN_DEBUG_OPTS% 
-classpath %CLASSWORLDS_JAR% "-Dclassworlds.conf=%M2_HOME%\bin\m2.conf" 
"-Dmaven.home=%M2_HOME%" 
"-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" 
%CLASSWORLDS_LAUNCHER% %MAVEN_CMD_LINE_ARGS%
+%MAVEN_JAVA_EXE% %JVM_CONFIG_MAVEN_PROPS% %MAVEN_OPTS% %MAVEN_DEBUG_OPTS% 
-classpath %CLASSWORLDS_JAR% "-Dclassworlds.conf=%M2_HOME%\bin\m2.conf" 
"-Dmaven.home=%M2_HOME%" 
"-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" 
"-Dlibrary.jansi.path=%MAVEN_HOME%\lib\ext" %CLASSWORLDS_LAUNCHER% 
%MAVEN_CMD_LINE_ARGS%
 if ERRORLEVEL 1 goto error
 goto end
 

http://git-wip-us.apache.org/repos/asf/maven/blob/b80915b8/maven-core/pom.xml
--
diff --git a/maven-core/pom.xml b/maven-core/pom.xml
index ac1968b..efff5c1 100644
--- a/maven-core/pom.xml
+++ b/maven-core/pom.xml
@@ -75,6 +75,10 @@
   org.eclipse.aether
   aether-util
 
+
+  org.apache.maven.shared
+  maven-shared-utils
+
 
 
   org.eclipse.sisu

http://git-wip-us.apache.org/repos/asf/maven/blob/b80915b8/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 349576c..62ae269 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
@@ -19,8 +19,11 @@ package org.apache.maven.lifecycle;
  * under the License.
  */
 
+import static 

[31/50] maven git commit: [MNG-6147] MetadataResolutionResult#getGraph() contains duplicate if clause

[schulte]

[MNG-6147] MetadataResolutionResult#getGraph() contains duplicate if clause


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

Branch: refs/heads/MNG-5359
Commit: f53f1547a16fb0f7e288de5c4684c599652ee601
Parents: 920f10a
Author: Michael Osipov 
Authored: Sat Jan 28 15:26:52 2017 +0100
Committer: Michael Osipov 
Committed: Sat Jan 28 17:09:30 2017 +0100

--
 .../maven/repository/metadata/MetadataResolutionResult.java  | 4 
 1 file changed, 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/f53f1547/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataResolutionResult.java
--
diff --git 
a/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataResolutionResult.java
 
b/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataResolutionResult.java
index 1d9e9c4..814b66c 100644
--- 
a/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataResolutionResult.java
+++ 
b/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataResolutionResult.java
@@ -119,10 +119,6 @@ public class MetadataResolutionResult
 {
 return conflictResolver.resolveConflicts( getGraph(), 
ArtifactScopeEnum.test );
 }
-else if ( requestType.equals( 
MetadataResolutionRequestTypeEnum.classpathRuntime ) )
-{
-return conflictResolver.resolveConflicts( getGraph(), 
ArtifactScopeEnum.test );
-}
 else if ( requestType.equals( MetadataResolutionRequestTypeEnum.graph 
) )
 {
 return getGraph();

[36/50] maven git commit: [MNG-5993] Confusing error message in case of missing/empty artifactId/groupId and version in pluginManagement

[schulte]

[MNG-5993] Confusing error message in case of missing/empty
 artifactId/groupId and version in pluginManagement


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

Branch: refs/heads/MNG-5359
Commit: 017dcaf22a2cc1c6361dc64a02d1bdbdb799b95e
Parents: 065281c
Author: Karl Heinz Marbaise 
Authored: Fri Apr 1 22:53:37 2016 +0200
Committer: Karl Heinz Marbaise 
Committed: Sun Jan 29 21:12:49 2017 +0100

--
 .../internal/LifecyclePluginResolver.java   |  12 +-
 .../internal/DefaultPluginVersionResolver.java  |   6 +-
 .../model/validation/DefaultModelValidator.java | 170 +++
 .../validation/DefaultModelValidatorTest.java   |  73 ++--
 .../missing-artifactId-pluginManagement.xml |  39 +
 .../raw-model/missing-ga-pluginManagement.xml   |  39 +
 .../missing-groupId-pluginManagement.xml|  39 +
 .../missing-plugin-version-pluginManagement.xml |  40 +
 8 files changed, 321 insertions(+), 97 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/017dcaf2/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecyclePluginResolver.java
--
diff --git 
a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecyclePluginResolver.java
 
b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecyclePluginResolver.java
index 956e717..f02552a 100644
--- 
a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecyclePluginResolver.java
+++ 
b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecyclePluginResolver.java
@@ -19,6 +19,9 @@ package org.apache.maven.lifecycle.internal;
  * under the License.
  */
 
+import java.util.HashMap;
+import java.util.Map;
+
 import org.apache.maven.execution.MavenSession;
 import org.apache.maven.model.Plugin;
 import org.apache.maven.model.PluginManagement;
@@ -30,9 +33,6 @@ import org.apache.maven.project.MavenProject;
 import org.codehaus.plexus.component.annotations.Component;
 import org.codehaus.plexus.component.annotations.Requirement;
 
-import java.util.HashMap;
-import java.util.Map;
-
 /**
  * @since 3.0
  * @author Benjamin Bentmann
@@ -46,7 +46,6 @@ public class LifecyclePluginResolver
 @Requirement
 private PluginVersionResolver pluginVersionResolver;
 
-
 public LifecyclePluginResolver( PluginVersionResolver 
pluginVersionResolver )
 {
 this.pluginVersionResolver = pluginVersionResolver;
@@ -65,9 +64,8 @@ public class LifecyclePluginResolver
 {
 if ( plugin.getVersion() == null )
 {
-PluginVersionRequest request =
-new DefaultPluginVersionRequest( plugin, 
session.getRepositorySession(),
- 
project.getRemotePluginRepositories() );
+PluginVersionRequest request = new 
DefaultPluginVersionRequest( plugin, session.getRepositorySession(),
+   
 project.getRemotePluginRepositories() );
 plugin.setVersion( pluginVersionResolver.resolve( request 
).getVersion() );
 }
 versions.put( plugin.getKey(), plugin.getVersion() );

http://git-wip-us.apache.org/repos/asf/maven/blob/017dcaf2/maven-core/src/main/java/org/apache/maven/plugin/version/internal/DefaultPluginVersionResolver.java
--
diff --git 
a/maven-core/src/main/java/org/apache/maven/plugin/version/internal/DefaultPluginVersionResolver.java
 
b/maven-core/src/main/java/org/apache/maven/plugin/version/internal/DefaultPluginVersionResolver.java
index f11ee95..82e32fb 100644
--- 
a/maven-core/src/main/java/org/apache/maven/plugin/version/internal/DefaultPluginVersionResolver.java
+++ 
b/maven-core/src/main/java/org/apache/maven/plugin/version/internal/DefaultPluginVersionResolver.java
@@ -87,8 +87,6 @@ public class DefaultPluginVersionResolver
 public PluginVersionResult resolve( PluginVersionRequest request )
 throws PluginVersionResolutionException
 {
-logger.debug( "Resolving plugin version for " + request.getGroupId() + 
":" + request.getArtifactId() );
-
 PluginVersionResult result = resolveFromProject( request );
 
 if ( result == null )
@@ -103,8 +101,8 @@ public class DefaultPluginVersionResolver
 }
 else if ( logger.isDebugEnabled() )
 {
-logger.debug( "Resolved plugin version for " + 
request.getGroupId() + ":" + request.getArtifactId()
-   

[39/50] maven git commit: [MNG-5815] "mvn.cmd" does not indicate failure properly when using "&&"

[schulte]

[MNG-5815] "mvn.cmd" does not indicate failure properly when using "&&"


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

Branch: refs/heads/MNG-5359
Commit: fe586467ecbd63791001e7a6ddf8f18d4fac19b8
Parents: ca43030
Author: Michael Osipov 
Authored: Wed May 11 11:47:14 2016 +0200
Committer: Michael Osipov 
Committed: Sun Jan 29 21:51:20 2017 +0100

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


http://git-wip-us.apache.org/repos/asf/maven/blob/fe586467/apache-maven/src/bin/mvn.cmd
--
diff --git a/apache-maven/src/bin/mvn.cmd b/apache-maven/src/bin/mvn.cmd
index 3f170c3..2321b9c 100644
--- a/apache-maven/src/bin/mvn.cmd
+++ b/apache-maven/src/bin/mvn.cmd
@@ -154,4 +154,4 @@ if "%MAVEN_BATCH_PAUSE%" == "on" pause
 
 if "%MAVEN_TERMINATE_CMD%" == "on" exit %ERROR_CODE%
 
-exit /B %ERROR_CODE%
+cmd /C exit /B %ERROR_CODE%

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

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

Branch: refs/heads/MNG-5359
Commit: a99a78984c1f20394abf6e76b6167b9e61e6163c
Parents: 311fc62
Author: Christian Schulte 
Authored: Tue Jun 14 21:26:56 2016 +0200
Committer: Hervé Boutemy 
Committed: Wed Jan 25 08:09:30 2017 +0100

--
 .../UnknownRepositoryLayoutException.java   |  2 +-
 .../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|  8 +-
 .../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, 236 insertions(+), 172 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/a99a7898/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 5abe110..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
@@ -23,7 +23,7 @@ import 
org.codehaus.plexus.component.repository.exception.ComponentLookupExcepti
 
 /**
  * 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/a99a7898/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/a99a7898/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/apache/maven/artifact/repository/layout/FlatRepositoryLayout.java
index 8553a31..58143e0 100644
--- 

[35/50] maven git commit: [MNG-5607] Don't use M2_HOME in mvn shell/command scripts anymore

[schulte]

[MNG-5607] Don't use M2_HOME in mvn shell/command scripts anymore

* Variable has been removed and replaced with an internal one which
  cannot be overriden from outside. From now on, it is an
  implementation detail which it should have been from the beginning.
* Cleaned up license header and style of the variable description
  section graciously borrowed from the Tomcat start scripts.


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

Branch: refs/heads/MNG-5359
Commit: 065281c43d7435be204aa963e1f94d1128bb5351
Parents: 4337d18
Author: Michael Osipov 
Authored: Thu Apr 14 22:41:07 2016 +0200
Committer: Michael Osipov 
Committed: Sun Jan 29 16:53:44 2017 +0100

--
 apache-maven/src/bin/mvn| 94 +---
 apache-maven/src/bin/mvn.cmd| 63 +
 apache-maven/src/bin/mvnDebug   | 25 ++
 apache-maven/src/bin/mvnDebug.cmd   | 16 ++--
 apache-maven/src/bin/mvnyjp | 23 ++---
 .../java/org/apache/maven/cli/MavenCli.java |  3 +-
 6 files changed, 90 insertions(+), 134 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/065281c4/apache-maven/src/bin/mvn
--
diff --git a/apache-maven/src/bin/mvn b/apache-maven/src/bin/mvn
index 567e469..3a4dc26 100755
--- a/apache-maven/src/bin/mvn
+++ b/apache-maven/src/bin/mvn
@@ -1,5 +1,5 @@
 #!/bin/sh
-# 
+
 # 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
@@ -16,23 +16,16 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-# 
 
-# 
-# Maven2 Start Up Batch script
+# -
+# Apache Maven Startup Script
 #
-# Required ENV vars:
-# --
-#   JAVA_HOME - location of a JDK home dir
+# Environment Variable Prerequisites
 #
-# Optional ENV vars
-# -
-#   M2_HOME - location of maven2's installed home dir
-#   MAVEN_OPTS - parameters passed to the Java VM when running Maven
-# e.g. to debug Maven itself, use
-#   set MAVEN_OPTS=-Xdebug 
-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
-#   MAVEN_SKIP_RC - flag to disable loading of mavenrc files
-# 
+#   JAVA_HOME   Must point at your Java Development Kit installation.
+#   MAVEN_OPTS  (Optional) Java runtime options used when Maven is 
executed.
+#   MAVEN_SKIP_RC   (Optional) Flag to disable loading of mavenrc files.
+# -
 
 if [ -z "$MAVEN_SKIP_RC" ] ; then
 
@@ -46,12 +39,12 @@ if [ -z "$MAVEN_SKIP_RC" ] ; then
 
 fi
 
-# OS specific support.  $var _must_ be set to either true or false.
+# OS specific support. $var _must_ be set to either true or false.
 cygwin=false;
 darwin=false;
-mingw=false
+mingw=false;
 case "`uname`" in
-  CYGWIN*) cygwin=true ;;
+  CYGWIN*) cygwin=true;;
   MINGW*) mingw=true;;
   Darwin*) darwin=true
#
@@ -94,46 +87,43 @@ if [ -z "$JAVA_HOME" ] ; then
   fi
 fi
 
-if [ -z "$M2_HOME" ] ; then
-  ## resolve links - $0 may be a link to maven's home
-  PRG="$0"
+## resolve links - $0 may be a link to Maven's home
+PRG="$0"
 
-  # need this for relative symlinks
-  while [ -h "$PRG" ] ; do
-ls=`ls -ld "$PRG"`
-link=`expr "$ls" : '.*-> \(.*\)$'`
-if expr "$link" : '/.*' > /dev/null; then
-  PRG="$link"
-else
-  PRG="`dirname "$PRG"`/$link"
-fi
-  done
+# need this for relative symlinks
+while [ -h "$PRG" ] ; do
+  ls=`ls -ld "$PRG"`
+  link=`expr "$ls" : '.*-> \(.*\)$'`
+  if expr "$link" : '/.*' > /dev/null; then
+PRG="$link"
+  else
+PRG="`dirname "$PRG"`/$link"
+  fi
+done
 
-  saveddir=`pwd`
+saveddir=`pwd`
 
-  M2_HOME=`dirname "$PRG"`/..
+MAVEN_HOME=`dirname "$PRG"`/..
 
-  # make it fully qualified
-  M2_HOME=`cd "$M2_HOME" && pwd`
+# make it fully qualified
+MAVEN_HOME=`cd "$MAVEN_HOME" && pwd`
 
-  cd "$saveddir"
-  # echo Using m2 at $M2_HOME
-fi
+cd "$saveddir"
 
-# For Cygwin, ensure paths are in UNIX format before anything is touched
+# For Cygwin, 

[34/50] maven git commit: [MNG-6163] Introduce CLASSWORLDS_JAR in shell startup scripts

[schulte]

[MNG-6163] Introduce CLASSWORLDS_JAR in shell startup scripts

This commit was previously for MNG-5538 and closes #27.


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

Branch: refs/heads/MNG-5359
Commit: 4337d18af65df8d3221bdd1e393f13c5f4db9054
Parents: b928546
Author: Arlo Louis O'Keeffe 
Authored: Wed Oct 29 09:07:45 2014 +0100
Committer: Michael Osipov 
Committed: Sun Jan 29 16:00:35 2017 +0100

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


http://git-wip-us.apache.org/repos/asf/maven/blob/4337d18a/apache-maven/src/bin/mvn
--
diff --git a/apache-maven/src/bin/mvn b/apache-maven/src/bin/mvn
index f3acb73..567e469 100755
--- a/apache-maven/src/bin/mvn
+++ b/apache-maven/src/bin/mvn
@@ -182,6 +182,7 @@ if [ -z "$JAVA_HOME" ] ; then
   echo "Warning: JAVA_HOME environment variable is not set."
 fi
 
+CLASSWORLDS_JAR=`echo "${M2_HOME}"/boot/plexus-classworlds-*.jar`
 CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher
 
 # For Cygwin, switch paths to Windows format before running java
@@ -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}" \
   "-Dlibrary.jansi.path=${MAVEN_HOME}/lib/ext" \

[48/50] maven git commit: [MNG-6001] Replace %HOME% with %USERPROFILE% in mvn.cmd

[schulte]

[MNG-6001] Replace %HOME% with %USERPROFILE% in mvn.cmd


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

Branch: refs/heads/MNG-5359
Commit: d426bf9c6e59f893499c623c3434ce8f61200d9f
Parents: 1bc69ff
Author: Michael Osipov 
Authored: Fri Apr 15 13:06:24 2016 +0200
Committer: Michael Osipov 
Committed: Mon Jan 30 13:23:07 2017 +0100

--
 apache-maven/src/bin/mvn.cmd | 11 ---
 1 file changed, 4 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/d426bf9c/apache-maven/src/bin/mvn.cmd
--
diff --git a/apache-maven/src/bin/mvn.cmd b/apache-maven/src/bin/mvn.cmd
index 0c2fd4b..aab3085 100644
--- a/apache-maven/src/bin/mvn.cmd
+++ b/apache-maven/src/bin/mvn.cmd
@@ -32,14 +32,11 @@
 @REM enable echoing my setting MAVEN_BATCH_ECHO to 'on'
 @if "%MAVEN_BATCH_ECHO%" == "on"  echo %MAVEN_BATCH_ECHO%
 
-@REM set %HOME% to equivalent of $HOME
-if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%")
-
 @REM Execute a user defined script before this one
 if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre
 @REM check for pre script, once with legacy .bat ending and once with .cmd 
ending
-if exist "%HOME%\mavenrc_pre.bat" call "%HOME%\mavenrc_pre.bat"
-if exist "%HOME%\mavenrc_pre.cmd" call "%HOME%\mavenrc_pre.cmd"
+if exist "%USERPROFILE%\mavenrc_pre.bat" call "%USERPROFILE%\mavenrc_pre.bat"
+if exist "%USERPROFILE%\mavenrc_pre.cmd" call "%USERPROFILE%\mavenrc_pre.cmd"
 :skipRcPre
 
 @setlocal
@@ -143,8 +140,8 @@ set ERROR_CODE=1
 
 if not "%MAVEN_SKIP_RC%" == "" goto skipRcPost
 @REM check for post script, once with legacy .bat ending and once with .cmd 
ending
-if exist "%HOME%\mavenrc_post.bat" call "%HOME%\mavenrc_post.bat"
-if exist "%HOME%\mavenrc_post.cmd" call "%HOME%\mavenrc_post.cmd"
+if exist "%USERPROFILE%\mavenrc_post.bat" call "%USERPROFILE%\mavenrc_post.bat"
+if exist "%USERPROFILE%\mavenrc_post.cmd" call "%USERPROFILE%\mavenrc_post.cmd"
 :skipRcPost
 
 @REM pause the script if MAVEN_BATCH_PAUSE is set to 'on'

[22/50] maven git commit: added link to 3.3.1 release notes for details on .mvn

[schulte]

added link to 3.3.1 release notes for details on .mvn

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

Branch: refs/heads/MNG-5359
Commit: 4547ff73d84f189dea35f60dffafff9cf2f446ba
Parents: 8a8f7cd
Author: Hervé Boutemy 
Authored: Mon Nov 14 12:50:10 2016 +0100
Committer: Hervé Boutemy 
Committed: Wed Jan 25 00:09:30 2017 +0100

--
 maven-embedder/src/site/apt/index.apt.vm | 7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/4547ff73/maven-embedder/src/site/apt/index.apt.vm
--
diff --git a/maven-embedder/src/site/apt/index.apt.vm 
b/maven-embedder/src/site/apt/index.apt.vm
index 17220c9..e820765 100644
--- a/maven-embedder/src/site/apt/index.apt.vm
+++ b/maven-embedder/src/site/apt/index.apt.vm
@@ -20,7 +20,7 @@
  -
  Hervé Boutemy
  -
- 2015-03-12
+ 2016-11-14
  -
 
 ${project.name}
@@ -33,13 +33,14 @@ ${project.name}
 
  * {{{./logging.html}logging API}}.
 
- * since 3.3.0, per project settings can be defined by files in <<<.mvn/>>> 
directory:
+ * since 3.3.1 (see {{{/docs/3.3.1/release-notes.html#Core_Extensions}3.3.1 
release notes}} for more details),
+   per project settings can be defined by files in <<<.mvn/>>> directory:
 
* <<<.mvn/jvm.config>>> containing jvm options,
 
* <<<.mvn/maven.config>>> containing Maven command-line parameter,
 
-   * <<<.mvn/extensions.xml>>> containing {{{./core-extensions.html}a list of 
extensions}}.
+   * <<<.mvn/extensions.xml>>> containing {{{./core-extensions.html}a list of 
extensions}},
 
  * since 3.5.0, output is colorized by default, with color disabled in batch 
mode: see

{{{/shared/maven-shared-utils/apidocs/org/apache/maven/shared/utils/logging/package-summary.html}styled
 message API}}

[32/50] maven git commit: [MNG-6145] Remove non-existent m2 include in component.xml

[schulte]

[MNG-6145] Remove non-existent m2 include in component.xml


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

Branch: refs/heads/MNG-5359
Commit: aecccf9a2a0a5d2db1fcb602cc972284fd573a4a
Parents: f53f154
Author: Michael Osipov 
Authored: Fri Oct 7 21:39:24 2016 +0200
Committer: Michael Osipov 
Committed: Sat Jan 28 18:19:31 2017 +0100

--
 apache-maven/src/main/assembly/component.xml | 1 -
 1 file changed, 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/aecccf9a/apache-maven/src/main/assembly/component.xml
--
diff --git a/apache-maven/src/main/assembly/component.xml 
b/apache-maven/src/main/assembly/component.xml
index 8ccf02a..ca4dcb6 100644
--- a/apache-maven/src/main/assembly/component.xml
+++ b/apache-maven/src/main/assembly/component.xml
@@ -68,7 +68,6 @@ under the License.
   src/bin
   bin
   
-m2
 mvn
 mvnDebug
 

[13/50] maven git commit: [MNG-6030] ReactorModelCache do not used effectively after maven version 3.0.5 which cause a large memory footprint o Reintroduced ReactorModelCache reduces the memory footpr

[schulte]

[MNG-6030] ReactorModelCache do not used effectively after maven version 3.0.5 
which cause a large memory footprint
 o Reintroduced ReactorModelCache reduces the memory footprint.


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

Branch: refs/heads/MNG-5359
Commit: cfb075ac706b25df630f3671f61f8d8313e0f138
Parents: 733eedc
Author: Karl Heinz Marbaise 
Authored: Tue May 31 21:39:31 2016 +0200
Committer: Karl Heinz Marbaise 
Committed: Tue Jan 24 20:19:10 2017 +0100

--
 .../maven/project/DefaultProjectBuilder.java   | 17 +++--
 1 file changed, 11 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/cfb075ac/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..d064ab4 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
@@ -116,14 +116,14 @@ public class DefaultProjectBuilder
 public ProjectBuildingResult build( File pomFile, ProjectBuildingRequest 
request )
 throws ProjectBuildingException
 {
-return build( pomFile, new FileModelSource( pomFile ), new 
InternalConfig( request, null ) );
+return build( pomFile, new FileModelSource( pomFile ), new 
InternalConfig( request, null, null ) );
 }
 
 @Override
 public ProjectBuildingResult build( ModelSource modelSource, 
ProjectBuildingRequest request )
 throws ProjectBuildingException
 {
-return build( null, modelSource, new InternalConfig( request, null ) );
+return build( null, modelSource, new InternalConfig( request, null, 
null ) );
 }
 
 private ProjectBuildingResult build( File pomFile, ModelSource 
modelSource, InternalConfig config )
@@ -275,7 +275,7 @@ public class DefaultProjectBuilder
 request.setUserProperties( configuration.getUserProperties() );
 request.setBuildStartTime( configuration.getBuildStartTime() );
 request.setModelResolver( resolver );
-request.setModelCache( new ReactorModelCache() );
+request.setModelCache( config.modelCache );
 
 return request;
 }
@@ -294,7 +294,7 @@ public class DefaultProjectBuilder
 org.eclipse.aether.artifact.Artifact pomArtifact = 
RepositoryUtils.toArtifact( artifact );
 pomArtifact = ArtifactDescriptorUtils.toPomArtifact( pomArtifact );
 
-InternalConfig config = new InternalConfig( request, null );
+InternalConfig config = new InternalConfig( request, null, null );
 
 boolean localProject;
 
@@ -394,7 +394,9 @@ public class DefaultProjectBuilder
 
 ReactorModelPool modelPool = new ReactorModelPool();
 
-InternalConfig config = new InternalConfig( request, modelPool );
+ReactorModelCache modelCache = new ReactorModelCache();
+
+InternalConfig config = new InternalConfig( request, modelPool, 
modelCache );
 
 Map projectIndex = new HashMap<>( 256 );
 
@@ -913,11 +915,14 @@ public class DefaultProjectBuilder
 public final List repositories;
 
 public final ReactorModelPool modelPool;
+
+public final ReactorModelCache modelCache;
 
-InternalConfig( ProjectBuildingRequest request, ReactorModelPool 
modelPool )
+InternalConfig( ProjectBuildingRequest request, ReactorModelPool 
modelPool, ReactorModelCache modelCache )
 {
 this.request = request;
 this.modelPool = modelPool;
+this.modelCache = modelCache;
 session =
 LegacyLocalRepositoryManager.overlay( 
request.getLocalRepository(), request.getRepositorySession(),
   repoSystem );

[41/50] maven git commit: [MNG-6014] Removing ArtifactHandler for ejb3 o Followup to MNG-5894 of Maven 3.3.9 where the maven-ejb3-plugin has been removed from life cycle. o Removed the ArtifactHandler

[schulte]

[MNG-6014] Removing ArtifactHandler for ejb3
 o Followup to MNG-5894 of Maven 3.3.9 where the maven-ejb3-plugin
   has been removed from life cycle.
 o Removed the ArtifactHandler for ejb3 cause without
   a bound life cycle it does not make sense.
 o Removed entry from artifact-handlers.apt site.


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

Branch: refs/heads/MNG-5359
Commit: 5a462344f9e8aee3f1a423f0268ea27ce017c8c3
Parents: 46c1581
Author: Karl Heinz Marbaise 
Authored: Mon May 2 20:45:01 2016 +0200
Committer: Karl Heinz Marbaise 
Committed: Mon Jan 30 09:20:07 2017 +0100

--
 .../main/resources/META-INF/plexus/artifact-handlers.xml | 11 ---
 maven-core/src/site/apt/artifact-handlers.apt|  2 --
 2 files changed, 13 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/5a462344/maven-core/src/main/resources/META-INF/plexus/artifact-handlers.xml
--
diff --git 
a/maven-core/src/main/resources/META-INF/plexus/artifact-handlers.xml 
b/maven-core/src/main/resources/META-INF/plexus/artifact-handlers.xml
index f467252..2f26ce2 100644
--- a/maven-core/src/main/resources/META-INF/plexus/artifact-handlers.xml
+++ b/maven-core/src/main/resources/META-INF/plexus/artifact-handlers.xml
@@ -80,17 +80,6 @@ Artifact handlers are required by the dependency resolution 
mechanism.
 true
   
 
-
-  org.apache.maven.artifact.handler.ArtifactHandler
-  ejb3
-  
org.apache.maven.artifact.handler.DefaultArtifactHandler
-  
-ejb3
-true
-java
-false
-  
-
 
 

[33/50] maven git commit: Remove Subversion keywords from LICENSE.vm

[schulte]

Remove Subversion keywords from LICENSE.vm


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

Branch: refs/heads/MNG-5359
Commit: b9285469a587f7c4bdc777c50173ba3a0619cc9e
Parents: aecccf9
Author: Michael Osipov 
Authored: Sun Jan 29 15:14:27 2017 +0100
Committer: Michael Osipov 
Committed: Sun Jan 29 15:14:27 2017 +0100

--
 apache-maven/src/main/appended-resources/META-INF/LICENSE.vm | 2 --
 1 file changed, 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/b9285469/apache-maven/src/main/appended-resources/META-INF/LICENSE.vm
--
diff --git a/apache-maven/src/main/appended-resources/META-INF/LICENSE.vm 
b/apache-maven/src/main/appended-resources/META-INF/LICENSE.vm
index 1a46225..390fa42 100644
--- a/apache-maven/src/main/appended-resources/META-INF/LICENSE.vm
+++ b/apache-maven/src/main/appended-resources/META-INF/LICENSE.vm
@@ -16,8 +16,6 @@
 ## specific language governing permissions and limitations
 ## under the License.
 ##
-## $Date: 2008-03-09 23:17:06 -0700 (Sun, 09 Mar 2008) $ $Rev: 635446 $
-##
 
 Apache Maven includes a number of components and libraries with separate 
 copyright notices and license terms. Your use of those components are 

[20/50] maven git commit: updated notice

[schulte]

updated notice

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

Branch: refs/heads/MNG-5359
Commit: 60e4fa650fc2e5b3b646c74f3eeab7d0381b8bcb
Parents: 512fa6a
Author: Hervé Boutemy 
Authored: Wed Oct 5 23:57:03 2016 +0200
Committer: Hervé Boutemy 
Committed: Wed Jan 25 00:08:12 2017 +0100

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


http://git-wip-us.apache.org/repos/asf/maven/blob/60e4fa65/maven-compat/src/main/java/org/apache/maven/project/MavenProjectBuilder.java
--
diff --git 
a/maven-compat/src/main/java/org/apache/maven/project/MavenProjectBuilder.java 
b/maven-compat/src/main/java/org/apache/maven/project/MavenProjectBuilder.java
index c44d8db..816b4a9 100644
--- 
a/maven-compat/src/main/java/org/apache/maven/project/MavenProjectBuilder.java
+++ 
b/maven-compat/src/main/java/org/apache/maven/project/MavenProjectBuilder.java
@@ -39,7 +39,8 @@ public interface MavenProjectBuilder
 MavenProject build( File pom, ProjectBuilderConfiguration configuration )
 throws ProjectBuildingException;
 
-//TODO maven-site-plugin -- Vincent, Dennis and Lukas are checking but 
this doesn't appear to be required anymore.
+//TODO maven-site-plugin -- not used by the plugin directly, but used by 
Doxia Integration Tool & MPIR
+// see DOXIASITETOOLS-167 & MPIR-349
 MavenProject build( File pom, ArtifactRepository localRepository, 
ProfileManager profileManager )
 throws ProjectBuildingException;
 

[44/50] maven git commit: [MNG-5829] mvn shell script fails with syntax error on Solaris 10

[schulte]

[MNG-5829] mvn shell script fails with syntax error on Solaris 10

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.

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

Branch: refs/heads/MNG-5359
Commit: 1d9708a954e2d764f6ba933c4e9ba117afa9b4c4
Parents: 8c7ce55
Author: Joseph Walton 
Authored: Mon Jan 30 11:01:49 2017 +0100
Committer: Michael Osipov 
Committed: Mon Jan 30 12:56:36 2017 +0100

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


http://git-wip-us.apache.org/repos/asf/maven/blob/1d9708a9/apache-maven/src/bin/mvn
--
diff --git a/apache-maven/src/bin/mvn b/apache-maven/src/bin/mvn
index 3a4dc26..4a7f610 100755
--- a/apache-maven/src/bin/mvn
+++ b/apache-maven/src/bin/mvn
@@ -192,14 +192,14 @@ fi
 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}"
 }
@@ -207,12 +207,12 @@ find_maven_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/1d9708a9/apache-maven/src/bin/mvnDebug
--
diff --git a/apache-maven/src/bin/mvnDebug b/apache-maven/src/bin/mvnDebug
index 8d6e6a1..be495ff 100755
--- a/apache-maven/src/bin/mvnDebug
+++ b/apache-maven/src/bin/mvnDebug
@@ -31,4 +31,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/1d9708a9/apache-maven/src/bin/mvnyjp
--
diff --git a/apache-maven/src/bin/mvnyjp b/apache-maven/src/bin/mvnyjp
index b2dbe1d..a35eabf 100755
--- a/apache-maven/src/bin/mvnyjp
+++ b/apache-maven/src/bin/mvnyjp
@@ -32,4 +32,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 "$0"`/mvn" "$@"

[37/50] maven git commit: [MNG-6092] warn if prerequisites.maven is used for non-plugin projects

[schulte]

[MNG-6092] warn if prerequisites.maven is used for non-plugin projects


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

Branch: refs/heads/MNG-5359
Commit: 4604c49ee442fef48c0d3efe35fb85d2f0784131
Parents: 017dcaf
Author: Karl Heinz Marbaise 
Authored: Sat Oct 1 16:29:32 2016 +0200
Committer: Karl Heinz Marbaise 
Committed: Sun Jan 29 21:16:35 2017 +0100

--
 .../java/org/apache/maven/DefaultMaven.java | 62 +---
 1 file changed, 41 insertions(+), 21 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/4604c49e/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
--
diff --git a/maven-core/src/main/java/org/apache/maven/DefaultMaven.java 
b/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
index da17830..15b946e 100644
--- a/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
+++ b/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
@@ -42,6 +42,7 @@ import org.apache.maven.graph.GraphBuilder;
 import org.apache.maven.internal.aether.DefaultRepositorySystemSessionFactory;
 import org.apache.maven.lifecycle.internal.ExecutionEventCatapult;
 import org.apache.maven.lifecycle.internal.LifecycleStarter;
+import org.apache.maven.model.Prerequisites;
 import org.apache.maven.model.building.ModelProblem;
 import org.apache.maven.model.building.Result;
 import org.apache.maven.plugin.LegacySupport;
@@ -111,7 +112,7 @@ public class DefaultMaven
 }
 catch ( RuntimeException e )
 {
-//TODO Hack to make the cycle detection the same for the new graph 
builder
+// TODO Hack to make the cycle detection the same for the new 
graph builder
 if ( e.getCause() instanceof ProjectCycleException )
 {
 result = addExceptionToResult( new 
DefaultMavenExecutionResult(), e.getCause() );
@@ -160,7 +161,7 @@ public class DefaultMaven
 //
 @SuppressWarnings( "checkstyle:methodlength" )
 private MavenExecutionResult doExecute( MavenExecutionRequest request )
-{
+{
 request.setStartTime( new Date() );
 
 MavenExecutionResult result = new DefaultMavenExecutionResult();
@@ -203,11 +204,12 @@ public class DefaultMaven
 {
 try
 {
-for ( AbstractMavenLifecycleParticipant listener : 
getLifecycleParticipants( Collections
-.emptyList() ) )
+// CHECKSTYLE_OFF: LineLength
+for ( AbstractMavenLifecycleParticipant listener : 
getLifecycleParticipants( Collections.emptyList() ) )
 {
 listener.afterSessionStart( session );
 }
+// CHECKSTYLE_ON: LineLength
 }
 catch ( MavenExecutionException e )
 {
@@ -217,12 +219,11 @@ public class DefaultMaven
 eventCatapult.fire( ExecutionEvent.Type.ProjectDiscoveryStarted, 
session, null );
 
 Result graphResult = buildGraph( 
session, result );
-
+
 if ( graphResult.hasErrors() )
 {
-return addExceptionToResult( result,
- Iterables.toArray( 
graphResult.getProblems(), ModelProblem.class )[0]
- .getException() );
+return addExceptionToResult( result, Iterables.toArray( 
graphResult.getProblems(),
+
ModelProblem.class )[0].getException() );
 }
 
 try
@@ -283,14 +284,13 @@ public class DefaultMaven
 // Note that participants may affect the topological order of the 
projects but it is
 // not expected that a participant will add or remove projects from 
the session.
 //
-
+
 graphResult = buildGraph( session, result );
-
+
 if ( graphResult.hasErrors() )
 {
-return addExceptionToResult( result,
- Iterables.toArray( 
graphResult.getProblems(), ModelProblem.class )[0]
- .getException() );
+return addExceptionToResult( result, Iterables.toArray( 
graphResult.getProblems(),
+
ModelProblem.class )[0].getException() );
 }
 
 try
@@ -304,6 +304,8 @@ public class DefaultMaven
 
 result.setProject( session.getTopLevelProject() );
 
+validatePrerequisitesForNonMavenPluginProjects( 
session.getProjects() );
+
 

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

[schulte]

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


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

Branch: refs/heads/MNG-5359
Commit: 72c6051382c17eb72281c8ecf4ffb6b65c6b3ff1
Parents: 2678388
Author: Christian Schulte 
Authored: Sun Dec 20 19:32:57 2015 +0100
Committer: Christian Schulte 
Committed: Tue Jan 31 04:00:41 2017 +0100

--
 .../project/EmptyLifecyclePluginAnalyzer.java   |  27 ++-
 .../project/AbstractMavenProjectTestCase.xml|   2 +-
 .../lifecycle/DefaultLifecycleExecutor.java |  22 +-
 .../lifecycle/LifeCyclePluginAnalyzer.java  |  32 ---
 .../maven/lifecycle/LifecycleExecutor.java  |  20 +-
 .../LifecycleMappingNotFoundException.java  |  45 
 .../lifecycle/LifecyclePluginAnalyzer.java  |  59 ++
 .../DefaultLifecyclePluginAnalyzer.java | 207 ++-
 .../DefaultLifecycleBindingsInjector.java   |  40 ++--
 .../lifecycle/EmptyLifecyclePluginAnalyzer.java |  25 ++-
 .../LifecycleExecutorSubModulesTest.java|   4 +-
 .../stub/LifeCyclePluginAnalyzerStub.java   |  74 ---
 .../stub/LifecyclePluginAnalyzerStub.java   |  96 +
 .../project/AbstractMavenProjectTestCase.xml|   2 +-
 .../maven/project/PomConstructionTest.xml   |   2 +-
 15 files changed, 451 insertions(+), 206 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/72c60513/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..2e0d7ea 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
@@ -23,7 +23,9 @@ import java.util.Collections;
 import java.util.LinkedHashSet;
 import java.util.Set;
 
-import org.apache.maven.lifecycle.LifeCyclePluginAnalyzer;
+import org.apache.maven.lifecycle.LifecyclePluginAnalyzer;
+import org.apache.maven.model.Build;
+import org.apache.maven.model.Model;
 import org.apache.maven.model.Plugin;
 import org.apache.maven.model.PluginExecution;
 
@@ -31,8 +33,9 @@ import org.apache.maven.model.PluginExecution;
  * @author Benjamin Bentmann
  */
 public class EmptyLifecyclePluginAnalyzer
-implements LifeCyclePluginAnalyzer
+implements LifecyclePluginAnalyzer
 {
+
 public Set getPluginsBoundByDefaultToAllLifecycles( String 
packaging )
 {
 Set plugins;
@@ -57,6 +60,26 @@ public class EmptyLifecyclePluginAnalyzer
 return plugins;
 }
 
+@Override
+public Model getLifecycleModel( final Model model )
+{
+if ( model == null )
+{
+throw new NullPointerException( "model" );
+}
+
+final Model lifecycleModel = new Model();
+lifecycleModel.setBuild( new Build() );
+lifecycleModel.getBuild().setPluginManagement( model.getBuild() != null
+   ? 
model.getBuild().getPluginManagement()
+   : null );
+
+lifecycleModel.getBuild().getPlugins().
+addAll( this.getPluginsBoundByDefaultToAllLifecycles( 
model.getPackaging() ) );
+
+return lifecycleModel;
+}
+
 private Plugin newPlugin( String artifactId, String... goals )
 {
 Plugin plugin = new Plugin();

http://git-wip-us.apache.org/repos/asf/maven/blob/72c60513/maven-compat/src/test/resources/org/apache/maven/project/AbstractMavenProjectTestCase.xml
--
diff --git 
a/maven-compat/src/test/resources/org/apache/maven/project/AbstractMavenProjectTestCase.xml
 
b/maven-compat/src/test/resources/org/apache/maven/project/AbstractMavenProjectTestCase.xml
index bcc291e..7e02f5e 100644
--- 
a/maven-compat/src/test/resources/org/apache/maven/project/AbstractMavenProjectTestCase.xml
+++ 
b/maven-compat/src/test/resources/org/apache/maven/project/AbstractMavenProjectTestCase.xml
@@ -2,7 +2,7 @@
 
   
 
-  org.apache.maven.lifecycle.LifeCyclePluginAnalyzer
+  org.apache.maven.lifecycle.LifecyclePluginAnalyzer
   
org.apache.maven.project.EmptyLifecyclePluginAnalyzer
 
   

[43/50] maven git commit: [MNG-6068] Document default scope compile in XSD o Improved description.

[schulte]

[MNG-6068] Document default scope compile in XSD
 o Improved description.


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

Branch: refs/heads/MNG-5359
Commit: 8c7ce555720ec205680a1ce71ede03a4bc49bedb
Parents: 1f04934
Author: Karl Heinz Marbaise 
Authored: Mon Jan 30 12:48:28 2017 +0100
Committer: Karl Heinz Marbaise 
Committed: Mon Jan 30 12:48:28 2017 +0100

--
 maven-model/src/main/mdo/maven.mdo | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/8c7ce555/maven-model/src/main/mdo/maven.mdo
--
diff --git a/maven-model/src/main/mdo/maven.mdo 
b/maven-model/src/main/mdo/maven.mdo
index 2f4ea0c..d830113 100644
--- a/maven-model/src/main/mdo/maven.mdo
+++ b/maven-model/src/main/mdo/maven.mdo
@@ -1398,7 +1398,7 @@
 It also assists in determining which artifacts to include in a 
distribution of
 this project. For more information, see
 https://maven.apache.org/guides/introduction/introduction-to-dependency-mechanism.html;>the
-dependency mechanism. If no scope is given the scope is 
compile.
+dependency mechanism. The default scope is 
compile.
 ]]>
   
   String

[17/50] maven git commit: added README.md to rat excludes

[schulte]

added README.md to rat excludes

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

Branch: refs/heads/MNG-5359
Commit: 9d432fb515c390beb593d8c4608775c46cfc03f9
Parents: cfbad56
Author: Hervé Boutemy 
Authored: Sat May 28 21:14:54 2016 +0200
Committer: Hervé Boutemy 
Committed: Wed Jan 25 00:00:43 2017 +0100

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


http://git-wip-us.apache.org/repos/asf/maven/blob/9d432fb5/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 3f9ce4f..5d1f57f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -581,6 +581,7 @@ under the License.
 .repository/** 
 .maven/spy.log 
 .java-version
+README.md
   
 
   

[09/50] maven git commit: [MNG-6093] use monkey patched slf4j-simple provider with Maven color

[schulte]

[MNG-6093] use monkey patched slf4j-simple provider with Maven color

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

Branch: refs/heads/MNG-5359
Commit: 94bc4de2ea54afa09a353034ed06edf0f68a8d87
Parents: b80915b
Author: Hervé Boutemy 
Authored: Thu Sep 22 17:46:53 2016 +0200
Committer: Hervé Boutemy 
Committed: Tue Jan 24 18:40:07 2017 +0100

--
 apache-maven/pom.xml|   4 +-
 .../maven/slf4j-configuration.properties|   1 +
 maven-slf4j-provider/pom.xml| 116 +++
 .../java/org/slf4j/impl/MavenSimpleLogger.java  | 115 ++
 .../slf4j/impl/MavenSimpleLoggerFactory.java|  44 +++
 .../src/main/script/patch-slf4j-simple.groovy   |  53 +
 maven-slf4j-provider/src/site/site.xml  |  36 ++
 pom.xml |   6 +
 src/site/xdoc/index.xml |   2 +
 9 files changed, 375 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/94bc4de2/apache-maven/pom.xml
--
diff --git a/apache-maven/pom.xml b/apache-maven/pom.xml
index f7c28ed..b2fa989 100644
--- a/apache-maven/pom.xml
+++ b/apache-maven/pom.xml
@@ -88,8 +88,8 @@
   aether-transport-wagon
 
 
-  org.slf4j
-  slf4j-simple
+  org.apache.maven
+  maven-slf4j-provider
 
 
   org.fusesource.jansi

http://git-wip-us.apache.org/repos/asf/maven/blob/94bc4de2/maven-embedder/src/main/resources/META-INF/maven/slf4j-configuration.properties
--
diff --git 
a/maven-embedder/src/main/resources/META-INF/maven/slf4j-configuration.properties
 
b/maven-embedder/src/main/resources/META-INF/maven/slf4j-configuration.properties
index 8741836..ae1bc39 100644
--- 
a/maven-embedder/src/main/resources/META-INF/maven/slf4j-configuration.properties
+++ 
b/maven-embedder/src/main/resources/META-INF/maven/slf4j-configuration.properties
@@ -18,5 +18,6 @@
 # key = Slf4j effective logger factory implementation
 # value = corresponding o.a.m.cli.logging.Slf4jConfiguration class
 org.slf4j.impl.SimpleLoggerFactory 
org.apache.maven.cli.logging.impl.Slf4jSimpleConfiguration
+org.slf4j.impl.MavenSimpleLoggerFactory 
org.apache.maven.cli.logging.impl.Slf4jSimpleConfiguration
 org.slf4j.helpers.Log4jLoggerFactory 
org.apache.maven.cli.logging.impl.Log4j2Configuration
 ch.qos.logback.classic.LoggerContext 
org.apache.maven.cli.logging.impl.LogbackConfiguration

http://git-wip-us.apache.org/repos/asf/maven/blob/94bc4de2/maven-slf4j-provider/pom.xml
--
diff --git a/maven-slf4j-provider/pom.xml b/maven-slf4j-provider/pom.xml
new file mode 100644
index 000..81af382
--- /dev/null
+++ b/maven-slf4j-provider/pom.xml
@@ -0,0 +1,116 @@
+
+
+
+
+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
+maven
+3.5.0-SNAPSHOT
+  
+
+  maven-slf4j-provider
+
+  Maven SLF4J Simple Provider
+  
+Maven SLF4J provider based on SLF4J's simple provider, monkey-patched to 
support Maven styled colors
+for levels and stacktraces rendering.
+  
+
+  
+
+  org.slf4j
+  slf4j-api
+
+
+  org.apache.maven.shared
+  maven-shared-utils
+
+  
+
+  
+
+  
+org.apache.maven.plugins
+maven-dependency-plugin
+
+  
+
+  org.slf4j
+  slf4j-simple
+  ${slf4jVersion}
+  jar
+  sources
+  false
+  
${project.build.directory}/generated-sources/slf4j-simple
+  org/slf4j/impl/*.java
+
+  
+
+
+  
+unzip-slf4j-simple
+
+  unpack
+
+  
+
+  
+  
+org.codehaus.mojo
+build-helper-maven-plugin
+1.12
+
+  
+add-slf4j-simple
+generate-sources
+
+  add-source
+
+
+  
+
${project.build.directory}/generated-sources/slf4j-simple
+  
+
+  
+
+  
+  
+org.codehaus.gmaven
+groovy-maven-plugin
+2.0
+
+  
+patch-slf4j-simple
+  

[04/50] maven git commit: [MNG-6138] Remove obsolete message_*.properties form maven-core

[schulte]

[MNG-6138] Remove obsolete message_*.properties form maven-core


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

Branch: refs/heads/MNG-5359
Commit: 8373c79a47ce4f12e549ae817a9c5f9eae950fb8
Parents: c516ef7
Author: Michael Osipov 
Authored: Thu Dec 22 22:39:00 2016 +0100
Committer: Michael Osipov 
Committed: Sun Jan 22 21:37:57 2017 +0100

--
 .../apache/maven/messages/messages.properties   | 34 
 .../maven/messages/messages_de.properties   | 34 
 .../maven/messages/messages_el.properties   | 33 ---
 .../maven/messages/messages_en.properties   | 23 -
 .../maven/messages/messages_es.properties   | 33 ---
 .../maven/messages/messages_fr.properties   | 33 ---
 .../maven/messages/messages_ja.properties   | 34 
 .../maven/messages/messages_ko.properties   | 34 
 .../maven/messages/messages_nl.properties   | 33 ---
 .../maven/messages/messages_no.properties   | 33 ---
 .../maven/messages/messages_pl.properties   | 33 ---
 .../maven/messages/messages_zh_CN.properties| 34 
 12 files changed, 391 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/8373c79a/maven-core/src/main/resources/org/apache/maven/messages/messages.properties
--
diff --git 
a/maven-core/src/main/resources/org/apache/maven/messages/messages.properties 
b/maven-core/src/main/resources/org/apache/maven/messages/messages.properties
deleted file mode 100644
index d576d7a..000
--- 
a/maven-core/src/main/resources/org/apache/maven/messages/messages.properties
+++ /dev/null
@@ -1,34 +0,0 @@
-# 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.
-
-# --
-# Project Verifier
-# --
-failed.download.warning=WARNING: Failed to download {0}.
-remote.repository.disabled.warning=The use of the remote repository has been 
disabled.
-directory.nonexistant.warning=Directory {0} does not exist. Attempting to 
create.
-not.directory.warning={0} is not a directory.
-not.writable.warning={0} is not writable.
-cannot.create.directory.warning=Unable to create directory {0}
-maven.repo.local.unset.warning=maven.repo.local is not set.
-single.unsatisfied.dependency.error=The build cannot continue because of the 
following unsatisfied dependency:
-multiple.unsatisfied.dependency.error=The build cannot continue because of the 
following unsatisfied dependencies:
-offline.snapshot.warning=You are working offline so the build will continue, 
but {0} may be out of date!
-download.message=Attempting to download {0}.
-plugin.loading.error=The plugin {0} could not be loaded.
-empty.descriptor.error=The file {0} you specified has zero length.
-checksum.verification.error=The follow artifact is corrupt: {0}.

http://git-wip-us.apache.org/repos/asf/maven/blob/8373c79a/maven-core/src/main/resources/org/apache/maven/messages/messages_de.properties
--
diff --git 
a/maven-core/src/main/resources/org/apache/maven/messages/messages_de.properties
 
b/maven-core/src/main/resources/org/apache/maven/messages/messages_de.properties
deleted file mode 100644
index d5c7dad..000
--- 
a/maven-core/src/main/resources/org/apache/maven/messages/messages_de.properties
+++ /dev/null
@@ -1,34 +0,0 @@
-# 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
-# 

[45/50] maven git commit: [MNG-5852] mvn shell script invokes /bin/sh but requires Bash functions

[schulte]

[MNG-5852] mvn shell script invokes /bin/sh but requires Bash functions

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

Branch: refs/heads/MNG-5359
Commit: 135102022763eaa62fa1d0125adab7ff207ef2f4
Parents: 1d9708a
Author: Joseph Walton 
Authored: Mon Jan 30 11:13:16 2017 +0100
Committer: Michael Osipov 
Committed: Mon Jan 30 12:56:36 2017 +0100

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


http://git-wip-us.apache.org/repos/asf/maven/blob/13510202/apache-maven/src/bin/mvn
--
diff --git a/apache-maven/src/bin/mvn b/apache-maven/src/bin/mvn
index 4a7f610..172f43b 100755
--- a/apache-maven/src/bin/mvn
+++ b/apache-maven/src/bin/mvn
@@ -190,8 +190,7 @@ 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`"
   while [ "$wdir" != '/' ] ; do
@@ -202,6 +201,7 @@ find_maven_basedir() {
 wdir="`cd "$wdir/.."; pwd`"
   done
   echo "${basedir}"
+)
 }
 
 # concatenates all lines of a file

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

[schulte]

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


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

Branch: refs/heads/MNG-5359
Commit: 46c1581474ed3b8110dbc7275172b92056b6e5dd
Parents: fe58646
Author: Tobias Oberlies 
Authored: Sat Dec 19 18:06:23 2015 +0100
Committer: Michael Osipov 
Committed: Sun Jan 29 22:56:10 2017 +0100

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


http://git-wip-us.apache.org/repos/asf/maven/blob/46c15814/apache-maven/src/bin/mvnDebug
--
diff --git a/apache-maven/src/bin/mvnDebug b/apache-maven/src/bin/mvnDebug
index 09f48d9..8d6e6a1 100755
--- a/apache-maven/src/bin/mvnDebug
+++ b/apache-maven/src/bin/mvnDebug
@@ -31,4 +31,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/46c15814/apache-maven/src/bin/mvnyjp
--
diff --git a/apache-maven/src/bin/mvnyjp b/apache-maven/src/bin/mvnyjp
index e08f77e..b2dbe1d 100755
--- a/apache-maven/src/bin/mvnyjp
+++ b/apache-maven/src/bin/mvnyjp
@@ -32,4 +32,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 "$0")/mvn" "$@"

[05/50] maven git commit: [MNG-5975] Use Java 7's SimpleDateFormat in CLIReportingUtils#formatTimestamp

[schulte]

[MNG-5975] Use Java 7's SimpleDateFormat in CLIReportingUtils#formatTimestamp


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

Branch: refs/heads/MNG-5359
Commit: 355f4dff03cea8cab0d7bdcb00fffa4e43b2c10b
Parents: a2358ba
Author: Michael Osipov 
Authored: Fri Feb 12 23:30:47 2016 +0100
Committer: Michael Osipov 
Committed: Sun Jan 22 21:37:57 2017 +0100

--
 .../org/apache/maven/cli/CLIReportingUtils.java | 32 ++--
 1 file changed, 10 insertions(+), 22 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/355f4dff/maven-embedder/src/main/java/org/apache/maven/cli/CLIReportingUtils.java
--
diff --git 
a/maven-embedder/src/main/java/org/apache/maven/cli/CLIReportingUtils.java 
b/maven-embedder/src/main/java/org/apache/maven/cli/CLIReportingUtils.java
index 2397d5d..214704b 100644
--- a/maven-embedder/src/main/java/org/apache/maven/cli/CLIReportingUtils.java
+++ b/maven-embedder/src/main/java/org/apache/maven/cli/CLIReportingUtils.java
@@ -19,15 +19,15 @@ package org.apache.maven.cli;
  * under the License.
  */
 
-import org.codehaus.plexus.util.Os;
-import org.slf4j.Logger;
-
 import java.io.IOException;
 import java.io.InputStream;
+import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.Locale;
 import java.util.Properties;
-import java.util.TimeZone;
+
+import org.codehaus.plexus.util.Os;
+import org.slf4j.Logger;
 
 /**
  * Utility class used to report errors, statistics, application version info, 
etc.
@@ -152,24 +152,8 @@ public final class CLIReportingUtils
 
 public static String formatTimestamp( long timestamp )
 {
-// Manual construction of the tz offset because only Java 7 is aware 
of ISO 8601 time zones
-TimeZone tz = TimeZone.getDefault();
-int offset = tz.getRawOffset();
-
-// Raw offset ignores DST, so check if we are in DST now and add the 
offset
-if ( tz.inDaylightTime( new Date( timestamp ) ) )
-{
-offset += tz.getDSTSavings();
-}
-
-// CHECKSTYLE_OFF: MagicNumber
-long m = Math.abs( ( offset / ONE_MINUTE ) % 60 );
-long h = Math.abs( ( offset / ONE_HOUR ) % 24 );
-// CHECKSTYLE_ON: MagicNumber
-
-int offsetDir = (int) Math.signum( (float) offset );
-char offsetSign = offsetDir >= 0 ? '+' : '-';
-return String.format( "%tFT% 0 )
 {
+// Length 11+ chars
 format = "%d d %02d:%02d h";
 }
 else if ( h > 0 )
 {
+// Length 7 chars
 format = "%2$02d:%3$02d h";
 }
 else if ( m > 0 )
 {
+// Length 9 chars
 format = "%3$02d:%4$02d min";
 }
 else
 {
+// Length 7-8 chars
 format = "%4$d.%5$03d s";
 }
 

[49/50] maven git commit: [MNG-6003] Drastically reduce JAVA_HOME discovery code

[schulte]

[MNG-6003] Drastically reduce JAVA_HOME discovery code

All special handling has been removed. JAVA_HOME must be set properly by
the user if necessary. Error messages have been graciously borrowed from
the Tomcat start scripts.


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

Branch: refs/heads/MNG-5359
Commit: 2678388ea2cebc43f58009720609523ae09176f7
Parents: d426bf9
Author: Michael Osipov 
Authored: Fri Apr 15 22:17:15 2016 +0200
Committer: Michael Osipov 
Committed: Mon Jan 30 19:57:17 2017 +0100

--
 apache-maven/src/bin/mvn | 84 ---
 apache-maven/src/bin/mvn.cmd | 53 
 2 files changed, 34 insertions(+), 103 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/2678388e/apache-maven/src/bin/mvn
--
diff --git a/apache-maven/src/bin/mvn b/apache-maven/src/bin/mvn
index 172f43b..4db1ad6 100755
--- a/apache-maven/src/bin/mvn
+++ b/apache-maven/src/bin/mvn
@@ -41,52 +41,12 @@ fi
 
 # OS specific support. $var _must_ be set to either true or false.
 cygwin=false;
-darwin=false;
 mingw=false;
 case "`uname`" in
   CYGWIN*) cygwin=true;;
   MINGW*) mingw=true;;
-  Darwin*) darwin=true
-   #
-   # Look for the Apple JDKs first to preserve the existing behaviour, 
and then look
-   # for the new JDKs provided by Oracle.
-   #
-   if [ -z "$JAVA_HOME" ] && [ -L 
/System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK ] ; then
- #
- # Apple JDKs
- #
- export 
JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK/Home
-   fi
-
-   if [ -z "$JAVA_HOME" ] && [ -L 
/System/Library/Java/JavaVirtualMachines/CurrentJDK ] ; then
- #
- # Apple JDKs
- #
- export 
JAVA_HOME=/System/Library/Java/JavaVirtualMachines/CurrentJDK/Contents/Home
-   fi
-
-   if [ -z "$JAVA_HOME" ] && [ -L 
"/Library/Java/JavaVirtualMachines/CurrentJDK" ] ; then
- #
- # Oracle JDKs
- #
- export 
JAVA_HOME=/Library/Java/JavaVirtualMachines/CurrentJDK/Contents/Home
-   fi
-
-   if [ -z "$JAVA_HOME" ] && [ -x "/usr/libexec/java_home" ]; then
- #
- # Apple JDKs
- #
- export JAVA_HOME=`/usr/libexec/java_home`
-   fi
-   ;;
 esac
 
-if [ -z "$JAVA_HOME" ] ; then
-  if [ -r /etc/gentoo-release ] ; then
-JAVA_HOME=`java-config --jre-home`
-  fi
-fi
-
 ## resolve links - $0 may be a link to Maven's home
 PRG="$0"
 
@@ -129,49 +89,19 @@ if $mingw ; then
   # TODO classpath?
 fi
 
-if [ -z "$JAVA_HOME" ]; then
-  javaExecutable="`which javac`"
-  if [ -n "$javaExecutable" ] && ! [ "`expr \"$javaExecutable\" : '\([^ 
]*\)'`" = "no" ]; then
-# readlink(1) is not available as standard on Solaris 10.
-readLink=`which readlink`
-if [ ! `expr "$readLink" : '\([^ ]*\)'` = "no" ]; then
-  if $darwin ; then
-javaHome="`dirname \"$javaExecutable\"`"
-javaExecutable="`cd \"$javaHome\" && pwd -P`/javac"
-  else
-javaExecutable="`readlink -f \"$javaExecutable\"`"
-  fi
-  javaHome="`dirname \"$javaExecutable\"`"
-  javaHome=`expr "$javaHome" : '\(.*\)/bin'`
-  JAVA_HOME="$javaHome"
-  export JAVA_HOME
-fi
-  fi
-fi
-
-if [ -z "$JAVACMD" ] ; then
-  if [ -n "$JAVA_HOME"  ] ; then
-if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
-  # IBM's JDK on AIX uses strange locations for the executables
-  JAVACMD="$JAVA_HOME/jre/sh/java"
-else
-  JAVACMD="$JAVA_HOME/bin/java"
-fi
-  else
-JAVACMD="`which java`"
-  fi
+if [ -z "$JAVA_HOME" ] ; then
+  JAVACMD="`which java`"
+else
+  JAVACMD="$JAVA_HOME/bin/java"
 fi
 
 if [ ! -x "$JAVACMD" ] ; then
-  echo "Error: JAVA_HOME is not defined correctly." >&2
-  echo "  We cannot execute $JAVACMD" >&2
+  echo "The JAVA_HOME environment variable is not defined correctly" >&2
+  echo "This environment variable is needed to run this program" >&2
+  echo "NB: JAVA_HOME should point to a JDK not a JRE" >&2
   exit 1
 fi
 
-if [ -z "$JAVA_HOME" ] ; then
-  echo "Warning: JAVA_HOME environment variable is not set."
-fi
-
 CLASSWORLDS_JAR=`echo "${MAVEN_HOME}"/boot/plexus-classworlds-*.jar`
 CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher
 

http://git-wip-us.apache.org/repos/asf/maven/blob/2678388e/apache-maven/src/bin/mvn.cmd

[27/50] maven git commit: [MNG-5958] restore binary compatibility of Lifecycle.setPhases

[schulte]

[MNG-5958] restore binary compatibility of Lifecycle.setPhases

While MNG-5805 restored binary compatibility of Lifecycle.getPhases
it didn't do the same for Lifecycle.setPhases. This breaks plugins
like flexmojos-maven-plugin which have their own lifecycle mapping
implementations.

This closes #77


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

Branch: refs/heads/MNG-5359
Commit: 6b31c4a556f51cd1c2064fe773550c0acf14d307
Parents: f20a5d9
Author: Stuart McCulloch 
Authored: Wed Jan 6 11:23:06 2016 +
Committer: Christian Schulte 
Committed: Thu Jan 26 20:19:57 2017 +0100

--
 .../java/org/apache/maven/lifecycle/mapping/Lifecycle.java  | 9 +++--
 1 file changed, 7 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/6b31c4a5/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/Lifecycle.java
--
diff --git 
a/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/Lifecycle.java 
b/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/Lifecycle.java
index d2b6d6c..c14cf94 100644
--- a/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/Lifecycle.java
+++ b/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/Lifecycle.java
@@ -106,8 +106,13 @@ public class Lifecycle
 }
 
 @Deprecated
-public void setPhases( Map phases )
+public void setPhases( Map phases )
 {
-setLifecyclePhases( phases );
+Map lphases = new LinkedHashMap<>();
+for ( Map.Entry e: phases.entrySet() )
+{
+lphases.put( e.getKey(), new LifecyclePhase( e.getValue() ) );
+}
+setLifecyclePhases( lphases );
 }
 }

[23/50] maven git commit: added core its to projects' sources

[schulte]

added core its to projects' sources


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

Branch: refs/heads/MNG-5359
Commit: 311fc62b7daca1d63596e2202598a0fd3e4d77e2
Parents: 4547ff7
Author: Hervé Boutemy 
Authored: Wed Nov 16 14:41:06 2016 +0100
Committer: Hervé Boutemy 
Committed: Wed Jan 25 00:09:42 2017 +0100

--
 doap_Maven.rdf | 6 ++
 1 file changed, 6 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/311fc62b/doap_Maven.rdf
--
diff --git a/doap_Maven.rdf b/doap_Maven.rdf
index a50b68f..9a043ce 100644
--- a/doap_Maven.rdf
+++ b/doap_Maven.rdf
@@ -190,6 +190,12 @@ under the License.
 https://git-wip-us.apache.org/repos/asf/maven.git"/>
   
 
+
+  
+https://git-wip-us.apache.org/repos/asf/maven-integration-testing.git"/>
+https://git-wip-us.apache.org/repos/asf/maven-integration-testing.git"/>
+  
+
 
   
 Apache Maven PMC

[02/50] maven git commit: [MNG-6081] Log refactoring - Method Invocation Replaced By Variable

[schulte]

[MNG-6081] Log refactoring - Method Invocation Replaced By Variable


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

Branch: refs/heads/MNG-5359
Commit: a2358ba7bb9b5b8ccb4ca2b6ea66b637b88d6c09
Parents: 5053a62
Author: Nemo Chen 
Authored: Fri Oct 21 22:36:41 2016 +0200
Committer: Michael Osipov 
Committed: Sun Jan 22 21:37:57 2017 +0100

--
 .../apache/maven/artifact/resolver/DebugResolutionListener.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/a2358ba7/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DebugResolutionListener.java
--
diff --git 
a/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DebugResolutionListener.java
 
b/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DebugResolutionListener.java
index 43806b1..bd1ed9a 100644
--- 
a/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DebugResolutionListener.java
+++ 
b/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DebugResolutionListener.java
@@ -71,7 +71,7 @@ public class DebugResolutionListener
 
 if ( omittedVersion != null ? !omittedVersion.equals( keptVersion ) : 
keptVersion != null )
 {
-logger.debug( indent + omitted + " (removed - nearer found: " + 
kept.getVersion() + ")" );
+logger.debug( indent + omitted + " (removed - nearer found: " + 
keptVersion + ")" );
 }
 }
 
@@ -164,4 +164,4 @@ public class DebugResolutionListener
 }
 }
 
-}
\ No newline at end of file
+}