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-13 Thread khmarbaise 
Repository: maven
Updated Branches:
  refs/heads/master 181b0215a -> 51cc76c32


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

Branch: refs/heads/master
Commit: 51cc76c32625be2f807dcf2ffbeb085984729b57
Parents: 181b021
Author: Karl Heinz Marbaise 
Authored: Tue Sep 29 11:46:48 2015 +0200
Committer: Karl Heinz Marbaise 
Committed: Mon Mar 13 22:08:51 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/51cc76c3/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 fc154cb..915ee72 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/51cc76c3/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( 
request.getSystemProperties() ) );
+
+try
+{
+St

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-13 Thread hboutemy 
Repository: maven
Updated Branches:
  refs/heads/MNG-6057 41e4b3240 -> 8a3aa6c1b (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/8a3aa6c1
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/8a3aa6c1
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/8a3aa6c1

Branch: refs/heads/MNG-6057
Commit: 8a3aa6c1b9d84455435654530430760d26c16bf5
Parents: ab2e24f
Author: Karl Heinz Marbaise 
Authored: Tue Sep 29 11:46:48 2015 +0200
Committer: Hervé Boutemy 
Committed: Mon Mar 13 08:27:57 2017 +0100

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


http://git-wip-us.apache.org/repos/asf/maven/blob/8a3aa6c1/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/8a3aa6c1/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..ee51fbd 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,42 @@ 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 )
+{
+// MNG-6090 interpolate parent version for ${sha1}, ${revision} or 
${changelist}
+try
+{
+String parentVersion = 
interpolatedModel.getParent().getVersion();
+
+StringSearchInterpolator ssi = new StringSearchInterpolator();
+ssi.addValueSource( new MapBasedValueSource( 
request.getUserProperties() ) );

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( 
request.getSystemProperties() ) );
+
+try
+{

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-07 Thread khmarbaise 
Repository: maven
Updated Branches:
  refs/heads/MNG-6057 784b1dc46 -> 8af5a8f0e (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/8af5a8f0
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/8af5a8f0
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/8af5a8f0

Branch: refs/heads/MNG-6057
Commit: 8af5a8f0e756bd2bffb97ca576c46104307e9125
Parents: 862c84a
Author: Karl Heinz Marbaise 
Authored: Tue Sep 29 11:46:48 2015 +0200
Committer: Karl Heinz Marbaise 
Committed: Tue Mar 7 23:00:39 2017 +0100

--
 .../resolver/DefaultArtifactResolver.java   | 46 
 .../model/building/DefaultModelBuilder.java | 35 +--
 .../AbstractStringBasedModelInterpolator.java   | 33 +++---
 3 files changed, 77 insertions(+), 37 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/8af5a8f0/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..93a5919 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,10 +22,12 @@ 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;
@@ -149,21 +151,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 )
 {
@@ -255,8 +257,7 @@ 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 );
@@ -268,8 +269,7 @@ public class DefaultArtifactResolver
  ArtifactRepository 
localRepository,
  
List remoteRepositories,
  
ArtifactMetadataSource source )
- throws 
ArtifactResolutionException,
-

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-05 Thread khmarbaise 
Repository: maven
Updated Branches:
  refs/heads/MNG-6057 [created] 82548dbc8


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

Branch: refs/heads/MNG-6057
Commit: 82548dbc84bea2e0ab95316c809239dd22433055
Parents: 0b9a30f
Author: Karl Heinz Marbaise 
Authored: Tue Sep 29 11:46:48 2015 +0200
Committer: Karl Heinz Marbaise 
Committed: Sat Feb 25 22:22:28 2017 +0100

--
 .../resolver/DefaultArtifactResolver.java   | 46 
 .../model/building/DefaultModelBuilder.java | 35 +--
 .../AbstractStringBasedModelInterpolator.java   | 33 +++---
 3 files changed, 77 insertions(+), 37 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/82548dbc/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..93a5919 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,10 +22,12 @@ 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;
@@ -149,21 +151,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 )
 {
@@ -255,8 +257,7 @@ 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 );
@@ -268,8 +269,7 @@ public class DefaultArtifactResolver
  ArtifactRepository 
localRepository,
  
List remoteRepositories,
  
ArtifactMetadataSource source )
- throws 
ArtifactResolutionException,
- 
Art

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-02-25 Thread khmarbaise 
Repository: maven
Updated Branches:
  refs/heads/mvn-3.5.1/MNG-6057 07ea23358 -> 82548dbc8 (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/82548dbc
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/82548dbc
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/82548dbc

Branch: refs/heads/mvn-3.5.1/MNG-6057
Commit: 82548dbc84bea2e0ab95316c809239dd22433055
Parents: 0b9a30f
Author: Karl Heinz Marbaise 
Authored: Tue Sep 29 11:46:48 2015 +0200
Committer: Karl Heinz Marbaise 
Committed: Sat Feb 25 22:22:28 2017 +0100

--
 .../resolver/DefaultArtifactResolver.java   | 46 
 .../model/building/DefaultModelBuilder.java | 35 +--
 .../AbstractStringBasedModelInterpolator.java   | 33 +++---
 3 files changed, 77 insertions(+), 37 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/82548dbc/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..93a5919 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,10 +22,12 @@ 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;
@@ -149,21 +151,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 )
 {
@@ -255,8 +257,7 @@ 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 );
@@ -268,8 +269,7 @@ public class DefaultArtifactResolver
  ArtifactRepository 
localRepository,
  
List remoteRepositories,
  
ArtifactMetadataSource source )
- throws 
ArtifactResolutionException,
-

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-02-20 Thread khmarbaise 
Repository: maven
Updated Branches:
  refs/heads/mvn-3.5.1/MNG-6057 55bc3774c -> 6cd1e (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/6cd1
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/6cd1
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/6cd1

Branch: refs/heads/mvn-3.5.1/MNG-6057
Commit: 6cd1e637a4031718493983f240ac8f2bc6b3
Parents: e6217a4
Author: Karl Heinz Marbaise 
Authored: Tue Sep 29 11:46:48 2015 +0200
Committer: Karl Heinz Marbaise 
Committed: Mon Feb 20 22:19:50 2017 +0100

--
 .../resolver/DefaultArtifactResolver.java   | 47 
 .../model/building/DefaultModelBuilder.java | 35 +--
 .../AbstractStringBasedModelInterpolator.java   | 27 ---
 3 files changed, 72 insertions(+), 37 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/6cd1/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..9bc37c3 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,10 +22,12 @@ 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;
@@ -149,21 +151,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 )
 {
@@ -255,8 +257,7 @@ 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 );
@@ -268,8 +269,7 @@ public class DefaultArtifactResolver
  ArtifactRepository 
localRepository,
  
List remoteRepositories,
  
ArtifactMetadataSource source )
- throws 
ArtifactResolutionException,
-

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-02-20 Thread khmarbaise 
Repository: maven
Updated Branches:
  refs/heads/mvn-3.5.1/MNG-6057 [created] 55bc3774c


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

Branch: refs/heads/mvn-3.5.1/MNG-6057
Commit: 55bc3774cf8e9b97a1656825010551abfc3fe090
Parents: e6217a4
Author: Karl Heinz Marbaise 
Authored: Tue Sep 29 11:46:48 2015 +0200
Committer: Karl Heinz Marbaise 
Committed: Mon Feb 20 21:45:48 2017 +0100

--
 .../resolver/DefaultArtifactResolver.java   | 47 
 .../model/building/DefaultModelBuilder.java | 33 --
 .../AbstractStringBasedModelInterpolator.java   | 27 ---
 3 files changed, 69 insertions(+), 38 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/55bc3774/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..9bc37c3 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,10 +22,12 @@ 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;
@@ -149,21 +151,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 )
 {
@@ -255,8 +257,7 @@ 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 );
@@ -268,8 +269,7 @@ public class DefaultArtifactResolver
  ArtifactRepository 
localRepository,
  
List remoteRepositories,
  
ArtifactMetadataSource source )
- throws 
ArtifactResolutionException,
-