maven-surefire git commit: [SUREFIRE-1342] Acknowledge normal exit of JVM and drain shared memory between processes [Forced Update!]

2017-03-12 Thread tibordigana 
Repository: maven-surefire
Updated Branches:
  refs/heads/SUREFIRE-1342 703021371 -> 377fbdc56 (forced update)


[SUREFIRE-1342] Acknowledge normal exit of JVM and drain shared memory between 
processes


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

Branch: refs/heads/SUREFIRE-1342
Commit: 377fbdc563dd90deb4df3277e3bf5309735d7540
Parents: d468680
Author: Tibor17 
Authored: Mon Mar 13 03:10:08 2017 +0100
Committer: Tibor17 
Committed: Mon Mar 13 03:22:32 2017 +0100

--
 .../surefire/booterclient/ForkStarter.java  |  1 +
 .../lazytestprovider/AbstractCommandStream.java |  8 +-
 .../lazytestprovider/NotifiableTestStream.java  |  2 +
 .../lazytestprovider/TestLessInputStream.java   | 49 +++-
 .../TestProvidingInputStream.java   | 18 +++--
 .../booterclient/output/ForkClient.java |  1 +
 .../output/ThreadedStreamConsumer.java  | 40 --
 .../booterclient/MockNotifiableTestStream.java  |  5 ++
 .../TestProvidingInputStreamTest.java   |  1 +
 .../apache/maven/surefire/booter/Command.java   |  1 +
 .../maven/surefire/booter/CommandReader.java| 22 ++---
 .../surefire/booter/MasterProcessCommand.java   |  3 +-
 .../apache/maven/surefire/booter/Shutdown.java  | 15 
 .../booter/MasterProcessCommandTest.java|  7 ++
 .../maven/surefire/booter/ForkedBooter.java | 84 ++--
 15 files changed, 183 insertions(+), 74 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/377fbdc5/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkStarter.java
--
diff --git 
a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkStarter.java
 
b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkStarter.java
index 54d304a..b69d010 100644
--- 
a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkStarter.java
+++ 
b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkStarter.java
@@ -644,6 +644,7 @@ public class ForkStarter
 }
 finally
 {
+currentForkClients.remove( forkClient );
 closer.close();
 if ( runResult == null )
 {

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/377fbdc5/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/lazytestprovider/AbstractCommandStream.java
--
diff --git 
a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/lazytestprovider/AbstractCommandStream.java
 
b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/lazytestprovider/AbstractCommandStream.java
index 4d6331c..3531ccf 100644
--- 
a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/lazytestprovider/AbstractCommandStream.java
+++ 
b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/lazytestprovider/AbstractCommandStream.java
@@ -41,10 +41,12 @@ public abstract class AbstractCommandStream
 protected abstract boolean isClosed();
 
 /**
- * Unnecessarily opposite to {@link #isClosed()} however may respect
- * {@link #getLastCommand() last command} and {@link #isClosed()}.
+ * Opposite to {@link #isClosed()}.
  */
-protected abstract boolean canContinue();
+protected boolean canContinue()
+{
+return !isClosed();
+}
 
 /**
  * Possibly waiting for next command (see {@link #nextCommand()}) unless 
the stream is atomically

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/377fbdc5/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/lazytestprovider/NotifiableTestStream.java
--
diff --git 
a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/lazytestprovider/NotifiableTestStream.java
 
b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/lazytestprovider/NotifiableTestStream.java
index 5c89173..b181de1 100644
--- 
a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/lazytestprovider/NotifiableTestStream.java
+++ 
b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/lazytestprovider/NotifiableTestStream.java
@@ -45,4 +45,6

maven-surefire git commit: [SUREFIRE-1342] Acknowledge normal exit of JVM and drain shared memory between processes

2017-03-12 Thread tibordigana 
Repository: maven-surefire
Updated Branches:
  refs/heads/SUREFIRE-1342 d468680be -> 703021371


[SUREFIRE-1342] Acknowledge normal exit of JVM and drain shared memory between 
processes


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

Branch: refs/heads/SUREFIRE-1342
Commit: 70302137108d496720354b180debd224f0fcfd5d
Parents: d468680
Author: Tibor17 
Authored: Mon Mar 13 03:10:08 2017 +0100
Committer: Tibor17 
Committed: Mon Mar 13 03:10:08 2017 +0100

--
 .../surefire/booterclient/ForkStarter.java  |  1 +
 .../lazytestprovider/AbstractCommandStream.java |  8 +-
 .../lazytestprovider/NotifiableTestStream.java  |  2 +
 .../lazytestprovider/TestLessInputStream.java   | 49 +++-
 .../TestProvidingInputStream.java   | 18 +++--
 .../booterclient/output/ForkClient.java |  1 +
 .../output/ThreadedStreamConsumer.java  | 48 +--
 .../booterclient/MockNotifiableTestStream.java  |  5 ++
 .../TestProvidingInputStreamTest.java   |  1 +
 .../apache/maven/surefire/booter/Command.java   |  1 +
 .../maven/surefire/booter/CommandReader.java| 22 ++---
 .../surefire/booter/MasterProcessCommand.java   |  3 +-
 .../apache/maven/surefire/booter/Shutdown.java  | 15 
 .../booter/MasterProcessCommandTest.java|  7 ++
 .../maven/surefire/booter/ForkedBooter.java | 84 ++--
 15 files changed, 187 insertions(+), 78 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/70302137/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkStarter.java
--
diff --git 
a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkStarter.java
 
b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkStarter.java
index 54d304a..b69d010 100644
--- 
a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkStarter.java
+++ 
b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkStarter.java
@@ -644,6 +644,7 @@ public class ForkStarter
 }
 finally
 {
+currentForkClients.remove( forkClient );
 closer.close();
 if ( runResult == null )
 {

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/70302137/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/lazytestprovider/AbstractCommandStream.java
--
diff --git 
a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/lazytestprovider/AbstractCommandStream.java
 
b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/lazytestprovider/AbstractCommandStream.java
index 4d6331c..3531ccf 100644
--- 
a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/lazytestprovider/AbstractCommandStream.java
+++ 
b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/lazytestprovider/AbstractCommandStream.java
@@ -41,10 +41,12 @@ public abstract class AbstractCommandStream
 protected abstract boolean isClosed();
 
 /**
- * Unnecessarily opposite to {@link #isClosed()} however may respect
- * {@link #getLastCommand() last command} and {@link #isClosed()}.
+ * Opposite to {@link #isClosed()}.
  */
-protected abstract boolean canContinue();
+protected boolean canContinue()
+{
+return !isClosed();
+}
 
 /**
  * Possibly waiting for next command (see {@link #nextCommand()}) unless 
the stream is atomically

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/70302137/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/lazytestprovider/NotifiableTestStream.java
--
diff --git 
a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/lazytestprovider/NotifiableTestStream.java
 
b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/lazytestprovider/NotifiableTestStream.java
index 5c89173..b181de1 100644
--- 
a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/lazytestprovider/NotifiableTestStream.java
+++ 
b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/lazytestprovider/NotifiableTestStream.java
@@ -45,4 +45,6 @@ public

[maven-surefire] Git Push Summary

2017-03-12 Thread tibordigana 
Repository: maven-surefire
Updated Branches:
  refs/heads/SUREFIRE-1342 [created] d468680be

maven-integration-testing git commit: [MNG-6057], [MNG-6090], [MNG-5895] o Added IT's for MNG-5895, MNG-6057, MNG-6090 o Added flatten-maven-plugin for usage during the IT's. [Forced Update!]

2017-03-12 Thread khmarbaise 
Repository: maven-integration-testing
Updated Branches:
  refs/heads/MNG-6057 c066c2f3f -> a35b512bb (forced update)


[MNG-6057], [MNG-6090], [MNG-5895]
 o Added IT's for MNG-5895, MNG-6057, MNG-6090
 o Added flatten-maven-plugin for usage during
   the IT's.


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

Branch: refs/heads/MNG-6057
Commit: a35b512bb6eec9079edc856db19eaa2661d0fb94
Parents: c68f707
Author: Karl Heinz Marbaise 
Authored: Wed Mar 8 00:12:31 2017 +0100
Committer: Karl Heinz Marbaise 
Committed: Sun Mar 12 23:35:53 2017 +0100

--
 .gitignore  |   1 +
 .../apache/maven/it/IntegrationTestSuite.java   |   3 +
 ...Tmng5895CIFriendlyUsageWithPropertyTest.java |  70 +++
 .../it/MavenITmng6057CheckReactorOrderTest.java | 119 +++
 .../maven/it/MavenITmng6090CIFriendlyTest.java  |  80 +
 .../test/resources/bootstrap/group-6/pom.xml|   7 ++
 .../module-1/pom.xml|  33 +
 .../module-2/pom.xml|  33 +
 .../module-3/jar-with-prod.xml  |  17 +++
 .../module-3/pom.xml|  57 +
 .../pom.xml |  39 ++
 .../module-1/pom.xml|  34 ++
 .../module-2/pom.xml|  40 +++
 .../mng-6057-check-reactor-order/pom.xml|  35 ++
 .../mng-6090-ci-friendly/module-1/pom.xml   |  33 +
 .../mng-6090-ci-friendly/module-2/pom.xml   |  33 +
 .../module-3/jar-with-prod.xml  |  17 +++
 .../mng-6090-ci-friendly/module-3/pom.xml   |  57 +
 .../test/resources/mng-6090-ci-friendly/pom.xml |  68 +++
 19 files changed, 776 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/a35b512b/.gitignore
--
diff --git a/.gitignore b/.gitignore
index fa65a79..5fb5e3a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,3 +11,4 @@ bin
 .DS_Store
 .idea
 jvz-*
+.flattened-pom.xml

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/a35b512b/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 272a859..bbc7c9e 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,9 @@ public class IntegrationTestSuite
 // 
-
 // suite.addTestSuite( MavenIT0108SnapshotUpdateTest.class ); -- 
MNG-3137
 
+suite.addTestSuite( MavenITmng6057CheckReactorOrderTest.class );
+suite.addTestSuite( 
MavenITmng5895CIFriendlyUsageWithPropertyTest.class );
+suite.addTestSuite( MavenITmng6090CIFriendlyTest.class );
 suite.addTestSuite( 
MavenITmng6173GetProjectsAndDependencyGraphTest.class );
 suite.addTestSuite( MavenITmng6173GetAllProjectsInReactorTest.class );
 suite.addTestSuite( MavenITmng5958LifecyclePhaseBinaryCompat.class );

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/a35b512b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5895CIFriendlyUsageWithPropertyTest.java
--
diff --git 
a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5895CIFriendlyUsageWithPropertyTest.java
 
b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5895CIFriendlyUsageWithPropertyTest.java
new file mode 100644
index 000..7d13fd4
--- /dev/null
+++ 
b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5895CIFriendlyUsageWithPropertyTest.java
@@ -0,0 +1,70 @@
+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

maven git commit: [MNG-6090] CI friendly properties break submodule builds [MNG-6057] Problem with CI friendly usage of ${..} reactor order is changed o Based on the missing replacement of the version

2017-03-12 Thread khmarbaise 
Repository: maven
Updated Branches:
  refs/heads/MNG-6057 3c00dd10e -> 41e4b3240 (forced update)


[MNG-6090] CI friendly properties break submodule builds
[MNG-6057] Problem with CI friendly usage of ${..} reactor order is changed
 o Based on the missing replacement of the versions ${revision}
   ${changelist} or ${sha1} within the parent element the order
   of the reactor changes.
[MNG-5895] Problem with CI friendly usage of ${..} which is already
defined via property in pom file.


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

Branch: refs/heads/MNG-6057
Commit: 41e4b32405dfdea3b28a4e235e54a651db98154a
Parents: ab2e24f
Author: Karl Heinz Marbaise 
Authored: Tue Sep 29 11:46:48 2015 +0200
Committer: Karl Heinz Marbaise 
Committed: Sun Mar 12 23:30:10 2017 +0100

--
 .../resolver/DefaultArtifactResolver.java   |  3 +-
 .../model/building/DefaultModelBuilder.java | 35 ++--
 .../AbstractStringBasedModelInterpolator.java   | 20 +++
 .../model/validation/DefaultModelValidator.java |  7 ++--
 4 files changed, 59 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/41e4b324/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java
--
diff --git 
a/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java
 
b/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java
index b78846b..7fcc290 100644
--- 
a/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java
+++ 
b/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java
@@ -376,7 +376,7 @@ public class DefaultArtifactResolver
 ArtifactFilter resolutionFilter = request.getResolutionFilter();
 RepositorySystemSession session = getSession( 
request.getLocalRepository() );
 
-// TODO hack because metadata isn't generated in m2e correctly and i 
want to run the maven i have in the
+// TODO: hack because metadata isn't generated in m2e correctly and i 
want to run the maven i have in the
 // workspace
 if ( source == null )
 {
@@ -506,6 +506,7 @@ public class DefaultArtifactResolver
 if ( result.hasMetadataResolutionExceptions() || 
result.hasVersionRangeViolations()
 || result.hasCircularDependencyExceptions() )
 {
+logger.info( "Failure detected." );
 return result;
 }
 

http://git-wip-us.apache.org/repos/asf/maven/blob/41e4b324/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
--
diff --git 
a/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
 
b/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
index 4ebb033..463bf1c 100644
--- 
a/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
+++ 
b/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
@@ -62,6 +62,8 @@ import org.apache.maven.model.superpom.SuperPomProvider;
 import org.apache.maven.model.validation.ModelValidator;
 import org.codehaus.plexus.component.annotations.Component;
 import org.codehaus.plexus.component.annotations.Requirement;
+import org.codehaus.plexus.interpolation.MapBasedValueSource;
+import org.codehaus.plexus.interpolation.StringSearchInterpolator;
 
 import java.io.File;
 import java.io.IOException;
@@ -766,13 +768,40 @@ public class DefaultModelBuilder
 // save profile activations before interpolation, since they are 
evaluated with limited scope
 Map originalActivations = getProfileActivations( 
model, true );
 
-Model result = modelInterpolator.interpolateModel( model, 
model.getProjectDirectory(), request, problems );
-result.setPomFile( model.getPomFile() );
+Model interpolatedModel =
+modelInterpolator.interpolateModel( model, 
model.getProjectDirectory(), request, problems );
+if ( interpolatedModel.getParent() != null )
+{
+StringSearchInterpolator ssi = new StringSearchInterpolator();
+ssi.addValueSource( new MapBasedValueSource( 
request.getUserProperties() ) );
+
+ssi.addValueSource( new MapBasedValueSource( model.getProperties() 
) );
+
+ssi.addValueSource( new MapBasedValueSource(

maven-surefire git commit: [Jenkinsfile] Included junit: failsafe-reports

2017-03-12 Thread tibordigana 
Repository: maven-surefire
Updated Branches:
  refs/heads/master 944c08d70 -> d468680be


[Jenkinsfile] Included junit: failsafe-reports


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

Branch: refs/heads/master
Commit: d468680be5d6f2a936df4a7c2efd2172c9eef773
Parents: 944c08d
Author: Tibor17 
Authored: Sun Mar 12 23:06:43 2017 +0100
Committer: Tibor17 
Committed: Sun Mar 12 23:06:43 2017 +0100

--
 Jenkinsfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/d468680b/Jenkinsfile
--
diff --git a/Jenkinsfile b/Jenkinsfile
index 854f959..cbac90d 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -13,7 +13,7 @@ pipeline {
 }
 post {
 success {
-junit '**/target/surefire-reports/**/*.xml' 
+junit 
'**/target/surefire-reports/**/*.xml,**/target/failsafe-reports/**/*.xml' 
 }
 }
 }
@@ -30,7 +30,7 @@ pipeline {
 }
 post {
 success {
-junit '**/target/surefire-reports/**/*.xml' 
+junit 
'**/target/surefire-reports/**/*.xml,**/target/failsafe-reports/**/*.xml' 
 }
 }
 }

maven-surefire git commit: I forgot to actually invoke maven

2017-03-12 Thread stephenc 
Repository: maven-surefire
Updated Branches:
  refs/heads/master 728b4ab42 -> 944c08d70


I forgot to actually invoke maven


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

Branch: refs/heads/master
Commit: 944c08d7005863899203aa67e2b2aedb533f44a1
Parents: 728b4ab
Author: Stephen Connolly 
Authored: Sun Mar 12 21:39:00 2017 +
Committer: Stephen Connolly 
Committed: Sun Mar 12 21:39:00 2017 +

--
 Jenkinsfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/944c08d7/Jenkinsfile
--
diff --git a/Jenkinsfile b/Jenkinsfile
index 7a73b6b..854f959 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -9,7 +9,7 @@ pipeline {
 jdk 'JDK 1.8.0_102'
 }
 steps {
-sh 'clean install jacoco:report -B -U -e -fae -V 
-Prun-its,embedded,jenkins -Dsurefire.useFile=false -Dfailsafe.useFile=false 
-Dintegration-test-port=8084'
+sh 'mvn clean install jacoco:report -B -U -e -fae -V 
-Prun-its,embedded,jenkins -Dsurefire.useFile=false -Dfailsafe.useFile=false 
-Dintegration-test-port=8084'
 }
 post {
 success {
@@ -26,7 +26,7 @@ pipeline {
 jdk 'JDK 1.8_121 (Windows Only)'
 }
 steps {
-bat 'clean install jacoco:report -B -U -e -fae -V 
-Prun-its,embedded,jenkins -Dsurefire.useFile=false -Dfailsafe.useFile=false 
-Dintegration-test-port=8084'
+bat 'mvn clean install jacoco:report -B -U -e -fae -V 
-Prun-its,embedded,jenkins -Dsurefire.useFile=false -Dfailsafe.useFile=false 
-Dintegration-test-port=8084'
 }
 post {
 success {

maven-surefire git commit: Let's do a real build

2017-03-12 Thread stephenc 
Repository: maven-surefire
Updated Branches:
  refs/heads/master 7866b0ffb -> 728b4ab42


Let's do a real build


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

Branch: refs/heads/master
Commit: 728b4ab426c1b8aaa8e2271efab19d73feea9a95
Parents: 7866b0f
Author: Stephen Connolly 
Authored: Sun Mar 12 21:37:52 2017 +
Committer: Stephen Connolly 
Committed: Sun Mar 12 21:37:52 2017 +

--
 Jenkinsfile | 14 --
 1 file changed, 12 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/728b4ab4/Jenkinsfile
--
diff --git a/Jenkinsfile b/Jenkinsfile
index c7006ae..7a73b6b 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -9,7 +9,12 @@ pipeline {
 jdk 'JDK 1.8.0_102'
 }
 steps {
-sh 'mvn -v'
+sh 'clean install jacoco:report -B -U -e -fae -V 
-Prun-its,embedded,jenkins -Dsurefire.useFile=false -Dfailsafe.useFile=false 
-Dintegration-test-port=8084'
+}
+post {
+success {
+junit '**/target/surefire-reports/**/*.xml' 
+}
 }
 }
 stage('Windows Build') {
@@ -21,7 +26,12 @@ pipeline {
 jdk 'JDK 1.8_121 (Windows Only)'
 }
 steps {
-bat 'mvn -v'
+bat 'clean install jacoco:report -B -U -e -fae -V 
-Prun-its,embedded,jenkins -Dsurefire.useFile=false -Dfailsafe.useFile=false 
-Dintegration-test-port=8084'
+}
+post {
+success {
+junit '**/target/surefire-reports/**/*.xml' 
+}
 }
 }
 }

maven-surefire git commit: More tweaks

2017-03-12 Thread stephenc 
Repository: maven-surefire
Updated Branches:
  refs/heads/master 75619d62e -> 7866b0ffb


More tweaks


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

Branch: refs/heads/master
Commit: 7866b0ffb305aa822b48bcb27916a42d9702ed84
Parents: 75619d6
Author: Stephen Connolly 
Authored: Sun Mar 12 21:34:19 2017 +
Committer: Stephen Connolly 
Committed: Sun Mar 12 21:34:19 2017 +

--
 Jenkinsfile | 20 ++--
 pom.xml |  1 +
 2 files changed, 19 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/7866b0ff/Jenkinsfile
--
diff --git a/Jenkinsfile b/Jenkinsfile
index e72ff99..c7006ae 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -3,9 +3,25 @@ pipeline {
 label env.NIX_LABEL
 }
 stages {
-stage('Build') {
+stage('Unix Build') {
+tools {
+maven 'Maven 3.3.9'
+jdk 'JDK 1.8.0_102'
+}
+steps {
+sh 'mvn -v'
+}
+}
+stage('Windows Build') {
+agent {
+label env.WIN_LABEL
+}
+tools {
+maven 'Maven 3.3.9 (Windows)'
+jdk 'JDK 1.8_121 (Windows Only)'
+}
 steps {
-sh 'ls -l'
+bat 'mvn -v'
 }
 }
 }

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/7866b0ff/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 3b8ab65..df9d79b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -391,6 +391,7 @@
   
   
 
+  Jenkinsfile
   README.md
   .gitignore
   .git/**/*

maven-surefire git commit: Adding a dummy Jenkinsfile

2017-03-12 Thread stephenc 
Repository: maven-surefire
Updated Branches:
  refs/heads/master f4d54fac0 -> 75619d62e


Adding a dummy Jenkinsfile


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

Branch: refs/heads/master
Commit: 75619d62e4180f763e20f9e130440094f465c266
Parents: f4d54fa
Author: Stephen Connolly 
Authored: Sun Mar 12 21:20:13 2017 +
Committer: Stephen Connolly 
Committed: Sun Mar 12 21:20:13 2017 +

--
 Jenkinsfile | 12 
 1 file changed, 12 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/75619d62/Jenkinsfile
--
diff --git a/Jenkinsfile b/Jenkinsfile
new file mode 100644
index 000..e72ff99
--- /dev/null
+++ b/Jenkinsfile
@@ -0,0 +1,12 @@
+pipeline {
+agent {
+label env.NIX_LABEL
+}
+stages {
+stage('Build') {
+steps {
+sh 'ls -l'
+}
+}
+}
+}

[1/2] maven git commit: removed noisy formatting changes from previous commit (to be squashed)

2017-03-12 Thread hboutemy 
Repository: maven
Updated Branches:
  refs/heads/MNG-6057 9d1fce536 -> 3c00dd10e


removed noisy formatting changes from previous commit (to be squashed)

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

Branch: refs/heads/MNG-6057
Commit: 959ca0c258503ece2a9d813e27c57d3b04d71612
Parents: 9d1fce5
Author: Hervé Boutemy 
Authored: Sun Mar 12 19:31:01 2017 +0100
Committer: Hervé Boutemy 
Committed: Sun Mar 12 19:31:01 2017 +0100

--
 .../resolver/DefaultArtifactResolver.java   | 43 
 .../AbstractStringBasedModelInterpolator.java   | 19 -
 2 files changed, 36 insertions(+), 26 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/959ca0c2/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java
--
diff --git 
a/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java
 
b/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java
index 93a5919..7fcc290 100644
--- 
a/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java
+++ 
b/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java
@@ -22,12 +22,10 @@ package org.apache.maven.artifact.resolver;
 import java.io.File;
 import java.util.ArrayList;
 import java.util.Collections;
-import java.util.Iterator;
 import java.util.LinkedHashMap;
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Map;
-import java.util.Map.Entry;
 import java.util.Set;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.Executor;
@@ -151,21 +149,21 @@ public class DefaultArtifactResolver
 
 public void resolve( Artifact artifact, List 
remoteRepositories,
  ArtifactRepository localRepository, TransferListener 
resolutionListener )
-throws ArtifactResolutionException, ArtifactNotFoundException
+ throws ArtifactResolutionException, 
ArtifactNotFoundException
 {
 resolve( artifact, remoteRepositories, getSession( localRepository ) );
 }
 
 public void resolveAlways( Artifact artifact, List 
remoteRepositories,
ArtifactRepository localRepository )
-throws ArtifactResolutionException, ArtifactNotFoundException
+   throws ArtifactResolutionException, 
ArtifactNotFoundException
 {
 resolve( artifact, remoteRepositories, getSession( localRepository ) );
 }
 
 private void resolve( Artifact artifact, List 
remoteRepositories,
   RepositorySystemSession session )
-throws ArtifactResolutionException, ArtifactNotFoundException
+  throws ArtifactResolutionException, 
ArtifactNotFoundException
 {
 if ( artifact == null )
 {
@@ -257,7 +255,8 @@ public class DefaultArtifactResolver
  ArtifactRepository 
localRepository,
  
List remoteRepositories,
  
ArtifactMetadataSource source, ArtifactFilter filter )
-throws ArtifactResolutionException, ArtifactNotFoundException
+ throws 
ArtifactResolutionException,
+ 
ArtifactNotFoundException
 {
 return resolveTransitively( artifacts, originatingArtifact, 
Collections.EMPTY_MAP, localRepository,
 remoteRepositories, source, filter );
@@ -269,7 +268,8 @@ public class DefaultArtifactResolver
  ArtifactRepository 
localRepository,
  
List remoteRepositories,
  
ArtifactMetadataSource source )
-throws ArtifactResolutionException, ArtifactNotFoundException
+ throws 
ArtifactResolutionException,
+ 
ArtifactNotFoundException
 {
 return resolveTransitively( artifacts, originatingArtifact, 
managedVersions, localRepository,
 remoteRepositories, source, null );
@@ -280,7 +280,8 @@ public class DefaultArtifactResolver

[2/2] maven git commit: marked new constants public and used it in validator

2017-03-12 Thread hboutemy 
marked new constants public and used it in validator

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

Branch: refs/heads/MNG-6057
Commit: 3c00dd10e3f443540bb79bc30ef4fc8ce1ac076d
Parents: 959ca0c
Author: Hervé Boutemy 
Authored: Sun Mar 12 19:31:35 2017 +0100
Committer: Hervé Boutemy 
Committed: Sun Mar 12 19:31:35 2017 +0100

--
 .../apache/maven/model/validation/DefaultModelValidator.java  | 7 +--
 1 file changed, 5 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/3c00dd10/maven-model-builder/src/main/java/org/apache/maven/model/validation/DefaultModelValidator.java
--
diff --git 
a/maven-model-builder/src/main/java/org/apache/maven/model/validation/DefaultModelValidator.java
 
b/maven-model-builder/src/main/java/org/apache/maven/model/validation/DefaultModelValidator.java
index 59b0532..e790f21 100644
--- 
a/maven-model-builder/src/main/java/org/apache/maven/model/validation/DefaultModelValidator.java
+++ 
b/maven-model-builder/src/main/java/org/apache/maven/model/validation/DefaultModelValidator.java
@@ -53,6 +53,7 @@ import org.apache.maven.model.building.ModelProblem.Severity;
 import org.apache.maven.model.building.ModelProblem.Version;
 import org.apache.maven.model.building.ModelProblemCollector;
 import org.apache.maven.model.building.ModelProblemCollectorRequest;
+import 
org.apache.maven.model.interpolation.AbstractStringBasedModelInterpolator;
 import org.codehaus.plexus.component.annotations.Component;
 import org.codehaus.plexus.util.StringUtils;
 
@@ -806,8 +807,10 @@ public class DefaultModelValidator
 // revision
 // sha1
 //
-if ( string.trim().contains( "${changelist}" ) || 
string.trim().contains( "${revision}" )
-|| string.trim().contains( "${sha1}" ) )
+string = string.trim();
+if ( string.contains( "${" + 
AbstractStringBasedModelInterpolator.CHANGELIST_PROPERTY + "}" )
+|| string.contains( "${" + 
AbstractStringBasedModelInterpolator.REVISION_PROPERTY + "}" )
+|| string.contains( "${" + 
AbstractStringBasedModelInterpolator.SHA1_PROPERTY + "}" ) )
 {
 return true;
 }

[maven] Git Push Summary

2017-03-12 Thread hboutemy 
Repository: maven
Updated Branches:
  refs/heads/MNG-6170 [deleted] 7cdff43ab

[06/17] maven git commit: Merge branch 'MNG-6181'

2017-03-12 Thread hboutemy 
Merge branch 'MNG-6181'


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

Branch: refs/heads/MNG-6169
Commit: 862c84a52b9ae9b88bc9a6cfa256852532d02a9a
Parents: 748551d e0da20a
Author: rfscholte 
Authored: Sun Mar 5 17:32:00 2017 +0100
Committer: rfscholte 
Committed: Sun Mar 5 17:32:00 2017 +0100

--
 apache-maven/src/conf/logging/simplelogger.properties | 8 +++-
 1 file changed, 7 insertions(+), 1 deletion(-)
--

[08/17] maven git commit: [MNG-6182] ModelResolver interface enhancements.

2017-03-12 Thread hboutemy 
[MNG-6182] ModelResolver interface enhancements.


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

Branch: refs/heads/MNG-6169
Commit: ab800b0cfae4e3ca9453304e3b9727ba4a4b712b
Parents: 114ef6c
Author: Christian Schulte 
Authored: Sat Jan 30 19:17:34 2016 +0100
Committer: Christian Schulte 
Committed: Wed Mar 8 18:24:18 2017 +0100

--
 .../maven/project/ProjectModelResolver.java | 84 +++
 .../maven/model/resolution/ModelResolver.java   | 32 
 .../internal/DefaultModelResolver.java  | 85 
 3 files changed, 167 insertions(+), 34 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/ab800b0c/maven-core/src/main/java/org/apache/maven/project/ProjectModelResolver.java
--
diff --git 
a/maven-core/src/main/java/org/apache/maven/project/ProjectModelResolver.java 
b/maven-core/src/main/java/org/apache/maven/project/ProjectModelResolver.java
index 7b93217..3a31d33 100644
--- 
a/maven-core/src/main/java/org/apache/maven/project/ProjectModelResolver.java
+++ 
b/maven-core/src/main/java/org/apache/maven/project/ProjectModelResolver.java
@@ -28,7 +28,7 @@ import java.util.Set;
 
 import com.google.common.base.Predicate;
 import com.google.common.collect.Iterables;
-
+import org.apache.maven.model.Dependency;
 import org.apache.maven.model.Parent;
 import org.apache.maven.model.Repository;
 import org.apache.maven.model.building.FileModelSource;
@@ -203,24 +203,26 @@ public class ProjectModelResolver
 return new FileModelSource( pomFile );
 }
 
-public ModelSource resolveModel( Parent parent )
+@Override
+public ModelSource resolveModel( final Parent parent )
 throws UnresolvableModelException
 {
-Artifact artifact = new DefaultArtifact( parent.getGroupId(), 
parent.getArtifactId(), "", "pom",
- parent.getVersion() );
-
-VersionRangeRequest versionRangeRequest = new VersionRangeRequest( 
artifact, repositories, context );
-versionRangeRequest.setTrace( trace );
-
 try
 {
-VersionRangeResult versionRangeResult = 
resolver.resolveVersionRange( session, versionRangeRequest );
+final Artifact artifact = new DefaultArtifact( 
parent.getGroupId(), parent.getArtifactId(), "", "pom",
+   parent.getVersion() 
);
+
+final VersionRangeRequest versionRangeRequest = new 
VersionRangeRequest( artifact, repositories, context );
+versionRangeRequest.setTrace( trace );
+
+final VersionRangeResult versionRangeResult = 
resolver.resolveVersionRange( session, versionRangeRequest );
 
 if ( versionRangeResult.getHighestVersion() == null )
 {
-throw new UnresolvableModelException( "No versions matched the 
requested range '" + parent.getVersion()
-  + "'", 
parent.getGroupId(), parent.getArtifactId(),
-  parent.getVersion() );
+throw new UnresolvableModelException(
+String.format( "No versions matched the requested parent 
version range '%s'",
+   parent.getVersion() ),
+parent.getGroupId(), parent.getArtifactId(), 
parent.getVersion() );
 
 }
 
@@ -229,21 +231,69 @@ public class ProjectModelResolver
  && 
versionRangeResult.getVersionConstraint().getRange().getUpperBound() == null )
 {
 // Message below is checked for in the MNG-2199 core IT.
-throw new UnresolvableModelException( "The requested version 
range '" + parent.getVersion()
-  + "' does not 
specify an upper bound", parent.getGroupId(),
-  parent.getArtifactId(), 
parent.getVersion() );
+throw new UnresolvableModelException(
+String.format( "The requested parent version range '%s' 
does not specify an upper bound",
+   parent.getVersion() ),
+parent.getGroupId(), parent.getArtifactId(), 
parent.getVersion() );
 
 }
 
 parent.setVersion( 
versionRangeResult.getHighestVersion().toString() );
+
+return resolveModel( parent.getGroupId(), parent.getArtifactId(), 
parent.getVersion() );
 }
-

[04/17] maven git commit: [MNG-6179] Remove WARNING about prerequisites usage

2017-03-12 Thread hboutemy 
[MNG-6179] Remove WARNING about prerequisites usage


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

Branch: refs/heads/MNG-6169
Commit: 748551d0274cc2eebfb2f976536d18277e564584
Parents: 529e8a6
Author: Karl Heinz Marbaise 
Authored: Fri Feb 24 22:49:21 2017 +0100
Committer: Karl Heinz Marbaise 
Committed: Wed Mar 1 20:05:45 2017 +0100

--
 pom.xml | 7 ---
 1 file changed, 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/748551d0/pom.xml
--
diff --git a/pom.xml b/pom.xml
index a085ffa..ba06feb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -149,13 +149,6 @@ under the License.
 
   
 
-  
-  
-  
-  
-${maven.version}
-  
-

[15/17] maven git commit: Code improvement.

2017-03-12 Thread hboutemy 
Code improvement.


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

Branch: refs/heads/MNG-6169
Commit: 809ba34055c70eab31876aad03c577e925fa2e6e
Parents: ab2e24f
Author: Karl Heinz Marbaise 
Authored: Mon Mar 6 08:24:33 2017 +0100
Committer: Karl Heinz Marbaise 
Committed: Sat Mar 11 20:53:18 2017 +0100

--
 .../resolver/DefaultArtifactResolver.java   |  4 ++--
 .../java/org/apache/maven/cli/MavenCli.java | 21 
 2 files changed, 6 insertions(+), 19 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/809ba340/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java
--
diff --git 
a/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java
 
b/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java
index b78846b..fc154cb 100644
--- 
a/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java
+++ 
b/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java
@@ -258,7 +258,7 @@ public class DefaultArtifactResolver
  throws 
ArtifactResolutionException,
  
ArtifactNotFoundException
 {
-return resolveTransitively( artifacts, originatingArtifact, 
Collections.EMPTY_MAP, localRepository,
+return resolveTransitively( artifacts, originatingArtifact, 
Collections.emptyMap(), localRepository,
 remoteRepositories, source, filter );
 
 }
@@ -305,7 +305,7 @@ public class DefaultArtifactResolver
  throws 
ArtifactResolutionException,
  
ArtifactNotFoundException
 {
-return resolveTransitively( artifacts, originatingArtifact, 
Collections.EMPTY_MAP, localRepository,
+return resolveTransitively( artifacts, originatingArtifact, 
Collections.emptyMap(), localRepository,
 remoteRepositories, source, null, 
listeners );
 }
 

http://git-wip-us.apache.org/repos/asf/maven/blob/809ba340/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 f3ae923..b3367c1 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
@@ -126,24 +126,11 @@ public class MavenCli
 
 public static final String MULTIMODULE_PROJECT_DIRECTORY = 
"maven.multiModuleProjectDirectory";
 
-@SuppressWarnings( "checkstyle:constantname" )
-public static final String userHome = System.getProperty( "user.home" );
+public static final String USER_HOME = System.getProperty( "user.home" );
 
-@SuppressWarnings( "checkstyle:constantname" )
-public static final File userMavenConfigurationHome = new File( userHome, 
".m2" );
+public static final File USER_MAVEN_CONFIGURATION_HOME = new File( 
USER_HOME, ".m2" );
 
-/**
- * @deprecated use {@link 
SettingsXmlConfigurationProcessor#DEFAULT_USER_SETTINGS_FILE}
- */
-public static final File DEFAULT_USER_SETTINGS_FILE = 
SettingsXmlConfigurationProcessor.DEFAULT_USER_SETTINGS_FILE;
-
-/**
- * @deprecated use {@link 
SettingsXmlConfigurationProcessor#DEFAULT_GLOBAL_SETTINGS_FILE}
- */
-public static final File DEFAULT_GLOBAL_SETTINGS_FILE =
-SettingsXmlConfigurationProcessor.DEFAULT_GLOBAL_SETTINGS_FILE;
-
-public static final File DEFAULT_USER_TOOLCHAINS_FILE = new File( 
userMavenConfigurationHome, "toolchains.xml" );
+public static final File DEFAULT_USER_TOOLCHAINS_FILE = new File( 
USER_MAVEN_CONFIGURATION_HOME, "toolchains.xml" );
 
 public static final File DEFAULT_GLOBAL_TOOLCHAINS_FILE =
 new File( System.getProperty( "maven.conf" ), "toolchains.xml" );
@@ -1257,7 +1244,7 @@ public class MavenCli
 //
 // 
--
 
-@SuppressWarnings( "unchecked" ) List goals = 
commandLine.getArgList();
+List goals = commandLine.getArgList();
 
 boolean recursive = true;

[11/17] maven git commit: [MNG-6176] Javadoc errors prevent release with Java 8 Upgrade modello to 1.9.0 Fix invalid Javadoc

2017-03-12 Thread hboutemy 
[MNG-6176] Javadoc errors prevent release with Java 8
Upgrade modello to 1.9.0
Fix invalid Javadoc


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

Branch: refs/heads/MNG-6169
Commit: 587317b0095fc5d51041fed9e5b4786246a29a7b
Parents: 8f025fa
Author: rfscholte 
Authored: Fri Mar 10 16:17:28 2017 +0100
Committer: rfscholte 
Committed: Fri Mar 10 16:17:28 2017 +0100

--
 .../artifact/versioning/ComparableVersion.java  |  8 +++---
 .../maven/artifact/versioning/VersionRange.java |  5 ++--
 maven-compat/pom.xml| 12 +
 .../resolver/ArtifactResolutionResult.java  | 13 +++---
 .../maven/artifact/resolver/ResolutionNode.java |  2 +-
 .../maven/execution/MojoExecutionEvent.java |  4 ++-
 .../maven/execution/MojoExecutionListener.java  |  4 ++-
 .../maven/execution/ProjectExecutionEvent.java  |  4 ++-
 .../execution/ProjectExecutionListener.java |  4 ++-
 .../scope/WeakMojoExecutionListener.java|  3 ++-
 .../lifecycle/MojoExecutionConfigurator.java|  5 ++--
 .../lifecycle/internal/BuildListCalculator.java |  3 ++-
 ...DefaultLifecycleExecutionPlanCalculator.java |  4 +--
 .../DefaultLifecyclePluginAnalyzer.java |  4 +--
 .../DefaultLifecycleTaskSegmentCalculator.java  |  6 ++---
 .../lifecycle/internal/DependencyContext.java   |  7 ++---
 .../lifecycle/internal/ExecutionPlanItem.java   |  5 ++--
 .../maven/lifecycle/internal/GoalTask.java  |  5 ++--
 .../internal/LifecycleDebugLogger.java  |  5 ++--
 .../internal/LifecycleDependencyResolver.java   |  6 ++---
 .../LifecycleExecutionPlanCalculator.java   |  1 -
 .../internal/LifecycleModuleBuilder.java|  7 ++---
 .../internal/LifecyclePluginResolver.java   |  3 +--
 .../maven/lifecycle/internal/LifecycleTask.java |  5 ++--
 .../LifecycleTaskSegmentCalculator.java |  6 ++---
 .../internal/MojoDescriptorCreator.java |  5 ++--
 .../maven/lifecycle/internal/MojoExecutor.java  |  5 ++--
 .../maven/lifecycle/internal/PhaseRecorder.java |  3 +--
 .../internal/ProjectArtifactFactory.java|  4 ++-
 .../lifecycle/internal/ProjectBuildList.java|  5 ++--
 .../maven/lifecycle/internal/ProjectIndex.java  |  5 ++--
 .../lifecycle/internal/ProjectSegment.java  | 18 -
 .../maven/lifecycle/internal/TaskSegment.java   |  4 +--
 .../lifecycle/internal/builder/Builder.java |  5 ++--
 .../ConcurrencyDependencyGraph.java |  5 ++--
 .../multithreaded/MultiThreadedBuilder.java |  4 +--
 .../multithreaded/ThreadOutputMuxer.java|  8 +++---
 .../PluginParameterExpressionEvaluator.java |  2 +-
 .../internal/DefaultMavenPluginManager.java | 10 +---
 .../org/apache/maven/project/MavenProject.java  |  9 +++
 .../project/RepositorySessionDecorator.java |  2 +-
 .../maven/repository/ArtifactTransferEvent.java |  4 +--
 .../legacy/metadata/ArtifactMetadataSource.java |  6 ++---
 .../maven/toolchain/ToolchainPrivate.java   |  2 +-
 .../java/org/apache/maven/cli/MavenCli.java |  4 ---
 .../maven/cli/event/ExecutionEventLogger.java   |  6 +++--
 .../model/interpolation/ModelInterpolator.java  |  2 --
 .../apache/maven/model/merge/ModelMerger.java   |  4 +--
 maven-model/src/main/mdo/maven.mdo  | 14 +-
 .../org/apache/maven/plugin/AbstractMojo.java   | 27 +---
 .../org/apache/maven/plugin/ContextEnabled.java |  3 +--
 .../main/java/org/apache/maven/plugin/Mojo.java |  9 +++
 .../maven/plugin/MojoExecutionException.java|  3 +--
 .../maven/plugin/MojoFailureException.java  |  3 +--
 .../maven/plugin/descriptor/MojoDescriptor.java |  3 +--
 .../org/apache/maven/plugin/logging/Log.java| 27 +++-
 .../ArtifactDescriptorReaderDelegate.java   |  2 +-
 maven-settings/src/main/mdo/settings.mdo|  2 +-
 pom.xml |  2 +-
 59 files changed, 186 insertions(+), 162 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/587317b0/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/ComparableVersion.java
--
diff --git 
a/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/ComparableVersion.java
 
b/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/ComparableVersion.java
index f434ef0..5222871 100644
--- 
a/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/ComparableVersion.java
+++ 
b/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/ComparableVersion.java
@@ -29,9 +29,11 @@

[12/17] maven git commit: [MNG-6170] NPE in cases using Multithreaded -T X versions:set -DnewVersion=1.0-SNAPSHOT o In some cases the code will return a null which should not be scheduled.

2017-03-12 Thread hboutemy 
[MNG-6170] NPE in cases using Multithreaded -T X versions:set
-DnewVersion=1.0-SNAPSHOT
 o In some cases the code will return a null which should
   not be scheduled.


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

Branch: refs/heads/MNG-6169
Commit: 7cdff43aba436408c79d2b4afc169b9c6909235a
Parents: 587317b
Author: Karl Heinz Marbaise 
Authored: Sun Feb 12 12:59:25 2017 +0100
Committer: Karl Heinz Marbaise 
Committed: Sat Mar 11 12:00:24 2017 +0100

--
 .../multithreaded/MultiThreadedBuilder.java | 27 
 1 file changed, 16 insertions(+), 11 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/7cdff43a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/multithreaded/MultiThreadedBuilder.java
--
diff --git 
a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/multithreaded/MultiThreadedBuilder.java
 
b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/multithreaded/MultiThreadedBuilder.java
index 072aec8..1414a12 100644
--- 
a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/multithreaded/MultiThreadedBuilder.java
+++ 
b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/multithreaded/MultiThreadedBuilder.java
@@ -55,6 +55,7 @@ import org.codehaus.plexus.logging.Logger;
  * @since 3.0
  * @author Kristian Rosenvold
  * Builds one or more lifecycles for a full module
+ * NOTE: This class is not part of any public api and can be changed 
or deleted without prior notice.
  */
 @Component( role = Builder.class, hint = "multithreaded" )
 public class MultiThreadedBuilder
@@ -67,7 +68,6 @@ public class MultiThreadedBuilder
 @Requirement
 private LifecycleModuleBuilder lifecycleModuleBuilder;
 
-
 public MultiThreadedBuilder()
 {
 }
@@ -142,15 +142,20 @@ public class MultiThreadedBuilder
 {
 break;
 }
-final List newItemsThatCanBeBuilt =
-analyzer.markAsFinished( projectBuild.getProject() );
-for ( MavenProject mavenProject : newItemsThatCanBeBuilt )
+
+// MNG-6170: Only schedule other modules from reactor if we 
have more modules to build than one. 
+if ( analyzer.getNumberOfBuilds() > 1 )
 {
-ProjectSegment scheduledDependent = projectBuildList.get( 
mavenProject );
-logger.debug( "Scheduling: " + scheduledDependent );
-Callable cb =
-createBuildCallable( rootSession, scheduledDependent, 
reactorContext, taskSegment, muxer );
-service.submit( cb );
+final List newItemsThatCanBeBuilt =
+analyzer.markAsFinished( projectBuild.getProject() );
+for ( MavenProject mavenProject : newItemsThatCanBeBuilt )
+{
+ProjectSegment scheduledDependent = 
projectBuildList.get( mavenProject );
+logger.debug( "Scheduling: " + scheduledDependent );
+Callable cb =
+createBuildCallable( rootSession, 
scheduledDependent, reactorContext, taskSegment, muxer );
+service.submit( cb );
+}
 }
 }
 catch ( InterruptedException e )
@@ -160,13 +165,13 @@ public class MultiThreadedBuilder
 }
 catch ( ExecutionException e )
 {
-// TODO MNG-5766 changes likely made this redundant 
+// TODO MNG-5766 changes likely made this redundant
 rootSession.getResult().addException( e );
 break;
 }
 }
 
-// cancel outstanding builds (if any)  - this can happen if an 
exception is thrown in above block
+// cancel outstanding builds (if any) - this can happen if an 
exception is thrown in above block
 
 Future unprocessed;
 while ( ( unprocessed = service.poll() ) != null )

[17/17] maven git commit: [MNG-6169] Lifecycle/binding plugin version updates

2017-03-12 Thread hboutemy 
[MNG-6169] Lifecycle/binding plugin version updates


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

Branch: refs/heads/MNG-6169
Commit: 430f70c03f328d66800f432db759b6685cfc581a
Parents: 181b021
Author: Christian Schulte 
Authored: Sat Feb 11 19:19:35 2017 +0100
Committer: Hervé Boutemy 
Committed: Sun Mar 12 17:30:52 2017 +0100

--
 .../resources/META-INF/plexus/components.xml|  7 +-
 .../META-INF/plexus/default-bindings.xml| 98 ++--
 2 files changed, 53 insertions(+), 52 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/430f70c0/maven-core/src/main/resources/META-INF/plexus/components.xml
--
diff --git a/maven-core/src/main/resources/META-INF/plexus/components.xml 
b/maven-core/src/main/resources/META-INF/plexus/components.xml
index 3f099cb..ff41c8a 100644
--- a/maven-core/src/main/resources/META-INF/plexus/components.xml
+++ b/maven-core/src/main/resources/META-INF/plexus/components.xml
@@ -77,8 +77,9 @@ under the License.
   post-clean
 
 
+  
   
-org.apache.maven.plugins:maven-clean-plugin:2.5:clean
+org.apache.maven.plugins:maven-clean-plugin:2.6.1:clean
   
 
 
@@ -101,10 +102,10 @@ under the License.
 
 
   
-org.apache.maven.plugins:maven-site-plugin:3.3:site
+org.apache.maven.plugins:maven-site-plugin:3.6:site
   
   
-org.apache.maven.plugins:maven-site-plugin:3.3:deploy
+org.apache.maven.plugins:maven-site-plugin:3.6:deploy
   
 
 

http://git-wip-us.apache.org/repos/asf/maven/blob/430f70c0/maven-core/src/main/resources/META-INF/plexus/default-bindings.xml
--
diff --git a/maven-core/src/main/resources/META-INF/plexus/default-bindings.xml 
b/maven-core/src/main/resources/META-INF/plexus/default-bindings.xml
index 4a303db..c846fb1 100644
--- a/maven-core/src/main/resources/META-INF/plexus/default-bindings.xml
+++ b/maven-core/src/main/resources/META-INF/plexus/default-bindings.xml
@@ -41,10 +41,10 @@ Mappings to default lifecycle, specific for each packaging.
 
 
   
-org.apache.maven.plugins:maven-install-plugin:2.4:install
+org.apache.maven.plugins:maven-install-plugin:2.5.2:install
   
   
-org.apache.maven.plugins:maven-deploy-plugin:2.7:deploy
+org.apache.maven.plugins:maven-deploy-plugin:2.8.2:deploy
   
 
 
@@ -67,28 +67,28 @@ Mappings to default lifecycle, specific for each packaging.
 
 
   
-org.apache.maven.plugins:maven-resources-plugin:2.6:resources
+org.apache.maven.plugins:maven-resources-plugin:3.0.2:resources
   
   
-org.apache.maven.plugins:maven-compiler-plugin:3.1:compile
+org.apache.maven.plugins:maven-compiler-plugin:3.6.1:compile
   
   
-
org.apache.maven.plugins:maven-resources-plugin:2.6:testResources
+
org.apache.maven.plugins:maven-resources-plugin:3.0.2:testResources
   
   
-org.apache.maven.plugins:maven-compiler-plugin:3.1:testCompile
+
org.apache.maven.plugins:maven-compiler-plugin:3.6.1:testCompile
   
   
-org.apache.maven.plugins:maven-surefire-plugin:2.12.4:test
+org.apache.maven.plugins:maven-surefire-plugin:2.19.1:test
   
   
-org.apache.maven.plugins:maven-jar-plugin:2.4:jar
+org.apache.maven.plugins:maven-jar-plugin:3.0.2:jar
   
   
-org.apache.maven.plugins:maven-install-plugin:2.4:install
+org.apache.maven.plugins:maven-install-plugin:2.5.2:install
   
   
-org.apache.maven.plugins:maven-deploy-plugin:2.7:deploy
+org.apache.maven.plugins:maven-deploy-plugin:2.8.2:deploy
   
 
 
@@ -111,28 +111,28 @@ Mappings to default lifecycle, specific for each 
packaging.
 
 
   
-org.apache.maven.plugins:maven-resources-plugin:2.6:resources
+

[03/17] maven git commit: Merge remote-tracking branch 'origin/master'

2017-03-12 Thread hboutemy 
Merge remote-tracking branch 'origin/master'


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

Branch: refs/heads/MNG-6169
Commit: 529e8a62049d009a800cbf0b37ca348abaf9022d
Parents: e652882 0b9a30f
Author: Stephen Connolly 
Authored: Tue Feb 28 22:04:39 2017 +
Committer: Stephen Connolly 
Committed: Tue Feb 28 22:04:39 2017 +

--
 apache-maven/src/bin/mvn | 6 +++---
 apache-maven/src/bin/mvn.cmd | 2 +-
 .../src/main/java/org/apache/maven/cli/CLIManager.java   | 8 
 maven-model-builder/src/site/apt/index.apt   | 6 --
 4 files changed, 8 insertions(+), 14 deletions(-)
--

[13/17] maven git commit: fixed typos

2017-03-12 Thread hboutemy 
fixed typos

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

Branch: refs/heads/MNG-6169
Commit: 24b9ef48f6045c3cca7297f4b7b94d3ee71b3718
Parents: 7cdff43
Author: Hervé Boutemy 
Authored: Sat Mar 11 18:19:02 2017 +0100
Committer: Hervé Boutemy 
Committed: Sat Mar 11 18:19:02 2017 +0100

--
 .../lifecycle/internal/DefaultLifecycleMappingDelegate.java  | 2 +-
 .../maven/lifecycle/internal/DefaultLifecyclePluginAnalyzer.java | 4 ++--
 .../src/site/resources/design/2.1-lifecycle-refactor.graffle | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/24b9ef48/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecycleMappingDelegate.java
--
diff --git 
a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecycleMappingDelegate.java
 
b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecycleMappingDelegate.java
index 8348530..db974bc 100644
--- 
a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecycleMappingDelegate.java
+++ 
b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecycleMappingDelegate.java
@@ -79,7 +79,7 @@ public class DefaultLifecycleMappingDelegate
 /*
  * Grab plugin executions that are bound to the selected lifecycle 
phases from project. The effective model of
  * the project already contains the plugin executions induced by the 
project's packaging type. Remember, all
- * phases of interest and only those are in the lifecyle mapping, if a 
phase has no value in the map, we are not
+ * phases of interest and only those are in the lifecycle mapping, if 
a phase has no value in the map, we are not
  * interested in any of the executions bound to it.
  */
 

http://git-wip-us.apache.org/repos/asf/maven/blob/24b9ef48/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecyclePluginAnalyzer.java
--
diff --git 
a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecyclePluginAnalyzer.java
 
b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecyclePluginAnalyzer.java
index 9e402e6..aec785f 100644
--- 
a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecyclePluginAnalyzer.java
+++ 
b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecyclePluginAnalyzer.java
@@ -73,7 +73,7 @@ public class DefaultLifecyclePluginAnalyzer
 // together and this really shows the problem of constructing a sensible 
default configuration but
 // it's all encapsulated here so it appears normalized to the POM builder.
 
-// We are going to take the project packaging and find all plugin in the 
default lifecycle and create
+// We are going to take the project packaging and find all plugins in the 
default lifecycle and create
 // fully populated Plugin objects, including executions with goals and 
default configuration taken
 // from the plugin.xml inside a plugin.
 //
@@ -82,7 +82,7 @@ public class DefaultLifecyclePluginAnalyzer
 {
 if ( logger.isDebugEnabled() )
 {
-logger.debug( "Looking up lifecyle mappings for packaging " + 
packaging + " from "
+logger.debug( "Looking up lifecycle mappings for packaging " + 
packaging + " from "
 + Thread.currentThread().getContextClassLoader() );
 }
 

http://git-wip-us.apache.org/repos/asf/maven/blob/24b9ef48/maven-core/src/site/resources/design/2.1-lifecycle-refactor.graffle
--
diff --git 
a/maven-core/src/site/resources/design/2.1-lifecycle-refactor.graffle 
b/maven-core/src/site/resources/design/2.1-lifecycle-refactor.graffle
index 722bc03..58811ba 100755
--- a/maven-core/src/site/resources/design/2.1-lifecycle-refactor.graffle
+++ b/maven-core/src/site/resources/design/2.1-lifecycle-refactor.graffle
@@ -3548,7 +3548,7 @@ uses plugin prefix}
 {\colortbl;\red255\green255\blue255;}
 
\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc
 
-\f0\b\fs24 \cf0 \ul \ulc0 LifecyleBindingManager}
+\f0\b\fs24 \cf0 \ul \ulc0 LifecycleBindingManager}

[16/17] maven git commit: [MNG-6115] prevent JAnsi from writing temp native files to lib/ext

2017-03-12 Thread hboutemy 
[MNG-6115] prevent JAnsi from writing temp native files to lib/ext

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

Branch: refs/heads/MNG-6169
Commit: 181b0215aa1199e152db9d2c08b1a01436547805
Parents: 809ba34
Author: Hervé Boutemy 
Authored: Sun Mar 5 00:39:31 2017 +0100
Committer: Hervé Boutemy 
Committed: Sun Mar 12 12:12:16 2017 +0100

--
 apache-maven/pom.xml| 17 ++
 apache-maven/src/bin/mvn|  1 -
 apache-maven/src/bin/mvn.cmd|  1 -
 apache-maven/src/lib/jansi-native/README.txt|  7 +++
 apache-maven/src/main/assembly/component.xml|  8 +++
 .../java/org/apache/maven/cli/MavenCli.java | 59 
 6 files changed, 91 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/181b0215/apache-maven/pom.xml
--
diff --git a/apache-maven/pom.xml b/apache-maven/pom.xml
index 6fc5a73..a528ddb 100644
--- a/apache-maven/pom.xml
+++ b/apache-maven/pom.xml
@@ -130,6 +130,22 @@ under the License.
 
   
 org.apache.maven.plugins
+maven-dependency-plugin
+
+  jansi
+  META-INF/native/**
+
+
+  
+unpack-jansi-native
+
+  unpack-dependencies
+
+  
+
+  
+  
+org.apache.maven.plugins
 maven-compiler-plugin
 
   
@@ -215,6 +231,7 @@ under the License.
 clean-target-dir
 prepare-package
 
+  true
   
 
   ${distributionTargetDir}

http://git-wip-us.apache.org/repos/asf/maven/blob/181b0215/apache-maven/src/bin/mvn
--
diff --git a/apache-maven/src/bin/mvn b/apache-maven/src/bin/mvn
index cfb39b0..df62f68 100755
--- a/apache-maven/src/bin/mvn
+++ b/apache-maven/src/bin/mvn
@@ -191,5 +191,4 @@ exec "$JAVACMD" \
   -classpath "${CLASSWORLDS_JAR}" \
   "-Dclassworlds.conf=${MAVEN_HOME}/bin/m2.conf" \
   "-Dmaven.home=${MAVEN_HOME}" 
"-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \
-  "-Dlibrary.jansi.path=${MAVEN_HOME}/lib/ext" \
   ${CLASSWORLDS_LAUNCHER} "$@"

http://git-wip-us.apache.org/repos/asf/maven/blob/181b0215/apache-maven/src/bin/mvn.cmd
--
diff --git a/apache-maven/src/bin/mvn.cmd b/apache-maven/src/bin/mvn.cmd
index c86662b..9d92279 100644
--- a/apache-maven/src/bin/mvn.cmd
+++ b/apache-maven/src/bin/mvn.cmd
@@ -178,7 +178,6 @@ set 
CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher
   "-Dclassworlds.conf=%MAVEN_HOME%\bin\m2.conf" ^
   "-Dmaven.home=%MAVEN_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/181b0215/apache-maven/src/lib/jansi-native/README.txt
--
diff --git a/apache-maven/src/lib/jansi-native/README.txt 
b/apache-maven/src/lib/jansi-native/README.txt
new file mode 100644
index 000..22857a6
--- /dev/null
+++ b/apache-maven/src/lib/jansi-native/README.txt
@@ -0,0 +1,7 @@
+This directory contains Jansi native libraries, extracted from Jansi jar.
+
+You can add your own extensions for platforms not natively supported by
+Jansi: the libraries follow HawtJNI directory and filename conventions.
+See 
http://fusesource.github.io/hawtjni/documentation/api/org/fusesource/hawtjni/runtime/Library.html
+
+See https://github.com/fusesource/jansi-native for native lib source.

http://git-wip-us.apache.org/repos/asf/maven/blob/181b0215/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 ca4dcb6..7b05af7 100644
--- a/apache-maven/src/main/assembly/component.xml
+++ b/apache-maven/src/main/assembly/component.xml
@@ -56,6 +56,14 @@ under the License.
   
 
 
+  target/dependency/META-INF/native
+  lib/jansi-native
+  
+**
+  
+  0755
+
+
   src/bin
   bin

[10/17] maven git commit: [MNG-6180] groupId has plain color when goal fails

2017-03-12 Thread hboutemy 
[MNG-6180] groupId has plain color when goal fails


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

Branch: refs/heads/MNG-6169
Commit: 8f025faab8fe0a3a6dbf3b76742fe365f4352e64
Parents: 34afec6
Author: rfscholte 
Authored: Sun Mar 5 17:25:43 2017 +0100
Committer: rfscholte 
Committed: Fri Mar 10 10:48:41 2017 +0100

--
 .../org/apache/maven/lifecycle/LifecycleExecutionException.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/8f025faa/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 62ae269..0831a4f 100644
--- 
a/maven-core/src/main/java/org/apache/maven/lifecycle/LifecycleExecutionException.java
+++ 
b/maven-core/src/main/java/org/apache/maven/lifecycle/LifecycleExecutionException.java
@@ -84,8 +84,9 @@ public class LifecycleExecutionException
 
 if ( execution != null )
 {
-buffer.a( ' ' ).a( execution.getGroupId() ).a( ':' );
-buffer.mojo( execution.getArtifactId() + ':' + 
execution.getVersion() + ':' + execution.getGoal() );
+buffer.a( ' ' );
+buffer.mojo( execution.getGroupId() + ':' + 
execution.getArtifactId() + ':' + execution.getVersion() + ':'
++ execution.getGoal() );
 buffer.a( ' ' ).strong( '(' + execution.getExecutionId() + ')' );
 }

[01/17] maven git commit: [maven-release-plugin] prepare release maven-3.5.0-alpha-1 [Forced Update!]

2017-03-12 Thread hboutemy 
Repository: maven
Updated Branches:
  refs/heads/MNG-6169 e87637f68 -> 430f70c03 (forced update)


[maven-release-plugin] prepare release maven-3.5.0-alpha-1


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

Branch: refs/heads/MNG-6169
Commit: 8e6bbc4d4aa7cdc837625a05358c98ca15f72698
Parents: dc9c4db
Author: Stephen Connolly 
Authored: Thu Feb 23 14:56:21 2017 +
Committer: Stephen Connolly 
Committed: Thu Feb 23 14:56:21 2017 +

--
 apache-maven/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-resolver-provider/pom.xml   | 2 +-
 maven-settings-builder/pom.xml| 2 +-
 maven-settings/pom.xml| 2 +-
 maven-slf4j-provider/pom.xml  | 2 +-
 pom.xml   | 4 ++--
 15 files changed, 16 insertions(+), 16 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/8e6bbc4d/apache-maven/pom.xml
--
diff --git a/apache-maven/pom.xml b/apache-maven/pom.xml
index 6fc5a73..bf746fe 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.0-alpha-1
   
 
   apache-maven

http://git-wip-us.apache.org/repos/asf/maven/blob/8e6bbc4d/maven-artifact/pom.xml
--
diff --git a/maven-artifact/pom.xml b/maven-artifact/pom.xml
index e3943c9..d52f636 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.0-alpha-1
   
 
   maven-artifact

http://git-wip-us.apache.org/repos/asf/maven/blob/8e6bbc4d/maven-builder-support/pom.xml
--
diff --git a/maven-builder-support/pom.xml b/maven-builder-support/pom.xml
index 39eb161..1522718 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.0-alpha-1
   
 
   maven-builder-support

http://git-wip-us.apache.org/repos/asf/maven/blob/8e6bbc4d/maven-compat/pom.xml
--
diff --git a/maven-compat/pom.xml b/maven-compat/pom.xml
index 2b205f7..3424480 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.0-alpha-1
   
 
   maven-compat

http://git-wip-us.apache.org/repos/asf/maven/blob/8e6bbc4d/maven-core/pom.xml
--
diff --git a/maven-core/pom.xml b/maven-core/pom.xml
index 0e20235..7c67b62 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.0-alpha-1
   
 
   maven-core

http://git-wip-us.apache.org/repos/asf/maven/blob/8e6bbc4d/maven-embedder/pom.xml
--
diff --git a/maven-embedder/pom.xml b/maven-embedder/pom.xml
index 30ad2ce..268e313 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.0-alpha-1
   
 
   maven-embedder

http://git-wip-us.apache.org/repos/asf/maven/blob/8e6bbc4d/maven-model-builder/pom.xml
--
diff --git a/maven-model-builder/pom.xml b/maven-model-builder/pom.xml
index 0dd08ac..65943cc 100644
--- a/maven-model-builder/pom.xml
+++ b/maven-model-builder/pom.xml
@@ -25,7 +25,7 @@ under the License.
   
 org.apache.maven
 maven
-3.5.0-SNAPSHOT
+3.5.0-alpha-1
   
 
   maven-model-builder

http://git-wip-us.apache.org/repos/asf/maven/blob/8e6bbc4d/maven-model/pom.xml
--
diff --git a/maven-model/pom.xml b/maven-model/pom.xml
index 41cf168..1c636c7 100644
--- a/maven-model/pom.xml
+++ b/maven-model/pom.xml
@@ -25,7 +25,7 @@ under the License.

[14/17] maven git commit: Fixed checkstyle reported error.

2017-03-12 Thread hboutemy 
Fixed checkstyle reported error.


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

Branch: refs/heads/MNG-6169
Commit: ab2e24fe3612b4f12c66e698e398fcb2b908f1aa
Parents: 24b9ef4
Author: Karl Heinz Marbaise 
Authored: Sat Mar 11 18:40:24 2017 +0100
Committer: Karl Heinz Marbaise 
Committed: Sat Mar 11 18:40:24 2017 +0100

--
 .../lifecycle/internal/DefaultLifecycleMappingDelegate.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/ab2e24fe/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecycleMappingDelegate.java
--
diff --git 
a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecycleMappingDelegate.java
 
b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecycleMappingDelegate.java
index db974bc..c2bf919 100644
--- 
a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecycleMappingDelegate.java
+++ 
b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecycleMappingDelegate.java
@@ -79,8 +79,8 @@ public class DefaultLifecycleMappingDelegate
 /*
  * Grab plugin executions that are bound to the selected lifecycle 
phases from project. The effective model of
  * the project already contains the plugin executions induced by the 
project's packaging type. Remember, all
- * phases of interest and only those are in the lifecycle mapping, if 
a phase has no value in the map, we are not
- * interested in any of the executions bound to it.
+ * phases of interest and only those are in the lifecycle mapping, if 
a phase has no value in the map, we are
+ * not interested in any of the executions bound to it.
  */
 
 for ( Plugin plugin : project.getBuild().getPlugins() )

[05/17] maven git commit: [MNG-6181] HttpClient produces a lot of noise at debug loglevel

2017-03-12 Thread hboutemy 
[MNG-6181] HttpClient produces a lot of noise at debug loglevel

Turn off httpclient logging by default, which restores logging from previous 
Maven versions


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

Branch: refs/heads/MNG-6169
Commit: e0da20a1f801aeda0cd74495834c637c3a207478
Parents: 0b9a30f
Author: rfscholte 
Authored: Sun Mar 5 15:30:27 2017 +0100
Committer: rfscholte 
Committed: Sun Mar 5 15:30:27 2017 +0100

--
 apache-maven/src/conf/logging/simplelogger.properties | 8 +++-
 1 file changed, 7 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/e0da20a1/apache-maven/src/conf/logging/simplelogger.properties
--
diff --git a/apache-maven/src/conf/logging/simplelogger.properties 
b/apache-maven/src/conf/logging/simplelogger.properties
index 859ff72..eb3d049 100644
--- a/apache-maven/src/conf/logging/simplelogger.properties
+++ b/apache-maven/src/conf/logging/simplelogger.properties
@@ -22,4 +22,10 @@ org.slf4j.simpleLogger.showLogName=false
 org.slf4j.simpleLogger.logFile=System.out
 org.slf4j.simpleLogger.levelInBrackets=true
 org.slf4j.simpleLogger.log.Sisu=info
-org.slf4j.simpleLogger.warnLevelString=WARNING
\ No newline at end of file
+org.slf4j.simpleLogger.warnLevelString=WARNING
+
+# MNG-6181: mvn -X also prints all debug logging from http-client
+# Be aware that the shaded packages are used
+# org.apache.http -> org.apache.maven.wagon.providers.http.httpclient
+org.slf4j.simpleLogger.log.org.apache.maven.wagon.providers.http.httpclient=off
+org.slf4j.simpleLogger.log.org.apache.maven.wagon.providers.http.httpclient.wire=off
\ No newline at end of file

[09/17] maven git commit: [MNG-6183] Dependency management debug message enhancements.

2017-03-12 Thread hboutemy 
[MNG-6183] Dependency management debug message enhancements.

o Updated to add debug log messages about optional flag management.


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

Branch: refs/heads/MNG-6169
Commit: 34afec69c866f731f3f9d9b3606bbc31b51d64e7
Parents: ab800b0
Author: Christian Schulte 
Authored: Wed Jan 27 03:46:11 2016 +0100
Committer: Christian Schulte 
Committed: Wed Mar 8 19:37:31 2017 +0100

--
 .../maven/project/DefaultProjectDependenciesResolver.java| 8 
 1 file changed, 8 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/34afec69/maven-core/src/main/java/org/apache/maven/project/DefaultProjectDependenciesResolver.java
--
diff --git 
a/maven-core/src/main/java/org/apache/maven/project/DefaultProjectDependenciesResolver.java
 
b/maven-core/src/main/java/org/apache/maven/project/DefaultProjectDependenciesResolver.java
index 16b60c2..21dfaa2 100644
--- 
a/maven-core/src/main/java/org/apache/maven/project/DefaultProjectDependenciesResolver.java
+++ 
b/maven-core/src/main/java/org/apache/maven/project/DefaultProjectDependenciesResolver.java
@@ -273,6 +273,14 @@ public class DefaultProjectDependenciesResolver
 appendManagementSource( buffer, art, "version" );
 buffer.append( ')' );
 }
+
+Boolean premanagedOptional = 
DependencyManagerUtils.getPremanagedOptional( node );
+if ( premanagedOptional != null && !premanagedOptional.equals( 
dep.getOptional() ) )
+{
+buffer.append( " (optionality managed from " ).append( 
premanagedOptional );
+appendManagementSource( buffer, art, "optional" );
+buffer.append( ')' );
+}
 }
 else
 {

[07/17] maven git commit: [MNG-6173] MavenSession.getAllProjects() should return all projects in the reactor

2017-03-12 Thread hboutemy 
[MNG-6173] MavenSession.getAllProjects() should return all projects in the 
reactor

This commit removes the initialization of the MavenSession object from the
DefaultGraphBuilder. The GraphBuilder implementation should only build the
graph and should not touch the MavenSession object passed into it.

To allow complete initialization of the MavenSession the ProjectDependencyGraph
interface got enhanced so that GraphBuilder implementations can communicate all
collected projects in addition to the processed list of projects.

This closes #105


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

Branch: refs/heads/MNG-6169
Commit: 114ef6c5a2802e8758e466af92b70f51fd7a2929
Parents: 862c84a
Author: Christoph Böhme 
Authored: Mon Feb 20 07:32:17 2017 +0100
Committer: Christian Schulte 
Committed: Mon Mar 6 17:35:24 2017 +0100

--
 .../java/org/apache/maven/DefaultMaven.java |   2 +-
 .../maven/execution/ProjectDependencyGraph.java |   9 ++
 .../apache/maven/graph/DefaultGraphBuilder.java | 109 ---
 .../graph/DefaultProjectDependencyGraph.java|  32 ++
 .../graph/FilteredProjectDependencyGraph.java   |   8 ++
 .../AbstractCoreMavenComponentTestCase.java |   1 +
 .../maven/lifecycle/LifecycleExecutorTest.java  |   5 +
 .../stub/ProjectDependencyGraphStub.java|   5 +
 8 files changed, 106 insertions(+), 65 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/114ef6c5/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 15b946e..7e46ad0 100644
--- a/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
+++ b/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
@@ -525,7 +525,7 @@ public class DefaultMaven
 {
 ProjectDependencyGraph projectDependencyGraph = graphResult.get();
 session.setProjects( projectDependencyGraph.getSortedProjects() );
-session.setAllProjects( projectDependencyGraph.getSortedProjects() 
);
+session.setAllProjects( projectDependencyGraph.getAllProjects() );
 session.setProjectDependencyGraph( projectDependencyGraph );
 }
 

http://git-wip-us.apache.org/repos/asf/maven/blob/114ef6c5/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 0d5584b..d206d73 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
@@ -33,6 +33,15 @@ public interface ProjectDependencyGraph
 {
 
 /**
+ * Gets all collected projects.
+ *
+ * @return All collected projects.
+ *
+ * @since 3.5.0-alpha-2
+ */
+List getAllProjects();
+
+/**
  * Gets all projects in their intended build order, i.e. after 
topologically sorting the projects according to their
  * inter-dependencies.
  *

http://git-wip-us.apache.org/repos/asf/maven/blob/114ef6c5/maven-core/src/main/java/org/apache/maven/graph/DefaultGraphBuilder.java
--
diff --git 
a/maven-core/src/main/java/org/apache/maven/graph/DefaultGraphBuilder.java 
b/maven-core/src/main/java/org/apache/maven/graph/DefaultGraphBuilder.java
index 680d584..2cbea84 100644
--- a/maven-core/src/main/java/org/apache/maven/graph/DefaultGraphBuilder.java
+++ b/maven-core/src/main/java/org/apache/maven/graph/DefaultGraphBuilder.java
@@ -28,12 +28,12 @@ import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Map;
 
+import com.google.common.collect.Lists;
 import org.apache.maven.DefaultMaven;
 import org.apache.maven.MavenExecutionException;
 import org.apache.maven.ProjectCycleException;
 import org.apache.maven.artifact.ArtifactUtils;
 import org.apache.maven.execution.MavenExecutionRequest;
-import org.apache.maven.execution.MavenExecutionResult;
 import org.apache.maven.execution.MavenSession;
 import org.apache.maven.execution.ProjectDependencyGraph;
 import org.apache.maven.model.Plugin;
@@ -43,6 +43,7 @@ import org.apache.maven.model.building.ModelProblemUtils;
 import org.apache.maven.model.building.ModelSource;
 import

[02/17] maven git commit: [maven-release-plugin] prepare for next development iteration

2017-03-12 Thread hboutemy 
[maven-release-plugin] prepare for next development iteration


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

Branch: refs/heads/MNG-6169
Commit: e6528827571b0ebe06675ef47c8157d1522116a5
Parents: 8e6bbc4
Author: Stephen Connolly 
Authored: Thu Feb 23 14:56:31 2017 +
Committer: Stephen Connolly 
Committed: Thu Feb 23 14:56:31 2017 +

--
 apache-maven/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-resolver-provider/pom.xml   | 2 +-
 maven-settings-builder/pom.xml| 2 +-
 maven-settings/pom.xml| 2 +-
 maven-slf4j-provider/pom.xml  | 2 +-
 pom.xml   | 4 ++--
 15 files changed, 16 insertions(+), 16 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/e6528827/apache-maven/pom.xml
--
diff --git a/apache-maven/pom.xml b/apache-maven/pom.xml
index bf746fe..6fc5a73 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-alpha-1
+3.5.0-SNAPSHOT
   
 
   apache-maven

http://git-wip-us.apache.org/repos/asf/maven/blob/e6528827/maven-artifact/pom.xml
--
diff --git a/maven-artifact/pom.xml b/maven-artifact/pom.xml
index d52f636..e3943c9 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-alpha-1
+3.5.0-SNAPSHOT
   
 
   maven-artifact

http://git-wip-us.apache.org/repos/asf/maven/blob/e6528827/maven-builder-support/pom.xml
--
diff --git a/maven-builder-support/pom.xml b/maven-builder-support/pom.xml
index 1522718..39eb161 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-alpha-1
+3.5.0-SNAPSHOT
   
 
   maven-builder-support

http://git-wip-us.apache.org/repos/asf/maven/blob/e6528827/maven-compat/pom.xml
--
diff --git a/maven-compat/pom.xml b/maven-compat/pom.xml
index 3424480..2b205f7 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-alpha-1
+3.5.0-SNAPSHOT
   
 
   maven-compat

http://git-wip-us.apache.org/repos/asf/maven/blob/e6528827/maven-core/pom.xml
--
diff --git a/maven-core/pom.xml b/maven-core/pom.xml
index 7c67b62..0e20235 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-alpha-1
+3.5.0-SNAPSHOT
   
 
   maven-core

http://git-wip-us.apache.org/repos/asf/maven/blob/e6528827/maven-embedder/pom.xml
--
diff --git a/maven-embedder/pom.xml b/maven-embedder/pom.xml
index 268e313..30ad2ce 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-alpha-1
+3.5.0-SNAPSHOT
   
 
   maven-embedder

http://git-wip-us.apache.org/repos/asf/maven/blob/e6528827/maven-model-builder/pom.xml
--
diff --git a/maven-model-builder/pom.xml b/maven-model-builder/pom.xml
index 65943cc..0dd08ac 100644
--- a/maven-model-builder/pom.xml
+++ b/maven-model-builder/pom.xml
@@ -25,7 +25,7 @@ under the License.
   
 org.apache.maven
 maven
-3.5.0-alpha-1
+3.5.0-SNAPSHOT
   
 
   maven-model-builder

http://git-wip-us.apache.org/repos/asf/maven/blob/e6528827/maven-model/pom.xml
--
diff --git a/maven-model/pom.xml b/maven-model/pom.xml
index 1c636c7..41cf168 100644
--- a/maven-model/pom.xml
+++ b/maven-model/pom.xml
@@ -25,7 +25,7 @@ under the License.
   
 org.apache.maven
 maven
-3.5.0-alpha-1
+3.5.0-SNAPSHOT
   
 
   maven-model

[maven] Git Push Summary

2017-03-12 Thread hboutemy 
Repository: maven
Updated Branches:
  refs/heads/MNG-6115-2 [deleted] c36cf425c

[maven] Git Push Summary

2017-03-12 Thread hboutemy 
Repository: maven
Updated Branches:
  refs/heads/MNG-6115 [deleted] 5ff329f66

maven git commit: [MNG-6115] prevent JAnsi from writing temp native files to lib/ext

2017-03-12 Thread hboutemy 
Repository: maven
Updated Branches:
  refs/heads/master 809ba3405 -> 181b0215a


[MNG-6115] prevent JAnsi from writing temp native files to lib/ext

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

Branch: refs/heads/master
Commit: 181b0215aa1199e152db9d2c08b1a01436547805
Parents: 809ba34
Author: Hervé Boutemy 
Authored: Sun Mar 5 00:39:31 2017 +0100
Committer: Hervé Boutemy 
Committed: Sun Mar 12 12:12:16 2017 +0100

--
 apache-maven/pom.xml| 17 ++
 apache-maven/src/bin/mvn|  1 -
 apache-maven/src/bin/mvn.cmd|  1 -
 apache-maven/src/lib/jansi-native/README.txt|  7 +++
 apache-maven/src/main/assembly/component.xml|  8 +++
 .../java/org/apache/maven/cli/MavenCli.java | 59 
 6 files changed, 91 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/181b0215/apache-maven/pom.xml
--
diff --git a/apache-maven/pom.xml b/apache-maven/pom.xml
index 6fc5a73..a528ddb 100644
--- a/apache-maven/pom.xml
+++ b/apache-maven/pom.xml
@@ -130,6 +130,22 @@ under the License.
 
   
 org.apache.maven.plugins
+maven-dependency-plugin
+
+  jansi
+  META-INF/native/**
+
+
+  
+unpack-jansi-native
+
+  unpack-dependencies
+
+  
+
+  
+  
+org.apache.maven.plugins
 maven-compiler-plugin
 
   
@@ -215,6 +231,7 @@ under the License.
 clean-target-dir
 prepare-package
 
+  true
   
 
   ${distributionTargetDir}

http://git-wip-us.apache.org/repos/asf/maven/blob/181b0215/apache-maven/src/bin/mvn
--
diff --git a/apache-maven/src/bin/mvn b/apache-maven/src/bin/mvn
index cfb39b0..df62f68 100755
--- a/apache-maven/src/bin/mvn
+++ b/apache-maven/src/bin/mvn
@@ -191,5 +191,4 @@ exec "$JAVACMD" \
   -classpath "${CLASSWORLDS_JAR}" \
   "-Dclassworlds.conf=${MAVEN_HOME}/bin/m2.conf" \
   "-Dmaven.home=${MAVEN_HOME}" 
"-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \
-  "-Dlibrary.jansi.path=${MAVEN_HOME}/lib/ext" \
   ${CLASSWORLDS_LAUNCHER} "$@"

http://git-wip-us.apache.org/repos/asf/maven/blob/181b0215/apache-maven/src/bin/mvn.cmd
--
diff --git a/apache-maven/src/bin/mvn.cmd b/apache-maven/src/bin/mvn.cmd
index c86662b..9d92279 100644
--- a/apache-maven/src/bin/mvn.cmd
+++ b/apache-maven/src/bin/mvn.cmd
@@ -178,7 +178,6 @@ set 
CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher
   "-Dclassworlds.conf=%MAVEN_HOME%\bin\m2.conf" ^
   "-Dmaven.home=%MAVEN_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/181b0215/apache-maven/src/lib/jansi-native/README.txt
--
diff --git a/apache-maven/src/lib/jansi-native/README.txt 
b/apache-maven/src/lib/jansi-native/README.txt
new file mode 100644
index 000..22857a6
--- /dev/null
+++ b/apache-maven/src/lib/jansi-native/README.txt
@@ -0,0 +1,7 @@
+This directory contains Jansi native libraries, extracted from Jansi jar.
+
+You can add your own extensions for platforms not natively supported by
+Jansi: the libraries follow HawtJNI directory and filename conventions.
+See 
http://fusesource.github.io/hawtjni/documentation/api/org/fusesource/hawtjni/runtime/Library.html
+
+See https://github.com/fusesource/jansi-native for native lib source.

http://git-wip-us.apache.org/repos/asf/maven/blob/181b0215/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 ca4dcb6..7b05af7 100644
--- a/apache-maven/src/main/assembly/component.xml
+++ b/apache-maven/src/main/assembly/component.xml
@@ -56,6 +56,14 @@ under the License.
   
 
 
+  target/dependency/META-INF/native
+  lib/jansi-native
+  
+**
+  
+  0755
+
+
   src/bin
   bin

maven git commit: dummy change

2017-03-12 Thread stephenc 
Repository: maven
Updated Branches:
  refs/heads/temp-experiment2 [created] ab21ebd16


dummy change


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

Branch: refs/heads/temp-experiment2
Commit: ab21ebd16fa2d1255e7a5085e54188b5fc8cf3fc
Parents: 529e8a6
Author: Stephen Connolly 
Authored: Sat Mar 11 23:15:45 2017 +
Committer: Stephen Connolly 
Committed: Sat Mar 11 23:15:45 2017 +

--
 README.md | 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/ab21ebd1/README.md
--
diff --git a/README.md b/README.md
index 33a4be4..fe4b0a3 100644
--- a/README.md
+++ b/README.md
@@ -21,3 +21,4 @@ mvn 
-DdistributionTargetDir="$HOME/app/maven/apache-maven-3.5.x-SNAPSHOT" clean
 ```
 
 Once the build completes, you should have a new Maven distro ready to roll in 
that directory!
+

[maven] Git Push Summary

2017-03-12 Thread stephenc 
Repository: maven
Updated Branches:
  refs/heads/temp-experiment2 [deleted] ab21ebd16