[maven] Git Push Summary

[hboutemy]

Repository: maven
Updated Branches:
  refs/heads/m6078 [deleted] 13bf55443

[maven] Git Push Summary

[hboutemy]

Repository: maven
Updated Branches:
  refs/heads/MNG-6115 [deleted] 5ff329f66

[2/7] maven git commit: [MNG-6078] Perform a proper merge of the two sources of command line arguments

[rfscholte]

[MNG-6078] Perform a proper merge of the two sources of command line arguments

- Needed to extend Commons CLI's CommandLine just to perform the merged


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

Branch: refs/heads/m6078
Commit: 13bf5544488e4ff2a0782f995492b3f56da1
Parents: 90ef7a1
Author: Stephen Connolly 
Authored: Tue Feb 21 10:10:21 2017 +
Committer: Stephen Connolly 
Committed: Tue Feb 21 12:59:09 2017 +

--
 .../java/org/apache/maven/cli/MavenCli.java | 25 +++---
 .../org/apache/maven/cli/MergedCommandLine.java | 75 ++
 .../java/org/apache/maven/cli/MavenCliTest.java | 83 +++-
 3 files changed, 149 insertions(+), 34 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/13bf5544/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 f788a5f..8d38ab0 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
@@ -383,7 +383,7 @@ public class MavenCli
 CLIManager cliManager = new CLIManager();
 
 List args = new ArrayList<>();
-
+CommandLine mavenConfig = null;
 try
 {
 File configFile = new File( 
cliRequest.multiModuleProjectDirectory, MVN_MAVEN_CONFIG );
@@ -398,8 +398,8 @@ public class MavenCli
 }
 }
 
-CommandLine config = cliManager.parse( args.toArray( new 
String[args.size()] ) );
-List unrecongized = config.getArgList();
+mavenConfig = cliManager.parse( args.toArray( new 
String[args.size()] ) );
+List unrecongized = mavenConfig.getArgList();
 if ( !unrecongized.isEmpty() )
 {
 throw new ParseException( "Unrecognized maven.config 
entries: " + unrecongized );
@@ -415,21 +415,14 @@ public class MavenCli
 
 try
 {
-int index = 0;
-for ( String arg : cliRequest.args )
+if ( mavenConfig == null )
 {
-if ( arg.startsWith( "-D" ) )
-{
-// a property definition so needs to come last so that the 
last property wins
-args.add( arg );
-}
-else
-{
-// not a property definition so needs to come first to 
override maven.config
-args.add( index++, arg );
-}
+cliRequest.commandLine = cliManager.parse( cliRequest.args );
+}
+else
+{
+cliRequest.commandLine = new MergedCommandLine( 
cliManager.parse( cliRequest.args ), mavenConfig );
 }
-cliRequest.commandLine = cliManager.parse( args.toArray( new 
String[args.size()] ) );
 }
 catch ( ParseException e )
 {

http://git-wip-us.apache.org/repos/asf/maven/blob/13bf5544/maven-embedder/src/main/java/org/apache/maven/cli/MergedCommandLine.java
--
diff --git 
a/maven-embedder/src/main/java/org/apache/maven/cli/MergedCommandLine.java 
b/maven-embedder/src/main/java/org/apache/maven/cli/MergedCommandLine.java
new file mode 100644
index 000..cb0a587
--- /dev/null
+++ b/maven-embedder/src/main/java/org/apache/maven/cli/MergedCommandLine.java
@@ -0,0 +1,75 @@
+package org.apache.maven.cli;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import org.apache.commons.cli.CommandLine;
+import 

[4/7] maven git commit: MNG-6115: Add Jansi native library search path to our start scripts

[rfscholte]

MNG-6115: Add Jansi native library search path to our start scripts

test for jansi.dll


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

Branch: refs/heads/MNG-6115
Commit: e9e26f649375804818adc2087dadd830261569a3
Parents: 1a79bb3
Author: rfscholte 
Authored: Sun Feb 26 00:11:27 2017 +0100
Committer: rfscholte 
Committed: Sun Feb 26 00:11:27 2017 +0100

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


http://git-wip-us.apache.org/repos/asf/maven/blob/e9e26f64/apache-maven/src/bin/mvn.cmd
--
diff --git a/apache-maven/src/bin/mvn.cmd b/apache-maven/src/bin/mvn.cmd
index e57ebbf..1fe8aca 100644
--- a/apache-maven/src/bin/mvn.cmd
+++ b/apache-maven/src/bin/mvn.cmd
@@ -167,7 +167,7 @@ for /F "usebackq delims=" %%a in 
("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do s
 
 :endReadAdditionalConfig
 
-if exist "%MAVEN_HOME%\lib\ext\" set 
"JANSI_ARGS=-Dlibrary.jansi.path=%MAVEN_HOME%\lib\ext"
+if exist "%MAVEN_HOME%\lib\ext\jansi.dll" set 
"JANSI_ARGS=-Dlibrary.jansi.path=%MAVEN_HOME%\lib\ext"
 
 for %%i in ("%MAVEN_HOME%"\boot\plexus-classworlds-*) do set 
CLASSWORLDS_JAR="%%i"
 set CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher

[7/7] maven git commit: MNG-6078: commons-cli 1.4 released

[rfscholte]

MNG-6078: commons-cli 1.4 released


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

Branch: refs/heads/MNG-6078
Commit: 9ded5358e48f60218f4a4c08d68373819359625f
Parents: d0d34df
Author: rfscholte 
Authored: Mon Mar 13 23:27:35 2017 +0100
Committer: rfscholte 
Committed: Mon Mar 13 23:27:35 2017 +0100

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


http://git-wip-us.apache.org/repos/asf/maven/blob/9ded5358/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 5efdfc1..1dc43c3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -50,7 +50,7 @@ under the License.
 1.7
 1.7
 2.5.2
-1.4-SNAPSHOT
+1.4
 3.5
 4.12
 1.10.19

[3/7] maven git commit: MNG-6115: Add Jansi native library search path to our start scripts Prevent writing temp-files to lib/ext/

[rfscholte]

MNG-6115: Add Jansi native library search path to our start scripts
Prevent writing temp-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/1a79bb3e
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/1a79bb3e
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/1a79bb3e

Branch: refs/heads/MNG-6115
Commit: 1a79bb3edf6f40b3c2cdd74cb3b9e8a98e4fb3f5
Parents: 0b9a30f
Author: rfscholte 
Authored: Sun Feb 26 00:09:43 2017 +0100
Committer: rfscholte 
Committed: Sun Feb 26 00:09:43 2017 +0100

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


http://git-wip-us.apache.org/repos/asf/maven/blob/1a79bb3e/apache-maven/src/bin/mvn.cmd
--
diff --git a/apache-maven/src/bin/mvn.cmd b/apache-maven/src/bin/mvn.cmd
index c86662b..e57ebbf 100644
--- a/apache-maven/src/bin/mvn.cmd
+++ b/apache-maven/src/bin/mvn.cmd
@@ -167,6 +167,8 @@ for /F "usebackq delims=" %%a in 
("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do s
 
 :endReadAdditionalConfig
 
+if exist "%MAVEN_HOME%\lib\ext\" set 
"JANSI_ARGS=-Dlibrary.jansi.path=%MAVEN_HOME%\lib\ext"
+
 for %%i in ("%MAVEN_HOME%"\boot\plexus-classworlds-*) do set 
CLASSWORLDS_JAR="%%i"
 set CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher
 
@@ -178,7 +180,7 @@ 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" ^
+  %JANSI_ARGS% ^
   %CLASSWORLDS_LAUNCHER% %MAVEN_CMD_LINE_ARGS%
 if ERRORLEVEL 1 goto error
 goto end

[1/7] maven git commit: [MNG-6078] Undo the order reversal hack

[rfscholte]

Repository: maven
Updated Branches:
  refs/heads/MNG-6078 d0d34dfd4 -> 9ded5358e
  refs/heads/MNG-6115 [created] 5ff329f66
  refs/heads/m6078 [created] 13bf55443


[MNG-6078] Undo the order reversal hack

- ca4303031357a7decaee8de770b71fb2c2fedd28 used a hack to reverse the order of 
arguments
- The side effect of the hack is that the first named system property value on 
the CLI would win
- The side-effect is causing a lot of integration test builds to fail and will 
likely have other unintended consequences
- Correct fix is to put system properties at the end.
- If this change passes the integration tests then it will need to be augmented 
to correctly round-trip the CLI options
  as there is the potential that somebody may legitimately be passing an arg 
parameter a value that starts with -D
  for example 'mvn -ep -Dsecretpassword' or 'mvn -l -D.log' but given that this 
requires a parse and unparse
  to handle the escaping, I want to get evidence that the integration tests 
pass first


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

Branch: refs/heads/m6078
Commit: 90ef7a1db4e775339c765d28bb5f2335ace9e16a
Parents: e6217a4
Author: Stephen Connolly 
Authored: Tue Feb 21 00:11:27 2017 +
Committer: Stephen Connolly 
Committed: Tue Feb 21 00:11:27 2017 +

--
 .../java/org/apache/maven/cli/MavenCli.java | 26 
 .../java/org/apache/maven/cli/MavenCliTest.java | 22 +
 2 files changed, 38 insertions(+), 10 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/90ef7a1d/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 4e10b05..f788a5f 100644
--- a/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
+++ b/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
@@ -19,15 +19,12 @@ package org.apache.maven.cli;
  * under the License.
  */
 
-import static org.apache.maven.shared.utils.logging.MessageUtils.buffer;
-
 import com.google.common.base.Charsets;
 import com.google.common.io.Files;
 import com.google.inject.AbstractModule;
 import org.apache.commons.cli.CommandLine;
 import org.apache.commons.cli.ParseException;
 import org.apache.commons.cli.UnrecognizedOptionException;
-import org.apache.commons.lang3.ArrayUtils;
 import org.apache.maven.BuildAbort;
 import org.apache.maven.InternalErrorException;
 import org.apache.maven.Maven;
@@ -102,7 +99,6 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.PrintStream;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.LinkedHashMap;
@@ -115,6 +111,8 @@ import java.util.StringTokenizer;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+import static org.apache.maven.shared.utils.logging.MessageUtils.buffer;
+
 // TODO push all common bits back to plexus cli and prepare for transition to 
Guice. We don't need 50 ways to make CLIs
 
 /**
@@ -417,7 +415,20 @@ public class MavenCli
 
 try
 {
-args.addAll( 0, Arrays.asList( cliRequest.args ) );
+int index = 0;
+for ( String arg : cliRequest.args )
+{
+if ( arg.startsWith( "-D" ) )
+{
+// a property definition so needs to come last so that the 
last property wins
+args.add( arg );
+}
+else
+{
+// not a property definition so needs to come first to 
override maven.config
+args.add( index++, arg );
+}
+}
 cliRequest.commandLine = cliManager.parse( args.toArray( new 
String[args.size()] ) );
 }
 catch ( ParseException e )
@@ -1587,11 +1598,6 @@ public class MavenCli
 
 if ( defStrs != null )
 {
-//The following is needed to get precedence
-//of properties which are defined on command line
-//over properties defined in the .mvn/maven.config. 
-ArrayUtils.reverse( defStrs );
-
 for ( String defStr : defStrs )
 {
 setCliProperty( defStr, userProperties );

[5/7] maven git commit: [MNG-6115] prevent writing temp-files to lib/ext/

[rfscholte]

[MNG-6115] prevent writing temp-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/5ee18b33
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/5ee18b33
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/5ee18b33

Branch: refs/heads/MNG-6115
Commit: 5ee18b33b30a3866eb7d205b3cf0ebe24ae59cf9
Parents: 748551d
Author: rfscholte 
Authored: Sun Feb 26 00:09:43 2017 +0100
Committer: Hervé Boutemy 
Committed: Sat Mar 4 04:48:44 2017 +0100

--
 apache-maven/src/bin/mvn | 8 +++-
 apache-maven/src/bin/mvn.cmd | 4 +++-
 2 files changed, 10 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/5ee18b33/apache-maven/src/bin/mvn
--
diff --git a/apache-maven/src/bin/mvn b/apache-maven/src/bin/mvn
index cfb39b0..a262243 100755
--- a/apache-maven/src/bin/mvn
+++ b/apache-maven/src/bin/mvn
@@ -117,6 +117,13 @@ if $cygwin ; then
 CLASSWORLDS_JAR=`cygpath --path --windows "$CLASSWORLDS_JAR"`
 fi
 
+for libjansi in ${MAVEN_HOME}/lib/ext/libjansi-* ; do
+  if [ -x "$libjansi" ] ; then
+MAVEN_OPTS="$MAVEN_OPTS -Dlibrary.jansi.path=${libjansi}"
+break
+  fi
+done
+
 # traverses directory structure from process work directory to filesystem root
 # first directory with .mvn subdirectory is considered project base directory
 find_maven_basedir() {
@@ -191,5 +198,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/5ee18b33/apache-maven/src/bin/mvn.cmd
--
diff --git a/apache-maven/src/bin/mvn.cmd b/apache-maven/src/bin/mvn.cmd
index c86662b..36d9993 100644
--- a/apache-maven/src/bin/mvn.cmd
+++ b/apache-maven/src/bin/mvn.cmd
@@ -170,6 +170,8 @@ for /F "usebackq delims=" %%a in 
("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do s
 for %%i in ("%MAVEN_HOME%"\boot\plexus-classworlds-*) do set 
CLASSWORLDS_JAR="%%i"
 set CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher
 
+if exist "%MAVEN_HOME%\lib\ext\jansi.dll" set 
"JANSI_ARGS=-Dlibrary.jansi.path=%MAVEN_HOME%\lib\ext\jansi.dll"
+
 "%JAVACMD%" ^
   %JVM_CONFIG_MAVEN_PROPS% ^
   %MAVEN_OPTS% ^
@@ -178,7 +180,7 @@ 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" ^
+  %JANSI_ARGS% ^
   %CLASSWORLDS_LAUNCHER% %MAVEN_CMD_LINE_ARGS%
 if ERRORLEVEL 1 goto error
 goto end

[6/7] maven git commit: Merge branch 'MNG-6115' of https://git-wip-us.apache.org/repos/asf/maven into MNG-6115

[rfscholte]

Merge branch 'MNG-6115' of https://git-wip-us.apache.org/repos/asf/maven into 
MNG-6115


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

Branch: refs/heads/MNG-6115
Commit: 5ff329f66abd83797095ae833db35ab8e33a4bb1
Parents: e9e26f6 5ee18b3
Author: rfscholte 
Authored: Sun Mar 5 15:14:51 2017 +0100
Committer: rfscholte 
Committed: Sun Mar 5 15:14:51 2017 +0100

--
 apache-maven/src/bin/mvn | 8 +++-
 apache-maven/src/bin/mvn.cmd | 2 ++
 pom.xml  | 7 ---
 3 files changed, 9 insertions(+), 8 deletions(-)
--


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

[maven] Git Push Summary

[khmarbaise]

Repository: maven
Updated Branches:
  refs/heads/MNG-6057 [deleted] 51cc76c32

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

[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( 

[maven-integration-testing] Git Push Summary

[khmarbaise]

Repository: maven-integration-testing
Updated Branches:
  refs/heads/MNG-6057 [deleted] 80a351d88

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.

[khmarbaise]

Repository: maven-integration-testing
Updated Branches:
  refs/heads/master c68f7072b -> dec1deb3f


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

Branch: refs/heads/master
Commit: dec1deb3f1bb86cf08c6b593d10161ddbf732b8e
Parents: c68f707
Author: Karl Heinz Marbaise 
Authored: Wed Mar 8 00:12:31 2017 +0100
Committer: Karl Heinz Marbaise 
Committed: Mon Mar 13 22:06:57 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|  72 +++
 .../src/test/resources/bootstrap/pom.xml|  10 ++
 .../module-1/pom.xml|  33 +
 .../module-2/pom.xml|  33 +
 .../module-3/jar-with-prod.xml  |  17 +++
 .../module-3/pom.xml|  56 +
 .../pom.xml |  55 +
 .../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 |  86 ++
 20 files changed, 884 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/dec1deb3/.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/dec1deb3/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/dec1deb3/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 

[1/3] maven git commit: Code improvement. [Forced Update!]

[khmarbaise]

Repository: maven
Updated Branches:
  refs/heads/MNG-6057 8a3aa6c1b -> 51cc76c32 (forced update)


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-6057
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();
+ 

[3/3] 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 v

[khmarbaise]

[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/MNG-6057
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
+{
+String 

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

[khmarbaise]

[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-6057
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
   

[2/3] maven-integration-testing git commit: Just run MNG-6057 tests nothing more for testing purposes.

[khmarbaise]

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/80a351d8/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 bbc7c9e..bee94cd 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
@@ -109,591 +109,591 @@ public class IntegrationTestSuite
 suite.addTestSuite( MavenITmng6057CheckReactorOrderTest.class );
 suite.addTestSuite( 
MavenITmng5895CIFriendlyUsageWithPropertyTest.class );
 suite.addTestSuite( MavenITmng6090CIFriendlyTest.class );
-suite.addTestSuite( 
MavenITmng6173GetProjectsAndDependencyGraphTest.class );
-suite.addTestSuite( MavenITmng6173GetAllProjectsInReactorTest.class );
-suite.addTestSuite( MavenITmng5958LifecyclePhaseBinaryCompat.class );
-suite.addTestSuite( 
MavenITmng5898BuildMultimoduleWithEARFailsToResolveWARTest.class );
-suite.addTestSuite( MavenITmng5889CoreExtensionsTest.class );
-suite.addTestSuite( MavenITmng5840ParentVersionRanges.class );
-suite.addTestSuite( MavenITmng5840RelativePathReactorMatching.class );
-suite.addTestSuite( MavenITmng5805PkgTypeMojoConfiguration.class );
-suite.addTestSuite( MavenITmng5805PkgTypeMojoConfiguration2.class );
-suite.addTestSuite( MavenITmng5783PluginDependencyFiltering.class );
-suite.addTestSuite( MavenITmng5774ConfigurationProcessorsTest.class );
-suite.addTestSuite( MavenITmng5771CoreExtensionsTest.class );
-suite.addTestSuite( MavenITmng5768CliExecutionIdTest.class );
-suite.addTestSuite( MavenITmng5742BuildExtensionClassloaderTest.class 
);
-suite.addTestSuite( MavenITmng5578SessionScopeTest.class );
-suite.addTestSuite( 
MavenITmng5753CustomMojoExecutionConfiguratorTest.class );
-suite.addTestSuite( MavenITmng5716ToolchainsTypeTest.class );
-suite.addTestSuite( 
MavenITmng5663NestedImportScopePomResolutionTest.class );
-suite.addTestSuite( MavenITmng2562Timestamp322Test.class );
-suite.addTestSuite( MavenITmng2199ParentVersionRangeTest.class );
-suite.addTestSuite( 
MavenITmng5640LifecycleParticipantAfterSessionEnd.class );
-suite.addTestSuite( MavenITmng5639ImportScopePomResolutionTest.class );
-suite.addTestSuite( MavenITmng5608ProfileActivationWarningTest.class );
-suite.addTestSuite( MavenITmng5591WorkspaceReader.class );
-suite.addTestSuite( MavenITmng5581LifecycleMappingDelegate.class );
-suite.addTestSuite( MavenITmng5572ReactorPluginExtensionsTest.class  );
-suite.addTestSuite( MavenITmng5576CdFriendlyVersions.class );
-suite.addTestSuite( MavenITmng5530MojoExecutionScopeTest.class );
-//suite.addTestSuite( MavenITmng5208EventSpyParallelTest.class );
-suite.addTestSuite( MavenITmng5482AetherNotFoundTest.class );
-suite.addTestSuite( 
MavenITmng5445LegacyStringSearchModelInterpolatorTest.class );
-suite.addTestSuite( 
MavenITmng5389LifecycleParticipantAfterSessionEnd.class );
-suite.addTestSuite( MavenITmng5387ArtifactReplacementPlugin.class );
-suite.addTestSuite( MavenITmng5382Jsr330Plugin.class );
-suite.addTestSuite( MavenITmng5338FileOptionToDirectory.class );
-suite.addTestSuite( 
MavenITmng5280SettingsProfilesRepositoriesOrderTest.class );
-suite.addTestSuite( MavenITmng5230MakeReactorWithExcludesTest.class );
-suite.addTestSuite( MavenITmng5224InjectedSettings.class );
-suite.addTestSuite( MavenITmng5214DontMapWsdlToJar.class );
-suite.addTestSuite( 
MavenITmng5137ReactorResolutionInForkedBuildTest.class );
-suite.addTestSuite( 
MavenITmng5135AggregatorDepResolutionModuleExtensionTest.class );
-suite.addTestSuite( 
MavenITmng5096ExclusionAtDependencyWithImpliedClassifierTest.class );
-suite.addTestSuite( MavenITmng5064SuppressSnapshotUpdatesTest.class );
-suite.addTestSuite( 
MavenITmng5019StringBasedCompLookupFromChildPluginRealmTest.class );
-suite.addTestSuite( 
MavenITmng5013ConfigureParamBeanFromScalarValueTest.class );
-suite.addTestSuite( 
MavenITmng5012CollectionVsArrayParamCoercionTest.class );
-suite.addTestSuite( 
MavenITmng5011ConfigureCollectionArrayFromSystemPropTest.class );
-suite.addTestSuite( MavenITmng5009AggregationCycleTest.class );
-suite.addTestSuite( 
MavenITmng5006VersionRangeDependencyParentResolutionTest.class );
-suite.addTestSuite( 
MavenITmng5000ChildPathAwareUrlInheritanceTest.class );
-suite.addTestSuite( 
MavenITmng4992MapStylePropertiesParamConfigTest.class );
-

[3/3] maven-integration-testing git commit: Just run MNG-6057 tests nothing more for testing purposes.

[khmarbaise]

Just run MNG-6057 tests nothing more for testing purposes.


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

Branch: refs/heads/MNG-6057
Commit: 80a351d88f7cbcdbc390f66a49b1b84de43821d9
Parents: 8556a88
Author: Karl Heinz Marbaise 
Authored: Mon Mar 13 19:39:37 2017 +0100
Committer: Karl Heinz Marbaise 
Committed: Mon Mar 13 21:45:16 2017 +0100

--
 .../apache/maven/it/IntegrationTestSuite.java   | 1170 +-
 .../test/resources/bootstrap/group-6/pom.xml|   72 ++
 .../module-3/pom.xml|   14 -
 .../pom.xml |   16 +
 .../test/resources/mng-6090-ci-friendly/pom.xml |6 +-
 5 files changed, 678 insertions(+), 600 deletions(-)
--

[1/3] maven-integration-testing git commit: Just run MNG-6057 tests nothing more for testing purposes. [Forced Update!]

[khmarbaise]

Repository: maven-integration-testing
Updated Branches:
  refs/heads/MNG-6057 befd7947c -> 80a351d88 (forced update)


http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/80a351d8/core-it-suite/src/test/resources/bootstrap/group-6/pom.xml
--
diff --git a/core-it-suite/src/test/resources/bootstrap/group-6/pom.xml 
b/core-it-suite/src/test/resources/bootstrap/group-6/pom.xml
index b48464e..7c5c03c 100644
--- a/core-it-suite/src/test/resources/bootstrap/group-6/pom.xml
+++ b/core-it-suite/src/test/resources/bootstrap/group-6/pom.xml
@@ -88,5 +88,77 @@ under the License.
   3.1
   runtime
 
+
+
+  org.apache.maven
+  maven-settings
+  3.1.1
+
+
+  org.apache.maven
+  maven-settings-builder
+  3.1.1
+
+
+  org.apache.maven
+  maven-repository-metadata
+  3.1.1
+
+
+  org.apache.maven
+  maven-aether-provider
+  3.1.1
+
+
+  org.eclipse.aether
+  aether-spi
+  0.9.0.M2
+
+
+  org.eclipse.aether
+  aether-impl
+  0.9.0.M2
+
+
+  org.eclipse.sisu
+  org.eclipse.sisu.plexus
+  0.0.0.M5
+
+
+  org.eclipse.sisu
+  org.eclipse.sisu.inject
+  0.0.0.M5
+
+
+  org.sonatype.sisu
+  sisu-guice
+  3.1.0
+  no_aop
+
+
+  com.google.guava
+  guava
+  10.0.1
+
+
+  com.google.code.findbugs
+  jsr305
+  1.3.9
+
+
+  org.codehaus.plexus
+  plexus-classworlds
+  2.5.1
+
+
+  org.codehaus.mojo
+  flatten-maven-plugin
+  1.0.0
+
+
+  org.apache.maven.plugins
+  maven-assembly-plugin
+  2.5.1
+
   
 

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/80a351d8/core-it-suite/src/test/resources/mng-5895-ci-friendly-usage-with-property/module-3/pom.xml
--
diff --git 
a/core-it-suite/src/test/resources/mng-5895-ci-friendly-usage-with-property/module-3/pom.xml
 
b/core-it-suite/src/test/resources/mng-5895-ci-friendly-usage-with-property/module-3/pom.xml
index 6c77439..e51f0fb 100644
--- 
a/core-it-suite/src/test/resources/mng-5895-ci-friendly-usage-with-property/module-3/pom.xml
+++ 
b/core-it-suite/src/test/resources/mng-5895-ci-friendly-usage-with-property/module-3/pom.xml
@@ -31,20 +31,6 @@

 
   
-
-  
-
-  org.apache.maven.plugins
-  maven-assembly-plugin
-  2.5.1
-
-
-  org.apache.maven.plugins
-  maven-jar-plugin
-  2.2
-
-  
-
 

org.apache.maven.plugins

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/80a351d8/core-it-suite/src/test/resources/mng-5895-ci-friendly-usage-with-property/pom.xml
--
diff --git 
a/core-it-suite/src/test/resources/mng-5895-ci-friendly-usage-with-property/pom.xml
 
b/core-it-suite/src/test/resources/mng-5895-ci-friendly-usage-with-property/pom.xml
index ccf3aec..38a3358 100644
--- 
a/core-it-suite/src/test/resources/mng-5895-ci-friendly-usage-with-property/pom.xml
+++ 
b/core-it-suite/src/test/resources/mng-5895-ci-friendly-usage-with-property/pom.xml
@@ -31,6 +31,22 @@ under the License.
   
1.3.0-SNAPSHOT
   
+  
+
+  
+
+  org.apache.maven.plugins
+  maven-assembly-plugin
+  2.5.1
+
+
+  org.apache.maven.plugins
+  maven-jar-plugin
+  2.2
+
+  
+
+  
   
 module-3
 module-1

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/80a351d8/core-it-suite/src/test/resources/mng-6090-ci-friendly/pom.xml
--
diff --git a/core-it-suite/src/test/resources/mng-6090-ci-friendly/pom.xml 
b/core-it-suite/src/test/resources/mng-6090-ci-friendly/pom.xml
index c7ac56e..233c4cd 100644
--- a/core-it-suite/src/test/resources/mng-6090-ci-friendly/pom.xml
+++ b/core-it-suite/src/test/resources/mng-6090-ci-friendly/pom.xml
@@ -50,13 +50,17 @@ under the License.
   maven-jar-plugin
   2.2
 
+
+  org.codehaus.mojo
+  flatten-maven-plugin
+  1.0.0
+
   
 
 
   
 org.codehaus.mojo
 flatten-maven-plugin
-1.0.0
 
   true
 

[3/3] maven-integration-testing git commit: Just run MNG-6057 tests nothing more for testing purposes.

[khmarbaise]

Just run MNG-6057 tests nothing more for testing purposes.


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

Branch: refs/heads/MNG-6057
Commit: befd7947cb13d5b7359c4bc277fb6bb4ab4ae29a
Parents: 8556a88
Author: Karl Heinz Marbaise 
Authored: Mon Mar 13 19:39:37 2017 +0100
Committer: Karl Heinz Marbaise 
Committed: Mon Mar 13 21:36:42 2017 +0100

--
 .../apache/maven/it/IntegrationTestSuite.java   | 1170 +-
 .../test/resources/bootstrap/group-6/pom.xml|   72 ++
 .../module-3/pom.xml|   14 -
 .../pom.xml |   16 +
 .../test/resources/mng-6090-ci-friendly/pom.xml |6 +-
 5 files changed, 678 insertions(+), 600 deletions(-)
--

[2/3] maven-integration-testing git commit: Just run MNG-6057 tests nothing more for testing purposes.

[khmarbaise]

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/befd7947/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 bbc7c9e..bee94cd 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
@@ -109,591 +109,591 @@ public class IntegrationTestSuite
 suite.addTestSuite( MavenITmng6057CheckReactorOrderTest.class );
 suite.addTestSuite( 
MavenITmng5895CIFriendlyUsageWithPropertyTest.class );
 suite.addTestSuite( MavenITmng6090CIFriendlyTest.class );
-suite.addTestSuite( 
MavenITmng6173GetProjectsAndDependencyGraphTest.class );
-suite.addTestSuite( MavenITmng6173GetAllProjectsInReactorTest.class );
-suite.addTestSuite( MavenITmng5958LifecyclePhaseBinaryCompat.class );
-suite.addTestSuite( 
MavenITmng5898BuildMultimoduleWithEARFailsToResolveWARTest.class );
-suite.addTestSuite( MavenITmng5889CoreExtensionsTest.class );
-suite.addTestSuite( MavenITmng5840ParentVersionRanges.class );
-suite.addTestSuite( MavenITmng5840RelativePathReactorMatching.class );
-suite.addTestSuite( MavenITmng5805PkgTypeMojoConfiguration.class );
-suite.addTestSuite( MavenITmng5805PkgTypeMojoConfiguration2.class );
-suite.addTestSuite( MavenITmng5783PluginDependencyFiltering.class );
-suite.addTestSuite( MavenITmng5774ConfigurationProcessorsTest.class );
-suite.addTestSuite( MavenITmng5771CoreExtensionsTest.class );
-suite.addTestSuite( MavenITmng5768CliExecutionIdTest.class );
-suite.addTestSuite( MavenITmng5742BuildExtensionClassloaderTest.class 
);
-suite.addTestSuite( MavenITmng5578SessionScopeTest.class );
-suite.addTestSuite( 
MavenITmng5753CustomMojoExecutionConfiguratorTest.class );
-suite.addTestSuite( MavenITmng5716ToolchainsTypeTest.class );
-suite.addTestSuite( 
MavenITmng5663NestedImportScopePomResolutionTest.class );
-suite.addTestSuite( MavenITmng2562Timestamp322Test.class );
-suite.addTestSuite( MavenITmng2199ParentVersionRangeTest.class );
-suite.addTestSuite( 
MavenITmng5640LifecycleParticipantAfterSessionEnd.class );
-suite.addTestSuite( MavenITmng5639ImportScopePomResolutionTest.class );
-suite.addTestSuite( MavenITmng5608ProfileActivationWarningTest.class );
-suite.addTestSuite( MavenITmng5591WorkspaceReader.class );
-suite.addTestSuite( MavenITmng5581LifecycleMappingDelegate.class );
-suite.addTestSuite( MavenITmng5572ReactorPluginExtensionsTest.class  );
-suite.addTestSuite( MavenITmng5576CdFriendlyVersions.class );
-suite.addTestSuite( MavenITmng5530MojoExecutionScopeTest.class );
-//suite.addTestSuite( MavenITmng5208EventSpyParallelTest.class );
-suite.addTestSuite( MavenITmng5482AetherNotFoundTest.class );
-suite.addTestSuite( 
MavenITmng5445LegacyStringSearchModelInterpolatorTest.class );
-suite.addTestSuite( 
MavenITmng5389LifecycleParticipantAfterSessionEnd.class );
-suite.addTestSuite( MavenITmng5387ArtifactReplacementPlugin.class );
-suite.addTestSuite( MavenITmng5382Jsr330Plugin.class );
-suite.addTestSuite( MavenITmng5338FileOptionToDirectory.class );
-suite.addTestSuite( 
MavenITmng5280SettingsProfilesRepositoriesOrderTest.class );
-suite.addTestSuite( MavenITmng5230MakeReactorWithExcludesTest.class );
-suite.addTestSuite( MavenITmng5224InjectedSettings.class );
-suite.addTestSuite( MavenITmng5214DontMapWsdlToJar.class );
-suite.addTestSuite( 
MavenITmng5137ReactorResolutionInForkedBuildTest.class );
-suite.addTestSuite( 
MavenITmng5135AggregatorDepResolutionModuleExtensionTest.class );
-suite.addTestSuite( 
MavenITmng5096ExclusionAtDependencyWithImpliedClassifierTest.class );
-suite.addTestSuite( MavenITmng5064SuppressSnapshotUpdatesTest.class );
-suite.addTestSuite( 
MavenITmng5019StringBasedCompLookupFromChildPluginRealmTest.class );
-suite.addTestSuite( 
MavenITmng5013ConfigureParamBeanFromScalarValueTest.class );
-suite.addTestSuite( 
MavenITmng5012CollectionVsArrayParamCoercionTest.class );
-suite.addTestSuite( 
MavenITmng5011ConfigureCollectionArrayFromSystemPropTest.class );
-suite.addTestSuite( MavenITmng5009AggregationCycleTest.class );
-suite.addTestSuite( 
MavenITmng5006VersionRangeDependencyParentResolutionTest.class );
-suite.addTestSuite( 
MavenITmng5000ChildPathAwareUrlInheritanceTest.class );
-suite.addTestSuite( 
MavenITmng4992MapStylePropertiesParamConfigTest.class );
-

[1/3] maven-integration-testing git commit: Just run MNG-6057 tests nothing more for testing purposes. [Forced Update!]

[khmarbaise]

Repository: maven-integration-testing
Updated Branches:
  refs/heads/MNG-6057 34f6f5692 -> befd7947c (forced update)


http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/befd7947/core-it-suite/src/test/resources/bootstrap/group-6/pom.xml
--
diff --git a/core-it-suite/src/test/resources/bootstrap/group-6/pom.xml 
b/core-it-suite/src/test/resources/bootstrap/group-6/pom.xml
index b48464e..4a26caa 100644
--- a/core-it-suite/src/test/resources/bootstrap/group-6/pom.xml
+++ b/core-it-suite/src/test/resources/bootstrap/group-6/pom.xml
@@ -88,5 +88,77 @@ under the License.
   3.1
   runtime
 
+
+
+  org.apache.maven
+  maven-settings
+  3.1.1
+
+
+  org.apache.maven
+  maven-settings-builder
+  3.1.1
+
+
+  org.apache.maven
+  maven-repository-metadata
+  3.1.1
+
+
+  org.apache.maven
+  maven-aether-provider
+  3.1.1
+
+
+  org.eclipse.aether
+  aether-spi
+  0.9.0.M2
+
+
+  org.eclipse.aether
+  aether-impl
+  0.9.0.M2
+
+
+  org.eclipse.sisu
+  org.eclipse.sisu.plexus
+  0.0.0.M5
+
+
+  org.eclipse.sisu
+  org.eclipse.sisu.inject
+  0.0.0.M5
+
+
+  org.sonatype.sisu
+  sisu-guice
+  3.1.0
+  no_aop
+
+
+  com.google.guava
+  guava
+  10.0.1
+
+
+  com.google.code.findbugs
+  jsr205
+  1.3.9
+
+
+  org.codehaus.plexus
+  plexus-classworlds
+  2.5.1
+
+
+  org.codehaus.mojo
+  flatten-maven-plugin
+  1.0.0
+
+
+  org.apache.maven.plugins
+  maven-assembly-plugin
+  2.5.1
+
   
 

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/befd7947/core-it-suite/src/test/resources/mng-5895-ci-friendly-usage-with-property/module-3/pom.xml
--
diff --git 
a/core-it-suite/src/test/resources/mng-5895-ci-friendly-usage-with-property/module-3/pom.xml
 
b/core-it-suite/src/test/resources/mng-5895-ci-friendly-usage-with-property/module-3/pom.xml
index 6c77439..e51f0fb 100644
--- 
a/core-it-suite/src/test/resources/mng-5895-ci-friendly-usage-with-property/module-3/pom.xml
+++ 
b/core-it-suite/src/test/resources/mng-5895-ci-friendly-usage-with-property/module-3/pom.xml
@@ -31,20 +31,6 @@

 
   
-
-  
-
-  org.apache.maven.plugins
-  maven-assembly-plugin
-  2.5.1
-
-
-  org.apache.maven.plugins
-  maven-jar-plugin
-  2.2
-
-  
-
 

org.apache.maven.plugins

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/befd7947/core-it-suite/src/test/resources/mng-5895-ci-friendly-usage-with-property/pom.xml
--
diff --git 
a/core-it-suite/src/test/resources/mng-5895-ci-friendly-usage-with-property/pom.xml
 
b/core-it-suite/src/test/resources/mng-5895-ci-friendly-usage-with-property/pom.xml
index ccf3aec..38a3358 100644
--- 
a/core-it-suite/src/test/resources/mng-5895-ci-friendly-usage-with-property/pom.xml
+++ 
b/core-it-suite/src/test/resources/mng-5895-ci-friendly-usage-with-property/pom.xml
@@ -31,6 +31,22 @@ under the License.
   
1.3.0-SNAPSHOT
   
+  
+
+  
+
+  org.apache.maven.plugins
+  maven-assembly-plugin
+  2.5.1
+
+
+  org.apache.maven.plugins
+  maven-jar-plugin
+  2.2
+
+  
+
+  
   
 module-3
 module-1

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/befd7947/core-it-suite/src/test/resources/mng-6090-ci-friendly/pom.xml
--
diff --git a/core-it-suite/src/test/resources/mng-6090-ci-friendly/pom.xml 
b/core-it-suite/src/test/resources/mng-6090-ci-friendly/pom.xml
index c7ac56e..233c4cd 100644
--- a/core-it-suite/src/test/resources/mng-6090-ci-friendly/pom.xml
+++ b/core-it-suite/src/test/resources/mng-6090-ci-friendly/pom.xml
@@ -50,13 +50,17 @@ under the License.
   maven-jar-plugin
   2.2
 
+
+  org.codehaus.mojo
+  flatten-maven-plugin
+  1.0.0
+
   
 
 
   
 org.codehaus.mojo
 flatten-maven-plugin
-1.0.0
 
   true
 

[3/3] maven-integration-testing git commit: Just run MNG-6057 tests nothing more for testing purposes.

[khmarbaise]

Just run MNG-6057 tests nothing more for testing purposes.


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

Branch: refs/heads/MNG-6057
Commit: 34f6f56925c25be7618aea7842aa97b5c6eadccf
Parents: 8556a88
Author: Karl Heinz Marbaise 
Authored: Mon Mar 13 19:39:37 2017 +0100
Committer: Karl Heinz Marbaise 
Committed: Mon Mar 13 21:23:19 2017 +0100

--
 .../apache/maven/it/IntegrationTestSuite.java   | 1170 +-
 .../test/resources/bootstrap/group-6/pom.xml|   72 ++
 .../module-3/pom.xml|   14 -
 .../pom.xml |   16 +
 .../test/resources/mng-6090-ci-friendly/pom.xml |6 +-
 5 files changed, 678 insertions(+), 600 deletions(-)
--

[1/3] maven-integration-testing git commit: Just run MNG-6057 tests nothing more for testing purposes. [Forced Update!]

[khmarbaise]

Repository: maven-integration-testing
Updated Branches:
  refs/heads/MNG-6057 2ee48a140 -> 34f6f5692 (forced update)


http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/34f6f569/core-it-suite/src/test/resources/bootstrap/group-6/pom.xml
--
diff --git a/core-it-suite/src/test/resources/bootstrap/group-6/pom.xml 
b/core-it-suite/src/test/resources/bootstrap/group-6/pom.xml
index b48464e..e33c0eb 100644
--- a/core-it-suite/src/test/resources/bootstrap/group-6/pom.xml
+++ b/core-it-suite/src/test/resources/bootstrap/group-6/pom.xml
@@ -88,5 +88,77 @@ under the License.
   3.1
   runtime
 
+
+
+  org.apache.maven
+  maven-settings
+  3.1.1
+
+
+  org.apache.maven
+  maven-settings-builder
+  3.1.1
+
+
+  org.apache.maven
+  maven-repository-metadata
+  3.1.1
+
+
+  org.apache.maven
+  maven-aether-provider
+  3.1.1
+
+
+  org.eclipse.aether
+  aether-spi
+  0.9.0.M2
+
+
+  org.eclipse.aether
+  aether-impl
+  0.9.0.M2
+
+
+  org.eclipse.sisu.plexus
+  org.eclipse.sisu.plexus
+  0.0.0.M5
+
+
+  org.eclipse.sisu.inject
+  org.eclipse.sisu.inject
+  0.0.0.M5
+
+
+  org.sonatype.sisu
+  sisu-guice
+  3.1.0
+  no_aop
+
+
+  com.google.guava
+  guava
+  10.0.1
+
+
+  com.google.code.findbugs
+  jsr205
+  1.3.9
+
+
+  org.codehaus.plexus
+  plexus-classworlds
+  2.5.1
+
+
+  org.codehaus.mojo
+  flatten-maven-plugin
+  1.0.0
+
+
+  org.apache.maven.plugins
+  maven-assembly-plugin
+  2.5.1
+
   
 

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/34f6f569/core-it-suite/src/test/resources/mng-5895-ci-friendly-usage-with-property/module-3/pom.xml
--
diff --git 
a/core-it-suite/src/test/resources/mng-5895-ci-friendly-usage-with-property/module-3/pom.xml
 
b/core-it-suite/src/test/resources/mng-5895-ci-friendly-usage-with-property/module-3/pom.xml
index 6c77439..e51f0fb 100644
--- 
a/core-it-suite/src/test/resources/mng-5895-ci-friendly-usage-with-property/module-3/pom.xml
+++ 
b/core-it-suite/src/test/resources/mng-5895-ci-friendly-usage-with-property/module-3/pom.xml
@@ -31,20 +31,6 @@

 
   
-
-  
-
-  org.apache.maven.plugins
-  maven-assembly-plugin
-  2.5.1
-
-
-  org.apache.maven.plugins
-  maven-jar-plugin
-  2.2
-
-  
-
 

org.apache.maven.plugins

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/34f6f569/core-it-suite/src/test/resources/mng-5895-ci-friendly-usage-with-property/pom.xml
--
diff --git 
a/core-it-suite/src/test/resources/mng-5895-ci-friendly-usage-with-property/pom.xml
 
b/core-it-suite/src/test/resources/mng-5895-ci-friendly-usage-with-property/pom.xml
index ccf3aec..38a3358 100644
--- 
a/core-it-suite/src/test/resources/mng-5895-ci-friendly-usage-with-property/pom.xml
+++ 
b/core-it-suite/src/test/resources/mng-5895-ci-friendly-usage-with-property/pom.xml
@@ -31,6 +31,22 @@ under the License.
   
1.3.0-SNAPSHOT
   
+  
+
+  
+
+  org.apache.maven.plugins
+  maven-assembly-plugin
+  2.5.1
+
+
+  org.apache.maven.plugins
+  maven-jar-plugin
+  2.2
+
+  
+
+  
   
 module-3
 module-1

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/34f6f569/core-it-suite/src/test/resources/mng-6090-ci-friendly/pom.xml
--
diff --git a/core-it-suite/src/test/resources/mng-6090-ci-friendly/pom.xml 
b/core-it-suite/src/test/resources/mng-6090-ci-friendly/pom.xml
index c7ac56e..233c4cd 100644
--- a/core-it-suite/src/test/resources/mng-6090-ci-friendly/pom.xml
+++ b/core-it-suite/src/test/resources/mng-6090-ci-friendly/pom.xml
@@ -50,13 +50,17 @@ under the License.
   maven-jar-plugin
   2.2
 
+
+  org.codehaus.mojo
+  flatten-maven-plugin
+  1.0.0
+
   
 
 
   
 org.codehaus.mojo
 flatten-maven-plugin
-1.0.0
 
   true
 

[2/3] maven-integration-testing git commit: Just run MNG-6057 tests nothing more for testing purposes.

[khmarbaise]

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/34f6f569/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 bbc7c9e..bee94cd 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
@@ -109,591 +109,591 @@ public class IntegrationTestSuite
 suite.addTestSuite( MavenITmng6057CheckReactorOrderTest.class );
 suite.addTestSuite( 
MavenITmng5895CIFriendlyUsageWithPropertyTest.class );
 suite.addTestSuite( MavenITmng6090CIFriendlyTest.class );
-suite.addTestSuite( 
MavenITmng6173GetProjectsAndDependencyGraphTest.class );
-suite.addTestSuite( MavenITmng6173GetAllProjectsInReactorTest.class );
-suite.addTestSuite( MavenITmng5958LifecyclePhaseBinaryCompat.class );
-suite.addTestSuite( 
MavenITmng5898BuildMultimoduleWithEARFailsToResolveWARTest.class );
-suite.addTestSuite( MavenITmng5889CoreExtensionsTest.class );
-suite.addTestSuite( MavenITmng5840ParentVersionRanges.class );
-suite.addTestSuite( MavenITmng5840RelativePathReactorMatching.class );
-suite.addTestSuite( MavenITmng5805PkgTypeMojoConfiguration.class );
-suite.addTestSuite( MavenITmng5805PkgTypeMojoConfiguration2.class );
-suite.addTestSuite( MavenITmng5783PluginDependencyFiltering.class );
-suite.addTestSuite( MavenITmng5774ConfigurationProcessorsTest.class );
-suite.addTestSuite( MavenITmng5771CoreExtensionsTest.class );
-suite.addTestSuite( MavenITmng5768CliExecutionIdTest.class );
-suite.addTestSuite( MavenITmng5742BuildExtensionClassloaderTest.class 
);
-suite.addTestSuite( MavenITmng5578SessionScopeTest.class );
-suite.addTestSuite( 
MavenITmng5753CustomMojoExecutionConfiguratorTest.class );
-suite.addTestSuite( MavenITmng5716ToolchainsTypeTest.class );
-suite.addTestSuite( 
MavenITmng5663NestedImportScopePomResolutionTest.class );
-suite.addTestSuite( MavenITmng2562Timestamp322Test.class );
-suite.addTestSuite( MavenITmng2199ParentVersionRangeTest.class );
-suite.addTestSuite( 
MavenITmng5640LifecycleParticipantAfterSessionEnd.class );
-suite.addTestSuite( MavenITmng5639ImportScopePomResolutionTest.class );
-suite.addTestSuite( MavenITmng5608ProfileActivationWarningTest.class );
-suite.addTestSuite( MavenITmng5591WorkspaceReader.class );
-suite.addTestSuite( MavenITmng5581LifecycleMappingDelegate.class );
-suite.addTestSuite( MavenITmng5572ReactorPluginExtensionsTest.class  );
-suite.addTestSuite( MavenITmng5576CdFriendlyVersions.class );
-suite.addTestSuite( MavenITmng5530MojoExecutionScopeTest.class );
-//suite.addTestSuite( MavenITmng5208EventSpyParallelTest.class );
-suite.addTestSuite( MavenITmng5482AetherNotFoundTest.class );
-suite.addTestSuite( 
MavenITmng5445LegacyStringSearchModelInterpolatorTest.class );
-suite.addTestSuite( 
MavenITmng5389LifecycleParticipantAfterSessionEnd.class );
-suite.addTestSuite( MavenITmng5387ArtifactReplacementPlugin.class );
-suite.addTestSuite( MavenITmng5382Jsr330Plugin.class );
-suite.addTestSuite( MavenITmng5338FileOptionToDirectory.class );
-suite.addTestSuite( 
MavenITmng5280SettingsProfilesRepositoriesOrderTest.class );
-suite.addTestSuite( MavenITmng5230MakeReactorWithExcludesTest.class );
-suite.addTestSuite( MavenITmng5224InjectedSettings.class );
-suite.addTestSuite( MavenITmng5214DontMapWsdlToJar.class );
-suite.addTestSuite( 
MavenITmng5137ReactorResolutionInForkedBuildTest.class );
-suite.addTestSuite( 
MavenITmng5135AggregatorDepResolutionModuleExtensionTest.class );
-suite.addTestSuite( 
MavenITmng5096ExclusionAtDependencyWithImpliedClassifierTest.class );
-suite.addTestSuite( MavenITmng5064SuppressSnapshotUpdatesTest.class );
-suite.addTestSuite( 
MavenITmng5019StringBasedCompLookupFromChildPluginRealmTest.class );
-suite.addTestSuite( 
MavenITmng5013ConfigureParamBeanFromScalarValueTest.class );
-suite.addTestSuite( 
MavenITmng5012CollectionVsArrayParamCoercionTest.class );
-suite.addTestSuite( 
MavenITmng5011ConfigureCollectionArrayFromSystemPropTest.class );
-suite.addTestSuite( MavenITmng5009AggregationCycleTest.class );
-suite.addTestSuite( 
MavenITmng5006VersionRangeDependencyParentResolutionTest.class );
-suite.addTestSuite( 
MavenITmng5000ChildPathAwareUrlInheritanceTest.class );
-suite.addTestSuite( 
MavenITmng4992MapStylePropertiesParamConfigTest.class );
-

[1/3] maven-integration-testing git commit: Just run MNG-6057 tests nothing more for testing purposes. [Forced Update!]

[khmarbaise]

Repository: maven-integration-testing
Updated Branches:
  refs/heads/MNG-6057 1128ac989 -> 2ee48a140 (forced update)


http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/2ee48a14/core-it-suite/src/test/resources/bootstrap/group-6/pom.xml
--
diff --git a/core-it-suite/src/test/resources/bootstrap/group-6/pom.xml 
b/core-it-suite/src/test/resources/bootstrap/group-6/pom.xml
index b48464e..3587d2e 100644
--- a/core-it-suite/src/test/resources/bootstrap/group-6/pom.xml
+++ b/core-it-suite/src/test/resources/bootstrap/group-6/pom.xml
@@ -88,5 +88,77 @@ under the License.
   3.1
   runtime
 
+
+
+  org.apache.maven
+  maven-settings
+  3.1.1
+
+
+  org.apache.maven
+  maven-settings-builder
+  3.1.1
+
+
+  org.apache.maven
+  maven-repository-metadata
+  3.1.1
+
+
+  org.apache.maven
+  maven-aether-provider
+  3.1.1
+
+
+  org.eclipse.aether
+  aether-spi
+  0.9.0.M2
+
+
+  org.eclipse.aether
+  aether-impl
+  0.9.0.M2
+
+
+  org.eclipse.sisu.plexus
+  org.elcipse.sisu.plexus
+  0.0.0.M5
+
+
+  org.eclipse.sisu.inject
+  org.elcipse.sisu.inject
+  0.0.0.M5
+
+
+  org.sonatype.sisu
+  sisu-guice
+  3.1.0
+  no_aop
+
+
+  com.google.guava
+  guava
+  10.0.1
+
+
+  com.google.code.findbugs
+  jsr205
+  1.3.9
+
+
+  org.codehaus.plexus
+  plexus-classworlds
+  2.5.1
+
+
+  org.codehaus.mojo
+  flatten-maven-plugin
+  1.0.0
+
+
+  org.apache.maven.plugins
+  maven-assembly-plugin
+  2.5.1
+
   
 

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/2ee48a14/core-it-suite/src/test/resources/mng-5895-ci-friendly-usage-with-property/module-3/pom.xml
--
diff --git 
a/core-it-suite/src/test/resources/mng-5895-ci-friendly-usage-with-property/module-3/pom.xml
 
b/core-it-suite/src/test/resources/mng-5895-ci-friendly-usage-with-property/module-3/pom.xml
index 6c77439..e51f0fb 100644
--- 
a/core-it-suite/src/test/resources/mng-5895-ci-friendly-usage-with-property/module-3/pom.xml
+++ 
b/core-it-suite/src/test/resources/mng-5895-ci-friendly-usage-with-property/module-3/pom.xml
@@ -31,20 +31,6 @@

 
   
-
-  
-
-  org.apache.maven.plugins
-  maven-assembly-plugin
-  2.5.1
-
-
-  org.apache.maven.plugins
-  maven-jar-plugin
-  2.2
-
-  
-
 

org.apache.maven.plugins

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/2ee48a14/core-it-suite/src/test/resources/mng-5895-ci-friendly-usage-with-property/pom.xml
--
diff --git 
a/core-it-suite/src/test/resources/mng-5895-ci-friendly-usage-with-property/pom.xml
 
b/core-it-suite/src/test/resources/mng-5895-ci-friendly-usage-with-property/pom.xml
index ccf3aec..38a3358 100644
--- 
a/core-it-suite/src/test/resources/mng-5895-ci-friendly-usage-with-property/pom.xml
+++ 
b/core-it-suite/src/test/resources/mng-5895-ci-friendly-usage-with-property/pom.xml
@@ -31,6 +31,22 @@ under the License.
   
1.3.0-SNAPSHOT
   
+  
+
+  
+
+  org.apache.maven.plugins
+  maven-assembly-plugin
+  2.5.1
+
+
+  org.apache.maven.plugins
+  maven-jar-plugin
+  2.2
+
+  
+
+  
   
 module-3
 module-1

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/2ee48a14/core-it-suite/src/test/resources/mng-6090-ci-friendly/pom.xml
--
diff --git a/core-it-suite/src/test/resources/mng-6090-ci-friendly/pom.xml 
b/core-it-suite/src/test/resources/mng-6090-ci-friendly/pom.xml
index c7ac56e..233c4cd 100644
--- a/core-it-suite/src/test/resources/mng-6090-ci-friendly/pom.xml
+++ b/core-it-suite/src/test/resources/mng-6090-ci-friendly/pom.xml
@@ -50,13 +50,17 @@ under the License.
   maven-jar-plugin
   2.2
 
+
+  org.codehaus.mojo
+  flatten-maven-plugin
+  1.0.0
+
   
 
 
   
 org.codehaus.mojo
 flatten-maven-plugin
-1.0.0
 
   true
 

[2/3] maven-integration-testing git commit: Just run MNG-6057 tests nothing more for testing purposes.

[khmarbaise]

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/2ee48a14/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 bbc7c9e..bee94cd 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
@@ -109,591 +109,591 @@ public class IntegrationTestSuite
 suite.addTestSuite( MavenITmng6057CheckReactorOrderTest.class );
 suite.addTestSuite( 
MavenITmng5895CIFriendlyUsageWithPropertyTest.class );
 suite.addTestSuite( MavenITmng6090CIFriendlyTest.class );
-suite.addTestSuite( 
MavenITmng6173GetProjectsAndDependencyGraphTest.class );
-suite.addTestSuite( MavenITmng6173GetAllProjectsInReactorTest.class );
-suite.addTestSuite( MavenITmng5958LifecyclePhaseBinaryCompat.class );
-suite.addTestSuite( 
MavenITmng5898BuildMultimoduleWithEARFailsToResolveWARTest.class );
-suite.addTestSuite( MavenITmng5889CoreExtensionsTest.class );
-suite.addTestSuite( MavenITmng5840ParentVersionRanges.class );
-suite.addTestSuite( MavenITmng5840RelativePathReactorMatching.class );
-suite.addTestSuite( MavenITmng5805PkgTypeMojoConfiguration.class );
-suite.addTestSuite( MavenITmng5805PkgTypeMojoConfiguration2.class );
-suite.addTestSuite( MavenITmng5783PluginDependencyFiltering.class );
-suite.addTestSuite( MavenITmng5774ConfigurationProcessorsTest.class );
-suite.addTestSuite( MavenITmng5771CoreExtensionsTest.class );
-suite.addTestSuite( MavenITmng5768CliExecutionIdTest.class );
-suite.addTestSuite( MavenITmng5742BuildExtensionClassloaderTest.class 
);
-suite.addTestSuite( MavenITmng5578SessionScopeTest.class );
-suite.addTestSuite( 
MavenITmng5753CustomMojoExecutionConfiguratorTest.class );
-suite.addTestSuite( MavenITmng5716ToolchainsTypeTest.class );
-suite.addTestSuite( 
MavenITmng5663NestedImportScopePomResolutionTest.class );
-suite.addTestSuite( MavenITmng2562Timestamp322Test.class );
-suite.addTestSuite( MavenITmng2199ParentVersionRangeTest.class );
-suite.addTestSuite( 
MavenITmng5640LifecycleParticipantAfterSessionEnd.class );
-suite.addTestSuite( MavenITmng5639ImportScopePomResolutionTest.class );
-suite.addTestSuite( MavenITmng5608ProfileActivationWarningTest.class );
-suite.addTestSuite( MavenITmng5591WorkspaceReader.class );
-suite.addTestSuite( MavenITmng5581LifecycleMappingDelegate.class );
-suite.addTestSuite( MavenITmng5572ReactorPluginExtensionsTest.class  );
-suite.addTestSuite( MavenITmng5576CdFriendlyVersions.class );
-suite.addTestSuite( MavenITmng5530MojoExecutionScopeTest.class );
-//suite.addTestSuite( MavenITmng5208EventSpyParallelTest.class );
-suite.addTestSuite( MavenITmng5482AetherNotFoundTest.class );
-suite.addTestSuite( 
MavenITmng5445LegacyStringSearchModelInterpolatorTest.class );
-suite.addTestSuite( 
MavenITmng5389LifecycleParticipantAfterSessionEnd.class );
-suite.addTestSuite( MavenITmng5387ArtifactReplacementPlugin.class );
-suite.addTestSuite( MavenITmng5382Jsr330Plugin.class );
-suite.addTestSuite( MavenITmng5338FileOptionToDirectory.class );
-suite.addTestSuite( 
MavenITmng5280SettingsProfilesRepositoriesOrderTest.class );
-suite.addTestSuite( MavenITmng5230MakeReactorWithExcludesTest.class );
-suite.addTestSuite( MavenITmng5224InjectedSettings.class );
-suite.addTestSuite( MavenITmng5214DontMapWsdlToJar.class );
-suite.addTestSuite( 
MavenITmng5137ReactorResolutionInForkedBuildTest.class );
-suite.addTestSuite( 
MavenITmng5135AggregatorDepResolutionModuleExtensionTest.class );
-suite.addTestSuite( 
MavenITmng5096ExclusionAtDependencyWithImpliedClassifierTest.class );
-suite.addTestSuite( MavenITmng5064SuppressSnapshotUpdatesTest.class );
-suite.addTestSuite( 
MavenITmng5019StringBasedCompLookupFromChildPluginRealmTest.class );
-suite.addTestSuite( 
MavenITmng5013ConfigureParamBeanFromScalarValueTest.class );
-suite.addTestSuite( 
MavenITmng5012CollectionVsArrayParamCoercionTest.class );
-suite.addTestSuite( 
MavenITmng5011ConfigureCollectionArrayFromSystemPropTest.class );
-suite.addTestSuite( MavenITmng5009AggregationCycleTest.class );
-suite.addTestSuite( 
MavenITmng5006VersionRangeDependencyParentResolutionTest.class );
-suite.addTestSuite( 
MavenITmng5000ChildPathAwareUrlInheritanceTest.class );
-suite.addTestSuite( 
MavenITmng4992MapStylePropertiesParamConfigTest.class );
-

[3/3] maven-integration-testing git commit: Just run MNG-6057 tests nothing more for testing purposes.

[khmarbaise]

Just run MNG-6057 tests nothing more for testing purposes.


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

Branch: refs/heads/MNG-6057
Commit: 2ee48a1400597f5550e600e2629c6af443605b35
Parents: 8556a88
Author: Karl Heinz Marbaise 
Authored: Mon Mar 13 19:39:37 2017 +0100
Committer: Karl Heinz Marbaise 
Committed: Mon Mar 13 21:14:45 2017 +0100

--
 .../apache/maven/it/IntegrationTestSuite.java   | 1170 +-
 .../test/resources/bootstrap/group-6/pom.xml|   72 ++
 .../module-3/pom.xml|   14 -
 .../pom.xml |   16 +
 .../test/resources/mng-6090-ci-friendly/pom.xml |6 +-
 5 files changed, 678 insertions(+), 600 deletions(-)
--

[2/3] maven-integration-testing git commit: Just run MNG-6057 tests nothing more for testing purposes.

[khmarbaise]

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/1128ac98/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 bbc7c9e..bee94cd 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
@@ -109,591 +109,591 @@ public class IntegrationTestSuite
 suite.addTestSuite( MavenITmng6057CheckReactorOrderTest.class );
 suite.addTestSuite( 
MavenITmng5895CIFriendlyUsageWithPropertyTest.class );
 suite.addTestSuite( MavenITmng6090CIFriendlyTest.class );
-suite.addTestSuite( 
MavenITmng6173GetProjectsAndDependencyGraphTest.class );
-suite.addTestSuite( MavenITmng6173GetAllProjectsInReactorTest.class );
-suite.addTestSuite( MavenITmng5958LifecyclePhaseBinaryCompat.class );
-suite.addTestSuite( 
MavenITmng5898BuildMultimoduleWithEARFailsToResolveWARTest.class );
-suite.addTestSuite( MavenITmng5889CoreExtensionsTest.class );
-suite.addTestSuite( MavenITmng5840ParentVersionRanges.class );
-suite.addTestSuite( MavenITmng5840RelativePathReactorMatching.class );
-suite.addTestSuite( MavenITmng5805PkgTypeMojoConfiguration.class );
-suite.addTestSuite( MavenITmng5805PkgTypeMojoConfiguration2.class );
-suite.addTestSuite( MavenITmng5783PluginDependencyFiltering.class );
-suite.addTestSuite( MavenITmng5774ConfigurationProcessorsTest.class );
-suite.addTestSuite( MavenITmng5771CoreExtensionsTest.class );
-suite.addTestSuite( MavenITmng5768CliExecutionIdTest.class );
-suite.addTestSuite( MavenITmng5742BuildExtensionClassloaderTest.class 
);
-suite.addTestSuite( MavenITmng5578SessionScopeTest.class );
-suite.addTestSuite( 
MavenITmng5753CustomMojoExecutionConfiguratorTest.class );
-suite.addTestSuite( MavenITmng5716ToolchainsTypeTest.class );
-suite.addTestSuite( 
MavenITmng5663NestedImportScopePomResolutionTest.class );
-suite.addTestSuite( MavenITmng2562Timestamp322Test.class );
-suite.addTestSuite( MavenITmng2199ParentVersionRangeTest.class );
-suite.addTestSuite( 
MavenITmng5640LifecycleParticipantAfterSessionEnd.class );
-suite.addTestSuite( MavenITmng5639ImportScopePomResolutionTest.class );
-suite.addTestSuite( MavenITmng5608ProfileActivationWarningTest.class );
-suite.addTestSuite( MavenITmng5591WorkspaceReader.class );
-suite.addTestSuite( MavenITmng5581LifecycleMappingDelegate.class );
-suite.addTestSuite( MavenITmng5572ReactorPluginExtensionsTest.class  );
-suite.addTestSuite( MavenITmng5576CdFriendlyVersions.class );
-suite.addTestSuite( MavenITmng5530MojoExecutionScopeTest.class );
-//suite.addTestSuite( MavenITmng5208EventSpyParallelTest.class );
-suite.addTestSuite( MavenITmng5482AetherNotFoundTest.class );
-suite.addTestSuite( 
MavenITmng5445LegacyStringSearchModelInterpolatorTest.class );
-suite.addTestSuite( 
MavenITmng5389LifecycleParticipantAfterSessionEnd.class );
-suite.addTestSuite( MavenITmng5387ArtifactReplacementPlugin.class );
-suite.addTestSuite( MavenITmng5382Jsr330Plugin.class );
-suite.addTestSuite( MavenITmng5338FileOptionToDirectory.class );
-suite.addTestSuite( 
MavenITmng5280SettingsProfilesRepositoriesOrderTest.class );
-suite.addTestSuite( MavenITmng5230MakeReactorWithExcludesTest.class );
-suite.addTestSuite( MavenITmng5224InjectedSettings.class );
-suite.addTestSuite( MavenITmng5214DontMapWsdlToJar.class );
-suite.addTestSuite( 
MavenITmng5137ReactorResolutionInForkedBuildTest.class );
-suite.addTestSuite( 
MavenITmng5135AggregatorDepResolutionModuleExtensionTest.class );
-suite.addTestSuite( 
MavenITmng5096ExclusionAtDependencyWithImpliedClassifierTest.class );
-suite.addTestSuite( MavenITmng5064SuppressSnapshotUpdatesTest.class );
-suite.addTestSuite( 
MavenITmng5019StringBasedCompLookupFromChildPluginRealmTest.class );
-suite.addTestSuite( 
MavenITmng5013ConfigureParamBeanFromScalarValueTest.class );
-suite.addTestSuite( 
MavenITmng5012CollectionVsArrayParamCoercionTest.class );
-suite.addTestSuite( 
MavenITmng5011ConfigureCollectionArrayFromSystemPropTest.class );
-suite.addTestSuite( MavenITmng5009AggregationCycleTest.class );
-suite.addTestSuite( 
MavenITmng5006VersionRangeDependencyParentResolutionTest.class );
-suite.addTestSuite( 
MavenITmng5000ChildPathAwareUrlInheritanceTest.class );
-suite.addTestSuite( 
MavenITmng4992MapStylePropertiesParamConfigTest.class );
-

[3/3] maven-integration-testing git commit: Just run MNG-6057 tests nothing more for testing purposes.

[khmarbaise]

Just run MNG-6057 tests nothing more for testing purposes.


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

Branch: refs/heads/MNG-6057
Commit: 1128ac98973927171967903a083d98703cbfe72b
Parents: 8556a88
Author: Karl Heinz Marbaise 
Authored: Mon Mar 13 19:39:37 2017 +0100
Committer: Karl Heinz Marbaise 
Committed: Mon Mar 13 20:55:09 2017 +0100

--
 .../apache/maven/it/IntegrationTestSuite.java   | 1170 +-
 .../test/resources/bootstrap/group-6/pom.xml|   11 +
 .../module-3/pom.xml|   14 -
 .../pom.xml |   16 +
 .../test/resources/mng-6090-ci-friendly/pom.xml |6 +-
 5 files changed, 617 insertions(+), 600 deletions(-)
--

[1/3] maven-integration-testing git commit: Just run MNG-6057 tests nothing more for testing purposes. [Forced Update!]

[khmarbaise]

Repository: maven-integration-testing
Updated Branches:
  refs/heads/MNG-6057 5577138cb -> 1128ac989 (forced update)


http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/1128ac98/core-it-suite/src/test/resources/bootstrap/group-6/pom.xml
--
diff --git a/core-it-suite/src/test/resources/bootstrap/group-6/pom.xml 
b/core-it-suite/src/test/resources/bootstrap/group-6/pom.xml
index b48464e..b8d6433 100644
--- a/core-it-suite/src/test/resources/bootstrap/group-6/pom.xml
+++ b/core-it-suite/src/test/resources/bootstrap/group-6/pom.xml
@@ -88,5 +88,16 @@ under the License.
   3.1
   runtime
 
+
+
+  org.codehaus.mojo
+  flatten-maven-plugin
+  1.0.0
+
+
+  org.apache.maven.plugins
+  maven-assembly-plugin
+  2.5.1
+
   
 

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/1128ac98/core-it-suite/src/test/resources/mng-5895-ci-friendly-usage-with-property/module-3/pom.xml
--
diff --git 
a/core-it-suite/src/test/resources/mng-5895-ci-friendly-usage-with-property/module-3/pom.xml
 
b/core-it-suite/src/test/resources/mng-5895-ci-friendly-usage-with-property/module-3/pom.xml
index 6c77439..e51f0fb 100644
--- 
a/core-it-suite/src/test/resources/mng-5895-ci-friendly-usage-with-property/module-3/pom.xml
+++ 
b/core-it-suite/src/test/resources/mng-5895-ci-friendly-usage-with-property/module-3/pom.xml
@@ -31,20 +31,6 @@

 
   
-
-  
-
-  org.apache.maven.plugins
-  maven-assembly-plugin
-  2.5.1
-
-
-  org.apache.maven.plugins
-  maven-jar-plugin
-  2.2
-
-  
-
 

org.apache.maven.plugins

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/1128ac98/core-it-suite/src/test/resources/mng-5895-ci-friendly-usage-with-property/pom.xml
--
diff --git 
a/core-it-suite/src/test/resources/mng-5895-ci-friendly-usage-with-property/pom.xml
 
b/core-it-suite/src/test/resources/mng-5895-ci-friendly-usage-with-property/pom.xml
index ccf3aec..38a3358 100644
--- 
a/core-it-suite/src/test/resources/mng-5895-ci-friendly-usage-with-property/pom.xml
+++ 
b/core-it-suite/src/test/resources/mng-5895-ci-friendly-usage-with-property/pom.xml
@@ -31,6 +31,22 @@ under the License.
   
1.3.0-SNAPSHOT
   
+  
+
+  
+
+  org.apache.maven.plugins
+  maven-assembly-plugin
+  2.5.1
+
+
+  org.apache.maven.plugins
+  maven-jar-plugin
+  2.2
+
+  
+
+  
   
 module-3
 module-1

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/1128ac98/core-it-suite/src/test/resources/mng-6090-ci-friendly/pom.xml
--
diff --git a/core-it-suite/src/test/resources/mng-6090-ci-friendly/pom.xml 
b/core-it-suite/src/test/resources/mng-6090-ci-friendly/pom.xml
index c7ac56e..233c4cd 100644
--- a/core-it-suite/src/test/resources/mng-6090-ci-friendly/pom.xml
+++ b/core-it-suite/src/test/resources/mng-6090-ci-friendly/pom.xml
@@ -50,13 +50,17 @@ under the License.
   maven-jar-plugin
   2.2
 
+
+  org.codehaus.mojo
+  flatten-maven-plugin
+  1.0.0
+
   
 
 
   
 org.codehaus.mojo
 flatten-maven-plugin
-1.0.0
 
   true
 

[1/3] maven-integration-testing git commit: Just run MNG-6057 tests nothing more for testing purposes. [Forced Update!]

[khmarbaise]

Repository: maven-integration-testing
Updated Branches:
  refs/heads/MNG-6057 76151abb5 -> 5577138cb (forced update)


http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/5577138c/core-it-suite/src/test/resources/bootstrap/group-6/pom.xml
--
diff --git a/core-it-suite/src/test/resources/bootstrap/group-6/pom.xml 
b/core-it-suite/src/test/resources/bootstrap/group-6/pom.xml
index b48464e..ce656b2 100644
--- a/core-it-suite/src/test/resources/bootstrap/group-6/pom.xml
+++ b/core-it-suite/src/test/resources/bootstrap/group-6/pom.xml
@@ -88,5 +88,18 @@ under the License.
   3.1
   runtime
 
+
+  
+org.codehaus.mojo
+flatten-maven-plugin
+1.0.0
+runtime
+  
+  
+org.apache.maven.plugins
+maven-assembly-plugin
+2.5.1
+runtime
+  
   
 

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/5577138c/core-it-suite/src/test/resources/mng-5895-ci-friendly-usage-with-property/module-3/pom.xml
--
diff --git 
a/core-it-suite/src/test/resources/mng-5895-ci-friendly-usage-with-property/module-3/pom.xml
 
b/core-it-suite/src/test/resources/mng-5895-ci-friendly-usage-with-property/module-3/pom.xml
index 6c77439..e51f0fb 100644
--- 
a/core-it-suite/src/test/resources/mng-5895-ci-friendly-usage-with-property/module-3/pom.xml
+++ 
b/core-it-suite/src/test/resources/mng-5895-ci-friendly-usage-with-property/module-3/pom.xml
@@ -31,20 +31,6 @@

 
   
-
-  
-
-  org.apache.maven.plugins
-  maven-assembly-plugin
-  2.5.1
-
-
-  org.apache.maven.plugins
-  maven-jar-plugin
-  2.2
-
-  
-
 

org.apache.maven.plugins

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/5577138c/core-it-suite/src/test/resources/mng-5895-ci-friendly-usage-with-property/pom.xml
--
diff --git 
a/core-it-suite/src/test/resources/mng-5895-ci-friendly-usage-with-property/pom.xml
 
b/core-it-suite/src/test/resources/mng-5895-ci-friendly-usage-with-property/pom.xml
index ccf3aec..38a3358 100644
--- 
a/core-it-suite/src/test/resources/mng-5895-ci-friendly-usage-with-property/pom.xml
+++ 
b/core-it-suite/src/test/resources/mng-5895-ci-friendly-usage-with-property/pom.xml
@@ -31,6 +31,22 @@ under the License.
   
1.3.0-SNAPSHOT
   
+  
+
+  
+
+  org.apache.maven.plugins
+  maven-assembly-plugin
+  2.5.1
+
+
+  org.apache.maven.plugins
+  maven-jar-plugin
+  2.2
+
+  
+
+  
   
 module-3
 module-1

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/5577138c/core-it-suite/src/test/resources/mng-6090-ci-friendly/pom.xml
--
diff --git a/core-it-suite/src/test/resources/mng-6090-ci-friendly/pom.xml 
b/core-it-suite/src/test/resources/mng-6090-ci-friendly/pom.xml
index c7ac56e..233c4cd 100644
--- a/core-it-suite/src/test/resources/mng-6090-ci-friendly/pom.xml
+++ b/core-it-suite/src/test/resources/mng-6090-ci-friendly/pom.xml
@@ -50,13 +50,17 @@ under the License.
   maven-jar-plugin
   2.2
 
+
+  org.codehaus.mojo
+  flatten-maven-plugin
+  1.0.0
+
   
 
 
   
 org.codehaus.mojo
 flatten-maven-plugin
-1.0.0
 
   true
 

[3/3] maven-integration-testing git commit: Just run MNG-6057 tests nothing more for testing purposes.

[khmarbaise]

Just run MNG-6057 tests nothing more for testing purposes.


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

Branch: refs/heads/MNG-6057
Commit: 5577138cb548a3327e890004073f5c3179fb430e
Parents: 8556a88
Author: Karl Heinz Marbaise 
Authored: Mon Mar 13 19:39:37 2017 +0100
Committer: Karl Heinz Marbaise 
Committed: Mon Mar 13 20:43:12 2017 +0100

--
 .../apache/maven/it/IntegrationTestSuite.java   | 1170 +-
 .../test/resources/bootstrap/group-6/pom.xml|   13 +
 .../module-3/pom.xml|   14 -
 .../pom.xml |   16 +
 .../test/resources/mng-6090-ci-friendly/pom.xml |6 +-
 5 files changed, 619 insertions(+), 600 deletions(-)
--

[2/2] maven-integration-testing git commit: Just run MNG-6057 tests nothing more for testing purposes.

[khmarbaise]

Just run MNG-6057 tests nothing more for testing purposes.


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

Branch: refs/heads/MNG-6057
Commit: 76151abb5b5fb1d42cdd687c7940294a3f315afb
Parents: 8556a88
Author: Karl Heinz Marbaise 
Authored: Mon Mar 13 19:39:37 2017 +0100
Committer: Karl Heinz Marbaise 
Committed: Mon Mar 13 19:39:37 2017 +0100

--
 .../apache/maven/it/IntegrationTestSuite.java   | 1170 +-
 1 file changed, 585 insertions(+), 585 deletions(-)
--

[1/2] maven-integration-testing git commit: Just run MNG-6057 tests nothing more for testing purposes.

[khmarbaise]

Repository: maven-integration-testing
Updated Branches:
  refs/heads/MNG-6057 8556a887d -> 76151abb5


http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/76151abb/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 bbc7c9e..bee94cd 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
@@ -109,591 +109,591 @@ public class IntegrationTestSuite
 suite.addTestSuite( MavenITmng6057CheckReactorOrderTest.class );
 suite.addTestSuite( 
MavenITmng5895CIFriendlyUsageWithPropertyTest.class );
 suite.addTestSuite( MavenITmng6090CIFriendlyTest.class );
-suite.addTestSuite( 
MavenITmng6173GetProjectsAndDependencyGraphTest.class );
-suite.addTestSuite( MavenITmng6173GetAllProjectsInReactorTest.class );
-suite.addTestSuite( MavenITmng5958LifecyclePhaseBinaryCompat.class );
-suite.addTestSuite( 
MavenITmng5898BuildMultimoduleWithEARFailsToResolveWARTest.class );
-suite.addTestSuite( MavenITmng5889CoreExtensionsTest.class );
-suite.addTestSuite( MavenITmng5840ParentVersionRanges.class );
-suite.addTestSuite( MavenITmng5840RelativePathReactorMatching.class );
-suite.addTestSuite( MavenITmng5805PkgTypeMojoConfiguration.class );
-suite.addTestSuite( MavenITmng5805PkgTypeMojoConfiguration2.class );
-suite.addTestSuite( MavenITmng5783PluginDependencyFiltering.class );
-suite.addTestSuite( MavenITmng5774ConfigurationProcessorsTest.class );
-suite.addTestSuite( MavenITmng5771CoreExtensionsTest.class );
-suite.addTestSuite( MavenITmng5768CliExecutionIdTest.class );
-suite.addTestSuite( MavenITmng5742BuildExtensionClassloaderTest.class 
);
-suite.addTestSuite( MavenITmng5578SessionScopeTest.class );
-suite.addTestSuite( 
MavenITmng5753CustomMojoExecutionConfiguratorTest.class );
-suite.addTestSuite( MavenITmng5716ToolchainsTypeTest.class );
-suite.addTestSuite( 
MavenITmng5663NestedImportScopePomResolutionTest.class );
-suite.addTestSuite( MavenITmng2562Timestamp322Test.class );
-suite.addTestSuite( MavenITmng2199ParentVersionRangeTest.class );
-suite.addTestSuite( 
MavenITmng5640LifecycleParticipantAfterSessionEnd.class );
-suite.addTestSuite( MavenITmng5639ImportScopePomResolutionTest.class );
-suite.addTestSuite( MavenITmng5608ProfileActivationWarningTest.class );
-suite.addTestSuite( MavenITmng5591WorkspaceReader.class );
-suite.addTestSuite( MavenITmng5581LifecycleMappingDelegate.class );
-suite.addTestSuite( MavenITmng5572ReactorPluginExtensionsTest.class  );
-suite.addTestSuite( MavenITmng5576CdFriendlyVersions.class );
-suite.addTestSuite( MavenITmng5530MojoExecutionScopeTest.class );
-//suite.addTestSuite( MavenITmng5208EventSpyParallelTest.class );
-suite.addTestSuite( MavenITmng5482AetherNotFoundTest.class );
-suite.addTestSuite( 
MavenITmng5445LegacyStringSearchModelInterpolatorTest.class );
-suite.addTestSuite( 
MavenITmng5389LifecycleParticipantAfterSessionEnd.class );
-suite.addTestSuite( MavenITmng5387ArtifactReplacementPlugin.class );
-suite.addTestSuite( MavenITmng5382Jsr330Plugin.class );
-suite.addTestSuite( MavenITmng5338FileOptionToDirectory.class );
-suite.addTestSuite( 
MavenITmng5280SettingsProfilesRepositoriesOrderTest.class );
-suite.addTestSuite( MavenITmng5230MakeReactorWithExcludesTest.class );
-suite.addTestSuite( MavenITmng5224InjectedSettings.class );
-suite.addTestSuite( MavenITmng5214DontMapWsdlToJar.class );
-suite.addTestSuite( 
MavenITmng5137ReactorResolutionInForkedBuildTest.class );
-suite.addTestSuite( 
MavenITmng5135AggregatorDepResolutionModuleExtensionTest.class );
-suite.addTestSuite( 
MavenITmng5096ExclusionAtDependencyWithImpliedClassifierTest.class );
-suite.addTestSuite( MavenITmng5064SuppressSnapshotUpdatesTest.class );
-suite.addTestSuite( 
MavenITmng5019StringBasedCompLookupFromChildPluginRealmTest.class );
-suite.addTestSuite( 
MavenITmng5013ConfigureParamBeanFromScalarValueTest.class );
-suite.addTestSuite( 
MavenITmng5012CollectionVsArrayParamCoercionTest.class );
-suite.addTestSuite( 
MavenITmng5011ConfigureCollectionArrayFromSystemPropTest.class );
-suite.addTestSuite( MavenITmng5009AggregationCycleTest.class );
-suite.addTestSuite( 
MavenITmng5006VersionRangeDependencyParentResolutionTest.class );
-suite.addTestSuite( 
MavenITmng5000ChildPathAwareUrlInheritanceTest.class 

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!]

[khmarbaise]

Repository: maven-integration-testing
Updated Branches:
  refs/heads/MNG-6057 657da32ec -> 8556a887d (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/8556a887
Tree: 
http://git-wip-us.apache.org/repos/asf/maven-integration-testing/tree/8556a887
Diff: 
http://git-wip-us.apache.org/repos/asf/maven-integration-testing/diff/8556a887

Branch: refs/heads/MNG-6057
Commit: 8556a887d52dc17e3e90131bd52125aa6e7c2200
Parents: c68f707
Author: Karl Heinz Marbaise 
Authored: Wed Mar 8 00:12:31 2017 +0100
Committer: Karl Heinz Marbaise 
Committed: Mon Mar 13 18:52:57 2017 +0100

--
 .gitignore  |   1 +
 .../apache/maven/it/IntegrationTestSuite.java   |   3 +
 ...Tmng5895CIFriendlyUsageWithPropertyTest.java |  70 +++
 .../it/MavenITmng6057CheckReactorOrderTest.java | 119 +++
 .../maven/it/MavenITmng6090CIFriendlyTest.java  |  80 +
 .../src/test/resources/bootstrap/pom.xml|  10 ++
 .../module-1/pom.xml|  33 +
 .../module-2/pom.xml|  33 +
 .../module-3/jar-with-prod.xml  |  17 +++
 .../module-3/pom.xml|  70 +++
 .../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 |  82 +
 19 files changed, 806 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/8556a887/.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/8556a887/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/8556a887/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 

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!]

[khmarbaise]

Repository: maven-integration-testing
Updated Branches:
  refs/heads/MNG-6057 a35b512bb -> 657da32ec (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/657da32e
Tree: 
http://git-wip-us.apache.org/repos/asf/maven-integration-testing/tree/657da32e
Diff: 
http://git-wip-us.apache.org/repos/asf/maven-integration-testing/diff/657da32e

Branch: refs/heads/MNG-6057
Commit: 657da32eca6e096edcd75bf3c94f7a18af9b4c04
Parents: c68f707
Author: Karl Heinz Marbaise 
Authored: Wed Mar 8 00:12:31 2017 +0100
Committer: Karl Heinz Marbaise 
Committed: Mon Mar 13 18:12:50 2017 +0100

--
 .gitignore  |   1 +
 .../apache/maven/it/IntegrationTestSuite.java   |   3 +
 ...Tmng5895CIFriendlyUsageWithPropertyTest.java |  70 +++
 .../it/MavenITmng6057CheckReactorOrderTest.java | 119 +++
 .../maven/it/MavenITmng6090CIFriendlyTest.java  |  80 +
 .../src/test/resources/bootstrap/pom.xml|   5 +
 .../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, 774 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/657da32e/.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/657da32e/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/657da32e/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

[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();
+