Re: [3/3] maven-surefire git commit: Revert "[SUREFIRE-1473] upgrade commons-lang3 to avoid NPE on jdk10"

[Olivier Lamy]

and now master fail again with jdk10...
Why are you reverting my changes?
As said in an email I wanted to have something working with jdk10.
So please first discuss on the email thread if you are not happy with my
changes...


On 18 February 2018 at 10:36,  wrote:

> Revert "[SUREFIRE-1473] upgrade commons-lang3 to avoid NPE on jdk10"
>
> This reverts commit 8bcf1f14a8697ef3359d7598fbd8062a687f2d5a.
>
>
> Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo
> Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/
> commit/5e732c6b
> Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/5e732c6b
> Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/5e732c6b
>
> Branch: refs/heads/master
> Commit: 5e732c6b2a87026ac56032cc8b2b7e8e92e6aa7e
> Parents: 3c41c55
> Author: Tibor17 
> Authored: Sun Feb 18 00:13:42 2018 +0100
> Committer: Tibor17 
> Committed: Sun Feb 18 00:13:42 2018 +0100
>
> --
>  pom.xml | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> --
>
>
> http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/
> 5e732c6b/pom.xml
> --
> diff --git a/pom.xml b/pom.xml
> index 2bcb0d7..3592b31 100644
> --- a/pom.xml
> +++ b/pom.xml
> @@ -89,7 +89,7 @@
>  2.2.1
>  
>  3.5
> -3.7
> +3.5
>  2.5
>  0.9
>  2.0.0-beta.5
>
>


-- 
Olivier Lamy
http://twitter.com/olamy | http://linkedin.com/in/olamy

svn commit: r1824643 - /maven/archetypes/trunk/maven-archetype-quickstart/src/site/apt/index.apt.vm

[hboutemy]

Author: hboutemy
Date: Sun Feb 18 03:05:54 2018
New Revision: 1824643

URL: http://svn.apache.org/viewvc?rev=1824643=rev
Log:
fixed typo

Modified:
maven/archetypes/trunk/maven-archetype-quickstart/src/site/apt/index.apt.vm

Modified: 
maven/archetypes/trunk/maven-archetype-quickstart/src/site/apt/index.apt.vm
URL: 
http://svn.apache.org/viewvc/maven/archetypes/trunk/maven-archetype-quickstart/src/site/apt/index.apt.vm?rev=1824643=1824642=1824643=diff
==
--- maven/archetypes/trunk/maven-archetype-quickstart/src/site/apt/index.apt.vm 
(original)
+++ maven/archetypes/trunk/maven-archetype-quickstart/src/site/apt/index.apt.vm 
Sun Feb 18 03:05:54 2018
@@ -41,7 +41,7 @@ project
 |   `-- App.java
 `-- test
 `-- java
-|   `-- $package
+`-- $package
 `-- AppTest.java
 
 ++

svn commit: r1824642 - in /maven/archetypes/trunk: maven-archetype-archetype/src/main/resources/archetype-resources/ maven-archetype-j2ee-simple/src/main/resources/archetype-resources/ maven-archetype

[hboutemy]

Author: hboutemy
Date: Sun Feb 18 02:58:32 2018
New Revision: 1824642

URL: http://svn.apache.org/viewvc?rev=1824642=rev
Log:
[MARCHETYPES-37] added XML prolog specifying encoding to generated pom.xml

Modified:

maven/archetypes/trunk/maven-archetype-archetype/src/main/resources/archetype-resources/pom.xml

maven/archetypes/trunk/maven-archetype-j2ee-simple/src/main/resources/archetype-resources/pom.xml

maven/archetypes/trunk/maven-archetype-plugin-site/src/main/resources/archetype-resources/pom.xml

maven/archetypes/trunk/maven-archetype-plugin/src/main/resources/archetype-resources/pom.xml

maven/archetypes/trunk/maven-archetype-portlet/src/main/resources/archetype-resources/pom.xml

maven/archetypes/trunk/maven-archetype-profiles/src/main/resources/archetype-resources/pom.xml

maven/archetypes/trunk/maven-archetype-quickstart/src/main/resources/archetype-resources/pom.xml

maven/archetypes/trunk/maven-archetype-site-simple/src/main/resources/archetype-resources/pom.xml

maven/archetypes/trunk/maven-archetype-site-simple/src/test/resources/projects/basic/reference/pom.xml

maven/archetypes/trunk/maven-archetype-site/src/main/resources/archetype-resources/pom.xml

maven/archetypes/trunk/maven-archetype-webapp/src/main/resources/archetype-resources/pom.xml

Modified: 
maven/archetypes/trunk/maven-archetype-archetype/src/main/resources/archetype-resources/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/archetypes/trunk/maven-archetype-archetype/src/main/resources/archetype-resources/pom.xml?rev=1824642=1824641=1824642=diff
==
--- 
maven/archetypes/trunk/maven-archetype-archetype/src/main/resources/archetype-resources/pom.xml
 (original)
+++ 
maven/archetypes/trunk/maven-archetype-archetype/src/main/resources/archetype-resources/pom.xml
 Sun Feb 18 02:58:32 2018
@@ -1,3 +1,5 @@
+
+
 http://maven.apache.org/POM/4.0.0; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/xsd/maven-4.0.0.xsd;>
   4.0.0

Modified: 
maven/archetypes/trunk/maven-archetype-j2ee-simple/src/main/resources/archetype-resources/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/archetypes/trunk/maven-archetype-j2ee-simple/src/main/resources/archetype-resources/pom.xml?rev=1824642=1824641=1824642=diff
==
--- 
maven/archetypes/trunk/maven-archetype-j2ee-simple/src/main/resources/archetype-resources/pom.xml
 (original)
+++ 
maven/archetypes/trunk/maven-archetype-j2ee-simple/src/main/resources/archetype-resources/pom.xml
 Sun Feb 18 02:58:32 2018
@@ -1,3 +1,5 @@
+
+
 http://maven.apache.org/POM/4.0.0; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/xsd/maven-4.0.0.xsd;>
   4.0.0

Modified: 
maven/archetypes/trunk/maven-archetype-plugin-site/src/main/resources/archetype-resources/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/archetypes/trunk/maven-archetype-plugin-site/src/main/resources/archetype-resources/pom.xml?rev=1824642=1824641=1824642=diff
==
--- 
maven/archetypes/trunk/maven-archetype-plugin-site/src/main/resources/archetype-resources/pom.xml
 (original)
+++ 
maven/archetypes/trunk/maven-archetype-plugin-site/src/main/resources/archetype-resources/pom.xml
 Sun Feb 18 02:58:32 2018
@@ -1,3 +1,5 @@
+
+
 http://maven.apache.org/POM/4.0.0; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/xsd/maven-4.0.0.xsd;>
   4.0.0

Modified: 
maven/archetypes/trunk/maven-archetype-plugin/src/main/resources/archetype-resources/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/archetypes/trunk/maven-archetype-plugin/src/main/resources/archetype-resources/pom.xml?rev=1824642=1824641=1824642=diff
==
--- 
maven/archetypes/trunk/maven-archetype-plugin/src/main/resources/archetype-resources/pom.xml
 (original)
+++ 
maven/archetypes/trunk/maven-archetype-plugin/src/main/resources/archetype-resources/pom.xml
 Sun Feb 18 02:58:32 2018
@@ -1,3 +1,5 @@
+
+
 ##
 ## Copyright 2001-2005 The Apache Software Foundation.
 ##

Modified: 
maven/archetypes/trunk/maven-archetype-portlet/src/main/resources/archetype-resources/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/archetypes/trunk/maven-archetype-portlet/src/main/resources/archetype-resources/pom.xml?rev=1824642=1824641=1824642=diff
==
--- 
maven/archetypes/trunk/maven-archetype-portlet/src/main/resources/archetype-resources/pom.xml
 (original)
+++ 

svn commit: r1824640 - in /maven/archetypes/trunk/maven-archetype-quickstart/src/test/resources/projects: basic/ it-basic/ it-basic/archetype.properties

[hboutemy]

Author: hboutemy
Date: Sun Feb 18 02:44:45 2018
New Revision: 1824640

URL: http://svn.apache.org/viewvc?rev=1824640=rev
Log:
make artifactId parameter different from base directory to avoid "basic" 
everywhere

Added:

maven/archetypes/trunk/maven-archetype-quickstart/src/test/resources/projects/it-basic/
  - copied from r1824639, 
maven/archetypes/trunk/maven-archetype-quickstart/src/test/resources/projects/basic/
Removed:

maven/archetypes/trunk/maven-archetype-quickstart/src/test/resources/projects/basic/
Modified:

maven/archetypes/trunk/maven-archetype-quickstart/src/test/resources/projects/it-basic/archetype.properties

Modified: 
maven/archetypes/trunk/maven-archetype-quickstart/src/test/resources/projects/it-basic/archetype.properties
URL: 
http://svn.apache.org/viewvc/maven/archetypes/trunk/maven-archetype-quickstart/src/test/resources/projects/it-basic/archetype.properties?rev=1824640=1824639=1824640=diff
==
--- 
maven/archetypes/trunk/maven-archetype-quickstart/src/test/resources/projects/it-basic/archetype.properties
 (original)
+++ 
maven/archetypes/trunk/maven-archetype-quickstart/src/test/resources/projects/it-basic/archetype.properties
 Sun Feb 18 02:44:45 2018
@@ -1,4 +1,4 @@
 groupId=archetype.it
-artifactId=basic
+artifactId=gen-basic
 version=0.1-SNAPSHOT
 package=it.pkg

[maven-surefire] Git Push Summary

[tibordigana]

Repository: maven-surefire
Updated Tags:  refs/tags/surefire-2.21.0_vote-1 [created] 120338b1b

maven-surefire git commit: [README.md] How to build with JDK 10

[tibordigana]

Repository: maven-surefire
Updated Branches:
  refs/heads/master eb210e08f -> d46556f6d


[README.md] How to build with JDK 10


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

Branch: refs/heads/master
Commit: d46556f6d60f47564d3065970b743e983616b730
Parents: eb210e0
Author: Tibor17 
Authored: Sun Feb 18 02:42:25 2018 +0100
Committer: Tibor17 
Committed: Sun Feb 18 02:42:25 2018 +0100

--
 README.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/d46556f6/README.md
--
diff --git a/README.md b/README.md
index c3dd2d2..639422f 100644
--- a/README.md
+++ b/README.md
@@ -34,7 +34,9 @@ But in order to run IT tests, you can do:
   **(on Linux/Unix)** *export MAVEN_OPTS="-server -Xmx512m 
-XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=384m -XX:+UseG1GC 
-XX:+UseStringDeduplication -XX:+TieredCompilation -XX:TieredStopAtLevel=1 
-XX:SoftRefLRUPolicyMSPerMB=50 -Djava.awt.headless=true 
-Dhttps.protocols=TLSv1"*  
   **(on Windows)** *set MAVEN_OPTS="-server -Xmx256m -XX:MetaspaceSize=128m 
-XX:MaxMetaspaceSize=384m -XX:+UseG1GC -XX:+UseStringDeduplication 
-XX:+TieredCompilation -XX:TieredStopAtLevel=1 -XX:SoftRefLRUPolicyMSPerMB=50 
-Djava.awt.headless=true -Dhttps.protocols=TLSv1"*
 * In order to run the build with **JDK 9** **on Windows** (**on Linux/Unix 
modify system property jdk.home**):  
-  *mvn install site site:stage -P reporting,run-its "-Djdk.home=e:\Program 
Files\Java\jdk9\"* 
+  *mvn install site site:stage -P reporting,run-its "-Djdk.home=e:\Program 
Files\Java\jdk9\"*
+* In order to run the build with **JDK 10** disable JaCoCo due to a [bug in 
JaCoCo](https://github.com/jacoco/jacoco/issues/629)
+  *mvn install site site:stage -P reporting,run-its -Djacoco.skip=true 
"-Djdk.home=e:\Program Files\Java\jdk10\"*
   
 ### Deploying web site
 

[48/52] [abbrv] [partial] maven-surefire git commit: [SUREFIRE-1471] Too long Windows path cause CI issues. Renamed surefire-intergation-tests to surefire-its.

[tibordigana]

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit47ParallelIT.java
--
diff --git 
a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit47ParallelIT.java
 
b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit47ParallelIT.java
deleted file mode 100644
index 5aee1a8..000
--- 
a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit47ParallelIT.java
+++ /dev/null
@@ -1,540 +0,0 @@
-package org.apache.maven.surefire.its;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import org.apache.maven.surefire.its.fixture.SurefireJUnit4IntegrationTestCase;
-import org.apache.maven.surefire.its.fixture.SurefireLauncher;
-import org.junit.Test;
-
-/**
- * Testing JUnitCoreWrapper with ParallelComputerBuilder.
- *
- * @author mailto:tibordig...@apache.org;>Tibor Digana (tibor17)
- * @since 2.16
- */
-public class JUnit47ParallelIT
-extends SurefireJUnit4IntegrationTestCase
-{
-
-@Test
-public void unknownThreadCountSuites()
-{
-unpack().parallelSuites().setTestToRun( "TestClass" 
).failNever().executeTest().verifyTextInLog(
-"Use threadCount or threadCountSuites > 0 or 
useUnlimitedThreads=true for parallel='suites'" );
-}
-
-@Test
-public void unknownThreadCountClasses()
-{
-unpack().parallelClasses().setTestToRun( "TestClass" 
).failNever().executeTest().verifyTextInLog(
-"Use threadCount or threadCountClasses > 0 or 
useUnlimitedThreads=true for parallel='classes'" );
-}
-
-@Test
-public void unknownThreadCountMethods()
-{
-unpack().parallelMethods().setTestToRun( "TestClass" 
).failNever().executeTest().verifyTextInLog(
-"Use threadCount or threadCountMethods > 0 or 
useUnlimitedThreads=true for parallel='methods'" );
-
-}
-
-@Test
-public void unknownThreadCountBoth()
-{
-unpack().parallelBoth().setTestToRun( "TestClass" 
).failNever().executeTest().verifyTextInLog(
-"Use useUnlimitedThreads=true, " +
-"or only threadCount > 0, " +
-"or (threadCountClasses > 0 and threadCountMethods > 0), " +
-"or (threadCount > 0 and threadCountClasses > 0 and 
threadCountMethods > 0), " +
-"or (threadCount > 0 and threadCountClasses > 0 and 
threadCount > threadCountClasses) " +
-"for parallel='both' or parallel='classesAndMethods'" );
-}
-
-@Test
-public void unknownThreadCountAll()
-{
-unpack().parallelAll().setTestToRun( "TestClass" 
).failNever().executeTest().verifyTextInLog(
-"Use useUnlimitedThreads=true, " +
-"or only threadCount > 0, " +
-"or (threadCountSuites > 0 and threadCountClasses > 0 and 
threadCountMethods > 0), " +
-"or every thread-count is specified, " +
-"or (threadCount > 0 and threadCountSuites > 0 and 
threadCountClasses > 0 " +
-"and threadCount > threadCountSuites + threadCountClasses) " +
-"for parallel='all'" );
-}
-
-@Test
-public void unknownThreadCountSuitesAndClasses()
-{
-unpack().parallelSuitesAndClasses().setTestToRun( "TestClass" 
).failNever().executeTest().verifyTextInLog(
-"Use useUnlimitedThreads=true, " +
-"or only threadCount > 0, " +
-"or (threadCountSuites > 0 and threadCountClasses > 0), " +
-"or (threadCount > 0 and threadCountSuites > 0 and 
threadCountClasses > 0) " +
-"or (threadCount > 0 and threadCountSuites > 0 and threadCount 
> threadCountSuites) " +
-"for parallel='suitesAndClasses' or 'both'" );
-}
-
-@Test
-public void unknownThreadCountSuitesAndMethods()
-{
-unpack().parallelSuitesAndMethods().setTestToRun( "TestClass" 
).failNever().executeTest().verifyTextInLog(
-"Use useUnlimitedThreads=true, " +
-"or only threadCount > 0, " +
-"or 

[41/52] [abbrv] [partial] maven-surefire git commit: [SUREFIRE-1471] Too long Windows path cause CI issues. Renamed surefire-intergation-tests to surefire-its.

[tibordigana]

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/consoleOutputEncoding/pom.xml
--
diff --git 
a/surefire-integration-tests/src/test/resources/consoleOutputEncoding/pom.xml 
b/surefire-integration-tests/src/test/resources/consoleOutputEncoding/pom.xml
deleted file mode 100644
index 5dec5d8..000
--- 
a/surefire-integration-tests/src/test/resources/consoleOutputEncoding/pom.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-
-
-
-http://maven.apache.org/POM/4.0.0; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/xsd/maven-4.0.0.xsd;>
-
-  
-org.apache.maven.surefire
-it-parent
-1.0
-../pom.xml
-  
-
-  4.0.0
-  org.apache.maven.plugins.surefire
-  consoleOutputEncodingsTest
-  jar
-  1.0-SNAPSHOT
-  consoleOutputTest
-  http://maven.apache.org
-
-  
-  
-  junit
-  junit
-  ${junit.version}
-  
-  
-  
- 
-
-   org.apache.maven.plugins
-   maven-surefire-plugin
-   
- ${forkMode}
- ${printSummary}
- ${reportFormat}
- 
-**/Test*.java
- 
-   
-
- 
-
-  
-
-
-  4.8.1
-  once
-  true
-  brief
-
-
-

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/consoleOutputEncoding/src/test/java/consoleOutput/Test1.java
--
diff --git 
a/surefire-integration-tests/src/test/resources/consoleOutputEncoding/src/test/java/consoleOutput/Test1.java
 
b/surefire-integration-tests/src/test/resources/consoleOutputEncoding/src/test/java/consoleOutput/Test1.java
deleted file mode 100644
index dfcfb97..000
--- 
a/surefire-integration-tests/src/test/resources/consoleOutputEncoding/src/test/java/consoleOutput/Test1.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package consoleOutput;
-
-/*
- * 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.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-import java.io.IOException;
-import java.io.PrintStream;
-import java.nio.charset.Charset;
-
-public class Test1
-{
-@Test
-public void testSystemOut()
-throws IOException
-{
-PrintStream out = System.out;
-out.print( getS( "print" ));
-out.write( getS( "utf-8" ).getBytes( Charset.forName( "UTF-8" ) ) );
-out.write( getS( "8859-1" ).getBytes( Charset.forName( "ISO-8859-1" ) 
) );
-out.write( getS( "utf-16" ).getBytes( Charset.forName( "UTF-16" ) ) );
-}
-
-private String getS( String s )
-{
-return " Hell\u00d8 " + s + "\n";
-}
-}

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/consoleoutput-noisy/pom.xml
--
diff --git 
a/surefire-integration-tests/src/test/resources/consoleoutput-noisy/pom.xml 
b/surefire-integration-tests/src/test/resources/consoleoutput-noisy/pom.xml
deleted file mode 100644
index e80b978..000
--- a/surefire-integration-tests/src/test/resources/consoleoutput-noisy/pom.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-http://maven.apache.org/POM/4.0.0; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/xsd/maven-4.0.0.xsd;>
-
-
-  
-org.apache.maven.surefire
-it-parent
-1.0
-../pom.xml
-  
-
-  4.0.0
-  org.apache.maven.plugins.surefire
-  fork-consoleOutput-noisy
-  jar
-  1.0-SNAPSHOT
-  consoleOutput-noisy
-  http://maven.apache.org
-
-  
-  
-  junit
-  junit
-  ${junit.version}
-  
-  
-  
- 
-
-   org.apache.maven.plugins
-   maven-surefire-plugin
-   
- ${forkMode}
- ${printSummary}
- ${useFile}
- ${parallel}
- ${threadCount}
- ${reportFormat}
- 

[37/52] [abbrv] [partial] maven-surefire git commit: [SUREFIRE-1471] Too long Windows path cause CI issues. Renamed surefire-intergation-tests to surefire-its.

[tibordigana]

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/junit44-environment/pom.xml
--
diff --git 
a/surefire-integration-tests/src/test/resources/junit44-environment/pom.xml 
b/surefire-integration-tests/src/test/resources/junit44-environment/pom.xml
deleted file mode 100644
index eb04443..000
--- a/surefire-integration-tests/src/test/resources/junit44-environment/pom.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-
-
-
-http://maven.apache.org/POM/4.0.0;
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/xsd/maven-4.0.0.xsd;>
-  4.0.0
-
-  org.apache.maven.plugins.surefire
-  junit44-environment
-  1.0-SNAPSHOT
-  Test for setting environment variables
-
-  
-1.7
-1.7
-  
-
-  
-
-  junit
-  junit
-  4.4
-  test
-
-  
-  
-  
-
-  
-maven-surefire-plugin
-${surefire.version}
-
-  
-foo
-  
-
-  
-
-  
-
-

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/junit44-environment/src/test/java/junit44/environment/BasicTest.java
--
diff --git 
a/surefire-integration-tests/src/test/resources/junit44-environment/src/test/java/junit44/environment/BasicTest.java
 
b/surefire-integration-tests/src/test/resources/junit44-environment/src/test/java/junit44/environment/BasicTest.java
deleted file mode 100644
index ee20aa6..000
--- 
a/surefire-integration-tests/src/test/resources/junit44-environment/src/test/java/junit44/environment/BasicTest.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package junit44.environment;
-
-/*
- * 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 static org.hamcrest.core.Is.*;
-import static org.hamcrest.core.IsNull.*;
-import org.junit.Assert;
-import org.junit.Test;
-
-
-public class BasicTest
-{
-
-
-@Test
-public void testEnvVar()
-{
-Assert.assertThat( System.getenv( "PATH" ), notNullValue() );
-Assert.assertThat( System.getenv( "DUMMY_ENV_VAR" ), is( "foo" ) );
-}
-
-
-}

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/junit44-hamcrest/pom.xml
--
diff --git 
a/surefire-integration-tests/src/test/resources/junit44-hamcrest/pom.xml 
b/surefire-integration-tests/src/test/resources/junit44-hamcrest/pom.xml
deleted file mode 100644
index 4140b41..000
--- a/surefire-integration-tests/src/test/resources/junit44-hamcrest/pom.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-
-
-
-http://maven.apache.org/POM/4.0.0;
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/xsd/maven-4.0.0.xsd;>
-  4.0.0
-
-  org.apache.maven.plugins.surefire
-  junit44-hamcrest
-  1.0-SNAPSHOT
-  Test for JUnit44 with Hamcrest extensions
-
-  
-1.7
-1.7
-  
-
-  
-
-  junit
-  junit
-  4.4
-  test
-
-  
-  
-  
-
-  
-maven-surefire-plugin
-${surefire.version}
-  
-
-  
-
-

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/junit44-hamcrest/src/test/java/junit44/hamcrest/BasicTest.java
--
diff --git 
a/surefire-integration-tests/src/test/resources/junit44-hamcrest/src/test/java/junit44/hamcrest/BasicTest.java
 
b/surefire-integration-tests/src/test/resources/junit44-hamcrest/src/test/java/junit44/hamcrest/BasicTest.java
deleted file mode 100644
index b847675..000
--- 
a/surefire-integration-tests/src/test/resources/junit44-hamcrest/src/test/java/junit44/hamcrest/BasicTest.java
+++ /dev/null
@@ -1,66 +0,0 @@
-package junit44.hamcrest;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the 

[36/52] [abbrv] [partial] maven-surefire git commit: [SUREFIRE-1471] Too long Windows path cause CI issues. Renamed surefire-intergation-tests to surefire-its.

[tibordigana]

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/junit47-redirect-output/pom.xml
--
diff --git 
a/surefire-integration-tests/src/test/resources/junit47-redirect-output/pom.xml 
b/surefire-integration-tests/src/test/resources/junit47-redirect-output/pom.xml
deleted file mode 100644
index 38ec727..000
--- 
a/surefire-integration-tests/src/test/resources/junit47-redirect-output/pom.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-http://maven.apache.org/POM/4.0.0; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/xsd/maven-4.0.0.xsd;>
-  4.0.0
-  org.apache.maven.plugins.surefire
-  fork-consoleOutput
-  jar
-  1.0-SNAPSHOT
-  fork-consoleOutput
-  http://maven.apache.org
-
-  
-  
-  junit
-  junit
-  ${junit.version}
-  
-  
-  
- 
-
-   org.apache.maven.plugins
-   maven-surefire-plugin
-   ${surefire.version}
-
-  
-org.apache.maven.surefire
-surefire-junit47
-${surefire.version}
-  
-
-   
- ${forkMode}
- ${printSummary}
- true
- 
${redirect.to.file}
- 2
- ${parallel}
- alphabetical
- 
-**/Test*.java
- 
-   
-
- 
-
-  
-
-
-  4.8.1
-  true
-  once
-  true
-  none
-  1.7
-  1.7
-
-
-

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/junit47-redirect-output/src/test/java/junit47ConsoleOutput/Test0.java
--
diff --git 
a/surefire-integration-tests/src/test/resources/junit47-redirect-output/src/test/java/junit47ConsoleOutput/Test0.java
 
b/surefire-integration-tests/src/test/resources/junit47-redirect-output/src/test/java/junit47ConsoleOutput/Test0.java
deleted file mode 100644
index 102faaa..000
--- 
a/surefire-integration-tests/src/test/resources/junit47-redirect-output/src/test/java/junit47ConsoleOutput/Test0.java
+++ /dev/null
@@ -1,63 +0,0 @@
-package junit47ConsoleOutput;
-
-/*
- * 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.junit.After;
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-public class Test0 {
-
-public Test0(){
-System.out.println("Constructor");
-}
-
-@Test
-public void testT0() throws Exception {
-System.out.println("testT0");
-}
-
-@Test
-public void testT1() throws Exception {
-System.out.println("testT1");
-}
-
-@BeforeClass
-public static void setUpBeforeClass() throws Exception {
-System.out.println("setUpBeforeClass");
-}
-
-@AfterClass
-public static void tearDownAfterClass() throws Exception {
-System.out.println("tearDownAfterClass");
-}
-
-@Before
-public void setUp() throws Exception {
-System.out.println("setUp");
-}
-
-@After
-public void tearDown() throws Exception {
-System.out.println("tearDown");
-}
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/junit47-redirect-output/src/test/java/junit47ConsoleOutput/Test1.java
--
diff --git 
a/surefire-integration-tests/src/test/resources/junit47-redirect-output/src/test/java/junit47ConsoleOutput/Test1.java
 
b/surefire-integration-tests/src/test/resources/junit47-redirect-output/src/test/java/junit47ConsoleOutput/Test1.java
deleted file mode 100644
index 40e084e..000
--- 
a/surefire-integration-tests/src/test/resources/junit47-redirect-output/src/test/java/junit47ConsoleOutput/Test1.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package junit47ConsoleOutput;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) 

[06/52] [abbrv] [partial] maven-surefire git commit: [SUREFIRE-1471] Too long Windows path cause CI issues. Renamed surefire-intergation-tests to surefire-its.

[tibordigana]

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/sibling-aggregator/aggregator/pom.xml
--
diff --git 
a/surefire-its/src/test/resources/sibling-aggregator/aggregator/pom.xml 
b/surefire-its/src/test/resources/sibling-aggregator/aggregator/pom.xml
new file mode 100644
index 000..b12b118
--- /dev/null
+++ b/surefire-its/src/test/resources/sibling-aggregator/aggregator/pom.xml
@@ -0,0 +1,51 @@
+
+
+
+http://maven.apache.org/POM/4.0.0;
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/xsd/maven-4.0.0.xsd;>
+  4.0.0
+
+  org.apache.maven.plugins.surefire.its.sibling-aggregator
+  aggregator
+  1.0-SNAPSHOT
+  Test for aggregator whose modules are in ../child
+  pom
+
+  
+1.7
+1.7
+  
+
+  
+../child1
+../child2
+  
+  
+  
+
+  
+maven-surefire-plugin
+${surefire.version}
+  
+
+  
+  
+
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/sibling-aggregator/child1/pom.xml
--
diff --git a/surefire-its/src/test/resources/sibling-aggregator/child1/pom.xml 
b/surefire-its/src/test/resources/sibling-aggregator/child1/pom.xml
new file mode 100644
index 000..be2f9df
--- /dev/null
+++ b/surefire-its/src/test/resources/sibling-aggregator/child1/pom.xml
@@ -0,0 +1,44 @@
+
+
+
+http://maven.apache.org/POM/4.0.0;
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/xsd/maven-4.0.0.xsd;>
+  4.0.0
+
+  org.apache.maven.plugins.surefire.its.sibling-aggregator
+  child1
+  1.0-SNAPSHOT
+  Test for aggregated child1
+
+  
+1.7
+1.7
+  
+
+  
+
+  junit
+  junit
+  3.8.1
+  test
+
+  
+
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/sibling-aggregator/child1/src/main/java/siblingAggregator/FooHolder.java
--
diff --git 
a/surefire-its/src/test/resources/sibling-aggregator/child1/src/main/java/siblingAggregator/FooHolder.java
 
b/surefire-its/src/test/resources/sibling-aggregator/child1/src/main/java/siblingAggregator/FooHolder.java
new file mode 100644
index 000..ec5d886
--- /dev/null
+++ 
b/surefire-its/src/test/resources/sibling-aggregator/child1/src/main/java/siblingAggregator/FooHolder.java
@@ -0,0 +1,24 @@
+package siblingAggregator;
+
+/*
+ * 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.
+ */
+
+public class FooHolder {
+public static String getFoo() { return "foo"; }
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/sibling-aggregator/child2/pom.xml
--
diff --git a/surefire-its/src/test/resources/sibling-aggregator/child2/pom.xml 
b/surefire-its/src/test/resources/sibling-aggregator/child2/pom.xml
new file mode 100644
index 000..b8c21bf
--- /dev/null
+++ b/surefire-its/src/test/resources/sibling-aggregator/child2/pom.xml
@@ -0,0 +1,49 @@
+
+
+
+http://maven.apache.org/POM/4.0.0;
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/xsd/maven-4.0.0.xsd;>
+  4.0.0
+
+  org.apache.maven.plugins.surefire.its.sibling-aggregator
+  child2
+  1.0-SNAPSHOT
+  Test for aggregated child2
+
+  
+1.7
+1.7
+  
+
+  
+
+  
org.apache.maven.plugins.surefire.its.sibling-aggregator
+  child1
+  1.0-SNAPSHOT
+
+
+  junit
+  junit
+  3.8.1
+  test
+
+  
+
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/sibling-aggregator/child2/src/test/java/siblingAggregator/FooHolderTest.java

[17/52] [abbrv] [partial] maven-surefire git commit: [SUREFIRE-1471] Too long Windows path cause CI issues. Renamed surefire-intergation-tests to surefire-its.

[tibordigana]

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/java/org/apache/maven/surefire/its/fixture/SurefireLauncherTest.java
--
diff --git 
a/surefire-its/src/test/java/org/apache/maven/surefire/its/fixture/SurefireLauncherTest.java
 
b/surefire-its/src/test/java/org/apache/maven/surefire/its/fixture/SurefireLauncherTest.java
new file mode 100644
index 000..b5df941
--- /dev/null
+++ 
b/surefire-its/src/test/java/org/apache/maven/surefire/its/fixture/SurefireLauncherTest.java
@@ -0,0 +1,43 @@
+package org.apache.maven.surefire.its.fixture;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import java.io.IOException;
+import org.apache.maven.it.VerificationException;
+
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+
+/**
+ * @author Kristian Rosenvold
+ */
+public class SurefireLauncherTest
+{
+@Test
+public void launcherGetsProperMethodName()
+throws IOException, VerificationException
+{
+MavenLauncher mavenLauncher = new MavenLauncher( 
SurefireLauncherTest.class, "foo", "" );
+String method = new SurefireLauncher( mavenLauncher 
).getTestMethodName();
+assertEquals( "launcherGetsProperMethodName", method );
+
+}
+}

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/java/org/apache/maven/surefire/its/fixture/SurefireVerifierException.java
--
diff --git 
a/surefire-its/src/test/java/org/apache/maven/surefire/its/fixture/SurefireVerifierException.java
 
b/surefire-its/src/test/java/org/apache/maven/surefire/its/fixture/SurefireVerifierException.java
new file mode 100644
index 000..5201503
--- /dev/null
+++ 
b/surefire-its/src/test/java/org/apache/maven/surefire/its/fixture/SurefireVerifierException.java
@@ -0,0 +1,37 @@
+package org.apache.maven.surefire.its.fixture;
+
+/*
+ * 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.
+ */
+
+/**
+ * @author Kristian Rosenvold
+ */
+public class SurefireVerifierException
+extends RuntimeException
+{
+public SurefireVerifierException( String message, Throwable cause )
+{
+super( message, cause );
+}
+
+public SurefireVerifierException( Throwable cause )
+{
+super( cause );
+}
+}

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/java/org/apache/maven/surefire/its/fixture/TestFile.java
--
diff --git 
a/surefire-its/src/test/java/org/apache/maven/surefire/its/fixture/TestFile.java
 
b/surefire-its/src/test/java/org/apache/maven/surefire/its/fixture/TestFile.java
new file mode 100644
index 000..cf6ad84
--- /dev/null
+++ 
b/surefire-its/src/test/java/org/apache/maven/surefire/its/fixture/TestFile.java
@@ -0,0 +1,155 @@
+package org.apache.maven.surefire.its.fixture;
+
+/*
+ * 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
+ *
+ * 

[02/52] [abbrv] [partial] maven-surefire git commit: [SUREFIRE-1471] Too long Windows path cause CI issues. Renamed surefire-intergation-tests to surefire-its.

[tibordigana]

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/surefire-569-RunTestFromDependencyJars/testjar/src/test/java/org/test/TestA.java
--
diff --git 
a/surefire-its/src/test/resources/surefire-569-RunTestFromDependencyJars/testjar/src/test/java/org/test/TestA.java
 
b/surefire-its/src/test/resources/surefire-569-RunTestFromDependencyJars/testjar/src/test/java/org/test/TestA.java
new file mode 100644
index 000..404377a
--- /dev/null
+++ 
b/surefire-its/src/test/resources/surefire-569-RunTestFromDependencyJars/testjar/src/test/java/org/test/TestA.java
@@ -0,0 +1,29 @@
+package org.test;
+
+/*
+ * 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.junit.Test;
+
+public class TestA {
+
+   @Test
+   public void shouldRun() {
+   }
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/surefire-569-RunTestFromDependencyJars/testjar/src/test/java/org/test/TestB.java
--
diff --git 
a/surefire-its/src/test/resources/surefire-569-RunTestFromDependencyJars/testjar/src/test/java/org/test/TestB.java
 
b/surefire-its/src/test/resources/surefire-569-RunTestFromDependencyJars/testjar/src/test/java/org/test/TestB.java
new file mode 100644
index 000..1295e97
--- /dev/null
+++ 
b/surefire-its/src/test/resources/surefire-569-RunTestFromDependencyJars/testjar/src/test/java/org/test/TestB.java
@@ -0,0 +1,29 @@
+package org.test;
+
+/*
+ * 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.junit.Test;
+
+public class TestB {
+
+   @Test
+   public void shouldRun() {
+   }
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/surefire-570-multipleReportDirectories/module1/pom.xml
--
diff --git 
a/surefire-its/src/test/resources/surefire-570-multipleReportDirectories/module1/pom.xml
 
b/surefire-its/src/test/resources/surefire-570-multipleReportDirectories/module1/pom.xml
new file mode 100644
index 000..5b8fd7c
--- /dev/null
+++ 
b/surefire-its/src/test/resources/surefire-570-multipleReportDirectories/module1/pom.xml
@@ -0,0 +1,23 @@
+http://maven.apache.org/POM/4.0.0; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
+   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/xsd/maven-4.0.0.xsd;>
+   4.0.0
+   
+   
+   org.apache.maven.surefire-report
+   surefire-570-multipleReportDirectories
+   0.0.1-SNAPSHOT
+   
+   
+   org.apache.maven.surefire-report.module1
+   module1
+   0.0.1-SNAPSHOT
+   
+   
+   junit
+   junit
+   3.8.2
+   jar
+   test
+   
+   
+
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/surefire-570-multipleReportDirectories/module1/src/main/java/org/apache/maven/surefire570/MyModule1Class.java
--
diff --git 

[50/52] [abbrv] [partial] maven-surefire git commit: [SUREFIRE-1471] Too long Windows path cause CI issues. Renamed surefire-intergation-tests to surefire-its.

[tibordigana]

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/Jenkinsfile
--
diff --git a/Jenkinsfile b/Jenkinsfile
index 01eabca..c080713 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -116,11 +116,11 @@ oses.eachWithIndex { os, indexOfOs ->
 //zip(zipFile: 
"it--maven-failsafe-plugin--${stageKey}.zip", dir: 
'build/maven-failsafe-plugin/target/it', archive: true)
 //}
 //
-//if 
(fileExists('build/surefire-integration-tests/target') {
-//zip(zipFile: 
"it--surefire-integration-tests--${stageKey}.zip", dir: 
'build/surefire-integration-tests/target', archive: true)
+//if (fileExists('build/surefire-its/target') {
+//zip(zipFile: 
"it--surefire-its--${stageKey}.zip", dir: 'build/surefire-its/target', archive: 
true)
 //}
 
-//archiveArtifacts(artifacts: 
'build/surefire-integration-tests/target/**/log.txt', allowEmptyArchive: true, 
fingerprint: true, onlyIfSuccessful: false)
+//archiveArtifacts(artifacts: 
'build/surefire-its/target/**/log.txt', allowEmptyArchive: true, fingerprint: 
true, onlyIfSuccessful: false)
 
 stage("cleanup ${stageKey}") {
 // clean up after ourselves to reduce disk 
space
@@ -214,12 +214,12 @@ oses.eachWithIndex { os, indexOfOs ->
 //zip(zipFile: 
"it--maven-failsafe-plugin--${stageKey}.zip", dir: 
'build/maven-failsafe-plugin/target/it', archive: true)
 //}
 //
-//if 
(fileExists('build/surefire-integration-tests/target') {
-//zip(zipFile: 
"it--surefire-integration-tests--${stageKey}.zip", dir: 
'build/surefire-integration-tests/target', archive: true)
+//if (fileExists('build/surefire-its/target') {
+//zip(zipFile: 
"it--surefire-its--${stageKey}.zip", dir: 'build/surefire-its/target', archive: 
true)
 //}
 //
 //sh 'tar czvf it1.tgz 
build/maven-failsafe-plugin/target/it'
-//sh 'tar czvf it2.tgz 
build/surefire-integration-tests/target'
+//sh 'tar czvf it2.tgz build/surefire-its/target'
 //archiveArtifacts(artifacts: '**/*.tgz', 
allowEmptyArchive: true, fingerprint: true, onlyIfSuccessful: false)
 //archiveArtifacts(artifacts: '*.tgz', 
allowEmptyArchive: true, fingerprint: true, onlyIfSuccessful: false)
 
@@ -303,7 +303,7 @@ def sourcesPatternCsv() {
 '**/surefire-api/src/main/java,' +
 '**/surefire-booter/src/main/java,' +
 '**/surefire-grouper/src/main/java,' +
-'**/surefire-integration-tests/src/main/java,' +
+'**/surefire-its/src/main/java,' +
 '**/surefire-logger-api/src/main/java,' +
 '**/surefire-providers/**/src/main/java,' +
 '**/surefire-report-parser/src/main/java'
@@ -318,7 +318,7 @@ def classPatternCsv() {
 '**/surefire-api/target/classes,' +
 '**/surefire-booter/target/classes,' +
 '**/surefire-grouper/target/classes,' +
-'**/surefire-integration-tests/target/classes,' +
+'**/surefire-its/target/classes,' +
 '**/surefire-logger-api/target/classes,' +
 '**/surefire-providers/**/target/classes,' +
 '**/surefire-report-parser/target/classes'
@@ -349,9 +349,9 @@ def testReportsPatternCsv() {
 '**/surefire-api/target/surefire-reports/*.xml,' +
 '**/surefire-booter/target/surefire-reports/*.xml,' +
 '**/surefire-grouper/target/surefire-reports/*.xml,' +
-'**/surefire-integration-tests/target/surefire-reports/*.xml,' +
+'**/surefire-its/target/surefire-reports/*.xml,' +
 '**/surefire-logger-api/target/surefire-reports/*.xml,' +
 '**/surefire-providers/**/target/surefire-reports/*.xml,' +
 '**/surefire-report-parser/target/surefire-reports/*.xml,' +
-'**/surefire-integration-tests/target/failsafe-reports/*.xml'
+'**/surefire-its/target/failsafe-reports/*.xml'
 }

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 8a9a405..f5af360 100644
--- a/pom.xml
+++ b/pom.xml
@@ -61,7 +61,7 @@
 maven-failsafe-plugin
 maven-surefire-report-plugin
 surefire-setup-integration-tests
-surefire-integration-tests
+surefire-its
   
 
   

[27/52] [abbrv] [partial] maven-surefire git commit: [SUREFIRE-1471] Too long Windows path cause CI issues. Renamed surefire-intergation-tests to surefire-its.

[tibordigana]

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-809-groupExpr-junit48/src/test/java/junit4/CategoryB.java
--
diff --git 
a/surefire-integration-tests/src/test/resources/surefire-809-groupExpr-junit48/src/test/java/junit4/CategoryB.java
 
b/surefire-integration-tests/src/test/resources/surefire-809-groupExpr-junit48/src/test/java/junit4/CategoryB.java
deleted file mode 100644
index f10f3b1..000
--- 
a/surefire-integration-tests/src/test/resources/surefire-809-groupExpr-junit48/src/test/java/junit4/CategoryB.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package junit4;
-/*
- * 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.
- */
-
-interface CategoryB {}

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-809-groupExpr-junit48/src/test/java/junit4/CategoryC.java
--
diff --git 
a/surefire-integration-tests/src/test/resources/surefire-809-groupExpr-junit48/src/test/java/junit4/CategoryC.java
 
b/surefire-integration-tests/src/test/resources/surefire-809-groupExpr-junit48/src/test/java/junit4/CategoryC.java
deleted file mode 100644
index 3e9e854..000
--- 
a/surefire-integration-tests/src/test/resources/surefire-809-groupExpr-junit48/src/test/java/junit4/CategoryC.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package junit4;
-/*
- * 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.
- */
-
-interface CategoryC {}

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-809-groupExpr-junit48/src/test/java/junit4/CategoryCTest.java
--
diff --git 
a/surefire-integration-tests/src/test/resources/surefire-809-groupExpr-junit48/src/test/java/junit4/CategoryCTest.java
 
b/surefire-integration-tests/src/test/resources/surefire-809-groupExpr-junit48/src/test/java/junit4/CategoryCTest.java
deleted file mode 100644
index 7fc323d..000
--- 
a/surefire-integration-tests/src/test/resources/surefire-809-groupExpr-junit48/src/test/java/junit4/CategoryCTest.java
+++ /dev/null
@@ -1,80 +0,0 @@
-package junit4;
-/*
- * 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.junit.AfterClass;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.junit.rules.TestName;
-
-
-@Category(CategoryC.class)
-public class CategoryCTest
-{
-static int catACount = 0;
-static int 

[51/52] [abbrv] [partial] maven-surefire git commit: [SUREFIRE-1471] Too long Windows path cause CI issues. Renamed surefire-intergation-tests to surefire-its.

[tibordigana]

[SUREFIRE-1471] Too long Windows path cause CI issues. Renamed 
surefire-intergation-tests to surefire-its.


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

Branch: refs/heads/master
Commit: 4d00932a06495deb27fb32187226cd7e40a89aee
Parents: b2d51ff
Author: Tibor17 
Authored: Mon Feb 5 23:06:52 2018 +0100
Committer: Tibor17 
Committed: Sun Feb 18 01:44:09 2018 +0100

--
 Jenkinsfile |  20 +-
 pom.xml |   2 +-
 surefire-integration-tests/pom.xml  | 202 ---
 .../maven/surefire/its/AbstractFailFastIT.java  | 105 
 .../maven/surefire/its/AbstractJigsawIT.java| 111 
 .../maven/surefire/its/AbstractTestCaseIT.java  |  41 --
 .../its/AbstractTestMultipleMethodPatterns.java | 483 -
 .../surefire/its/AdditionalClasspathIT.java |  39 --
 .../maven/surefire/its/AggregateReportIT.java   |  57 --
 .../apache/maven/surefire/its/ArgLineIT.java|  39 --
 .../maven/surefire/its/ArgLinePropertiesIT.java |  39 --
 .../surefire/its/AssumptionFailureReportIT.java |  34 --
 .../maven/surefire/its/CheckSingleTestIT.java   |  70 ---
 .../its/CheckTestFailIfNoTestsForkModeIT.java   |  81 ---
 .../surefire/its/CheckTestFailIfNoTestsIT.java  |  63 ---
 .../its/CheckTestNgBeforeMethodFailureIT.java   |  47 --
 .../surefire/its/CheckTestNgBeforeMethodIT.java |  44 --
 .../its/CheckTestNgCustomObjectFactoryIT.java   |  58 --
 .../CheckTestNgCustomTestRunnerFactoryIT.java   |  59 --
 .../surefire/its/CheckTestNgExecuteErrorIT.java |  69 ---
 .../its/CheckTestNgGroupThreadParallelIT.java   |  43 --
 .../maven/surefire/its/CheckTestNgJdk14IT.java  |  41 --
 .../its/CheckTestNgListenerReporterIT.java  | 105 
 .../surefire/its/CheckTestNgListenersIT.java|  37 --
 .../its/CheckTestNgPathWithSpacesIT.java|  42 --
 .../surefire/its/CheckTestNgReportTestIT.java   |  74 ---
 .../surefire/its/CheckTestNgSuiteXmlIT.java |  60 ---
 .../its/CheckTestNgSuiteXmlSingleIT.java|  44 --
 .../surefire/its/CheckTestNgVersionsIT.java | 223 
 .../maven/surefire/its/ClassPathOrderIT.java|  39 --
 .../surefire/its/ClasspathFilteringIT.java  |  39 --
 .../surefire/its/ClasspathScopeFilteringIT.java |  39 --
 .../maven/surefire/its/ConsoleOutputIT.java | 106 
 .../maven/surefire/its/CrashDetectionIT.java|  61 ---
 .../surefire/its/DefaultConfigurationIT.java|  38 --
 .../surefire/its/EnvironmentVariableIT.java |  40 --
 .../surefire/its/EnvironmentVariablesIT.java|  47 --
 .../maven/surefire/its/FailFastJUnitIT.java |  77 ---
 .../maven/surefire/its/FailFastTestNgIT.java|  69 ---
 .../maven/surefire/its/ForkConsoleOutputIT.java |  87 ---
 .../its/ForkConsoleOutputWithErrorsIT.java  |  47 --
 .../apache/maven/surefire/its/ForkModeIT.java   | 241 -
 .../surefire/its/ForkModeMultiModuleIT.java | 162 --
 .../maven/surefire/its/ForkModeTestNGIT.java|  35 --
 .../its/IncludesExcludesFromFileIT.java |  95 
 .../maven/surefire/its/IncludesExcludesIT.java  |  68 ---
 .../maven/surefire/its/JUnit44HamcrestIT.java   |  38 --
 .../surefire/its/JUnit47ConcurrencyIT.java  |  58 --
 .../maven/surefire/its/JUnit47ParallelIT.java   | 540 ---
 .../its/JUnit47ParallelNotThreadSafeIT.java |  52 --
 .../surefire/its/JUnit47RedirectOutputIT.java   |  71 ---
 .../JUnit47RerunFailingTestWithCucumberIT.java  |  80 ---
 .../its/JUnit47StaticInnerClassTestsIT.java |  34 --
 .../surefire/its/JUnit47WithCucumberIT.java |  70 ---
 .../surefire/its/JUnit48TestCategoriesIT.java   | 145 -
 .../JUnit4ForkAlwaysStaticInitPollutionIT.java  |  38 --
 .../maven/surefire/its/JUnit4IgnoreIT.java  |  52 --
 .../surefire/its/JUnit4RerunFailingTestsIT.java | 278 --
 .../maven/surefire/its/JUnit4RunListenerIT.java |  73 ---
 .../maven/surefire/its/JUnit4VersionsIT.java|  87 ---
 .../apache/maven/surefire/its/JUnitDepIT.java   |  70 ---
 .../maven/surefire/its/Java9FullApiIT.java  | 109 
 .../maven/surefire/its/LongWindowsPathIT.java   |  88 ---
 .../apache/maven/surefire/its/ModulePathIT.java |  45 --
 .../surefire/its/NoRunnableTestsInClassIT.java  |  39 --
 .../surefire/its/PlainOldJavaClasspathIT.java   |  38 --
 .../maven/surefire/its/PlexusConflictIT.java|  50 --
 .../apache/maven/surefire/its/PojoSimpleIT.java |  38 --
 .../apache/maven/surefire/its/ReporterTime.java |  26 -
 .../apache/maven/surefire/its/ReportersIT.java  |  45 --
 .../maven/surefire/its/ResultCountingIT.java|  66 ---
 .../apache/maven/surefire/its/RunOrderIT.java   

[31/52] [abbrv] [partial] maven-surefire git commit: [SUREFIRE-1471] Too long Windows path cause CI issues. Renamed surefire-intergation-tests to surefire-its.

[tibordigana]

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-1396-pluggableproviders-classpath/pom.xml
--
diff --git 
a/surefire-integration-tests/src/test/resources/surefire-1396-pluggableproviders-classpath/pom.xml
 
b/surefire-integration-tests/src/test/resources/surefire-1396-pluggableproviders-classpath/pom.xml
deleted file mode 100644
index be5cf97..000
--- 
a/surefire-integration-tests/src/test/resources/surefire-1396-pluggableproviders-classpath/pom.xml
+++ /dev/null
@@ -1,82 +0,0 @@
-
-
-
-http://maven.apache.org/POM/4.0.0;
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/xsd/maven-4.0.0.xsd;>
-  4.0.0
-
-  org.apache.maven.plugins.surefire
-  pluggableproviders-classpath
-  1.0-SNAPSHOT
-  pluggableproviders-classpath-test
-
-
-1.7
-1.7
-
-
-  
-
-  junit
-  junit
-  4.8.1
-  test
-
-  
-
-  
-
-  
-org.apache.maven.plugins
-maven-surefire-plugin
-${surefire.version}
-
-  
-org.apache.maven.plugins.surefire
-surefire-test-classpath-provider
-1.0-SNAPSHOT
-  
-
-  
-  
-org.apache.maven.plugins
-maven-failsafe-plugin
-${surefire.version}
-   
-
-
-integration-test
-verify
-
-
-
-
-
-org.apache.maven.plugins.surefire
-surefire-test-classpath-provider
-1.0-SNAPSHOT
-
-
-  
-
-  
-
-

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-1396-pluggableproviders-classpath/src/test/java/pluggableproviders/EmptyIT.java
--
diff --git 
a/surefire-integration-tests/src/test/resources/surefire-1396-pluggableproviders-classpath/src/test/java/pluggableproviders/EmptyIT.java
 
b/surefire-integration-tests/src/test/resources/surefire-1396-pluggableproviders-classpath/src/test/java/pluggableproviders/EmptyIT.java
deleted file mode 100644
index f7e2a7f..000
--- 
a/surefire-integration-tests/src/test/resources/surefire-1396-pluggableproviders-classpath/src/test/java/pluggableproviders/EmptyIT.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package pluggableproviders;
-
-/*
- * 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.
- */
-
-
-public class EmptyIT
-{
-
-}

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-1396-pluggableproviders-classpath/src/test/java/pluggableproviders/EmptyTest.java
--
diff --git 
a/surefire-integration-tests/src/test/resources/surefire-1396-pluggableproviders-classpath/src/test/java/pluggableproviders/EmptyTest.java
 
b/surefire-integration-tests/src/test/resources/surefire-1396-pluggableproviders-classpath/src/test/java/pluggableproviders/EmptyTest.java
deleted file mode 100644
index 4ac75c7..000
--- 
a/surefire-integration-tests/src/test/resources/surefire-1396-pluggableproviders-classpath/src/test/java/pluggableproviders/EmptyTest.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package pluggableproviders;
-
-/*
- * 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 

[09/52] [abbrv] [partial] maven-surefire git commit: [SUREFIRE-1471] Too long Windows path cause CI issues. Renamed surefire-intergation-tests to surefire-its.

[tibordigana]

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/junit44-dep/pom.xml
--
diff --git a/surefire-its/src/test/resources/junit44-dep/pom.xml 
b/surefire-its/src/test/resources/junit44-dep/pom.xml
new file mode 100644
index 000..d26c024
--- /dev/null
+++ b/surefire-its/src/test/resources/junit44-dep/pom.xml
@@ -0,0 +1,71 @@
+
+
+
+http://maven.apache.org/POM/4.0.0;
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/xsd/maven-4.0.0.xsd;>
+  4.0.0
+
+  org.apache.maven.plugins.surefire
+  junit44-dep
+  1.0-SNAPSHOT
+  Test for junit-dep
+
+  
+1.7
+1.7
+  
+
+  
+
+  junit
+  junit-dep
+  ${junit-dep.version}
+  test
+
+  
+
+  
+
+  provided381
+  
+
+  junit
+  junit
+  3.8.1
+  provided
+
+  
+
+  
+  
+
+  
+maven-surefire-plugin
+${surefire.version}
+
+  classes
+  1
+
+  
+
+  
+
+

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/junit44-dep/src/test/java/junit44Dep/BasicTest.java
--
diff --git 
a/surefire-its/src/test/resources/junit44-dep/src/test/java/junit44Dep/BasicTest.java
 
b/surefire-its/src/test/resources/junit44-dep/src/test/java/junit44Dep/BasicTest.java
new file mode 100644
index 000..219b8da
--- /dev/null
+++ 
b/surefire-its/src/test/resources/junit44-dep/src/test/java/junit44Dep/BasicTest.java
@@ -0,0 +1,67 @@
+package junit44Dep;
+
+/*
+ * 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.hamcrest.core.Is;
+import org.junit.After;
+import org.junit.AfterClass;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+
+
+public class BasicTest
+{
+
+private boolean setUpCalled = false;
+
+private static boolean tearDownCalled = false;
+
+@Before
+public void setUp()
+{
+setUpCalled = true;
+tearDownCalled = false;
+System.out.println( "Called setUp" );
+}
+
+@After
+public void tearDown()
+{
+setUpCalled = false;
+tearDownCalled = true;
+System.out.println( "Called tearDown" );
+}
+
+@Test
+public void testSetUp()
+{
+Assert.assertTrue( "setUp was not called", setUpCalled );
+Assert.assertFalse( "tearDown was called", tearDownCalled );
+Assert.assertThat( true, Is.is( true ) );
+}
+
+@AfterClass
+public static void oneTimeTearDown()
+{
+Assert.assertTrue( "tearDown was not called", tearDownCalled );
+}
+
+}

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/junit44-environment/pom.xml
--
diff --git a/surefire-its/src/test/resources/junit44-environment/pom.xml 
b/surefire-its/src/test/resources/junit44-environment/pom.xml
new file mode 100644
index 000..eb04443
--- /dev/null
+++ b/surefire-its/src/test/resources/junit44-environment/pom.xml
@@ -0,0 +1,59 @@
+
+
+
+http://maven.apache.org/POM/4.0.0;
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/xsd/maven-4.0.0.xsd;>
+  4.0.0
+
+  org.apache.maven.plugins.surefire
+  junit44-environment
+  1.0-SNAPSHOT
+  Test for setting environment variables
+
+  
+1.7
+1.7
+  
+
+  
+
+  junit
+  junit
+  4.4
+  test
+
+  
+  
+  
+
+  
+maven-surefire-plugin
+${surefire.version}
+
+  
+foo
+  
+
+  
+
+  
+
+

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/junit44-environment/src/test/java/junit44/environment/BasicTest.java
--
diff --git 

[11/52] [abbrv] [partial] maven-surefire git commit: [SUREFIRE-1471] Too long Windows path cause CI issues. Renamed surefire-intergation-tests to surefire-its.

[tibordigana]

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/fork-mode-multimodule/module-b/src/test/java/forkMode/Test1.java
--
diff --git 
a/surefire-its/src/test/resources/fork-mode-multimodule/module-b/src/test/java/forkMode/Test1.java
 
b/surefire-its/src/test/resources/fork-mode-multimodule/module-b/src/test/java/forkMode/Test1.java
new file mode 100644
index 000..7497816
--- /dev/null
+++ 
b/surefire-its/src/test/resources/fork-mode-multimodule/module-b/src/test/java/forkMode/Test1.java
@@ -0,0 +1,67 @@
+package forkMode;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.lang.management.ManagementFactory;
+import java.util.Random;
+
+import junit.framework.TestCase;
+
+public class Test1
+extends TestCase
+{
+
+private static final Random RANDOM = new Random();
+
+public void test1()
+throws IOException, InterruptedException
+{
+int sleepLength = Integer.valueOf( System.getProperty( "sleepLength", 
"1500" ));
+Thread.sleep(sleepLength);
+dumpPidFile( this );
+}
+
+public static void dumpPidFile( TestCase test )
+throws IOException
+{
+String fileName = test.getName() + "-pid";
+File target = new File( "target" ).getCanonicalFile();  // 
getCanonicalFile required for embedded mode
+if ( !( target.exists() && target.isDirectory() ) )
+{
+target = new File( "." );
+}
+File pidFile = new File( target, fileName );
+FileWriter fw = new FileWriter( pidFile );
+// DGF little known trick... this is guaranteed to be unique to the PID
+// In fact, it usually contains the pid and the local host name!
+String pid = ManagementFactory.getRuntimeMXBean().getName();
+fw.write( pid );
+fw.write( " " );
+fw.write( System.getProperty( "testProperty", String.valueOf( 
RANDOM.nextLong() ) ) );
+fw.flush();
+fw.close();
+System.out.println( "Done Writing pid file" + 
pidFile.getAbsolutePath() );
+}
+
+
+}

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/fork-mode-multimodule/module-b/src/test/java/forkMode/Test2.java
--
diff --git 
a/surefire-its/src/test/resources/fork-mode-multimodule/module-b/src/test/java/forkMode/Test2.java
 
b/surefire-its/src/test/resources/fork-mode-multimodule/module-b/src/test/java/forkMode/Test2.java
new file mode 100644
index 000..e9d0652
--- /dev/null
+++ 
b/surefire-its/src/test/resources/fork-mode-multimodule/module-b/src/test/java/forkMode/Test2.java
@@ -0,0 +1,36 @@
+package forkMode;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import java.io.IOException;
+
+import junit.framework.TestCase;
+
+public class Test2
+extends TestCase
+{
+
+public void test2() throws IOException, InterruptedException {
+int sleepLength = Integer.valueOf( System.getProperty( "sleepLength", 
"1500" ));
+Thread.sleep(sleepLength);
+Test1.dumpPidFile(this);
+}
+
+}

[44/52] [abbrv] [partial] maven-surefire git commit: [SUREFIRE-1471] Too long Windows path cause CI issues. Renamed surefire-intergation-tests to surefire-its.

[tibordigana]

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1364SystemPropertiesIT.java
--
diff --git 
a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1364SystemPropertiesIT.java
 
b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1364SystemPropertiesIT.java
deleted file mode 100644
index d13b0f2..000
--- 
a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1364SystemPropertiesIT.java
+++ /dev/null
@@ -1,203 +0,0 @@
-package org.apache.maven.surefire.its.jiras;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import org.apache.maven.surefire.its.fixture.OutputValidator;
-import org.apache.maven.surefire.its.fixture.SurefireJUnit4IntegrationTestCase;
-import org.apache.maven.surefire.its.fixture.SurefireLauncher;
-import org.junit.Test;
-
-/**
- * Report XML should contain system properties of forked JVM.
- *
- * @author mailto:tibordig...@apache.org;>Tibor Digana (tibor17)
- * @since 2.20.1
- */
-public class Surefire1364SystemPropertiesIT
-extends SurefireJUnit4IntegrationTestCase
-{
-@Test
-public void junit3Forked()
-{
-SurefireLauncher launcher = unpack( "surefire-1364" );
-OutputValidator validator = launcher.setForkJvm()
-.activateProfile( "junit3" )
-.forkMode( "once" )
-.executeTest()
-.verifyErrorFree( 2 );
-
-validator.getSurefireReportsXmlFile( "TEST-FirstTest.xml" )
-.assertContainsText( "" );
-
-validator.getSurefireReportsXmlFile( "TEST-SecondTest.xml" )
-.assertContainsText( "" );
-}
-
-@Test
-public void junit3InProcess()
-{
-SurefireLauncher launcher = unpack( "surefire-1364" );
-OutputValidator validator = launcher.setForkJvm()
-.activateProfile( "junit3" )
-.forkMode( "never" )
-.executeTest()
-.verifyErrorFree( 2 );
-
-validator.getSurefireReportsXmlFile( "TEST-FirstTest.xml" )
-.assertContainsText( "" );
-
-validator.getSurefireReportsXmlFile( "TEST-SecondTest.xml" )
-.assertContainsText( "" );
-}
-
-@Test
-public void junit4Forked()
-{
-SurefireLauncher launcher = unpack( "surefire-1364" );
-OutputValidator validator = launcher.setForkJvm()
-.forkMode( "once" )
-.executeTest()
-.verifyErrorFree( 2 );
-
-validator.getSurefireReportsXmlFile( "TEST-FirstTest.xml" )
-.assertContainsText( "" );
-
-validator.getSurefireReportsXmlFile( "TEST-SecondTest.xml" )
-.assertContainsText( "" );
-}
-
-@Test
-public void junit4InProcess()
-{
-SurefireLauncher launcher = unpack( "surefire-1364" );
-OutputValidator validator = launcher.setForkJvm()
-.forkMode( "never" )
-.executeTest()
-.verifyErrorFree( 2 );
-
-validator.getSurefireReportsXmlFile( "TEST-FirstTest.xml" )
-.assertContainsText( "" );
-
-validator.getSurefireReportsXmlFile( "TEST-SecondTest.xml" )
-.assertContainsText( "" );
-}
-
-@Test
-public void junit47Forked()
-{
-SurefireLauncher launcher = unpack( "surefire-1364" );
-OutputValidator validator = launcher.setForkJvm()
-.activateProfile( "junit47" )
-.forkMode( "once" )
-

[52/52] [abbrv] maven-surefire git commit: [SUREFIRE-1472] Multibranch Pipeline supports JDK 7-10 Maven 3.2-3.5 Linux Windows

[tibordigana]

[SUREFIRE-1472] Multibranch Pipeline supports JDK 7-10 Maven 3.2-3.5 Linux 
Windows


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

Branch: refs/heads/master
Commit: eb210e08f5cf98a20c7d45c3e389391992845443
Parents: 4d00932
Author: Tibor17 
Authored: Tue Feb 6 05:30:00 2018 +0100
Committer: Tibor17 
Committed: Sun Feb 18 01:44:10 2018 +0100

--
 Jenkinsfile | 334 ---
 maven-failsafe-plugin/pom.xml   |   5 +
 maven-surefire-common/pom.xml   |   2 -
 maven-surefire-report-plugin/pom.xml|   1 +
 pom.xml |  93 +++---
 surefire-api/pom.xml|   2 -
 surefire-booter/pom.xml |   2 -
 surefire-its/pom.xml|  14 +-
 .../maven/surefire/its/JUnit47ParallelIT.java   |   6 +-
 .../apache/maven/surefire/its/UmlautDirIT.java  |  17 +-
 .../surefire/its/fixture/JUnit4SuiteTest.java   |  44 +++
 .../its/fixture/SurefireLauncherTest.java   |   4 -
 ...urefire1295AttributeJvmCrashesToTestsIT.java | 107 +++---
 .../test/resources/crash-during-test/pom.xml|  13 +
 .../java/junit44/environment/BasicTest.java |  52 ---
 .../java/junit44/environment/SomeOtherTest.java |  28 --
 .../junit44/environment/Test1CrashedTest.java   |  52 +++
 .../junit44/environment/Test2WaitingTest.java   |  34 ++
 .../java/junit44/environment/Test3FastTest.java |  30 ++
 surefire-providers/pom.xml  |   1 -
 surefire-providers/surefire-junit3/pom.xml  |   1 -
 surefire-providers/surefire-junit4/pom.xml  |   6 -
 .../surefire/junitcore/pc/ParallelComputer.java |  22 +-
 .../junitcore/pc/ParallelComputerBuilder.java   |   2 +-
 .../pc/ParallelComputerBuilderTest.java |  82 +++--
 .../junitcore/pc/ParallelComputerUtilTest.java  |  63 ++--
 surefire-report-parser/pom.xml  |  12 +-
 .../surefire/report/JUnit4SuiteTest.java|  46 +++
 28 files changed, 606 insertions(+), 469 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/eb210e08/Jenkinsfile
--
diff --git a/Jenkinsfile b/Jenkinsfile
index c080713..822bbc1 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -26,208 +26,42 @@ properties(
 ]
 )
 
-def oses = ['windows']  // ['linux', 'windows']
-def mavens = env.BRANCH_NAME == 'master' ? ['3.2.x', '3.3.x', '3.5.x'] : 
['3.5.x']
-def jdks = ['9'] // env.BRANCH_NAME == 'master' ? ['7', '8', '9', '10'] : 
['10']
+final String NIX_LABEL = 'ubuntu-1||ubuntu-4||ubuntu-6||H19||H20'
+final String WIN_LABEL = 'windows-2016-1'
 
-def cmd = ['mvn']
-def options = ['-e', '-V', '-nsu']
-def optionsITs = ['-e', '-V', '-nsu', '-P', 'run-its']
-def goals = ['clean', 'install' , 'jacoco:report']
-def goalsITs = ['verify']
-def Map stages = [:]
+final def oses = ['linux', 'windows']
+final def mavens = ['3.2.x', '3.3.x', '3.5.x'] // env.BRANCH_NAME == 'master' 
? ['3.2.x', '3.3.x', '3.5.x'] : ['3.5.x']
+final def jdks = ['7', '8', '9', '10'] // env.BRANCH_NAME == 'master' ? ['7', 
'8', '9', '10'] : ['10']
 
-oses.eachWithIndex { os, indexOfOs ->
-
-mavens.eachWithIndex { maven, indexOfMaven ->
-
-jdks.eachWithIndex { jdk, indexOfJdk ->
-
-def String label = jenkinsEnv.labelForOS(os);
-def String jdkTestName = jenkinsEnv.jdkFromVersion(os, jdk)
-def String jdkName = jenkinsEnv.jdkFromVersion(os, '8')
-def String mvnName = jenkinsEnv.mvnFromVersion(os, maven)
-
-def stageKey = "${os}-jdk${jdk}-maven${maven}"
-
-if (label == null || jdkTestName == null || mvnName == null) {
-println "Skipping ${stageKey} as unsupported by Jenkins 
Environment."
-return;
-}
-
-println "${stageKey}  ==>  Label: ${label}, JDK: ${jdkTestName}, 
Maven: ${mvnName}."
+final def cmd = ['mvn']
+final def options = ['-e', '-V', '-nsu', '-P', 'run-its']
+final def goals = ['clean', 'install', 'jacoco:report']
+final Map stages = [:]
 
+oses.eachWithIndex { os, indexOfOs ->
+stages[os] = {
+mavens.eachWithIndex { maven, indexOfMaven ->
+jdks.eachWithIndex { jdk, indexOfJdk ->
+final String label = jenkinsEnv.labelForOS(os);
+final String jdkTestName = jenkinsEnv.jdkFromVersion(os, jdk)
+final String jdkName = jenkinsEnv.jdkFromVersion(os, '8')
+final String mvnName = 

[24/52] [abbrv] [partial] maven-surefire git commit: [SUREFIRE-1471] Too long Windows path cause CI issues. Renamed surefire-intergation-tests to surefire-its.

[tibordigana]

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/test-helper-dump-pid-plugin/pom.xml
--
diff --git 
a/surefire-integration-tests/src/test/resources/test-helper-dump-pid-plugin/pom.xml
 
b/surefire-integration-tests/src/test/resources/test-helper-dump-pid-plugin/pom.xml
deleted file mode 100644
index 4a01e23..000
--- 
a/surefire-integration-tests/src/test/resources/test-helper-dump-pid-plugin/pom.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-http://maven.apache.org/POM/4.0.0; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
-   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/xsd/maven-4.0.0.xsd;>
-   4.0.0
-
-   org.apache.maven.plugins.surefire
-   maven-dump-pid-plugin
-   0.1
-   maven-plugin
-
-   maven-dump-pid-plugin Maven Plugin
-   http://maven.apache.org
-
-   
-   
UTF-8
-   1.7
-   1.7
-   
-
-   
-   
-   org.apache.maven
-   maven-plugin-api
-   2.2.1
-   
-   
-   org.apache.maven.plugin-tools
-   maven-plugin-annotations
-   3.2
-   
-   
-   junit
-   junit
-   3.8.1
-   test
-   
-   
-
-   
-   
-   
-   org.apache.maven.plugins
-   maven-plugin-plugin
-   3.2
-   
-   
-   
true
-   
-   
-   
-   mojo-descriptor
-   
-   descriptor
-   
-   
-   
-   
-   
-   
-

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/test-helper-dump-pid-plugin/src/main/java/org/apache/maven/plugins/surefire/dumppid/DumpPidMojo.java
--
diff --git 
a/surefire-integration-tests/src/test/resources/test-helper-dump-pid-plugin/src/main/java/org/apache/maven/plugins/surefire/dumppid/DumpPidMojo.java
 
b/surefire-integration-tests/src/test/resources/test-helper-dump-pid-plugin/src/main/java/org/apache/maven/plugins/surefire/dumppid/DumpPidMojo.java
deleted file mode 100644
index 035976b..000
--- 
a/surefire-integration-tests/src/test/resources/test-helper-dump-pid-plugin/src/main/java/org/apache/maven/plugins/surefire/dumppid/DumpPidMojo.java
+++ /dev/null
@@ -1,70 +0,0 @@
-package org.apache.maven.plugins.surefire.dumppid;
-
-/*
- * Copyright 2001-2005 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import java.io.File;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.lang.management.ManagementFactory;
-
-import org.apache.maven.plugin.AbstractMojo;
-import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.maven.plugins.annotations.LifecyclePhase;
-import org.apache.maven.plugins.annotations.Mojo;
-import org.apache.maven.plugins.annotations.Parameter;
-
-/**
- * Goal dumps the PID of the maven process
- */
-@Mojo( name = "dump-pid", defaultPhase = 
LifecyclePhase.GENERATE_TEST_RESOURCES )
-public class DumpPidMojo
-extends AbstractMojo
-{
-
-@Parameter( defaultValue = "${project.build.directory}", property = 
"dumpPid.targetDir" )
-private File targetDir;
-
-public void execute()
-throws MojoExecutionException
-{
-File target;
-try
-{
-getLog().info( "Dumping PID to " + targetDir );
-
-if ( !targetDir.exists() )
-{
-targetDir.mkdirs();
-}
-
-target = new File( targetDir, "maven.pid" ).getCanonicalFile();
-
-FileWriter fw = new 

[12/52] [abbrv] [partial] maven-surefire git commit: [SUREFIRE-1471] Too long Windows path cause CI issues. Renamed surefire-intergation-tests to surefire-its.

[tibordigana]

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/failsafe-buildfail/src/test/java/MyIT.java
--
diff --git 
a/surefire-its/src/test/resources/failsafe-buildfail/src/test/java/MyIT.java 
b/surefire-its/src/test/resources/failsafe-buildfail/src/test/java/MyIT.java
new file mode 100644
index 000..c74feb1
--- /dev/null
+++ b/surefire-its/src/test/resources/failsafe-buildfail/src/test/java/MyIT.java
@@ -0,0 +1,26 @@
+/*
+ * 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 junit.framework.TestCase;
+
+public class MyIT extends TestCase {
+public void testSomething() {
+assertTrue(true);
+}
+}

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/failsafe-nofail/invoker.properties
--
diff --git a/surefire-its/src/test/resources/failsafe-nofail/invoker.properties 
b/surefire-its/src/test/resources/failsafe-nofail/invoker.properties
new file mode 100644
index 000..ab6608f
--- /dev/null
+++ b/surefire-its/src/test/resources/failsafe-nofail/invoker.properties
@@ -0,0 +1,19 @@
+#
+# 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.
+#
+invoker.buildResult=failure

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/failsafe-nofail/pom.xml
--
diff --git a/surefire-its/src/test/resources/failsafe-nofail/pom.xml 
b/surefire-its/src/test/resources/failsafe-nofail/pom.xml
new file mode 100644
index 000..c28972f
--- /dev/null
+++ b/surefire-its/src/test/resources/failsafe-nofail/pom.xml
@@ -0,0 +1,83 @@
+
+
+
+http://maven.apache.org/POM/4.0.0; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/xsd/maven-4.0.0.xsd;>
+  4.0.0
+  localhost
+  working-directory-test
+  1.0
+  Run tests multiple times
+  
+
+  junit
+  junit
+  3.8.2
+  test
+
+  
+  
+
+  
+org.apache.maven.plugins
+maven-failsafe-plugin
+${surefire.version}
+
+
+integration-test
+
+integration-test
+
+
+
${project.build.directory}/failsafe-reports/failsafe-summary-1.xml
+
+
+
+acceptance-test
+
+integration-test
+
+
+
+**/AT*.java
+**/*AT.java
+**/*ATCase.java
+
+
${project.build.directory}/failsafe-reports/failsafe-summary-2.xml
+
+
+
+verify
+
+verify
+
+
+
+
${project.build.directory}/failsafe-reports/failsafe-summary-1.xml
+
${project.build.directory}/failsafe-reports/failsafe-summary-2.xml
+
+
+
+
+  
+
+  
+
+

[40/52] [abbrv] [partial] maven-surefire git commit: [SUREFIRE-1471] Too long Windows path cause CI issues. Renamed surefire-intergation-tests to surefire-its.

[tibordigana]

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/failsafe-notests/src/test/java/AClass.java
--
diff --git 
a/surefire-integration-tests/src/test/resources/failsafe-notests/src/test/java/AClass.java
 
b/surefire-integration-tests/src/test/resources/failsafe-notests/src/test/java/AClass.java
deleted file mode 100644
index 268eec5..000
--- 
a/surefire-integration-tests/src/test/resources/failsafe-notests/src/test/java/AClass.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-import junit.framework.TestCase;
-
-public class AClass extends TestCase {
-public void testSomething() {
-assertTrue(false);
-}
-}

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/failsafe-regular/invoker.properties
--
diff --git 
a/surefire-integration-tests/src/test/resources/failsafe-regular/invoker.properties
 
b/surefire-integration-tests/src/test/resources/failsafe-regular/invoker.properties
deleted file mode 100644
index ab6608f..000
--- 
a/surefire-integration-tests/src/test/resources/failsafe-regular/invoker.properties
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-invoker.buildResult=failure

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/failsafe-regular/pom.xml
--
diff --git 
a/surefire-integration-tests/src/test/resources/failsafe-regular/pom.xml 
b/surefire-integration-tests/src/test/resources/failsafe-regular/pom.xml
deleted file mode 100644
index 4755cb4..000
--- a/surefire-integration-tests/src/test/resources/failsafe-regular/pom.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-
-
-
-http://maven.apache.org/POM/4.0.0; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/xsd/maven-4.0.0.xsd;>
-  4.0.0
-  localhost
-  working-directory-test
-  1.0
-  Run tests multiple times
-  
-
-  junit
-  junit
-  3.8.2
-  test
-
-  
-  
-
-  
-org.apache.maven.plugins
-maven-failsafe-plugin
-${surefire.version}
-
-
-integration-test
-
-integration-test
-
-
-
${project.build.directory}/failsafe-reports/Xfailsafe-summary-1.xml
-
-
-
-acceptance-test
-
-integration-test
-
-
-
-**/AT*.java
-**/*AT.java
-**/*ATCase.java
-
-
${project.build.directory}/failsafe-reports/Xfailsafe-summary-2.xml
-
-
-
-verify
-
-verify
-
-
-
-
${project.build.directory}/failsafe-reports/Xfailsafe-summary-1.xml
-

[07/52] [abbrv] [partial] maven-surefire git commit: [SUREFIRE-1471] Too long Windows path cause CI issues. Renamed surefire-intergation-tests to surefire-its.

[tibordigana]

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/junit48-smartStackTrace/pom.xml
--
diff --git a/surefire-its/src/test/resources/junit48-smartStackTrace/pom.xml 
b/surefire-its/src/test/resources/junit48-smartStackTrace/pom.xml
new file mode 100644
index 000..fe104a4
--- /dev/null
+++ b/surefire-its/src/test/resources/junit48-smartStackTrace/pom.xml
@@ -0,0 +1,57 @@
+
+
+
+http://maven.apache.org/POM/4.0.0;
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/xsd/maven-4.0.0.xsd;>
+  4.0.0
+
+  org.apache.maven.plugins.surefire
+  junit4-smartstacktrace
+  1.0-SNAPSHOT
+  Test for smart stack trace parser
+
+
+  
+4.8.1
+1.7
+1.7
+  
+
+  
+
+  junit
+  junit
+  ${junitVersion}
+  test
+
+  
+  
+  
+
+  
+org.apache.maven.plugins
+maven-surefire-plugin
+${surefire.version}
+  
+
+  
+
+

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/junit48-smartStackTrace/src/test/java/junit4/SmartStackTraceTest.java
--
diff --git 
a/surefire-its/src/test/resources/junit48-smartStackTrace/src/test/java/junit4/SmartStackTraceTest.java
 
b/surefire-its/src/test/resources/junit48-smartStackTrace/src/test/java/junit4/SmartStackTraceTest.java
new file mode 100644
index 000..c367ef5
--- /dev/null
+++ 
b/surefire-its/src/test/resources/junit48-smartStackTrace/src/test/java/junit4/SmartStackTraceTest.java
@@ -0,0 +1,50 @@
+package junit4;
+
+
+/*
+ * 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.junit.After;
+import org.junit.AfterClass;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+
+import java.io.IOException;
+
+
+public class SmartStackTraceTest
+{
+
+@Test(expected = RuntimeException.class)
+public void shouldFailInMethodButDoesnt()
+{
+}
+
+@Test(expected = IOException.class)
+public void incorrectExceptionThrown()
+{
+throw new RuntimeException("We fail here");
+}
+
+@Test(expected = IOException.class)
+public void shortName()
+{
+}
+
+}

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/large-test-results/pom.xml
--
diff --git a/surefire-its/src/test/resources/large-test-results/pom.xml 
b/surefire-its/src/test/resources/large-test-results/pom.xml
new file mode 100644
index 000..36caa01
--- /dev/null
+++ b/surefire-its/src/test/resources/large-test-results/pom.xml
@@ -0,0 +1,55 @@
+
+
+
+http://maven.apache.org/POM/4.0.0;
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/xsd/maven-4.0.0.xsd;>
+  4.0.0
+
+  org.apache.maven.plugins.surefire
+  large-test-results
+  1.0-SNAPSHOT
+  Test for large test results
+
+  
+
+  
+maven-surefire-plugin
+${surefire.version}
+
+  
+
numTests${numTests}
+  
+  -Xmx1024m
+
+  
+
+  
+
+  
+
+  junit
+  junit
+  3.8.1
+  test
+
+  
+
+

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/large-test-results/src/test/java/largeTestResults/BasicTest.java
--
diff --git 
a/surefire-its/src/test/resources/large-test-results/src/test/java/largeTestResults/BasicTest.java
 
b/surefire-its/src/test/resources/large-test-results/src/test/java/largeTestResults/BasicTest.java
new file mode 100644
index 000..bdeeb04
--- /dev/null
+++ 
b/surefire-its/src/test/resources/large-test-results/src/test/java/largeTestResults/BasicTest.java
@@ -0,0 +1,65 @@
+package largeTestResults;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license 

[21/52] [abbrv] [partial] maven-surefire git commit: [SUREFIRE-1471] Too long Windows path cause CI issues. Renamed surefire-intergation-tests to surefire-its.

[tibordigana]

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/java/org/apache/maven/surefire/its/AdditionalClasspathIT.java
--
diff --git 
a/surefire-its/src/test/java/org/apache/maven/surefire/its/AdditionalClasspathIT.java
 
b/surefire-its/src/test/java/org/apache/maven/surefire/its/AdditionalClasspathIT.java
new file mode 100644
index 000..0819196
--- /dev/null
+++ 
b/surefire-its/src/test/java/org/apache/maven/surefire/its/AdditionalClasspathIT.java
@@ -0,0 +1,39 @@
+package org.apache.maven.surefire.its;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import org.apache.maven.surefire.its.fixture.SurefireJUnit4IntegrationTestCase;
+import org.junit.Test;
+
+/**
+ * Test additionalClasspathElements
+ *
+ * @author mailto:dfabul...@apache.org;>Dan Fabulich
+ * @author mailto:krosenv...@apache.org;>Kristian Rosenvold
+ */
+public class AdditionalClasspathIT
+extends SurefireJUnit4IntegrationTestCase
+{
+@Test
+public void additionalClasspath()
+{
+unpack( "/additional-classpath" ).executeTest().verifyErrorFree( 1 );
+}
+}

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/java/org/apache/maven/surefire/its/AggregateReportIT.java
--
diff --git 
a/surefire-its/src/test/java/org/apache/maven/surefire/its/AggregateReportIT.java
 
b/surefire-its/src/test/java/org/apache/maven/surefire/its/AggregateReportIT.java
new file mode 100644
index 000..ab8f64c
--- /dev/null
+++ 
b/surefire-its/src/test/java/org/apache/maven/surefire/its/AggregateReportIT.java
@@ -0,0 +1,57 @@
+package org.apache.maven.surefire.its;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import java.io.File;
+
+import org.apache.maven.surefire.its.fixture.IntegrationTestSuiteResults;
+import org.apache.maven.surefire.its.fixture.OutputValidator;
+import org.apache.maven.surefire.its.fixture.SurefireJUnit4IntegrationTestCase;
+import org.apache.maven.surefire.its.fixture.TestFile;
+import org.junit.Test;
+
+import static 
org.apache.maven.surefire.its.fixture.HelperAssertions.parseTestResults;
+import static 
org.apache.maven.surefire.its.fixture.HelperAssertions.assertTestSuiteResults;
+import static org.junit.Assert.assertTrue;
+
+/**
+ * Test report aggregation
+ *
+ * @author mailto:dfabul...@apache.org;>Dan Fabulich
+ * @author mailto:krosenv...@apache.org;>Kristian Rosenvold
+ */
+public class AggregateReportIT
+extends SurefireJUnit4IntegrationTestCase
+{
+
+@Test
+public void aggregateReport()
+{
+OutputValidator outputValidator = unpack( "/aggregate-report" 
).addSurefireReportGoal().executeCurrentGoals();
+TestFile surefireReportHtml = outputValidator.getSiteFile( 
"surefire-report.html" );
+assertTrue( "surefire report missing: " + 
surefireReportHtml.getAbsolutePath(), surefireReportHtml.exists() );
+
+// TODO HtmlUnit tests on the surefire report
+
+IntegrationTestSuiteResults suite = parseTestResults( new File( 
outputValidator.getBaseDir(), "child1" ),
+  new File( 
outputValidator.getBaseDir(), "child2" ) );
+assertTestSuiteResults( 2, 0, 1, 0, suite );
+}
+}

[49/52] [abbrv] [partial] maven-surefire git commit: [SUREFIRE-1471] Too long Windows path cause CI issues. Renamed surefire-intergation-tests to surefire-its.

[tibordigana]

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgReportTestIT.java
--
diff --git 
a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgReportTestIT.java
 
b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgReportTestIT.java
deleted file mode 100644
index a358172..000
--- 
a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgReportTestIT.java
+++ /dev/null
@@ -1,74 +0,0 @@
-package org.apache.maven.surefire.its;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import org.apache.maven.surefire.its.fixture.SurefireJUnit4IntegrationTestCase;
-import org.junit.Test;
-
-import static org.hamcrest.Matchers.containsString;
-import static org.hamcrest.Matchers.is;
-
-/**
- * Test surefire-report on TestNG test
- *
- * @author mailto:dfabul...@apache.org;>Dan Fabulich
- */
-public class CheckTestNgReportTestIT
-extends SurefireJUnit4IntegrationTestCase
-{
-@Test
-public void testNgReport()
-throws Exception
-{
-unpack( "/testng-simple" )
-.sysProp( "testNgVersion", "5.7" )
-.sysProp( "testNgClassifier", "jdk15" )
-.addSurefireReportGoal()
-.executeCurrentGoals()
-.verifyErrorFree( 3 )
-.getSiteFile( "surefire-report.html" )
-.assertFileExists();
-}
-
-@Test
-public void shouldNotBeVerbose()
-throws Exception
-{
-unpack( "/testng-simple" )
-.sysProp( "testNgVersion", "5.10" )
-.sysProp( "testNgClassifier", "jdk15" )
-.executeTest()
-.verifyErrorFreeLog()
-.assertThatLogLine( containsString( "[Parser] Running:" ), is( 0 ) 
);
-}
-
-@Test
-public void shouldBeVerbose()
-throws Exception
-{
-unpack( "/testng-simple" )
-.sysProp( "testNgVersion", "5.10" )
-.sysProp( "testNgClassifier", "jdk15" )
-.sysProp( "surefire.testng.verbose", "10" )
-.executeTest()
-.verifyErrorFreeLog()
-.assertThatLogLine( containsString( "[Parser] Running:" ), is( 1 ) 
);
-}
-}

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgSuiteXmlIT.java
--
diff --git 
a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgSuiteXmlIT.java
 
b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgSuiteXmlIT.java
deleted file mode 100644
index 2e56dc9..000
--- 
a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgSuiteXmlIT.java
+++ /dev/null
@@ -1,60 +0,0 @@
-package org.apache.maven.surefire.its;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import org.apache.maven.surefire.its.fixture.SurefireJUnit4IntegrationTestCase;
-import org.apache.maven.surefire.its.fixture.SurefireLauncher;
-import org.junit.Ignore;
-import org.junit.Test;
-
-/**
- * Test simple TestNG suite XML file
- *
- * @author mailto:dfabul...@apache.org;>Dan Fabulich
- */
-public class 

[47/52] [abbrv] [partial] maven-surefire git commit: [SUREFIRE-1471] Too long Windows path cause CI issues. Renamed surefire-intergation-tests to surefire-its.

[tibordigana]

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/PojoSimpleIT.java
--
diff --git 
a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/PojoSimpleIT.java
 
b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/PojoSimpleIT.java
deleted file mode 100644
index 03902ef..000
--- 
a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/PojoSimpleIT.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package org.apache.maven.surefire.its;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import org.apache.maven.surefire.its.fixture.SurefireJUnit4IntegrationTestCase;
-import org.junit.Test;
-
-/**
- * Test support for POJO tests.
- *
- * @author Benjamin Bentmann
- */
-public class PojoSimpleIT
-extends SurefireJUnit4IntegrationTestCase
-{
-@Test
-public void testit()
-{
-unpack( "pojo-simple" ).executeTest().assertTestSuiteResults( 2, 0, 1, 
0 );
-}
-}

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ReporterTime.java
--
diff --git 
a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ReporterTime.java
 
b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ReporterTime.java
deleted file mode 100644
index 154fb73..000
--- 
a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ReporterTime.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package org.apache.maven.surefire.its;
-/*
- * 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.
- */
-
-/**
- * @author Kristian Rosenvold
- */
-public class ReporterTime
-{
-}

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

[38/52] [abbrv] [partial] maven-surefire git commit: [SUREFIRE-1471] Too long Windows path cause CI issues. Renamed surefire-intergation-tests to surefire-its.

[tibordigana]

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/junit-ignore/pom.xml
--
diff --git a/surefire-integration-tests/src/test/resources/junit-ignore/pom.xml 
b/surefire-integration-tests/src/test/resources/junit-ignore/pom.xml
deleted file mode 100644
index d9c3817..000
--- a/surefire-integration-tests/src/test/resources/junit-ignore/pom.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-
-
-
-http://maven.apache.org/POM/4.0.0;
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/xsd/maven-4.0.0.xsd;>
-  4.0.0
-
-  org.apache.maven.plugins.surefire
-  junit-ignore
-  1.0-SNAPSHOT
-  Test of @Ignore annotation
-
-  
-4.4
-
-3
-1.7
-1.7
-  
-
-  
-
-  junit
-  junit
-  ${junit.version}
-  test
-
-  
-  
-  
-
-  
-maven-surefire-plugin
-${surefire.version}
-
-  ${surefire.parallel}
-  false
-  ${surefire.threadcount}
-
-  
-
-  
-

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/junit-ignore/src/test/java/junit/ignore/ClassAndMethodIgnoreNothingToRunTest.java
--
diff --git 
a/surefire-integration-tests/src/test/resources/junit-ignore/src/test/java/junit/ignore/ClassAndMethodIgnoreNothingToRunTest.java
 
b/surefire-integration-tests/src/test/resources/junit-ignore/src/test/java/junit/ignore/ClassAndMethodIgnoreNothingToRunTest.java
deleted file mode 100644
index 66e858e..000
--- 
a/surefire-integration-tests/src/test/resources/junit-ignore/src/test/java/junit/ignore/ClassAndMethodIgnoreNothingToRunTest.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package junit.ignore;
-
-/*
- * 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.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
-
-@Ignore( "ignore this test" )
-public class ClassAndMethodIgnoreNothingToRunTest
-{
-
-@Ignore( "ignore this test" )
-@Test
-public void testIgnorable()
-{
-Assert.fail( "you should have ignored me!" );
-}
-
-}

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/junit-ignore/src/test/java/junit/ignore/ClassLevelIgnore1WithMethodThatIsNormalTest.java
--
diff --git 
a/surefire-integration-tests/src/test/resources/junit-ignore/src/test/java/junit/ignore/ClassLevelIgnore1WithMethodThatIsNormalTest.java
 
b/surefire-integration-tests/src/test/resources/junit-ignore/src/test/java/junit/ignore/ClassLevelIgnore1WithMethodThatIsNormalTest.java
deleted file mode 100644
index 7012f87..000
--- 
a/surefire-integration-tests/src/test/resources/junit-ignore/src/test/java/junit/ignore/ClassLevelIgnore1WithMethodThatIsNormalTest.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package junit.ignore;
-
-/*
- * 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.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
-
-@Ignore( "ignore this test" )
-public class ClassLevelIgnore1WithMethodThatIsNormalTest
-{
-
-@Test
-public void testIgnorable()
-{
-Assert.fail( "you 

[39/52] [abbrv] [partial] maven-surefire git commit: [SUREFIRE-1471] Too long Windows path cause CI issues. Renamed surefire-intergation-tests to surefire-its.

[tibordigana]

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/fork-mode-resource-loading/pom.xml
--
diff --git 
a/surefire-integration-tests/src/test/resources/fork-mode-resource-loading/pom.xml
 
b/surefire-integration-tests/src/test/resources/fork-mode-resource-loading/pom.xml
deleted file mode 100644
index e40033c..000
--- 
a/surefire-integration-tests/src/test/resources/fork-mode-resource-loading/pom.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-
-
-
-http://maven.apache.org/POM/4.0.0;
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/xsd/maven-4.0.0.xsd;>
-  4.0.0
-
-  org.apache.maven.plugins.surefire
-  fork-mode-resource-loading
-  1.0-SNAPSHOT
-  Test for forkMode
-
-  
-1.7
-1.7
-  
-
-  
-
-  
-maven-surefire-plugin
-${surefire.version}
-  
-
-  
-
-  
-
-  junit
-  junit
-  3.8.1
-  test
-
-  
-
-

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/fork-mode-resource-loading/src/test/java/forkMode/ResourceLoadTest.java
--
diff --git 
a/surefire-integration-tests/src/test/resources/fork-mode-resource-loading/src/test/java/forkMode/ResourceLoadTest.java
 
b/surefire-integration-tests/src/test/resources/fork-mode-resource-loading/src/test/java/forkMode/ResourceLoadTest.java
deleted file mode 100644
index e2c3d51..000
--- 
a/surefire-integration-tests/src/test/resources/fork-mode-resource-loading/src/test/java/forkMode/ResourceLoadTest.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package forkMode;
-
-/*
- * 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 junit.framework.TestCase;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URL;
-
-public class ResourceLoadTest
-extends TestCase
-{
-
-public void testGetResourceUrl() throws IOException {
-final URL resource = this.getClass().getClassLoader().getResource( 
"myFile.txt" );
-assertNotNull(  resource );
-}
-
-public void testGetResource() throws IOException {
-final InputStream resource = 
this.getClass().getClassLoader().getResourceAsStream( "myFile.txt" );
-assertNotNull(  resource );
-}
-
-public void testGetResourceThreadLoader() throws IOException {
-final InputStream resource = 
Thread.currentThread().getContextClassLoader().getResourceAsStream( 
"myFile.txt" );
-assertNotNull(  resource );
-}
-}

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/fork-mode-resource-loading/src/test/resources/myFile.txt
--
diff --git 
a/surefire-integration-tests/src/test/resources/fork-mode-resource-loading/src/test/resources/myFile.txt
 
b/surefire-integration-tests/src/test/resources/fork-mode-resource-loading/src/test/resources/myFile.txt
deleted file mode 100644
index 51f466f..000
--- 
a/surefire-integration-tests/src/test/resources/fork-mode-resource-loading/src/test/resources/myFile.txt
+++ /dev/null
@@ -1 +0,0 @@
-A file

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/fork-mode-testng/pom.xml
--
diff --git 
a/surefire-integration-tests/src/test/resources/fork-mode-testng/pom.xml 
b/surefire-integration-tests/src/test/resources/fork-mode-testng/pom.xml
deleted file mode 100644
index 8e25749..000
--- a/surefire-integration-tests/src/test/resources/fork-mode-testng/pom.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-
-
-
-http://maven.apache.org/POM/4.0.0; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; 
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/xsd/maven-4.0.0.xsd;>
-  4.0.0
-
-  org.apache.maven.plugins.surefire
-  fork-mode-testng
-  1.0-SNAPSHOT
-  Test for forkMode
-
-  
-1.7

[46/52] [abbrv] [partial] maven-surefire git commit: [SUREFIRE-1471] Too long Windows path cause CI issues. Renamed surefire-intergation-tests to surefire-its.

[tibordigana]

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/HelperAssertions.java
--
diff --git 
a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/HelperAssertions.java
 
b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/HelperAssertions.java
deleted file mode 100644
index ed0d40c..000
--- 
a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/HelperAssertions.java
+++ /dev/null
@@ -1,174 +0,0 @@
-package org.apache.maven.surefire.its.fixture;
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import org.apache.maven.plugin.surefire.log.api.ConsoleLogger;
-import org.apache.maven.plugin.surefire.log.api.PrintStreamLogger;
-import org.apache.maven.plugins.surefire.report.ReportTestSuite;
-import org.apache.maven.plugins.surefire.report.SurefireReportParser;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Locale;
-
-import static junit.framework.Assert.assertEquals;
-import static junit.framework.Assert.assertTrue;
-import static org.junit.Assume.assumeTrue;
-
-@SuppressWarnings( { "JavaDoc" } )
-public class HelperAssertions
-{
-/**
- * assert that the reports in the specified testDir have the right summary 
statistics
- */
-public static void assertTestSuiteResults( int total, int errors, int 
failures, int skipped, File testDir )
-{
-IntegrationTestSuiteResults suite = parseTestResults( testDir );
-assertTestSuiteResults( total, errors, failures, skipped, suite );
-}
-
-public static void assertTestSuiteResults( int total, int errors, int 
failures, int skipped, int flakes, File testDir )
-{
-IntegrationTestSuiteResults suite = parseTestResults( testDir );
-assertTestSuiteResults( total, errors, failures, skipped, flakes, 
suite );
-}
-
-public static void assertTestSuiteResults( int total, File testDir )
-{
-IntegrationTestSuiteResults suite = parseTestResults( testDir );
-assertTestSuiteResults( total, suite );
-}
-
-/**
- * assert that the reports in the specified testDir have the right summary 
statistics
- */
-public static void assertIntegrationTestSuiteResults( int total, int 
errors, int failures, int skipped,
-  File testDir )
-{
-IntegrationTestSuiteResults suite = parseIntegrationTestResults( 
testDir );
-assertTestSuiteResults( total, errors, failures, skipped, suite );
-}
-
-public static void assertIntegrationTestSuiteResults( int total, File 
testDir )
-{
-IntegrationTestSuiteResults suite = parseIntegrationTestResults( 
testDir );
-assertTestSuiteResults( total, suite );
-}
-
-public static void assertTestSuiteResults( int total, int errors, int 
failures, int skipped,
-   IntegrationTestSuiteResults 
actualSuite )
-{
-assertEquals( "wrong number of tests", total, actualSuite.getTotal() );
-assertEquals( "wrong number of errors", errors, 
actualSuite.getErrors() );
-assertEquals( "wrong number of failures", failures, 
actualSuite.getFailures() );
-assertEquals( "wrong number of skipped", skipped, 
actualSuite.getSkipped() );
-}
-
-public static void assertTestSuiteResults( int total, 
IntegrationTestSuiteResults actualSuite )
-{
-assertEquals( "wrong number of tests", total, actualSuite.getTotal() );
-}
-
-public static void assertTestSuiteResults( int total, int errors, int 
failures, int skipped, int flakes,
-   IntegrationTestSuiteResults 
actualSuite )
-{
-assertTestSuiteResults(total, errors, failures, skipped, actualSuite);
-assertEquals( "wrong number of flaky tests", flakes, 
actualSuite.getFlakes() );
-}
-
-public static IntegrationTestSuiteResults parseTestResults( File... 
testDirs )
-{
-List reports = 

[16/52] [abbrv] [partial] maven-surefire git commit: [SUREFIRE-1471] Too long Windows path cause CI issues. Renamed surefire-intergation-tests to surefire-its.

[tibordigana]

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1209RerunAndForkCountIT.java
--
diff --git 
a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1209RerunAndForkCountIT.java
 
b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1209RerunAndForkCountIT.java
new file mode 100644
index 000..6ee87fb
--- /dev/null
+++ 
b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1209RerunAndForkCountIT.java
@@ -0,0 +1,75 @@
+package org.apache.maven.surefire.its.jiras;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import org.apache.maven.it.VerificationException;
+import org.apache.maven.surefire.its.fixture.SurefireJUnit4IntegrationTestCase;
+import org.apache.maven.surefire.its.fixture.SurefireLauncher;
+import org.junit.Test;
+
+/**
+ * @author mailto:tibordig...@apache.org;>Tibor Digana (tibor17)
+ * @see https://issues.apache.org/jira/browse/SUREFIRE-1209;>SUREFIRE-1209
+ * @since 2.19
+ */
+public class Surefire1209RerunAndForkCountIT
+extends SurefireJUnit4IntegrationTestCase
+{
+@Test
+public void reusableForksJUnit47()
+throws VerificationException
+{
+unpack().executeTest()
+.assertTestSuiteResults( 5, 0, 0, 0, 4 );
+}
+
+@Test
+public void notReusableForksJUnit47()
+throws VerificationException
+{
+unpack().reuseForks( false )
+.executeTest()
+.assertTestSuiteResults( 5, 0, 0, 0, 4 );
+}
+
+@Test
+public void reusableForksJUnit4()
+throws VerificationException
+{
+unpack().addGoal( "-Pjunit4" )
+.executeTest()
+.assertTestSuiteResults( 5, 0, 0, 0, 4 );
+}
+
+@Test
+public void notReusableForksJUnit4()
+throws VerificationException
+{
+unpack().addGoal( "-Pjunit4" )
+.reuseForks( false )
+.executeTest()
+.assertTestSuiteResults( 5, 0, 0, 0, 4 );
+}
+
+private SurefireLauncher unpack()
+{
+return unpack( "surefire-1209-rerun-and-forkcount" );
+}
+}

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1211JUnitTestNgIT.java
--
diff --git 
a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1211JUnitTestNgIT.java
 
b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1211JUnitTestNgIT.java
new file mode 100644
index 000..53cd764
--- /dev/null
+++ 
b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1211JUnitTestNgIT.java
@@ -0,0 +1,62 @@
+package org.apache.maven.surefire.its.jiras;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import org.apache.maven.surefire.its.fixture.SurefireJUnit4IntegrationTestCase;
+import org.apache.maven.surefire.its.fixture.SurefireLauncher;
+import org.junit.Test;
+
+import static 
org.apache.maven.surefire.its.fixture.HelperAssertions.assumeJavaVersion;
+
+/**
+ * @author mailto:tibordig...@apache.org;>Tibor Digana (tibor17)
+ * @see https://issues.apache.org/jira/browse/SUREFIRE-1211;>SUREFIRE-1211
+ * 

[23/52] [abbrv] [partial] maven-surefire git commit: [SUREFIRE-1471] Too long Windows path cause CI issues. Renamed surefire-intergation-tests to surefire-its.

[tibordigana]

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/testng-method-pattern-before/pom.xml
--
diff --git 
a/surefire-integration-tests/src/test/resources/testng-method-pattern-before/pom.xml
 
b/surefire-integration-tests/src/test/resources/testng-method-pattern-before/pom.xml
deleted file mode 100644
index 41768cd..000
--- 
a/surefire-integration-tests/src/test/resources/testng-method-pattern-before/pom.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-
-
-
-http://maven.apache.org/POM/4.0.0;
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/xsd/maven-4.0.0.xsd;>
-  4.0.0
-
-  org.apache.maven.plugins.surefire
-  junit4
-  1.0-SNAPSHOT
-  Test for Testng
-
-  
-1.7
-1.7
-  
-
-  
-
-  testng-old
-  
-testNgClassifier
-  
-  
-
-  org.testng
-  testng
-  ${testNgVersion}
-  ${testNgClassifier}
-
-  
-
-
-  testng-new
-  
-!testNgClassifier
-  
-  
-
-  org.testng
-  testng
-  ${testNgVersion}
-
-  
-
-  
-  
-  
-
-  
-org.apache.maven.plugins
-maven-surefire-plugin
-${surefire.version}
-
-  BasicTest#testSuccess*
-
-  
-
-  
-
-

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/testng-method-pattern-before/src/test/java/testng/BasicTest.java
--
diff --git 
a/surefire-integration-tests/src/test/resources/testng-method-pattern-before/src/test/java/testng/BasicTest.java
 
b/surefire-integration-tests/src/test/resources/testng-method-pattern-before/src/test/java/testng/BasicTest.java
deleted file mode 100644
index 468e425..000
--- 
a/surefire-integration-tests/src/test/resources/testng-method-pattern-before/src/test/java/testng/BasicTest.java
+++ /dev/null
@@ -1,79 +0,0 @@
-package testng;
-
-/*
- * 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.testng.annotations.*;
-import org.testng.Assert;
-
-public class BasicTest
-{
-
-private boolean setUpCalled = false;
-
-private static boolean tearDownCalled = false;
-
-private Integer foo;
-
-@BeforeTest
-public void intialize()
-{
-setUpCalled = true;
-tearDownCalled = false;
-System.out.println( "Called setUp" );
-foo = Integer.valueOf( 1 );
-}
-
-@AfterTest
-public void shutdown()
-{
-setUpCalled = false;
-tearDownCalled = true;
-System.out.println( "Called tearDown" );
-}
-
-@Test
-public void testSetUp()
-{
-Assert.assertTrue( setUpCalled );
-Assert.assertNotNull( foo );
-}
-
-
-@Test
-public void testSuccessOne()
-{
-Assert.assertTrue( true );
-Assert.assertNotNull( foo );
-} 
-
-@Test
-public void testSuccessTwo()
-{
-Assert.assertTrue( true );
-Assert.assertNotNull( foo );
-}
-
-@AfterClass
-public static void oneTimeTearDown()
-{
-
-}
-
-}

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/testng-method-pattern/pom.xml
--
diff --git 
a/surefire-integration-tests/src/test/resources/testng-method-pattern/pom.xml 
b/surefire-integration-tests/src/test/resources/testng-method-pattern/pom.xml
deleted file mode 100644
index 50b08bf..000
--- 
a/surefire-integration-tests/src/test/resources/testng-method-pattern/pom.xml
+++ /dev/null
@@ -1,80 +0,0 @@
-
-
-
-http://maven.apache.org/POM/4.0.0;
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/xsd/maven-4.0.0.xsd;>
-  4.0.0
-
-  org.apache.maven.plugins.surefire
-  junit4
-  1.0-SNAPSHOT
-  Test 

[33/52] [abbrv] [partial] maven-surefire git commit: [SUREFIRE-1471] Too long Windows path cause CI issues. Renamed surefire-intergation-tests to surefire-its.

[tibordigana]

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-1095-npe-in-runlistener/pom.xml
--
diff --git 
a/surefire-integration-tests/src/test/resources/surefire-1095-npe-in-runlistener/pom.xml
 
b/surefire-integration-tests/src/test/resources/surefire-1095-npe-in-runlistener/pom.xml
deleted file mode 100644
index 8a39f12..000
--- 
a/surefire-integration-tests/src/test/resources/surefire-1095-npe-in-runlistener/pom.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-
-
-http://maven.apache.org/POM/4.0.0; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/xsd/maven-4.0.0.xsd;>
-  4.0.0
-  
-org.apache.maven.surefire
-it-parent
-1.0
-../pom.xml
-  
-  org.apache.maven.plugins.surefire
-  jiras-surefire-1095
-  1.0
-  http://maven.apache.org
-  
-
-  tibordigana
-  Tibor Digaňa (tibor17)
-  tibordig...@apache.org
-  
-Committer
-  
-  Europe/Bratislava
-
-  
-  
-
-  junit
-  junit
-  ${junit.version}
-  test
-
-  
-  
-
-  
-maven-surefire-plugin
-
-  
-**/SomeTest.java
-  
-  
-
-  listener
-  jiras.surefire1095.Listener
-
-  
-
-  
-
-  
-

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-1095-npe-in-runlistener/src/test/java/jiras/surefire1095/Listener.java
--
diff --git 
a/surefire-integration-tests/src/test/resources/surefire-1095-npe-in-runlistener/src/test/java/jiras/surefire1095/Listener.java
 
b/surefire-integration-tests/src/test/resources/surefire-1095-npe-in-runlistener/src/test/java/jiras/surefire1095/Listener.java
deleted file mode 100644
index f16c04a..000
--- 
a/surefire-integration-tests/src/test/resources/surefire-1095-npe-in-runlistener/src/test/java/jiras/surefire1095/Listener.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package jiras.surefire1095;
-
-/*
- * 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.junit.runner.Description;
-import org.junit.runner.notification.RunListener;
-
-public class Listener
-extends RunListener
-{
-@Override
-public void testRunStarted( Description description )
-throws Exception
-{
-String described = description.getDisplayName();
-System.out.println( "testRunStarted " +
-( described == null || described.equals( 
"null" )
-? description.getChildren()
-: description ) );
-}
-}

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-1095-npe-in-runlistener/src/test/java/jiras/surefire1095/SomeTest.java
--
diff --git 
a/surefire-integration-tests/src/test/resources/surefire-1095-npe-in-runlistener/src/test/java/jiras/surefire1095/SomeTest.java
 
b/surefire-integration-tests/src/test/resources/surefire-1095-npe-in-runlistener/src/test/java/jiras/surefire1095/SomeTest.java
deleted file mode 100644
index 923917a..000
--- 
a/surefire-integration-tests/src/test/resources/surefire-1095-npe-in-runlistener/src/test/java/jiras/surefire1095/SomeTest.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package jiras.surefire1095;
-
-/*
- * 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,
- 

[45/52] [abbrv] [partial] maven-surefire git commit: [SUREFIRE-1471] Too long Windows path cause CI issues. Renamed surefire-intergation-tests to surefire-its.

[tibordigana]

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1082ParallelJUnitParameterizedIT.java
--
diff --git 
a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1082ParallelJUnitParameterizedIT.java
 
b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1082ParallelJUnitParameterizedIT.java
deleted file mode 100644
index 2669b2f..000
--- 
a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1082ParallelJUnitParameterizedIT.java
+++ /dev/null
@@ -1,212 +0,0 @@
-package org.apache.maven.surefire.its.jiras;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import org.apache.maven.it.VerificationException;
-import org.apache.maven.surefire.its.fixture.OutputValidator;
-import org.apache.maven.surefire.its.fixture.SurefireJUnit4IntegrationTestCase;
-import org.apache.maven.surefire.its.fixture.SurefireLauncher;
-import org.apache.maven.surefire.its.fixture.TestFile;
-import org.hamcrest.BaseMatcher;
-import org.hamcrest.Description;
-import org.hamcrest.Matcher;
-import org.junit.Test;
-
-import java.nio.charset.Charset;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.Set;
-import java.util.TreeSet;
-
-import static org.hamcrest.core.AnyOf.anyOf;
-import static org.hamcrest.core.Is.is;
-import static org.hamcrest.core.StringContains.containsString;
-import static org.junit.Assert.assertThat;
-
-/**
- * @author mailto:tibordig...@apache.org;>Tibor Digana (tibor17)
- * @see https://issues.apache.org/jira/browse/SUREFIRE-1082;>SUREFIRE-1082
- * @since 2.18
- */
-public class Surefire1082ParallelJUnitParameterizedIT
-extends SurefireJUnit4IntegrationTestCase
-{
-private static Set printOnlyTestLinesFromConsole( OutputValidator 
validator )
-throws VerificationException
-{
-return printOnlyTestLines( validator.loadLogLines() );
-}
-
-private static Set printOnlyTestLinesFromOutFile( OutputValidator 
validator )
-throws VerificationException
-{
-TestFile report = validator.getSurefireReportsFile( 
"jiras.surefire1082.Jira1082Test-output.txt" );
-report.assertFileExists();
-return printOnlyTestLines( validator.loadFile( report.getFile(), 
Charset.forName( "UTF-8" ) ) );
-}
-
-private static Set printOnlyTestLines( Collection logs )
-throws VerificationException
-{
-Set log = new TreeSet();
-for ( String line : logs )
-{
-if ( line.startsWith( "class jiras.surefire1082." ) )
-{
-log.add( line );
-}
-}
-return log;
-}
-
-private static Matcher regex( Set r )
-{
-return new IsRegex( r );
-}
-
-private static void assertParallelRun( Set log )
-{
-assertThat( log.size(), is( 4 ) );
-
-Set expectedLogs1 = new TreeSet();
-expectedLogs1.add( "class jiras.surefire1082.Jira1082Test a 0 
pool-[\\d]+-thread-1" );
-expectedLogs1.add( "class jiras.surefire1082.Jira1082Test b 0 
pool-[\\d]+-thread-1" );
-expectedLogs1.add( "class jiras.surefire1082.Jira1082Test a 1 
pool-[\\d]+-thread-2" );
-expectedLogs1.add( "class jiras.surefire1082.Jira1082Test b 1 
pool-[\\d]+-thread-2" );
-
-Set expectedLogs2 = new TreeSet();
-expectedLogs2.add( "class jiras.surefire1082.Jira1082Test a 1 
pool-[\\d]+-thread-1" );
-expectedLogs2.add( "class jiras.surefire1082.Jira1082Test b 1 
pool-[\\d]+-thread-1" );
-expectedLogs2.add( "class jiras.surefire1082.Jira1082Test a 0 
pool-[\\d]+-thread-2" );
-expectedLogs2.add( "class jiras.surefire1082.Jira1082Test b 0 
pool-[\\d]+-thread-2" );
-
-assertThat( log, anyOf( regex( expectedLogs1 ), regex( expectedLogs2 ) 
) );
-}
-
-@Test
-public void checkClassesRunParallel()
-throws VerificationException
-{
-OutputValidator validator = unpack().setTestToRun( "Jira1082Test" )
-   

[43/52] [abbrv] [partial] maven-surefire git commit: [SUREFIRE-1471] Too long Windows path cause CI issues. Renamed surefire-intergation-tests to surefire-its.

[tibordigana]

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire697NiceSummaryIT.java
--
diff --git 
a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire697NiceSummaryIT.java
 
b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire697NiceSummaryIT.java
deleted file mode 100644
index 3175196..000
--- 
a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire697NiceSummaryIT.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package org.apache.maven.surefire.its.jiras;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import org.apache.maven.surefire.its.fixture.SurefireJUnit4IntegrationTestCase;
-import org.junit.Test;
-
-/**
- * SUREFIRE-697 Asserts proper truncation of long exception messages Some say 
testing this is a bit over the top.
- *
- * @author Kristian Rosenvold
- */
-public class Surefire697NiceSummaryIT
-extends SurefireJUnit4IntegrationTestCase
-{
-@Test
-public void testBuildFailingWhenErrors()
-{
-unpack( "/surefire-697-niceSummary" 
).failNever().executeTest().verifyTextInLog(
-"junit.surefire697.BasicTest#testShortMultiline RuntimeException A 
very short m" );
-}
-}

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire705ParallelForkTimeoutIT.java
--
diff --git 
a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire705ParallelForkTimeoutIT.java
 
b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire705ParallelForkTimeoutIT.java
deleted file mode 100644
index e1a258a..000
--- 
a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire705ParallelForkTimeoutIT.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package org.apache.maven.surefire.its.jiras;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import org.apache.maven.surefire.its.fixture.SurefireJUnit4IntegrationTestCase;
-import org.junit.Test;
-
-/**
- * Test
- *
- * @author Kristian Rosenvold
- */
-public class Surefire705ParallelForkTimeoutIT
-extends SurefireJUnit4IntegrationTestCase
-{
-@Test
-public void testTimeoutForked()
-{
-unpack( "/fork-timeout" ).setJUnitVersion( "4.8.1" ).addGoal( 
"-Djunit.version=4.8.1" ).addGoal(
-"-Djunit.parallel=classes" ).addGoal( "-DtimeOut=1" 
).maven().withFailure().executeTest()
-   .verifyTextInLog( "There was a timeout or other error 
in the fork" );
-}
-}

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire733AllOverrridesCapturedIT.java
--
diff --git 
a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire733AllOverrridesCapturedIT.java
 
b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire733AllOverrridesCapturedIT.java
deleted file mode 100644
index aabb05d..000
--- 

[22/52] [abbrv] [partial] maven-surefire git commit: [SUREFIRE-1471] Too long Windows path cause CI issues. Renamed surefire-intergation-tests to surefire-its.

[tibordigana]

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/testng-suite-xml/src/test/java/testng/suiteXml/TestNGSuiteTest.java
--
diff --git 
a/surefire-integration-tests/src/test/resources/testng-suite-xml/src/test/java/testng/suiteXml/TestNGSuiteTest.java
 
b/surefire-integration-tests/src/test/resources/testng-suite-xml/src/test/java/testng/suiteXml/TestNGSuiteTest.java
deleted file mode 100644
index 0ebf3df..000
--- 
a/surefire-integration-tests/src/test/resources/testng-suite-xml/src/test/java/testng/suiteXml/TestNGSuiteTest.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package testng.suiteXml;
-
-/*
- * 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.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
-
-
-/**
- * Tests that forcing testng to run tests via the 
- * "${maven.test.forcetestng}" configuration option
- * works.
- * 
- * @author jkuhnert
- */
-public class TestNGSuiteTest {
-
-   /**
-* Sets up testObject
-*/
-   @BeforeClass
-   public void configureTest()
-   {
-   testObject = new Object();
-   }
-   
-   Object testObject;
-   
-   /**
-* Tests reporting an error
-*/
-   @Test
-   public void isTestObjectNull()
-   {
-   assert testObject != null : "testObject is null";
-   }
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/testng-testRunnerFactory/pom.xml
--
diff --git 
a/surefire-integration-tests/src/test/resources/testng-testRunnerFactory/pom.xml
 
b/surefire-integration-tests/src/test/resources/testng-testRunnerFactory/pom.xml
deleted file mode 100644
index 818d53e..000
--- 
a/surefire-integration-tests/src/test/resources/testng-testRunnerFactory/pom.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-
-
-
-http://maven.apache.org/POM/4.0.0;
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/xsd/maven-4.0.0.xsd;>
-  4.0.0
-
-  
-org.apache.maven.surefire
-it-parent
-1.0
-../pom.xml
-  
-
-  org.apache.maven.plugins.surefire
-  testng-testrunnerfactory
-  1.0
-  TestNG using custom test runner factory
-
-  
-
-  
-  org.testng
-  testng
-  5.10
-  jdk15
-  test
-
-  
-
-  
-
-  
-org.apache.maven.plugins
-maven-surefire-plugin
-
-  
-
-  testrunfactory
-  
testng.testrunnerfactory.TestNGCustomTestRunnerFactory
-
-  
-
-  
-
-  
-
-

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/testng-testRunnerFactory/src/test/java/testng/testrunnerfactory/FileHelper.java
--
diff --git 
a/surefire-integration-tests/src/test/resources/testng-testRunnerFactory/src/test/java/testng/testrunnerfactory/FileHelper.java
 
b/surefire-integration-tests/src/test/resources/testng-testRunnerFactory/src/test/java/testng/testrunnerfactory/FileHelper.java
deleted file mode 100644
index 4b998ed..000
--- 
a/surefire-integration-tests/src/test/resources/testng-testRunnerFactory/src/test/java/testng/testrunnerfactory/FileHelper.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package testng.testrunnerfactory;
-
-import java.io.File;
-import java.io.FileWriter;
-import java.io.IOException;
-
-public class FileHelper
-{
-public static void writeFile( String fileName, String content )
-{
-try
-{
-File target = new File( System.getProperty("user.dir"), "target" 
).getCanonicalFile();
-File listenerOutput = new File( target, fileName );
-FileWriter out = new FileWriter( listenerOutput, true );
-out.write( content );
-out.flush();
-out.close();
-}
-catch ( IOException 

[10/52] [abbrv] [partial] maven-surefire git commit: [SUREFIRE-1471] Too long Windows path cause CI issues. Renamed surefire-intergation-tests to surefire-its.

[tibordigana]

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/junit-fork-mode-always/src/test/java/junit4/forkMode/Test1.java
--
diff --git 
a/surefire-its/src/test/resources/junit-fork-mode-always/src/test/java/junit4/forkMode/Test1.java
 
b/surefire-its/src/test/resources/junit-fork-mode-always/src/test/java/junit4/forkMode/Test1.java
new file mode 100644
index 000..d206283
--- /dev/null
+++ 
b/surefire-its/src/test/resources/junit-fork-mode-always/src/test/java/junit4/forkMode/Test1.java
@@ -0,0 +1,60 @@
+package junit4.forkMode;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.lang.management.ManagementFactory;
+
+import org.junit.Test;
+
+public class Test1
+{
+
+@Test
+public void test1()
+throws IOException
+{
+dumpPidFile( "test1" );
+}
+
+public static void dumpPidFile( String name )
+throws IOException
+{
+String fileName = name + "-pid";
+File target = new File( "target" );
+if ( !( target.exists() && target.isDirectory() ) )
+{
+target = new File( "." );
+}
+File pidFile = new File( target, fileName );
+FileWriter fw = new FileWriter( pidFile );
+// DGF little known trick... this is guaranteed to be unique to the PID
+// In fact, it usually contains the pid and the local host name!
+String pid = ManagementFactory.getRuntimeMXBean().getName();
+fw.write( pid );
+fw.flush();
+fw.close();
+
+System.out.println( "pid = " + pid );
+}
+
+}

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/junit-fork-mode-always/src/test/java/junit4/forkMode/Test2.java
--
diff --git 
a/surefire-its/src/test/resources/junit-fork-mode-always/src/test/java/junit4/forkMode/Test2.java
 
b/surefire-its/src/test/resources/junit-fork-mode-always/src/test/java/junit4/forkMode/Test2.java
new file mode 100644
index 000..f57f1b8
--- /dev/null
+++ 
b/surefire-its/src/test/resources/junit-fork-mode-always/src/test/java/junit4/forkMode/Test2.java
@@ -0,0 +1,36 @@
+package junit4.forkMode;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import java.io.IOException;
+
+import org.junit.Test;
+
+public class Test2
+{
+
+@Test
+public void test2()
+throws IOException
+{
+Test1.dumpPidFile( "test2" );
+}
+
+}

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/junit-fork-mode-always/src/test/java/junit4/forkMode/Test3.java
--
diff --git 
a/surefire-its/src/test/resources/junit-fork-mode-always/src/test/java/junit4/forkMode/Test3.java
 
b/surefire-its/src/test/resources/junit-fork-mode-always/src/test/java/junit4/forkMode/Test3.java
new file mode 100644
index 000..af7f6fd
--- /dev/null
+++ 
b/surefire-its/src/test/resources/junit-fork-mode-always/src/test/java/junit4/forkMode/Test3.java
@@ -0,0 +1,36 @@
+package junit4.forkMode;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file

[29/52] [abbrv] [partial] maven-surefire git commit: [SUREFIRE-1471] Too long Windows path cause CI issues. Renamed surefire-intergation-tests to surefire-its.

[tibordigana]

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-649-systemProperties/src/test/java/jiras/surefire649/SystemPropertiesTest.java
--
diff --git 
a/surefire-integration-tests/src/test/resources/surefire-649-systemProperties/src/test/java/jiras/surefire649/SystemPropertiesTest.java
 
b/surefire-integration-tests/src/test/resources/surefire-649-systemProperties/src/test/java/jiras/surefire649/SystemPropertiesTest.java
deleted file mode 100644
index 27512df..000
--- 
a/surefire-integration-tests/src/test/resources/surefire-649-systemProperties/src/test/java/jiras/surefire649/SystemPropertiesTest.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package jiras.surefire649;
-
-/*
- * 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.junit.Test;
-
-public final class SystemPropertiesTest {
-
-@Test
-public void someMethod() throws InterruptedException {
-String prop = System.getProperty( "emptyProperty" );
-System.out.println( "emptyProperty=" + ( prop == null ? null : "'" + 
prop + "'" ) );
-}
-
-}

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-649-systemPropertyVariables/pom.xml
--
diff --git 
a/surefire-integration-tests/src/test/resources/surefire-649-systemPropertyVariables/pom.xml
 
b/surefire-integration-tests/src/test/resources/surefire-649-systemPropertyVariables/pom.xml
deleted file mode 100644
index e7a7fad..000
--- 
a/surefire-integration-tests/src/test/resources/surefire-649-systemPropertyVariables/pom.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-
-
-http://maven.apache.org/POM/4.0.0; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/xsd/maven-4.0.0.xsd;>
-  4.0.0
-  
-org.apache.maven.surefire
-it-parent
-1.0
-../pom.xml
-  
-  org.apache.maven.plugins.surefire
-  jiras-surefire-649-sys-prop-vars
-  1.0
-  http://maven.apache.org
-  
-
-  tibordigana
-  Tibor Digaňa (tibor17)
-  tibordig...@apache.org
-  
-Committer
-  
-  Europe/Bratislava
-
-  
-  
-
-  junit
-  junit
-  4.11
-  test
-
-  
-  
-
-  
-maven-surefire-plugin
-
-  
-
-  
-
-  
-
-  
-

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-649-systemPropertyVariables/src/test/java/jiras/surefire649/SystemPropertyVariablesTest.java
--
diff --git 
a/surefire-integration-tests/src/test/resources/surefire-649-systemPropertyVariables/src/test/java/jiras/surefire649/SystemPropertyVariablesTest.java
 
b/surefire-integration-tests/src/test/resources/surefire-649-systemPropertyVariables/src/test/java/jiras/surefire649/SystemPropertyVariablesTest.java
deleted file mode 100644
index e235b46..000
--- 
a/surefire-integration-tests/src/test/resources/surefire-649-systemPropertyVariables/src/test/java/jiras/surefire649/SystemPropertyVariablesTest.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package jiras.surefire649;
-
-/*
- * 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 

[28/52] [abbrv] [partial] maven-surefire git commit: [SUREFIRE-1471] Too long Windows path cause CI issues. Renamed surefire-intergation-tests to surefire-its.

[tibordigana]

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-772-no-failsafe-reports/target/surefire-reports/TEST-junit.twoTestCases.TestTwo.xml
--
diff --git 
a/surefire-integration-tests/src/test/resources/surefire-772-no-failsafe-reports/target/surefire-reports/TEST-junit.twoTestCases.TestTwo.xml
 
b/surefire-integration-tests/src/test/resources/surefire-772-no-failsafe-reports/target/surefire-reports/TEST-junit.twoTestCases.TestTwo.xml
deleted file mode 100644
index a7429aa..000
--- 
a/surefire-integration-tests/src/test/resources/surefire-772-no-failsafe-reports/target/surefire-reports/TEST-junit.twoTestCases.TestTwo.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-
-
-  
-
-
-
-
-
-http://java.sun.com/"/>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-http://java.sun.com/cgi-bin/bugreport.cgi"/>
-
-
-
-
-  
-  
-
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-772-no-reports/pom.xml
--
diff --git 
a/surefire-integration-tests/src/test/resources/surefire-772-no-reports/pom.xml 
b/surefire-integration-tests/src/test/resources/surefire-772-no-reports/pom.xml
deleted file mode 100644
index ab99166..000
--- 
a/surefire-integration-tests/src/test/resources/surefire-772-no-reports/pom.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-
-
-
-http://maven.apache.org/POM/4.0.0;
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/xsd/maven-4.0.0.xsd;>
-  4.0.0
-
-  org.apache.maven.plugins.surefire
-  junit-twoTestCases
-  1.0-SNAPSHOT
-  Test for two test cases
-
-  
-
-  junit
-  junit
-  3.8.1
-  test
-
-  
-
-  
-
-  
-org.apache.maven.plugins
-maven-surefire-report-plugin
-${surefire.version}
-true
-  
-  
-org.apache.maven.plugins
-maven-site-plugin
-3.1
-  
-
-  
-
-

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-772-no-surefire-reports/pom.xml
--
diff --git 
a/surefire-integration-tests/src/test/resources/surefire-772-no-surefire-reports/pom.xml
 
b/surefire-integration-tests/src/test/resources/surefire-772-no-surefire-reports/pom.xml
deleted file mode 100644
index 1d8df09..000
--- 
a/surefire-integration-tests/src/test/resources/surefire-772-no-surefire-reports/pom.xml
+++ /dev/null
@@ -1,91 +0,0 @@
-
-
-
-http://maven.apache.org/POM/4.0.0;
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/xsd/maven-4.0.0.xsd;>
-  4.0.0
-
-  org.apache.maven.plugins.surefire
-  junit-twoTestCases
-  1.0-SNAPSHOT
-  Test for two test cases
-
-  
-
-  junit
-  junit
-  3.8.1
-  test
-
-  
-
-  
-
-  
-org.apache.maven.plugins
-maven-surefire-report-plugin
-${surefire.version}
-true
-  
-  
-org.apache.maven.plugins
-maven-site-plugin
-3.1
-  
-
-  
-
-  
-
-  skipSurefire
-  
-
-  
-org.apache.maven.plugins
-maven-surefire-report-plugin
-${surefire.version}
-true
-
-  true
-
-  
-
-  
-
-
-  optionalSurefire
-  
-
-  
-org.apache.maven.plugins
-maven-surefire-report-plugin
-${surefire.version}
-true
-
-  
false
-
-  
-
-  
-
-  
-
-

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-772-no-surefire-reports/target/failsafe-reports/TEST-junit.twoTestCases.BasicTest.xml
--
diff --git 
a/surefire-integration-tests/src/test/resources/surefire-772-no-surefire-reports/target/failsafe-reports/TEST-junit.twoTestCases.BasicTest.xml
 
b/surefire-integration-tests/src/test/resources/surefire-772-no-surefire-reports/target/failsafe-reports/TEST-junit.twoTestCases.BasicTest.xml
deleted file mode 100644
index 4832590..000
--- 

[25/52] [abbrv] [partial] maven-surefire git commit: [SUREFIRE-1471] Too long Windows path cause CI issues. Renamed surefire-intergation-tests to surefire-its.

[tibordigana]

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-946-killMainProcessInReusableFork/pom.xml
--
diff --git 
a/surefire-integration-tests/src/test/resources/surefire-946-killMainProcessInReusableFork/pom.xml
 
b/surefire-integration-tests/src/test/resources/surefire-946-killMainProcessInReusableFork/pom.xml
deleted file mode 100644
index 53bb0a3..000
--- 
a/surefire-integration-tests/src/test/resources/surefire-946-killMainProcessInReusableFork/pom.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-
-
-http://maven.apache.org/POM/4.0.0; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
-   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/xsd/maven-4.0.0.xsd;>
-   4.0.0
-
-   org.apache.maven.plugins.surefire
-   surefire-946
-   1.0-SNAPSHOT
-   Tests killing the main maven process when using reusable 
forks
-
-   
-   1.7
-   1.7
-   
-
-   
-   
-   junit
-   junit
-   4.4
-   test
-   
-   
-
-   
-   
-   
-   
org.apache.maven.plugins.surefire
-   
maven-selfdestruct-plugin
-   0.1
-   
-   
${selfdestruct.timeoutInMillis}
-   
${selfdestruct.method}
-   
-   
-   
-   maven-surefire-plugin
-   ${surefire.version}
-   
-   
-   
-
-

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-946-killMainProcessInReusableFork/src/test/java/junit44/environment/Basic01Test.java
--
diff --git 
a/surefire-integration-tests/src/test/resources/surefire-946-killMainProcessInReusableFork/src/test/java/junit44/environment/Basic01Test.java
 
b/surefire-integration-tests/src/test/resources/surefire-946-killMainProcessInReusableFork/src/test/java/junit44/environment/Basic01Test.java
deleted file mode 100644
index 8c52d1b..000
--- 
a/surefire-integration-tests/src/test/resources/surefire-946-killMainProcessInReusableFork/src/test/java/junit44/environment/Basic01Test.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package junit44.environment;
-
-/*
- * 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.junit.AfterClass;
-import org.junit.Test;
-
-public class Basic01Test
-{
-
-@Test
-public void testNothing()
-{
-}
-
-@AfterClass
-public static void waitSomeTimeAround()
-{
-try
-{
-Thread.sleep( Integer.getInteger( "testSleepTime", 2000 ) );
-}
-catch ( InterruptedException ignored )
-{
-}
-}
-
-}

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-946-killMainProcessInReusableFork/src/test/java/junit44/environment/Basic02Test.java
--
diff --git 
a/surefire-integration-tests/src/test/resources/surefire-946-killMainProcessInReusableFork/src/test/java/junit44/environment/Basic02Test.java
 
b/surefire-integration-tests/src/test/resources/surefire-946-killMainProcessInReusableFork/src/test/java/junit44/environment/Basic02Test.java
deleted file mode 100644
index 6ef33f9..000
--- 
a/surefire-integration-tests/src/test/resources/surefire-946-killMainProcessInReusableFork/src/test/java/junit44/environment/Basic02Test.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package junit44.environment;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with 

[15/52] [abbrv] [partial] maven-surefire git commit: [SUREFIRE-1471] Too long Windows path cause CI issues. Renamed surefire-intergation-tests to surefire-its.

[tibordigana]

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire621TestCountingJunit3InParallelIT.java
--
diff --git 
a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire621TestCountingJunit3InParallelIT.java
 
b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire621TestCountingJunit3InParallelIT.java
new file mode 100644
index 000..a47b9d8
--- /dev/null
+++ 
b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire621TestCountingJunit3InParallelIT.java
@@ -0,0 +1,98 @@
+package org.apache.maven.surefire.its.jiras;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import org.apache.maven.surefire.its.fixture.SurefireJUnit4IntegrationTestCase;
+import org.junit.Test;
+
+/**
+ * SUREFIRE-621 Asserts proper test counts when running junit 3 tests in 
parallel
+ * SUREFIRE-1264 Some tests can be lost when running in parallel with 
parameterized tests
+ * 
+ * Removed decision making with JUnit3 in {@code TestSet} class during Jira 
activity of SUREFIRE-1264
+ * which results in one hot spot where the test class is determined (see 
JUnitCoreRunListener#fillTestCountMap()).
+ *
+ * @author Kristian Rosenvold
+ * @author mailto:tibordig...@apache.org;>Tibor Digana (tibor17)
+ */
+public class Surefire621TestCountingJunit3InParallelIT
+extends SurefireJUnit4IntegrationTestCase
+{
+/**
+ * SUREFIRE-1264
+ */
+@Test
+public void testJunit3AllParallelBuildResultCount()
+{
+unpack( "surefire-621-testCounting-junit3-in-parallel" )
+.activateProfile( "all-parallel-junit3-testcases" )
+.execute( "integration-test" )
+.assertTestSuiteResults( 6, 0, 0, 0 );
+}
+
+/**
+ * SUREFIRE-621
+ */
+@Test
+public void testJunit3ParallelBuildResultCount()
+{
+unpack( "surefire-621-testCounting-junit3-in-parallel" )
+.failNever()
+.activateProfile( "parallel-junit3-testcases" )
+.execute( "install" )
+.assertTestSuiteResults( 6, 0, 0, 0 );
+}
+
+/**
+ * SUREFIRE-1264
+ */
+@Test
+public void testJunit3BuildResultCount()
+{
+unpack( "surefire-621-testCounting-junit3-in-parallel" )
+.activateProfile( "junit3-testcases" )
+.execute( "integration-test" )
+.assertTestSuiteResults( 6, 0, 0, 0 );
+}
+
+/**
+ * SUREFIRE-1264
+ */
+@Test
+public void testJunit3ParallelSuiteBuildResultCount()
+{
+unpack( "surefire-621-testCounting-junit3-in-parallel" )
+.activateProfile( "parallel-junit3-testsuite" )
+.execute( "integration-test" )
+.assertTestSuiteResults( 6, 0, 0, 0 );
+}
+
+/**
+ * SUREFIRE-1264
+ */
+@Test
+public void testJunit3SuiteBuildResultCount()
+{
+unpack( "surefire-621-testCounting-junit3-in-parallel" )
+.activateProfile( "junit3-testsuite" )
+.execute( "integration-test" )
+.assertTestSuiteResults( 6, 0, 0, 0 );
+}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire628ConsoleOutputBeforeAndAfterClassIT.java
--
diff --git 
a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire628ConsoleOutputBeforeAndAfterClassIT.java
 
b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire628ConsoleOutputBeforeAndAfterClassIT.java
new file mode 100644
index 000..27f9572
--- /dev/null
+++ 
b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire628ConsoleOutputBeforeAndAfterClassIT.java
@@ -0,0 +1,48 @@
+package org.apache.maven.surefire.its.jiras;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this 

[04/52] [abbrv] [partial] maven-surefire git commit: [SUREFIRE-1471] Too long Windows path cause CI issues. Renamed surefire-intergation-tests to surefire-its.

[tibordigana]

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/surefire-1202-rerun-and-failfast/pom.xml
--
diff --git 
a/surefire-its/src/test/resources/surefire-1202-rerun-and-failfast/pom.xml 
b/surefire-its/src/test/resources/surefire-1202-rerun-and-failfast/pom.xml
new file mode 100644
index 000..4fb9d72
--- /dev/null
+++ b/surefire-its/src/test/resources/surefire-1202-rerun-and-failfast/pom.xml
@@ -0,0 +1,118 @@
+
+
+http://maven.apache.org/POM/4.0.0;
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/xsd/maven-4.0.0.xsd;>
+4.0.0
+
+org.apache.maven.plugins.surefire
+jiras-surefire-1202
+1.0
+
+http://maven.apache.org
+
+
+
+tibordigana
+Tibor Digaňa (tibor17)
+tibordig...@apache.org
+
+PMC
+
+Europe/Bratislava
+
+
+
+
+1.7
+1.7
+
+
+
+
+junit
+junit
+4.12
+test
+
+
+
+
+
+
+
+org.apache.maven.plugins
+maven-surefire-plugin
+${surefire.version}
+
+once
+1
+2
+3
+alphabetical
+
+
+
+
+
+
+
+
+junit47
+
+true
+
+
+
+
+org.apache.maven.plugins
+maven-surefire-plugin
+
+
+org.apache.maven.surefire
+surefire-junit47
+${surefire.version}
+
+
+
+
+
+
+
+junit4
+
+
+
+org.apache.maven.plugins
+maven-surefire-plugin
+
+
+org.apache.maven.surefire
+surefire-junit4
+${surefire.version}
+
+
+
+
+
+
+
+
+
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/surefire-1202-rerun-and-failfast/src/test/java/pkg/ATest.java
--
diff --git 
a/surefire-its/src/test/resources/surefire-1202-rerun-and-failfast/src/test/java/pkg/ATest.java
 
b/surefire-its/src/test/resources/surefire-1202-rerun-and-failfast/src/test/java/pkg/ATest.java
new file mode 100644
index 000..cbe3f6f
--- /dev/null
+++ 
b/surefire-its/src/test/resources/surefire-1202-rerun-and-failfast/src/test/java/pkg/ATest.java
@@ -0,0 +1,45 @@
+package pkg;
+
+/*
+ * 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.junit.Test;
+
+import static java.util.concurrent.TimeUnit.MILLISECONDS;
+import static java.util.concurrent.TimeUnit.SECONDS;
+
+public class ATest
+{
+private static int count;
+
+@Test
+public void testA()
+throws Exception
+{
+MILLISECONDS.sleep( 500 );
+if ( count++ != 2 )
+{
+throw new RuntimeException( "assert \"foo\" == \"bar\"\n"
++ " |\n"
++ " false"
+);
+}
+SECONDS.sleep( 5 );
+}
+}
\ No newline at end of file

[42/52] [abbrv] [partial] maven-surefire git commit: [SUREFIRE-1471] Too long Windows path cause CI issues. Renamed surefire-intergation-tests to surefire-its.

[tibordigana]

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire946KillMainProcessInReusableForkIT.java
--
diff --git 
a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire946KillMainProcessInReusableForkIT.java
 
b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire946KillMainProcessInReusableForkIT.java
deleted file mode 100644
index ea663ab..000
--- 
a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire946KillMainProcessInReusableForkIT.java
+++ /dev/null
@@ -1,71 +0,0 @@
-package org.apache.maven.surefire.its.jiras;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import org.apache.maven.surefire.its.fixture.SurefireJUnit4IntegrationTestCase;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-public class Surefire946KillMainProcessInReusableForkIT
-extends SurefireJUnit4IntegrationTestCase
-{
-
-// there are 10 test classes that each would wait 2 seconds.
-private static final int TEST_SLEEP_TIME = 2000;
-
-@BeforeClass
-public static void installSelfdestructPlugin()
-throws Exception
-{
-unpack( Surefire946KillMainProcessInReusableForkIT.class, 
"surefire-946-self-destruct-plugin", "plugin" ).executeInstall();
-}
-
-@Test( timeout = 3 )
-public void testHalt()
-throws Exception
-{
-doTest( "halt" );
-}
-
-@Test( timeout = 3 )
-public void testExit()
-throws Exception
-{
-doTest( "exit" );
-}
-
-@Test( timeout = 3 )
-public void testInterrupt()
-throws Exception
-{
-doTest( "interrupt" );
-}
-
-private void doTest( String method )
-{
-unpack( "surefire-946-killMainProcessInReusableFork" )
-.sysProp( "selfdestruct.timeoutInMillis", "5000" )
-.sysProp( "selfdestruct.method", method )
-.sysProp( "testSleepTime", String.valueOf( TEST_SLEEP_TIME ) )
-.addGoal( 
"org.apache.maven.plugins.surefire:maven-selfdestruct-plugin:selfdestruct" )
-.setForkJvm()
-.forkPerThread().threadCount( 1 ).reuseForks( true 
).maven().withFailure().executeTest();
-}
-}

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire972BizarreNoClassDefIT.java
--
diff --git 
a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire972BizarreNoClassDefIT.java
 
b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire972BizarreNoClassDefIT.java
deleted file mode 100644
index 94db9f8..000
--- 
a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire972BizarreNoClassDefIT.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package org.apache.maven.surefire.its.jiras;
-
-import org.apache.maven.surefire.its.fixture.SurefireJUnit4IntegrationTestCase;
-import org.junit.Test;
-
-/*
- * 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.
- */
-public class Surefire972BizarreNoClassDefIT
-extends SurefireJUnit4IntegrationTestCase
-{
-@Test
-public void 

[26/52] [abbrv] [partial] maven-surefire git commit: [SUREFIRE-1471] Too long Windows path cause CI issues. Renamed surefire-intergation-tests to surefire-its.

[tibordigana]

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-847-testngfail/pom.xml
--
diff --git 
a/surefire-integration-tests/src/test/resources/surefire-847-testngfail/pom.xml 
b/surefire-integration-tests/src/test/resources/surefire-847-testngfail/pom.xml
deleted file mode 100644
index 18cb679..000
--- 
a/surefire-integration-tests/src/test/resources/surefire-847-testngfail/pom.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-
-
-http://maven.apache.org/POM/4.0.0; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/xsd/maven-4.0.0.xsd;>
-  4.0.0
-  org.codehaus.jira
-  surefire-847
-  0.0.1-SNAPSHOT
-  
-
-  com.google.inject
-  guice
-  3.0
-  no_aop
-  test
-
-
-  org.testng
-  testng
-  6.5.1
-  test
-
-  
-  
-
-  
-org.apache.maven.plugins
-maven-surefire-plugin
-${surefire.version}
-
-  false
-  
${project.build.directory}/test-classes
-
-  
-
-
-  
-  
-
${basedir}/src/test/resources/suite.xml
-1.7
-1.7
-  
-

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-847-testngfail/src/test/java/org/codehaus/SomeFailedTest.java
--
diff --git 
a/surefire-integration-tests/src/test/resources/surefire-847-testngfail/src/test/java/org/codehaus/SomeFailedTest.java
 
b/surefire-integration-tests/src/test/resources/surefire-847-testngfail/src/test/java/org/codehaus/SomeFailedTest.java
deleted file mode 100644
index 5e6a3da..000
--- 
a/surefire-integration-tests/src/test/resources/surefire-847-testngfail/src/test/java/org/codehaus/SomeFailedTest.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package org.codehaus;
-
-/*
- * 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.testng.Assert;
-import org.testng.annotations.Test;
-
-@Test
-public class SomeFailedTest {
-   
-   @Test
-   public void failedTest() {
-   Assert.assertFalse(true);
-   }
-}

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-847-testngfail/src/test/java/org/codehaus/SomePassedTest.java
--
diff --git 
a/surefire-integration-tests/src/test/resources/surefire-847-testngfail/src/test/java/org/codehaus/SomePassedTest.java
 
b/surefire-integration-tests/src/test/resources/surefire-847-testngfail/src/test/java/org/codehaus/SomePassedTest.java
deleted file mode 100644
index 737f070..000
--- 
a/surefire-integration-tests/src/test/resources/surefire-847-testngfail/src/test/java/org/codehaus/SomePassedTest.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package org.codehaus;
-
-/*
- * 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.testng.Assert;
-import org.testng.annotations.Test;
-
-
-public class SomePassedTest {
-
-   @Test
-   public void passedTestA(){
-   Assert.assertTrue(true);
-   }
-   
-   
-}

[35/52] [abbrv] [partial] maven-surefire git commit: [SUREFIRE-1471] Too long Windows path cause CI issues. Renamed surefire-intergation-tests to surefire-its.

[tibordigana]

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/junit48-smartStackTrace/src/test/java/junit4/SmartStackTraceTest.java
--
diff --git 
a/surefire-integration-tests/src/test/resources/junit48-smartStackTrace/src/test/java/junit4/SmartStackTraceTest.java
 
b/surefire-integration-tests/src/test/resources/junit48-smartStackTrace/src/test/java/junit4/SmartStackTraceTest.java
deleted file mode 100644
index c367ef5..000
--- 
a/surefire-integration-tests/src/test/resources/junit48-smartStackTrace/src/test/java/junit4/SmartStackTraceTest.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package junit4;
-
-
-/*
- * 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.junit.After;
-import org.junit.AfterClass;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-
-import java.io.IOException;
-
-
-public class SmartStackTraceTest
-{
-
-@Test(expected = RuntimeException.class)
-public void shouldFailInMethodButDoesnt()
-{
-}
-
-@Test(expected = IOException.class)
-public void incorrectExceptionThrown()
-{
-throw new RuntimeException("We fail here");
-}
-
-@Test(expected = IOException.class)
-public void shortName()
-{
-}
-
-}

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/large-test-results/pom.xml
--
diff --git 
a/surefire-integration-tests/src/test/resources/large-test-results/pom.xml 
b/surefire-integration-tests/src/test/resources/large-test-results/pom.xml
deleted file mode 100644
index 36caa01..000
--- a/surefire-integration-tests/src/test/resources/large-test-results/pom.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-
-
-
-http://maven.apache.org/POM/4.0.0;
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/xsd/maven-4.0.0.xsd;>
-  4.0.0
-
-  org.apache.maven.plugins.surefire
-  large-test-results
-  1.0-SNAPSHOT
-  Test for large test results
-
-  
-
-  
-maven-surefire-plugin
-${surefire.version}
-
-  
-
numTests${numTests}
-  
-  -Xmx1024m
-
-  
-
-  
-
-  
-
-  junit
-  junit
-  3.8.1
-  test
-
-  
-
-

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/large-test-results/src/test/java/largeTestResults/BasicTest.java
--
diff --git 
a/surefire-integration-tests/src/test/resources/large-test-results/src/test/java/largeTestResults/BasicTest.java
 
b/surefire-integration-tests/src/test/resources/large-test-results/src/test/java/largeTestResults/BasicTest.java
deleted file mode 100644
index bdeeb04..000
--- 
a/surefire-integration-tests/src/test/resources/large-test-results/src/test/java/largeTestResults/BasicTest.java
+++ /dev/null
@@ -1,65 +0,0 @@
-package largeTestResults;
-
-/*
- * 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 junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-public class BasicTest
-extends TestCase
-{
-
-private final int number;
-
-public 

[32/52] [abbrv] [partial] maven-surefire git commit: [SUREFIRE-1471] Too long Windows path cause CI issues. Renamed surefire-intergation-tests to surefire-its.

[tibordigana]

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-1185/src/test/java/pkg/RunningTest.java
--
diff --git 
a/surefire-integration-tests/src/test/resources/surefire-1185/src/test/java/pkg/RunningTest.java
 
b/surefire-integration-tests/src/test/resources/surefire-1185/src/test/java/pkg/RunningTest.java
deleted file mode 100644
index 2469bd3..000
--- 
a/surefire-integration-tests/src/test/resources/surefire-1185/src/test/java/pkg/RunningTest.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package pkg;
-
-/*
- * 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.junit.Test;
-
-public class RunningTest {
-@Test
-public void test()
-{
-}
-}

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-1185/src/test/java/pkg/UnlistedTest.java
--
diff --git 
a/surefire-integration-tests/src/test/resources/surefire-1185/src/test/java/pkg/UnlistedTest.java
 
b/surefire-integration-tests/src/test/resources/surefire-1185/src/test/java/pkg/UnlistedTest.java
deleted file mode 100644
index 8348673..000
--- 
a/surefire-integration-tests/src/test/resources/surefire-1185/src/test/java/pkg/UnlistedTest.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package pkg;
-
-/*
- * 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.junit.Test;
-
-public class UnlistedTest {
-@Test
-public void test()
-{
-}
-}

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-1202-rerun-and-failfast/pom.xml
--
diff --git 
a/surefire-integration-tests/src/test/resources/surefire-1202-rerun-and-failfast/pom.xml
 
b/surefire-integration-tests/src/test/resources/surefire-1202-rerun-and-failfast/pom.xml
deleted file mode 100644
index 4fb9d72..000
--- 
a/surefire-integration-tests/src/test/resources/surefire-1202-rerun-and-failfast/pom.xml
+++ /dev/null
@@ -1,118 +0,0 @@
-
-
-http://maven.apache.org/POM/4.0.0;
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/xsd/maven-4.0.0.xsd;>
-4.0.0
-
-org.apache.maven.plugins.surefire
-jiras-surefire-1202
-1.0
-
-http://maven.apache.org
-
-
-
-tibordigana
-Tibor Digaňa (tibor17)
-tibordig...@apache.org
-
-PMC
-
-Europe/Bratislava
-
-
-
-
-1.7
-1.7
-
-
-
-
-junit
-junit
-4.12
-test
-
-
-
-
-
-
-
-org.apache.maven.plugins
-maven-surefire-plugin
-${surefire.version}
-
-once
-1
-2
-3
-alphabetical
-
-
-
-
-
-
-
-
-junit47
-
-true
-
-
-
-   

[30/52] [abbrv] [partial] maven-surefire git commit: [SUREFIRE-1471] Too long Windows path cause CI issues. Renamed surefire-intergation-tests to surefire-its.

[tibordigana]

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-510-testClassPath/pom.xml
--
diff --git 
a/surefire-integration-tests/src/test/resources/surefire-510-testClassPath/pom.xml
 
b/surefire-integration-tests/src/test/resources/surefire-510-testClassPath/pom.xml
deleted file mode 100644
index 5cb7b92..000
--- 
a/surefire-integration-tests/src/test/resources/surefire-510-testClassPath/pom.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-
-
-
-http://maven.apache.org/POM/4.0.0;
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/xsd/maven-4.0.0.xsd;>
-  4.0.0
-
-  org.apache.maven.plugins.surefire
-  Surefire-510-systemprops
-  1.0-SNAPSHOT
-  Surefire-510-systemprops
-
-  
-1.7
-1.7
-  
-
-  
-
-  
-maven-surefire-plugin
-${surefire.version}
-
-  ${forkMode}
-
-  
-
-  
-
-  
-
-  junit
-  junit
-  3.8.1
-  test
-
-  
-
-

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-510-testClassPath/src/test/java/surefire510/Test1.java
--
diff --git 
a/surefire-integration-tests/src/test/resources/surefire-510-testClassPath/src/test/java/surefire510/Test1.java
 
b/surefire-integration-tests/src/test/resources/surefire-510-testClassPath/src/test/java/surefire510/Test1.java
deleted file mode 100644
index 012b1fb..000
--- 
a/surefire-integration-tests/src/test/resources/surefire-510-testClassPath/src/test/java/surefire510/Test1.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package surefire510;
-
-/*
- * 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 junit.framework.TestCase;
-
-import java.io.IOException;
-
-public class Test1
-extends TestCase
-{
-
-public void test1()
-throws IOException
-{
-String tcp = System.getProperty( "surefire.test.class.path" );
-if ( tcp != null )
-{
-System.out.println( "tcp is set" );
-}
-}
-}

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-569-RunTestFromDependencyJars/module1/pom.xml
--
diff --git 
a/surefire-integration-tests/src/test/resources/surefire-569-RunTestFromDependencyJars/module1/pom.xml
 
b/surefire-integration-tests/src/test/resources/surefire-569-RunTestFromDependencyJars/module1/pom.xml
deleted file mode 100644
index d173770..000
--- 
a/surefire-integration-tests/src/test/resources/surefire-569-RunTestFromDependencyJars/module1/pom.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-http://maven.apache.org/POM/4.0.0; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
-xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/xsd/maven-4.0.0.xsd;>
-4.0.0
-
-
-org.apache.maven.surefire
-surefire-569-RunTestFromDependencyJars
-0.0.1-SNAPSHOT
-../
-
-
-org.apache.maven.plugins.surefire.dependency-jar
-module1
-0.0.1-SNAPSHOT
-
-
-
-junit
-junit
-4.8.1
-jar
-test
-
-
-
-org.apache.maven.plugins.surefire.dependency-jar
-testjar
-${project.version}
-tests
-test
-
-
-
-
-
-
-org.apache.maven.plugins
-maven-surefire-plugin
-
-
-**/*A*.java
-
-
-
org.apache.maven.plugins.surefire.dependency-jar:testjar
-
-
-
-
-
-
\ No newline at end of file

[01/52] [abbrv] [partial] maven-surefire git commit: [SUREFIRE-1471] Too long Windows path cause CI issues. Renamed surefire-intergation-tests to surefire-its.

[tibordigana]

Repository: maven-surefire
Updated Branches:
  refs/heads/master 5e732c6b2 -> eb210e08f


http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/surefire-674-buildFailingWhenErrors/src/test/java/resultcounting/Test2.java
--
diff --git 
a/surefire-its/src/test/resources/surefire-674-buildFailingWhenErrors/src/test/java/resultcounting/Test2.java
 
b/surefire-its/src/test/resources/surefire-674-buildFailingWhenErrors/src/test/java/resultcounting/Test2.java
new file mode 100644
index 000..26b218c
--- /dev/null
+++ 
b/surefire-its/src/test/resources/surefire-674-buildFailingWhenErrors/src/test/java/resultcounting/Test2.java
@@ -0,0 +1,36 @@
+package resultcounting;
+
+/*
+ * 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.junit.Test;
+
+/**
+ * A test that causes an error
+ * 
+ * @author Kristian Rosenvold
+ */
+public class Test2
+{
+@Test
+public void testWithException1()
+{
+throw new RuntimeException( "We expect this" );
+}
+}
\ No newline at end of file

[34/52] [abbrv] [partial] maven-surefire git commit: [SUREFIRE-1471] Too long Windows path cause CI issues. Renamed surefire-intergation-tests to surefire-its.

[tibordigana]

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/sibling-aggregator/aggregator/pom.xml
--
diff --git 
a/surefire-integration-tests/src/test/resources/sibling-aggregator/aggregator/pom.xml
 
b/surefire-integration-tests/src/test/resources/sibling-aggregator/aggregator/pom.xml
deleted file mode 100644
index b12b118..000
--- 
a/surefire-integration-tests/src/test/resources/sibling-aggregator/aggregator/pom.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-
-
-
-http://maven.apache.org/POM/4.0.0;
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/xsd/maven-4.0.0.xsd;>
-  4.0.0
-
-  org.apache.maven.plugins.surefire.its.sibling-aggregator
-  aggregator
-  1.0-SNAPSHOT
-  Test for aggregator whose modules are in ../child
-  pom
-
-  
-1.7
-1.7
-  
-
-  
-../child1
-../child2
-  
-  
-  
-
-  
-maven-surefire-plugin
-${surefire.version}
-  
-
-  
-  
-
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/sibling-aggregator/child1/pom.xml
--
diff --git 
a/surefire-integration-tests/src/test/resources/sibling-aggregator/child1/pom.xml
 
b/surefire-integration-tests/src/test/resources/sibling-aggregator/child1/pom.xml
deleted file mode 100644
index be2f9df..000
--- 
a/surefire-integration-tests/src/test/resources/sibling-aggregator/child1/pom.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-
-
-
-http://maven.apache.org/POM/4.0.0;
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/xsd/maven-4.0.0.xsd;>
-  4.0.0
-
-  org.apache.maven.plugins.surefire.its.sibling-aggregator
-  child1
-  1.0-SNAPSHOT
-  Test for aggregated child1
-
-  
-1.7
-1.7
-  
-
-  
-
-  junit
-  junit
-  3.8.1
-  test
-
-  
-
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/sibling-aggregator/child1/src/main/java/siblingAggregator/FooHolder.java
--
diff --git 
a/surefire-integration-tests/src/test/resources/sibling-aggregator/child1/src/main/java/siblingAggregator/FooHolder.java
 
b/surefire-integration-tests/src/test/resources/sibling-aggregator/child1/src/main/java/siblingAggregator/FooHolder.java
deleted file mode 100644
index ec5d886..000
--- 
a/surefire-integration-tests/src/test/resources/sibling-aggregator/child1/src/main/java/siblingAggregator/FooHolder.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package siblingAggregator;
-
-/*
- * 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.
- */
-
-public class FooHolder {
-public static String getFoo() { return "foo"; }
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/sibling-aggregator/child2/pom.xml
--
diff --git 
a/surefire-integration-tests/src/test/resources/sibling-aggregator/child2/pom.xml
 
b/surefire-integration-tests/src/test/resources/sibling-aggregator/child2/pom.xml
deleted file mode 100644
index b8c21bf..000
--- 
a/surefire-integration-tests/src/test/resources/sibling-aggregator/child2/pom.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-
-
-
-http://maven.apache.org/POM/4.0.0;
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/xsd/maven-4.0.0.xsd;>
-  4.0.0
-
-  org.apache.maven.plugins.surefire.its.sibling-aggregator
-  child2
-  1.0-SNAPSHOT
-  Test for aggregated child2
-
-  
-1.7
-1.7
-  
-
-  
-
-  
org.apache.maven.plugins.surefire.its.sibling-aggregator
-  child1
-  1.0-SNAPSHOT
-
-
-  junit
-  junit
-  3.8.1
-  test

[14/52] [abbrv] [partial] maven-surefire git commit: [SUREFIRE-1471] Too long Windows path cause CI issues. Renamed surefire-intergation-tests to surefire-its.

[tibordigana]

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire901MIssingResultfileWhenNoTestsIT.java
--
diff --git 
a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire901MIssingResultfileWhenNoTestsIT.java
 
b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire901MIssingResultfileWhenNoTestsIT.java
new file mode 100644
index 000..14e278e
--- /dev/null
+++ 
b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire901MIssingResultfileWhenNoTestsIT.java
@@ -0,0 +1,39 @@
+package org.apache.maven.surefire.its.jiras;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import org.apache.maven.surefire.its.fixture.SurefireJUnit4IntegrationTestCase;
+
+import org.junit.Test;
+
+/**
+ * Failsafe should work with early return when no tests
+ * s
+ */
+public class Surefire901MIssingResultfileWhenNoTestsIT
+extends SurefireJUnit4IntegrationTestCase
+{
+@Test
+public void failsafeWithNoTests()
+{
+unpack( "failsafe-notests" ).executeVerify();
+}
+
+}

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire907PerThreadWithoutThreadCountIT.java
--
diff --git 
a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire907PerThreadWithoutThreadCountIT.java
 
b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire907PerThreadWithoutThreadCountIT.java
new file mode 100755
index 000..8317c52
--- /dev/null
+++ 
b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire907PerThreadWithoutThreadCountIT.java
@@ -0,0 +1,42 @@
+package org.apache.maven.surefire.its.jiras;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import org.apache.maven.surefire.its.fixture.OutputValidator;
+import org.apache.maven.surefire.its.fixture.SurefireJUnit4IntegrationTestCase;
+
+import org.junit.Test;
+
+public class Surefire907PerThreadWithoutThreadCountIT
+extends SurefireJUnit4IntegrationTestCase
+{
+@Test
+public void categoryAB()
+{
+OutputValidator validator = unpack( "fork-mode" )
+.forkPerThread()
+.reuseForks( false )
+.maven()
+.withFailure()
+.executeTest();
+
+validator.verifyTextInLog( "Fork mode perthread requires a thread 
count" );
+}
+
+}

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire920TestFailureIgnoreWithTimeoutIT.java
--
diff --git 
a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire920TestFailureIgnoreWithTimeoutIT.java
 
b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire920TestFailureIgnoreWithTimeoutIT.java
new file mode 100755
index 000..4f60895
--- /dev/null
+++ 
b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire920TestFailureIgnoreWithTimeoutIT.java
@@ -0,0 +1,45 @@
+package org.apache.maven.surefire.its.jiras;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license 

[19/52] [abbrv] [partial] maven-surefire git commit: [SUREFIRE-1471] Too long Windows path cause CI issues. Renamed surefire-intergation-tests to surefire-its.

[tibordigana]

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/java/org/apache/maven/surefire/its/JUnit4RerunFailingTestsIT.java
--
diff --git 
a/surefire-its/src/test/java/org/apache/maven/surefire/its/JUnit4RerunFailingTestsIT.java
 
b/surefire-its/src/test/java/org/apache/maven/surefire/its/JUnit4RerunFailingTestsIT.java
new file mode 100644
index 000..7d6f560
--- /dev/null
+++ 
b/surefire-its/src/test/java/org/apache/maven/surefire/its/JUnit4RerunFailingTestsIT.java
@@ -0,0 +1,278 @@
+package org.apache.maven.surefire.its;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import org.apache.maven.surefire.its.fixture.OutputValidator;
+import org.apache.maven.surefire.its.fixture.SurefireJUnit4IntegrationTestCase;
+import org.apache.maven.surefire.its.fixture.SurefireLauncher;
+import org.junit.Test;
+
+/**
+ * JUnit4 RunListener Integration Test.
+ *
+ * @author mailto:qingzhou...@google.com;>Qingzhou Luo
+ */
+public class JUnit4RerunFailingTestsIT
+extends SurefireJUnit4IntegrationTestCase
+{
+private SurefireLauncher unpack()
+{
+return unpack( "/junit4-rerun-failing-tests" );
+}
+
+@Test
+public void testRerunFailingErrorTestsWithOneRetry()
+throws Exception
+{
+OutputValidator outputValidator =
+unpack().addGoal( "-Dprovider=surefire-junit4" ).setJUnitVersion( 
"4.12" ).maven().addGoal(
+"-Dsurefire.rerunFailingTestsCount=1" 
).withFailure().executeTest().assertTestSuiteResults( 5, 1, 1, 0,
+   
 0 );
+verifyFailuresOneRetryAllClasses( outputValidator );
+
+outputValidator = unpack().addGoal( "-Dprovider=surefire-junit4" 
).setJUnitVersion( "4.12" ).maven().addGoal(
+"-Dsurefire.rerunFailingTestsCount=1" ).addGoal(
+"-DforkCount=2" 
).withFailure().executeTest().assertTestSuiteResults( 5, 1, 1, 0, 0 );
+verifyFailuresOneRetryAllClasses( outputValidator );
+
+outputValidator = unpack().addGoal( "-Dprovider=surefire-junit4" 
).setJUnitVersion( "4.12" ).maven().addGoal(
+"-Dsurefire.rerunFailingTestsCount=1" ).addGoal( 
"-Dparallel=methods" ).addGoal(
+"-DuseUnlimitedThreads=true" 
).withFailure().executeTest().assertTestSuiteResults( 5, 1, 1, 0, 0 );
+verifyFailuresOneRetryAllClasses( outputValidator );
+
+outputValidator = unpack().addGoal( "-Dprovider=surefire-junit4" 
).setJUnitVersion( "4.12" ).maven().addGoal(
+"-Dsurefire.rerunFailingTestsCount=1" ).addGoal( 
"-Dparallel=classes" ).addGoal(
+"-DuseUnlimitedThreads=true" 
).withFailure().executeTest().assertTestSuiteResults( 5, 1, 1, 0, 0 );
+verifyFailuresOneRetryAllClasses( outputValidator );
+}
+
+@Test
+public void testRerunFailingErrorTestsTwoRetry()
+throws Exception
+{
+// Four flakes, both tests have been re-run twice
+OutputValidator outputValidator =
+unpack().addGoal( "-Dprovider=surefire-junit4" ).setJUnitVersion( 
"4.12" ).maven().addGoal(
+"-Dsurefire.rerunFailingTestsCount=2" 
).executeTest().assertTestSuiteResults( 5, 0, 0, 0, 4 );
+
+verifyFailuresTwoRetryAllClasses( outputValidator );
+
+outputValidator = unpack().addGoal( "-Dprovider=surefire-junit4" 
).setJUnitVersion( "4.12" ).maven().addGoal(
+"-Dsurefire.rerunFailingTestsCount=2" ).addGoal( "-DforkCount=3" 
).executeTest()
+.assertTestSuiteResults( 5, 0, 0, 0, 4 );
+
+verifyFailuresTwoRetryAllClasses( outputValidator );
+
+outputValidator = unpack().addGoal( "-Dprovider=surefire-junit4" 
).setJUnitVersion( "4.12" ).maven().addGoal(
+"-Dsurefire.rerunFailingTestsCount=2" ).addGoal( 
"-Dparallel=methods" ).addGoal(
+"-DuseUnlimitedThreads=true" 
).executeTest().assertTestSuiteResults( 5, 0, 0, 0, 4 );
+
+verifyFailuresTwoRetryAllClasses( outputValidator );
+
+outputValidator = unpack().addGoal( "-Dprovider=surefire-junit4" 
).setJUnitVersion( 

[05/52] [abbrv] [partial] maven-surefire git commit: [SUREFIRE-1471] Too long Windows path cause CI issues. Renamed surefire-intergation-tests to surefire-its.

[tibordigana]

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/surefire-1095-npe-in-runlistener/src/test/java/jiras/surefire1095/Listener.java
--
diff --git 
a/surefire-its/src/test/resources/surefire-1095-npe-in-runlistener/src/test/java/jiras/surefire1095/Listener.java
 
b/surefire-its/src/test/resources/surefire-1095-npe-in-runlistener/src/test/java/jiras/surefire1095/Listener.java
new file mode 100644
index 000..f16c04a
--- /dev/null
+++ 
b/surefire-its/src/test/resources/surefire-1095-npe-in-runlistener/src/test/java/jiras/surefire1095/Listener.java
@@ -0,0 +1,38 @@
+package jiras.surefire1095;
+
+/*
+ * 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.junit.runner.Description;
+import org.junit.runner.notification.RunListener;
+
+public class Listener
+extends RunListener
+{
+@Override
+public void testRunStarted( Description description )
+throws Exception
+{
+String described = description.getDisplayName();
+System.out.println( "testRunStarted " +
+( described == null || described.equals( 
"null" )
+? description.getChildren()
+: description ) );
+}
+}

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/surefire-1095-npe-in-runlistener/src/test/java/jiras/surefire1095/SomeTest.java
--
diff --git 
a/surefire-its/src/test/resources/surefire-1095-npe-in-runlistener/src/test/java/jiras/surefire1095/SomeTest.java
 
b/surefire-its/src/test/resources/surefire-1095-npe-in-runlistener/src/test/java/jiras/surefire1095/SomeTest.java
new file mode 100644
index 000..923917a
--- /dev/null
+++ 
b/surefire-its/src/test/resources/surefire-1095-npe-in-runlistener/src/test/java/jiras/surefire1095/SomeTest.java
@@ -0,0 +1,31 @@
+package jiras.surefire1095;
+
+/*
+ * 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 junit.runner.Version;
+import org.junit.Test;
+
+public class SomeTest {
+@Test
+public void test()
+{
+System.out.println( "Running JUnit " + Version.id() );
+}
+}

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/surefire-1098-balanced-runorder/pom.xml
--
diff --git 
a/surefire-its/src/test/resources/surefire-1098-balanced-runorder/pom.xml 
b/surefire-its/src/test/resources/surefire-1098-balanced-runorder/pom.xml
new file mode 100644
index 000..75f1c8e
--- /dev/null
+++ b/surefire-its/src/test/resources/surefire-1098-balanced-runorder/pom.xml
@@ -0,0 +1,62 @@
+
+
+http://maven.apache.org/POM/4.0.0; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/xsd/maven-4.0.0.xsd;>
+  4.0.0
+  
+org.apache.maven.surefire
+it-parent
+1.0
+../pom.xml
+  
+  org.apache.maven.plugins.surefire
+  jiras-surefire-1098
+  1.0
+  http://maven.apache.org
+  
+
+  tibordigana
+  Tibor Digaňa (tibor17)
+  tibordig...@apache.org
+  
+Committer
+  
+  Europe/Bratislava
+
+  
+  
+
+  junit
+  junit
+  4.7
+  test

[08/52] [abbrv] [partial] maven-surefire git commit: [SUREFIRE-1471] Too long Windows path cause CI issues. Renamed surefire-intergation-tests to surefire-its.

[tibordigana]

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/junit47-parallel/src/test/java/surefireparallel/Waiting7Test.java
--
diff --git 
a/surefire-its/src/test/resources/junit47-parallel/src/test/java/surefireparallel/Waiting7Test.java
 
b/surefire-its/src/test/resources/junit47-parallel/src/test/java/surefireparallel/Waiting7Test.java
new file mode 100644
index 000..ca00a6a
--- /dev/null
+++ 
b/surefire-its/src/test/resources/junit47-parallel/src/test/java/surefireparallel/Waiting7Test.java
@@ -0,0 +1,50 @@
+package surefireparallel;
+
+/*
+ * 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.junit.Test;
+
+/**
+ * @author Tibor Digana (tibor17)
+ * @since 2.16
+ */
+public class Waiting7Test
+{
+@Test
+public void a()
+throws InterruptedException
+{
+Thread.sleep( 300L );
+}
+
+@Test
+public void b()
+throws InterruptedException
+{
+Thread.sleep( 300L );
+}
+
+@Test
+public void c()
+throws InterruptedException
+{
+Thread.sleep( 300L );
+}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/junit47-parallel/src/test/java/surefireparallel/Waiting8Test.java
--
diff --git 
a/surefire-its/src/test/resources/junit47-parallel/src/test/java/surefireparallel/Waiting8Test.java
 
b/surefire-its/src/test/resources/junit47-parallel/src/test/java/surefireparallel/Waiting8Test.java
new file mode 100644
index 000..96d1c66
--- /dev/null
+++ 
b/surefire-its/src/test/resources/junit47-parallel/src/test/java/surefireparallel/Waiting8Test.java
@@ -0,0 +1,50 @@
+package surefireparallel;
+
+/*
+ * 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.junit.Test;
+
+/**
+ * @author Tibor Digana (tibor17)
+ * @since 2.16
+ */
+public class Waiting8Test
+{
+@Test
+public void a()
+throws InterruptedException
+{
+Thread.sleep( 300L );
+}
+
+@Test
+public void b()
+throws InterruptedException
+{
+Thread.sleep( 300L );
+}
+
+@Test
+public void c()
+throws InterruptedException
+{
+Thread.sleep( 300L );
+}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/junit47-redirect-output/pom.xml
--
diff --git a/surefire-its/src/test/resources/junit47-redirect-output/pom.xml 
b/surefire-its/src/test/resources/junit47-redirect-output/pom.xml
new file mode 100644
index 000..38ec727
--- /dev/null
+++ b/surefire-its/src/test/resources/junit47-redirect-output/pom.xml
@@ -0,0 +1,58 @@
+http://maven.apache.org/POM/4.0.0; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/xsd/maven-4.0.0.xsd;>
+  4.0.0
+  org.apache.maven.plugins.surefire
+  fork-consoleOutput
+  jar
+  1.0-SNAPSHOT
+  fork-consoleOutput
+  http://maven.apache.org
+
+  
+  
+  junit
+  junit
+  ${junit.version}
+  
+  
+  
+ 
+
+   org.apache.maven.plugins
+   maven-surefire-plugin
+   

[20/52] [abbrv] [partial] maven-surefire git commit: [SUREFIRE-1471] Too long Windows path cause CI issues. Renamed surefire-intergation-tests to surefire-its.

[tibordigana]

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/java/org/apache/maven/surefire/its/ForkConsoleOutputIT.java
--
diff --git 
a/surefire-its/src/test/java/org/apache/maven/surefire/its/ForkConsoleOutputIT.java
 
b/surefire-its/src/test/java/org/apache/maven/surefire/its/ForkConsoleOutputIT.java
new file mode 100644
index 000..6aac330
--- /dev/null
+++ 
b/surefire-its/src/test/java/org/apache/maven/surefire/its/ForkConsoleOutputIT.java
@@ -0,0 +1,87 @@
+package org.apache.maven.surefire.its;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import org.apache.maven.surefire.its.fixture.SurefireJUnit4IntegrationTestCase;
+import org.apache.maven.surefire.its.fixture.SurefireLauncher;
+import org.junit.Test;
+
+/**
+ * Asserts proper behaviour of console output when forking
+ * SUREFIRE-639
+ * SUREFIRE-651
+ *
+ * @author Kristian Rosenvold
+ */
+public class ForkConsoleOutputIT
+extends SurefireJUnit4IntegrationTestCase
+{
+@Test
+public void printSummaryTrueWithRedirect()
+{
+unpack().setForkJvm()
+.redirectToFile( true )
+.printSummary( true )
+.executeTest()
+.getSurefireReportsFile( "forkConsoleOutput.Test1-output.txt" )
+.assertFileExists();
+}
+
+@Test
+public void printSummaryTrueWithoutRedirect()
+{
+unpack().setForkJvm()
+.redirectToFile( false )
+.printSummary( true )
+.executeTest()
+.getSurefireReportsFile( "forkConsoleOutput.Test1-output.txt" )
+.assertFileNotExists();
+}
+
+@Test
+public void printSummaryFalseWithRedirect()
+{
+unpack().setForkJvm()
+.redirectToFile( true )
+.printSummary( false )
+.debugLogging()
+.showErrorStackTraces()
+.executeTest()
+.getSurefireReportsFile( "forkConsoleOutput.Test1-output.txt" )
+.assertFileExists();
+}
+
+@Test
+public void printSummaryFalseWithoutRedirect()
+{
+unpack().setForkJvm()
+.redirectToFile( false )
+.printSummary( false )
+.executeTest()
+.getSurefireReportsFile( "forkConsoleOutput.Test1-output.txt" )
+.assertFileNotExists();
+}
+
+
+private SurefireLauncher unpack()
+{
+return unpack( "/fork-consoleOutput" );
+}
+}

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

[03/52] [abbrv] [partial] maven-surefire git commit: [SUREFIRE-1471] Too long Windows path cause CI issues. Renamed surefire-intergation-tests to surefire-its.

[tibordigana]

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/surefire-141-pluggableproviders-provider/pom.xml
--
diff --git 
a/surefire-its/src/test/resources/surefire-141-pluggableproviders-provider/pom.xml
 
b/surefire-its/src/test/resources/surefire-141-pluggableproviders-provider/pom.xml
new file mode 100644
index 000..10a40c4
--- /dev/null
+++ 
b/surefire-its/src/test/resources/surefire-141-pluggableproviders-provider/pom.xml
@@ -0,0 +1,51 @@
+
+
+http://maven.apache.org/POM/4.0.0; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/xsd/maven-4.0.0.xsd;>
+  4.0.0
+
+  org.apache.maven.plugins.surefire
+  surefire-test-provider
+  1.0-SNAPSHOT
+  Test provider
+
+  
+1.7
+1.7
+  
+
+  
+
+  org.apache.maven.surefire
+  surefire-api
+  ${surefire.version}
+
+  
+
+  
+
+  
+src/main/resources/META-INF
+META-INF
+  
+
+  
+
+

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/surefire-141-pluggableproviders-provider/src/main/java/org/apache/maven/surefire/testprovider/TestProvider.java
--
diff --git 
a/surefire-its/src/test/resources/surefire-141-pluggableproviders-provider/src/main/java/org/apache/maven/surefire/testprovider/TestProvider.java
 
b/surefire-its/src/test/resources/surefire-141-pluggableproviders-provider/src/main/java/org/apache/maven/surefire/testprovider/TestProvider.java
new file mode 100644
index 000..79b2ceb
--- /dev/null
+++ 
b/surefire-its/src/test/resources/surefire-141-pluggableproviders-provider/src/main/java/org/apache/maven/surefire/testprovider/TestProvider.java
@@ -0,0 +1,75 @@
+package org.apache.maven.surefire.testprovider;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import org.apache.maven.surefire.providerapi.AbstractProvider;
+import org.apache.maven.surefire.providerapi.ProviderParameters;
+import org.apache.maven.surefire.report.ReporterException;
+import org.apache.maven.surefire.suite.RunResult;
+import org.apache.maven.surefire.testset.TestSetFailedException;
+
+/**
+ * @author Kristian Rosenvold
+ */
+public class TestProvider
+extends AbstractProvider
+{
+
+public TestProvider( ProviderParameters booterParameters )
+{
+invokeRuntimeExceptionIfSet( System.getProperty( "constructorCrash" ) 
);
+}
+
+public Iterable getSuites()
+{
+invokeRuntimeExceptionIfSet( System.getProperty( "getSuitesCrash" ) );
+return null;
+}
+
+public RunResult invoke( Object forkTestSet )
+throws TestSetFailedException, ReporterException
+{
+throwIfSet( System.getProperty( "invokeCrash" ) );
+return new RunResult( 1, 0, 0, 2 );
+}
+
+private void throwIfSet( String throwError )
+throws TestSetFailedException, ReporterException
+{
+if ( "testSetFailed".equals( throwError ) )
+{
+throw new TestSetFailedException( "Let's fail" );
+}
+if ( "reporterException".equals( throwError ) )
+{
+throw new ReporterException( "Let's fail with a 
reporterexception", new RuntimeException() );
+}
+
+invokeRuntimeExceptionIfSet( throwError );
+}
+
+private void invokeRuntimeExceptionIfSet( String throwError )
+{
+if ( "runtimeException".equals( throwError ) )
+{
+throw new RuntimeException( "Let's fail with a runtimeException" );
+}
+}
+}

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/surefire-141-pluggableproviders-provider/src/main/resources/META-INF/services/org.apache.maven.surefire.providerapi.SurefireProvider
--
diff --git 
a/surefire-its/src/test/resources/surefire-141-pluggableproviders-provider/src/main/resources/META-INF/services/org.apache.maven.surefire.providerapi.SurefireProvider
 

[18/52] [abbrv] [partial] maven-surefire git commit: [SUREFIRE-1471] Too long Windows path cause CI issues. Renamed surefire-intergation-tests to surefire-its.

[tibordigana]

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/java/org/apache/maven/surefire/its/TimeoutForkedTestIT.java
--
diff --git 
a/surefire-its/src/test/java/org/apache/maven/surefire/its/TimeoutForkedTestIT.java
 
b/surefire-its/src/test/java/org/apache/maven/surefire/its/TimeoutForkedTestIT.java
new file mode 100644
index 000..fdcea20
--- /dev/null
+++ 
b/surefire-its/src/test/java/org/apache/maven/surefire/its/TimeoutForkedTestIT.java
@@ -0,0 +1,43 @@
+package org.apache.maven.surefire.its;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import org.apache.maven.surefire.its.fixture.SurefireJUnit4IntegrationTestCase;
+import org.junit.Test;
+
+/**
+ * Test
+ *
+ * @author mailto:dfabul...@apache.org;>Dan Fabulich
+ */
+public class TimeoutForkedTestIT
+extends SurefireJUnit4IntegrationTestCase
+{
+@Test
+public void testTimeoutForked()
+throws Exception
+{
+unpack( "/timeout-forked" ).addGoal( "-DsleepLength=1" ).addGoal(
+"-DforkTimeout=1" ).maven().withFailure().executeTest();
+// SUREFIRE-468 test that had to be reverted due to SUREFIRE-705
+//assertFalse( getSurefireReportsFile( 
"TEST-timeoutForked.BasicTest.xml" ).exists() );
+// assertFalse( getSurefireReportsFile( "timeoutForked.BasicTest.txt" 
).exists() );
+}
+}

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/java/org/apache/maven/surefire/its/TwoTestCasesIT.java
--
diff --git 
a/surefire-its/src/test/java/org/apache/maven/surefire/its/TwoTestCasesIT.java 
b/surefire-its/src/test/java/org/apache/maven/surefire/its/TwoTestCasesIT.java
new file mode 100644
index 000..c218769
--- /dev/null
+++ 
b/surefire-its/src/test/java/org/apache/maven/surefire/its/TwoTestCasesIT.java
@@ -0,0 +1,130 @@
+package org.apache.maven.surefire.its;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import org.apache.maven.plugins.surefire.report.ReportTestSuite;
+import org.apache.maven.surefire.its.fixture.*;
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
+
+/**
+ * Test running two test cases; confirms reporting works correctly
+ *
+ * @author mailto:dfabul...@apache.org;>Dan Fabulich
+ */
+public class TwoTestCasesIT
+extends SurefireJUnit4IntegrationTestCase
+{
+@Test
+public void testTwoTestCases()
+throws Exception
+{
+unpack( "junit-twoTestCases" )
+.sysProp( "testNgVersion", "5.7" )
+.sysProp( "testNgClassifier", "jdk15" )
+.executeTest()
+.verifyErrorFreeLog()
+.assertTestSuiteResults( 2, 0, 0, 0 );
+}
+
+/**
+ * Runs two tests encapsulated in a suite
+ */
+@Test
+public void testTwoTestCaseSuite()
+throws Exception
+{
+final OutputValidator outputValidator = unpack( 
"junit-twoTestCaseSuite" )
+.sysProp( 
"testNgVersion", "5.7" )
+.sysProp( 
"testNgClassifier", "jdk15" )
+

[13/52] [abbrv] [partial] maven-surefire git commit: [SUREFIRE-1471] Too long Windows path cause CI issues. Renamed surefire-intergation-tests to surefire-its.

[tibordigana]

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/classpath-order/src/main/resources/surefire-classpath-order.properties
--
diff --git 
a/surefire-its/src/test/resources/classpath-order/src/main/resources/surefire-classpath-order.properties
 
b/surefire-its/src/test/resources/classpath-order/src/main/resources/surefire-classpath-order.properties
new file mode 100644
index 000..10493b4
--- /dev/null
+++ 
b/surefire-its/src/test/resources/classpath-order/src/main/resources/surefire-classpath-order.properties
@@ -0,0 +1,2 @@
+# This file collides with the equally named file from the project's test 
resources
+Surefire: classes

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/classpath-order/src/main/resources/surefire-report.properties
--
diff --git 
a/surefire-its/src/test/resources/classpath-order/src/main/resources/surefire-report.properties
 
b/surefire-its/src/test/resources/classpath-order/src/main/resources/surefire-report.properties
new file mode 100644
index 000..585dd8b
--- /dev/null
+++ 
b/surefire-its/src/test/resources/classpath-order/src/main/resources/surefire-report.properties
@@ -0,0 +1,2 @@
+# This file collides with the equally named i18n bundle in the Surefire Report 
Plugin
+Surefire: classes

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/classpath-order/src/test/java/it/BasicTest.java
--
diff --git 
a/surefire-its/src/test/resources/classpath-order/src/test/java/it/BasicTest.java
 
b/surefire-its/src/test/resources/classpath-order/src/test/java/it/BasicTest.java
new file mode 100644
index 000..739e134
--- /dev/null
+++ 
b/surefire-its/src/test/resources/classpath-order/src/test/java/it/BasicTest.java
@@ -0,0 +1,61 @@
+package it;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import java.io.InputStream;
+import java.io.IOException;
+import java.util.Properties;
+
+import junit.framework.TestCase;
+
+public class BasicTest
+extends TestCase
+{
+
+public void testTestClassesBeforeMainClasses()
+{
+Properties props = getProperties( 
"/surefire-classpath-order.properties" );
+assertEquals( "test-classes", props.getProperty( "Surefire" ) );
+}
+
+public void testMainClassesBeforeDependencies()
+{
+Properties props = getProperties( "/surefire-report.properties" );
+assertEquals( "classes", props.getProperty( "Surefire" ) );
+}
+
+private Properties getProperties(String resource)
+{
+InputStream in = getClass().getResourceAsStream( resource );
+assertNotNull( in );
+try
+{
+   Properties props = new Properties();
+   props.load( in );
+   return props;
+}
+catch (IOException e)
+{
+fail(e.toString());
+return null;
+}
+}
+
+}

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/classpath-order/src/test/resources/surefire-classpath-order.properties
--
diff --git 
a/surefire-its/src/test/resources/classpath-order/src/test/resources/surefire-classpath-order.properties
 
b/surefire-its/src/test/resources/classpath-order/src/test/resources/surefire-classpath-order.properties
new file mode 100644
index 000..246cf2c
--- /dev/null
+++ 
b/surefire-its/src/test/resources/classpath-order/src/test/resources/surefire-classpath-order.properties
@@ -0,0 +1,2 @@
+# This file collides with the equally named file from the project's main 
resources
+Surefire: test-classes

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/classpath-scope-filtering/pom.xml
--
diff --git a/surefire-its/src/test/resources/classpath-scope-filtering/pom.xml 

[1/3] maven-surefire git commit: Revert "add a jdk10 profile to not run jacoco as it does not work yet for jdk10"

[tibordigana]

Repository: maven-surefire
Updated Branches:
  refs/heads/master 4ec99792c -> 5e732c6b2


Revert "add a jdk10 profile to not run jacoco as it does not work yet for jdk10"

This reverts commit 4ec99792c93efd3b2a6d3b8dcb2589fe6d37973f.


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

Branch: refs/heads/master
Commit: 680c5b5203f006ff05c76d610a4fad85ccf18e37
Parents: 4ec9979
Author: Tibor17 
Authored: Sun Feb 18 00:13:06 2018 +0100
Committer: Tibor17 
Committed: Sun Feb 18 00:13:06 2018 +0100

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


http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/680c5b52/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 183970a..9cf5b44 100644
--- a/pom.xml
+++ b/pom.xml
@@ -711,25 +711,5 @@
 
   
 
-
-  jdk10
-  
-10
-  
-  
-
-  
-
-
-  org.jacoco
-  jacoco-maven-plugin
-  
-true
-  
-
-  
-
-  
-
   
 

[2/3] maven-surefire git commit: Revert "[SUREFIRE-1474] 1.7 as minimum"

[tibordigana]

Revert "[SUREFIRE-1474] 1.7 as minimum"

This reverts commit ee1cc441b740f9802d9fe40b10b485e2058c06bc.


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

Branch: refs/heads/master
Commit: 3c41c554ea0940da4c174c27f2a071f440f355e4
Parents: 680c5b5
Author: Tibor17 
Authored: Sun Feb 18 00:13:28 2018 +0100
Committer: Tibor17 
Committed: Sun Feb 18 00:13:28 2018 +0100

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


http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/3c41c554/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 9cf5b44..2bcb0d7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -99,7 +99,6 @@
 ${java.home}/..
 1.8
 1.8
-7
   
 
   

[3/3] maven-surefire git commit: Revert "[SUREFIRE-1473] upgrade commons-lang3 to avoid NPE on jdk10"

[tibordigana]

Revert "[SUREFIRE-1473] upgrade commons-lang3 to avoid NPE on jdk10"

This reverts commit 8bcf1f14a8697ef3359d7598fbd8062a687f2d5a.


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

Branch: refs/heads/master
Commit: 5e732c6b2a87026ac56032cc8b2b7e8e92e6aa7e
Parents: 3c41c55
Author: Tibor17 
Authored: Sun Feb 18 00:13:42 2018 +0100
Committer: Tibor17 
Committed: Sun Feb 18 00:13:42 2018 +0100

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


http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/5e732c6b/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 2bcb0d7..3592b31 100644
--- a/pom.xml
+++ b/pom.xml
@@ -89,7 +89,7 @@
 2.2.1
 
 3.5
-3.7
+3.5
 2.5
 0.9
 2.0.0-beta.5

[25/50] [abbrv] maven git commit: [MNG-6332] Cleaned up mvn.cmd Script

[khmarbaise]

[MNG-6332] Cleaned up mvn.cmd Script


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

Branch: refs/heads/MNG-6069
Commit: 68a9d79671a7d385a204300994e06b1a19964bf4
Parents: abd73da
Author: Karl Heinz Marbaise 
Authored: Sat Dec 30 21:14:10 2017 +0100
Committer: Karl Heinz Marbaise 
Committed: Sat Jan 6 20:27:20 2018 +0100

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


http://git-wip-us.apache.org/repos/asf/maven/blob/68a9d796/apache-maven/src/bin/mvn.cmd
--
diff --git a/apache-maven/src/bin/mvn.cmd b/apache-maven/src/bin/mvn.cmd
index 7b0b271..823ccf0 100644
--- a/apache-maven/src/bin/mvn.cmd
+++ b/apache-maven/src/bin/mvn.cmd
@@ -61,11 +61,9 @@ goto error
 
 :chkMHome
 set "MAVEN_HOME=%~dp0.."
-if not "%MAVEN_HOME%"=="" goto valMHome
+if not "%MAVEN_HOME%"=="" goto stripMHome
 goto error
 
-:valMHome
-
 :stripMHome
 if not "_%MAVEN_HOME:~-1%"=="_\" goto checkMCmd
 set "MAVEN_HOME=%MAVEN_HOME:~0,-1%"

[10/50] [abbrv] maven git commit: logging the module count to let the user identify how many module are still to be executed/processed

[khmarbaise]

logging the module count to let the user identify how many module are still to 
be executed/processed


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

Branch: refs/heads/MNG-6069
Commit: 4d49d3b05b2e3d3a4530bb27e8cc162ab50baa7c
Parents: 5919b74
Author: Romain Manni-Bucau 
Authored: Thu Nov 9 09:30:47 2017 +0100
Committer: Romain Manni-Bucau 
Committed: Thu Nov 9 09:30:47 2017 +0100

--
 .../maven/cli/event/ExecutionEventLogger.java   | 20 +++-
 1 file changed, 19 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/4d49d3b0/maven-embedder/src/main/java/org/apache/maven/cli/event/ExecutionEventLogger.java
--
diff --git 
a/maven-embedder/src/main/java/org/apache/maven/cli/event/ExecutionEventLogger.java
 
b/maven-embedder/src/main/java/org/apache/maven/cli/event/ExecutionEventLogger.java
index 2a089df..6cab49f 100644
--- 
a/maven-embedder/src/main/java/org/apache/maven/cli/event/ExecutionEventLogger.java
+++ 
b/maven-embedder/src/main/java/org/apache/maven/cli/event/ExecutionEventLogger.java
@@ -23,6 +23,8 @@ import static 
org.apache.maven.cli.CLIReportingUtils.formatDuration;
 import static org.apache.maven.cli.CLIReportingUtils.formatTimestamp;
 import static org.apache.maven.shared.utils.logging.MessageUtils.buffer;
 
+import java.util.List;
+
 import org.apache.commons.lang3.Validate;
 import org.apache.maven.execution.AbstractExecutionListener;
 import org.apache.maven.execution.BuildFailure;
@@ -53,6 +55,9 @@ public class ExecutionEventLogger
 private static final int MAX_PADDED_BUILD_TIME_DURATION_LENGTH = 9;
 private static final int MAX_PROJECT_NAME_LENGTH = 52;
 
+private int totalProjects;
+private volatile int currentVisitedProjectCount;
+
 public ExecutionEventLogger()
 {
 logger = LoggerFactory.getLogger( ExecutionEventLogger.class );
@@ -106,10 +111,13 @@ public class ExecutionEventLogger
 
 logger.info( "" );
 
-for ( MavenProject project : event.getSession().getProjects() )
+final List projects = 
event.getSession().getProjects();
+for ( MavenProject project : projects )
 {
 logger.info( project.getName() );
 }
+
+totalProjects = projects.size();
 }
 }
 
@@ -259,6 +267,16 @@ public class ExecutionEventLogger
 infoMain( "Building " + event.getProject().getName() + " " + 
event.getProject().getVersion() );
 
 infoLine( '-' );
+
+if ( totalProjects > 1 )
+{
+int number;
+synchronized ( this )
+{
+number = ++currentVisitedProjectCount;
+}
+infoMain( "Module " + number + "/" + totalProjects );
+} // else what's the point
 }
 }
 

[28/50] [abbrv] maven git commit: [MNG-6308] added packaging in Building message footer and summary

[khmarbaise]

[MNG-6308] added packaging in Building message footer and summary

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

Branch: refs/heads/MNG-6069
Commit: 58cf490c696cebfb0cc3dce31fed68658b16626f
Parents: c2e3b3e
Author: Hervé Boutemy 
Authored: Sat Jan 6 22:14:00 2018 +0100
Committer: Hervé Boutemy 
Committed: Sat Jan 6 22:40:30 2018 +0100

--
 .../org/apache/maven/cli/event/ExecutionEventLogger.java| 9 +++--
 .../apache/maven/cli/event/ExecutionEventLoggerTest.java| 4 ++--
 2 files changed, 9 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/58cf490c/maven-embedder/src/main/java/org/apache/maven/cli/event/ExecutionEventLogger.java
--
diff --git 
a/maven-embedder/src/main/java/org/apache/maven/cli/event/ExecutionEventLogger.java
 
b/maven-embedder/src/main/java/org/apache/maven/cli/event/ExecutionEventLogger.java
index 3da9ad3..85760e6 100644
--- 
a/maven-embedder/src/main/java/org/apache/maven/cli/event/ExecutionEventLogger.java
+++ 
b/maven-embedder/src/main/java/org/apache/maven/cli/event/ExecutionEventLogger.java
@@ -114,7 +114,9 @@ public class ExecutionEventLogger
 final List projects = 
event.getSession().getProjects();
 for ( MavenProject project : projects )
 {
-logger.info( project.getName() );
+int len = LINE_LENGTH - project.getName().length() - 
project.getPackaging().length() - 2;
+logger.info( project.getName() + chars( ' ', ( len > 0 ) ? len 
: 1 ) + '[' + project.getPackaging()
++ ']' );
 }
 
 totalProjects = projects.size();
@@ -302,7 +304,10 @@ public class ExecutionEventLogger
 infoMain( building + ( ( pad > 0 ) ? chars( ' ', pad ) : "" ) 
+ progress );
 }
 
-infoLine( '-' );
+// --[ packaging ]--
+prefix = chars( '-', Math.max( 0, ( LINE_LENGTH - 
project.getPackaging().length() - 4 ) / 2 ) );
+suffix = chars( '-', Math.max( 0, LINE_LENGTH - 
project.getPackaging().length() - 4 - prefix.length() ) );
+infoMain( prefix + "[ " + project.getPackaging() + " ]" + suffix );
 }
 }
 

http://git-wip-us.apache.org/repos/asf/maven/blob/58cf490c/maven-embedder/src/test/java/org/apache/maven/cli/event/ExecutionEventLoggerTest.java
--
diff --git 
a/maven-embedder/src/test/java/org/apache/maven/cli/event/ExecutionEventLoggerTest.java
 
b/maven-embedder/src/test/java/org/apache/maven/cli/event/ExecutionEventLoggerTest.java
index 4c0539d..ca4c8a4 100644
--- 
a/maven-embedder/src/test/java/org/apache/maven/cli/event/ExecutionEventLoggerTest.java
+++ 
b/maven-embedder/src/test/java/org/apache/maven/cli/event/ExecutionEventLoggerTest.java
@@ -73,7 +73,7 @@ public class ExecutionEventLoggerTest
 inOrder.verify( logger ).info( "" );
 inOrder.verify( logger ).info( "--< 
org.apache.maven:maven-embedder >---" );
 inOrder.verify( logger ).info( "Building Apache Maven Embedder 
3.5.4-SNAPSHOT" );
-inOrder.verify( logger ).info( 
"" );
+inOrder.verify( logger ).info( "[ jar 
]-" );
 }
 
 @Test
@@ -101,6 +101,6 @@ public class ExecutionEventLoggerTest
 inOrder.verify( logger ).info( "" );
 inOrder.verify( logger ).info( "--< 
org.apache.maven.plugins.overflow:maven-project-info-reports-plugin >--" );
 inOrder.verify( logger ).info( "Building Apache Maven Project Info 
Reports Plugin 3.0.0-SNAPSHOT" );
-inOrder.verify( logger ).info( 
"" );
+inOrder.verify( logger ).info( "[ 
maven-plugin ]" );
 }
 }

[39/50] [abbrv] maven git commit: [MNG-6320] upgraded JAnsi to 1.17 to fix encoding issues

[khmarbaise]

[MNG-6320] upgraded JAnsi to 1.17 to fix encoding issues

see https://github.com/fusesource/jansi/pull/95

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

Branch: refs/heads/MNG-6069
Commit: 916839528cfc26719cb85dc74e3165095447bc97
Parents: 867e5d5
Author: Hervé Boutemy 
Authored: Thu Feb 8 23:46:42 2018 +0100
Committer: Hervé Boutemy 
Committed: Sat Feb 10 11:42:32 2018 +0100

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


http://git-wip-us.apache.org/repos/asf/maven/blob/91683952/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 4fb8053..89d8cb1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -292,7 +292,7 @@ under the License.
   
 org.fusesource.jansi
 jansi
-1.16
+1.17
   
   
 org.slf4j

[15/50] [abbrv] maven git commit: Start using some of the jenkinsEnv stuff

[khmarbaise]

Start using some of the jenkinsEnv stuff


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

Branch: refs/heads/MNG-6069
Commit: 35f3586eccb1cd7bf3a6585aaa1aeb8f0cd0516b
Parents: 866582d
Author: Stephen Connolly 
Authored: Mon Dec 11 13:42:14 2017 +
Committer: Stephen Connolly 
Committed: Mon Dec 11 13:42:14 2017 +

--
 Jenkinsfile | 207 ++-
 1 file changed, 112 insertions(+), 95 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/35f3586e/Jenkinsfile
--
diff --git a/Jenkinsfile b/Jenkinsfile
index 004abcb..39111e8 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -19,12 +19,15 @@
 
 properties([buildDiscarder(logRotator(artifactNumToKeepStr: '5', numToKeepStr: 
env.BRANCH_NAME=='master'?'10':'5'))])
 
+def buildOs = 'linux'
+def buildJdk = '7'
+def buildMvn = '3.5.0'
 def tests
 def CORE_IT_PROFILES='run-its,embedded'
 
 try {
 
-node('ubuntu') {
+node(jenkinsEnv.labelForOS(buildOs)) {
 dir('build') {
 stage('Checkout') {
 checkout scm
@@ -33,130 +36,144 @@ node('ubuntu') {
 def WORK_DIR=pwd()
 
 stage('Build / Unit Test') {
-def MAVEN_BUILD=tool name: 'Maven 3.3.9', type: 
'hudson.tasks.Maven$MavenInstallation'
-echo "Driving build and unit tests using Maven $MAVEN_BUILD"
-def JAVA7_HOME=tool name: 'JDK 1.7 (latest)', type: 
'hudson.model.JDK'
-echo "Running build and unit tests with Java $JAVA7_HOME"
-
-
withEnv(["PATH+MAVEN=$MAVEN_BUILD/bin","PATH+JDK=$JAVA7_HOME/bin"]) {
-sh "mvn clean verify -B -U -e -fae -V 
-Dmaven.test.failure.ignore=true -Dmaven.repo.local=$WORK_DIR/.repository"
+String jdkName = jenkinsEnv.jdkFromVersion(buildOs, buildJdk)
+String mvnName = jenkinsEnv.mvnFromVersion(buildOs, buildMvn)
+withMaven(jdk: jdkName, maven: mvnName, 
mavenLocalRepo:"${WORK_DIR}/.repository", options:[
+artifactsPublisher(disabled: disablePublishers),
+junitPublisher(ignoreAttachments: false),
+findbugsPublisher(disabled: disablePublishers),
+openTasksPublisher(disabled: disablePublishers),
+dependenciesFingerprintPublisher(),
+invokerPublisher(),
+pipelineGraphPublisher()
+]) {
+sh "mvn clean verify -B -U -e -fae -V 
-maven.test.failure.ignore=true"
 }
-
 dir ('apache-maven/target') {
 sh "mv apache-maven-*-bin.zip apache-maven-dist.zip"
 stash includes: 'apache-maven-dist.zip', name: 'dist'
 }
-junit allowEmptyResults: true, 
testResults:'**/target/*-reports/*.xml'
 }
 
 tests = resolveScm source: [$class: 'GitSCMSource', credentialsId: '', 
id: '_', remote: 
'https://git-wip-us.apache.org/repos/asf/maven-integration-testing.git', 
traits: [[$class: 'jenkins.plugins.git.traits.BranchDiscoveryTrait'], [$class: 
'GitToolSCMSourceTrait', gitTool: 'Default']]], targets: [BRANCH_NAME, 'master']
 }
 }
 
-stage 'Integration Test'
-parallel linuxJava7:{
-node('ubuntu') {
-def MAVEN_NIX_J7=tool name: 'Maven 3 (latest)', type: 
'hudson.tasks.Maven$MavenInstallation'
-echo "Driving integration tests using Maven $MAVEN_NIX_J7"
-def JAVA_NIX_J7=tool name: 'JDK 1.7 (latest)', type: 
'hudson.model.JDK'
-echo "Running integration tests with Java $JAVA_NIX_J7"
 
-dir('test') {
-def WORK_DIR=pwd()
-checkout tests
-sh "rm -rvf $WORK_DIR/apache-maven-dist.zip 
$WORK_DIR/it-local-repo"
-unstash 'dist'
-
withEnv(["PATH+MAVEN=$MAVEN_NIX_J7/bin","PATH+JDK=$JAVA_NIX_J7/bin"]) {
-sh "mvn clean install -P$CORE_IT_PROFILES -B -U -V 
-Dmaven.test.failure.ignore=true -Dmaven.repo.local=$WORK_DIR/it-local-repo 
-DmavenDistro=$WORK_DIR/apache-maven-dist.zip"
+parallel linuxJava7:{
+node(jenkinsEnv.labelForOS('linux')) {
+stage ('Linux Java 7') {
+String jdkName = jenkinsEnv.jdkFromVersion('linux', '7')
+String mvnName = jenkinsEnv.mvnFromVersion('linux', buildMvn)
+dir('test') {
+def WORK_DIR=pwd()
+checkout tests
+sh "rm -rvf $WORK_DIR/apache-maven-dist.zip 
$WORK_DIR/it-local-repo"
+unstash 

[44/50] [abbrv] maven git commit: [MNG-6353] Upgrade maven-shared-utils to 3.2.1 Add o.a.m.s.u.logging.MessageUtils.registerShutdownHook() to prevent ANSI from staying active when killing an active pr

[khmarbaise]

[MNG-6353] Upgrade maven-shared-utils to 3.2.1
Add o.a.m.s.u.logging.MessageUtils.registerShutdownHook() to prevent ANSI from 
staying active when killing an active process


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

Branch: refs/heads/MNG-6069
Commit: 22f782aecdba911324d459937e638e33165d7c12
Parents: 24b8820
Author: rfscholte 
Authored: Sat Feb 10 15:28:59 2018 +0100
Committer: rfscholte 
Committed: Sat Feb 10 15:28:59 2018 +0100

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


http://git-wip-us.apache.org/repos/asf/maven/blob/22f782ae/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 fa224d0..07e28bf 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
@@ -191,6 +191,7 @@ public class MavenCli
 MavenCli cli = new MavenCli();
 
 MessageUtils.systemInstall();
+MessageUtils.registerShutdownHook();
 int result = cli.doMain( new CliRequest( args, classWorld ) );
 MessageUtils.systemUninstall();
 

[50/50] [abbrv] maven git commit: [MNG-6069] Migrate to non deprecated parts of Commons CLI

[khmarbaise]

[MNG-6069] Migrate to non deprecated parts of Commons CLI


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

Branch: refs/heads/MNG-6069
Commit: fca8611993a6c5afca0e8b4195f5e0d38b8c0d71
Parents: cd34b08
Author: Karl Heinz Marbaise 
Authored: Sat Mar 18 18:18:27 2017 +0100
Committer: Karl Heinz Marbaise 
Committed: Sat Feb 17 21:50:32 2018 +0100

--
 .../java/org/apache/maven/cli/CLIManager.java   | 118 ++-
 1 file changed, 60 insertions(+), 58 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/fca86119/maven-embedder/src/main/java/org/apache/maven/cli/CLIManager.java
--
diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/CLIManager.java 
b/maven-embedder/src/main/java/org/apache/maven/cli/CLIManager.java
index a9038bf..20376d9 100644
--- a/maven-embedder/src/main/java/org/apache/maven/cli/CLIManager.java
+++ b/maven-embedder/src/main/java/org/apache/maven/cli/CLIManager.java
@@ -24,9 +24,9 @@ import java.io.PrintWriter;
 
 import org.apache.commons.cli.CommandLine;
 import org.apache.commons.cli.CommandLineParser;
-import org.apache.commons.cli.GnuParser;
+import org.apache.commons.cli.DefaultParser;
 import org.apache.commons.cli.HelpFormatter;
-import org.apache.commons.cli.OptionBuilder;
+import org.apache.commons.cli.Option;
 import org.apache.commons.cli.Options;
 import org.apache.commons.cli.ParseException;
 
@@ -35,43 +35,43 @@ import org.apache.commons.cli.ParseException;
  */
 public class CLIManager
 {
-public static final char ALTERNATE_POM_FILE = 'f';
+public static final String ALTERNATE_POM_FILE = "f";
 
-public static final char BATCH_MODE = 'B';
+public static final String BATCH_MODE = "B";
 
-public static final char SET_SYSTEM_PROPERTY = 'D';
+public static final String SET_SYSTEM_PROPERTY = "D";
 
-public static final char OFFLINE = 'o';
+public static final String OFFLINE = "o";
 
-public static final char QUIET = 'q';
+public static final String QUIET = "q";
 
-public static final char DEBUG = 'X';
+public static final String DEBUG = "X";
 
-public static final char ERRORS = 'e';
+public static final String ERRORS = "e";
 
-public static final char HELP = 'h';
+public static final String HELP = "h";
 
-public static final char VERSION = 'v';
+public static final String VERSION = "v";
 
-public static final char SHOW_VERSION = 'V';
+public static final String SHOW_VERSION = "V";
 
-public static final char NON_RECURSIVE = 'N';
+public static final String NON_RECURSIVE = "N";
 
-public static final char UPDATE_SNAPSHOTS = 'U';
+public static final String UPDATE_SNAPSHOTS = "U";
 
-public static final char ACTIVATE_PROFILES = 'P';
+public static final String ACTIVATE_PROFILES = "P";
 
 public static final String SUPRESS_SNAPSHOT_UPDATES = "nsu";
 
-public static final char CHECKSUM_FAILURE_POLICY = 'C';
+public static final String CHECKSUM_FAILURE_POLICY = "C";
 
-public static final char CHECKSUM_WARNING_POLICY = 'c';
+public static final String CHECKSUM_WARNING_POLICY = "c";
 
-public static final char ALTERNATE_USER_SETTINGS = 's';
+public static final String ALTERNATE_USER_SETTINGS = "s";
 
 public static final String ALTERNATE_GLOBAL_SETTINGS = "gs";
 
-public static final char ALTERNATE_USER_TOOLCHAINS = 't';
+public static final String ALTERNATE_USER_TOOLCHAINS = "t";
 
 public static final String ALTERNATE_GLOBAL_TOOLCHAINS = "gt";
 
@@ -103,50 +103,52 @@ public class CLIManager
 
 protected Options options;
 
-@SuppressWarnings( { "static-access", "checkstyle:linelength" } )
+// CHECKSTYLE_OFF: LineLength
 public CLIManager()
 {
 options = new Options();
-options.addOption( OptionBuilder.withLongOpt( "help" 
).withDescription( "Display help information" ).create( HELP ) );
-options.addOption( OptionBuilder.withLongOpt( "file" 
).hasArg().withDescription( "Force the use of an alternate POM file (or 
directory with pom.xml)" ).create( ALTERNATE_POM_FILE ) );
-options.addOption( OptionBuilder.withLongOpt( "define" 
).hasArg().withDescription( "Define a system property" ).create( 
SET_SYSTEM_PROPERTY ) );
-options.addOption( OptionBuilder.withLongOpt( "offline" 
).withDescription( "Work offline" ).create( OFFLINE ) );
-options.addOption( OptionBuilder.withLongOpt( "version" 
).withDescription( "Display version information" ).create( VERSION ) );
-options.addOption( 

[22/50] [abbrv] maven git commit: [MNG-6305] Validation of CI friendly version incorrect o Checkin that only the three expression changelist, revision and sha1 are valid in a version. o Added some te

[khmarbaise]

[MNG-6305] Validation of CI friendly version incorrect
 o Checkin that only the three expression changelist,
   revision and sha1 are valid in a version.
 o Added some tests.


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

Branch: refs/heads/MNG-6069
Commit: 2295c17b45f46cae0daa46105e0a7856505a108f
Parents: df5169b
Author: Karl Heinz Marbaise 
Authored: Thu Dec 28 21:29:46 2017 +0100
Committer: Karl Heinz Marbaise 
Committed: Sat Dec 30 21:41:18 2017 +0100

--
 .../AbstractStringBasedModelInterpolator.java   |  6 ++
 .../model/validation/DefaultModelValidator.java | 30 ---
 .../validation/DefaultModelValidatorTest.java   | 84 
 .../raw-model/bad-ci-friendly-sha1plus.xml  | 31 
 .../raw-model/bad-ci-friendly-sha1plus2.xml | 31 
 .../validation/raw-model/bad-ci-friendly.xml| 31 
 .../ok-ci-friendly-all-expressions.xml  | 31 
 .../raw-model/ok-ci-friendly-changelist.xml | 31 
 .../raw-model/ok-ci-friendly-revision.xml   | 31 
 .../raw-model/ok-ci-friendly-sha1.xml   | 31 
 10 files changed, 311 insertions(+), 26 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/2295c17b/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/AbstractStringBasedModelInterpolator.java
--
diff --git 
a/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/AbstractStringBasedModelInterpolator.java
 
b/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/AbstractStringBasedModelInterpolator.java
index b47edbe..09b53e4 100644
--- 
a/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/AbstractStringBasedModelInterpolator.java
+++ 
b/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/AbstractStringBasedModelInterpolator.java
@@ -61,6 +61,12 @@ public abstract class AbstractStringBasedModelInterpolator
 public static final String CHANGELIST_PROPERTY = "changelist";
 
 public static final String REVISION_PROPERTY = "revision";
+
+public static final String SHA1_PROPERTY_EXPRESSION = "${" + SHA1_PROPERTY 
+ "}";
+
+public static final String CHANGELIST_PROPERTY_EXPRESSION = "${" + 
CHANGELIST_PROPERTY + "}";
+
+public static final String REVISION_PROPERTY_EXPRESSION = "${" + 
REVISION_PROPERTY + "}";
 
 private static final List PROJECT_PREFIXES = Arrays.asList( 
"pom.", "project." );
 

http://git-wip-us.apache.org/repos/asf/maven/blob/2295c17b/maven-model-builder/src/main/java/org/apache/maven/model/validation/DefaultModelValidator.java
--
diff --git 
a/maven-model-builder/src/main/java/org/apache/maven/model/validation/DefaultModelValidator.java
 
b/maven-model-builder/src/main/java/org/apache/maven/model/validation/DefaultModelValidator.java
index d97d8f6..9299b43 100644
--- 
a/maven-model-builder/src/main/java/org/apache/maven/model/validation/DefaultModelValidator.java
+++ 
b/maven-model-builder/src/main/java/org/apache/maven/model/validation/DefaultModelValidator.java
@@ -26,6 +26,7 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 import org.apache.maven.model.Activation;
@@ -65,6 +66,13 @@ public class DefaultModelValidator
 implements ModelValidator
 {
 
+private static final Pattern CI_FRIENDLY_EXPRESSION = Pattern.compile( 
"\\$\\{(.+?)\\}" );
+
+private static final List CI_FRIENDLY_POSSIBLE_PROPERTY_NAMES =
+Arrays.asList( AbstractStringBasedModelInterpolator.REVISION_PROPERTY,
+   
AbstractStringBasedModelInterpolator.CHANGELIST_PROPERTY,
+   AbstractStringBasedModelInterpolator.SHA1_PROPERTY );
+
 private static final Pattern ID_REGEX = Pattern.compile( 
"[A-Za-z0-9_\\-.]+" );
 
 private static final Pattern ID_WITH_WILDCARDS_REGEX = Pattern.compile( 
"[A-Za-z0-9_\\-.?*]+" );
@@ -532,7 +540,7 @@ public class DefaultModelValidator

ModelBuildingRequest request )
 {
 // We only check for groupId/artifactId cause if there is another
-// module with the same groupId/artifactId this will fail the build 
+// module with the same groupId/artifactId this will fail the build
 // earlier like "Project '...' is duplicated in the reactor.
 // So it is sufficient to check only 

[02/50] [abbrv] maven git commit: [MNG-6196] updated slf4j to 1.7.25

[khmarbaise]

[MNG-6196] updated slf4j to 1.7.25

[SLF4J-394] use new slf4j methods done for us
[SLF4J-395] use slf4j-simple System.out cache

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

Branch: refs/heads/MNG-6069
Commit: eb2db7b28664dbaac6a59a2189c70d92e455dcea
Parents: 542a7a8
Author: Hervé Boutemy 
Authored: Sat Mar 4 02:59:42 2017 +0100
Committer: Hervé Boutemy 
Committed: Tue Sep 26 00:19:57 2017 +0200

--
 .../src/conf/logging/simplelogger.properties   |  1 +
 .../java/org/slf4j/impl/MavenSimpleLogger.java |  6 +-
 .../src/main/script/patch-slf4j-simple.groovy  | 17 -
 pom.xml|  2 +-
 4 files changed, 7 insertions(+), 19 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/eb2db7b2/apache-maven/src/conf/logging/simplelogger.properties
--
diff --git a/apache-maven/src/conf/logging/simplelogger.properties 
b/apache-maven/src/conf/logging/simplelogger.properties
index 8dea717..64b331b 100644
--- a/apache-maven/src/conf/logging/simplelogger.properties
+++ b/apache-maven/src/conf/logging/simplelogger.properties
@@ -20,6 +20,7 @@ org.slf4j.simpleLogger.showDateTime=false
 org.slf4j.simpleLogger.showThreadName=false
 org.slf4j.simpleLogger.showLogName=false
 org.slf4j.simpleLogger.logFile=System.out
+org.slf4j.simpleLogger.cacheOutputStream=true
 org.slf4j.simpleLogger.levelInBrackets=true
 org.slf4j.simpleLogger.log.Sisu=info
 org.slf4j.simpleLogger.warnLevelString=WARNING

http://git-wip-us.apache.org/repos/asf/maven/blob/eb2db7b2/maven-slf4j-provider/src/main/java/org/slf4j/impl/MavenSimpleLogger.java
--
diff --git 
a/maven-slf4j-provider/src/main/java/org/slf4j/impl/MavenSimpleLogger.java 
b/maven-slf4j-provider/src/main/java/org/slf4j/impl/MavenSimpleLogger.java
index 17f1f48..3c1ca4f 100644
--- a/maven-slf4j-provider/src/main/java/org/slf4j/impl/MavenSimpleLogger.java
+++ b/maven-slf4j-provider/src/main/java/org/slf4j/impl/MavenSimpleLogger.java
@@ -56,8 +56,12 @@ public class MavenSimpleLogger
 }
 
 @Override
-protected void renderThrowable( Throwable t, PrintStream stream )
+protected void writeThrowable( Throwable t, PrintStream stream )
 {
+if ( t == null )
+{
+return;
+}
 stream.print( buffer().failure( t.getClass().getName() ) );
 if ( t.getMessage() != null )
 {

http://git-wip-us.apache.org/repos/asf/maven/blob/eb2db7b2/maven-slf4j-provider/src/main/script/patch-slf4j-simple.groovy
--
diff --git a/maven-slf4j-provider/src/main/script/patch-slf4j-simple.groovy 
b/maven-slf4j-provider/src/main/script/patch-slf4j-simple.groovy
index bba8646..9865625 100644
--- a/maven-slf4j-provider/src/main/script/patch-slf4j-simple.groovy
+++ b/maven-slf4j-provider/src/main/script/patch-slf4j-simple.groovy
@@ -34,20 +34,3 @@ if ( content.contains( 'MavenSimpleLoggerFactory' ) )
 println 'patching StaticLoggerBinder.java';
 content = content.replaceAll( 'SimpleLoggerFactory', 
'MavenSimpleLoggerFactory' );
 file.write( content );
-
-
-println 'patching SimpleLogger.java';
-file = new File( dir, 'SimpleLogger.java' );
-content = file.text;
-content = content.replaceAll( 'private static final int LOG_LEVEL_', 
'protected static final int LOG_LEVEL_' );
-content = content.replaceAll( 't.printStackTrace(TARGET_STREAM)', 
'renderThrowable(t, TARGET_STREAM);' );
-
-index = content.indexOf( 'switch (level) {' );
-end = content.indexOf( '}', index ) + 1;
-content = content.substring( 0, index ) + 'buf.append(renderLevel(level));' + 
content.substring( end );
-
-content = content.substring( 0, content.lastIndexOf( '}' ) );
-content += '  protected void renderThrowable(Throwable t, PrintStream stream) 
{}\n';
-content += '  protected String renderLevel(int level) { return ""; }\n}\n';
-
-file.write( content );

http://git-wip-us.apache.org/repos/asf/maven/blob/eb2db7b2/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 4a79956..ea119e1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -66,7 +66,7 @@ under the License.
 1.9.1
 1.3
 1.1.0
-1.7.22
+1.7.25
 
true
 
 apache-maven

[21/50] [abbrv] maven git commit: [MNG-6330] Parents relativePath not verified anymore

[khmarbaise]

[MNG-6330] Parents relativePath not verified anymore


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

Branch: refs/heads/MNG-6069
Commit: df5169bdf9fead590d48e23fb182d7f73f1deb3d
Parents: 98af937
Author: rfscholte 
Authored: Fri Dec 29 10:39:45 2017 +0100
Committer: rfscholte 
Committed: Fri Dec 29 10:39:45 2017 +0100

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


http://git-wip-us.apache.org/repos/asf/maven/blob/df5169bd/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 463bf1c..c3dd043 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
@@ -845,8 +845,8 @@ public class DefaultModelBuilder
 {
 ModelSource expectedParentSource = getParentPomFile( 
childModel, childSource );
 
-if ( expectedParentSource instanceof ModelSource2
-&& !pomFile.toURI().equals( ( (ModelSource2) 
expectedParentSource ).getLocationURI() ) )
+if ( expectedParentSource == null || ( 
expectedParentSource instanceof ModelSource2
+&& !pomFile.toURI().equals( ( (ModelSource2) 
expectedParentSource ).getLocationURI() ) ) )
 {
 parentData = readParentExternally( childModel, 
request, problems );
 }

[18/50] [abbrv] maven git commit: Ensure any forked Maven executions are not spied on by Jenkins

[khmarbaise]

Ensure any forked Maven executions are not spied on by Jenkins


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

Branch: refs/heads/MNG-6069
Commit: a670c2ea1f592563b756b31d650c9a6db553fbdb
Parents: 5411c5a
Author: Stephen Connolly 
Authored: Tue Dec 12 15:29:35 2017 +
Committer: Stephen Connolly 
Committed: Tue Dec 12 15:29:35 2017 +

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


http://git-wip-us.apache.org/repos/asf/maven/blob/a670c2ea/pom.xml
--
diff --git a/pom.xml b/pom.xml
index a572e4b..c784d9d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -462,6 +462,7 @@ under the License.
   maven-surefire-plugin
   
 -Xmx256m
+
JENKINS_MAVEN_AGENT_DISABLED=true
   
 
 

[47/50] [abbrv] maven git commit: Reduce number of global checkstyle rule violations

[khmarbaise]

Reduce number of global checkstyle rule violations

Fix code for following checkstyle rules:
ConstantName, FileLength, InnerAssignment, JavadocType, MagicNumber, 
MethodLength, MethodName, NewlineAtEndOfFile, ParameterNumber, RedundantThrows, 
VisibilityModifier

Fixes #149

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

Branch: refs/heads/MNG-6069
Commit: d92508179410897404bcc7e826bb0877be2d08b8
Parents: 40cf506
Author: Sylwester Lachiewicz 
Authored: Thu Feb 1 22:57:39 2018 +0100
Committer: Hervé Boutemy 
Committed: Sun Feb 11 11:41:16 2018 +0100

--
 .../apache/maven/artifact/ArtifactUtils.java|  3 ++
 .../apache/maven/artifact/DefaultArtifact.java  |  1 +
 .../artifact/metadata/ArtifactMetadata.java |  3 ++
 .../repository/ArtifactRepositoryPolicy.java|  1 +
 .../artifact/repository/Authentication.java |  3 ++
 .../layout/ArtifactRepositoryLayout2.java   |  3 ++
 .../artifact/versioning/ComparableVersion.java  | 13 +++--
 .../java/org/apache/maven/repository/Proxy.java |  3 ++
 maven-compat/pom.xml|  4 --
 .../artifact/deployer/ArtifactDeployer.java |  3 ++
 .../deployer/DefaultArtifactDeployer.java   |  3 ++
 .../artifact/manager/DefaultWagonManager.java   |  3 ++
 .../repository/layout/FlatRepositoryLayout.java |  3 ++
 .../repository/metadata/MetadataBridge.java |  2 +-
 .../artifact/resolver/ArtifactCollector.java|  4 ++
 .../artifact/resolver/ArtifactResolver.java |  1 +
 .../resolver/DefaultArtifactCollector.java  |  4 ++
 .../resolver/DefaultArtifactResolver.java   | 11 ++--
 .../filter/InversionArtifactFilter.java |  3 ++
 .../artifact/versioning/ManagedVersionMap.java  |  3 ++
 .../profiles/DefaultMavenProfilesBuilder.java   |  3 ++
 .../maven/profiles/DefaultProfileManager.java   |  3 ++
 .../apache/maven/profiles/ProfileManager.java   |  3 ++
 .../maven/profiles/ProfilesConversionUtils.java |  3 ++
 .../activation/DetectedProfileActivator.java|  3 ++
 .../activation/FileProfileActivator.java|  3 ++
 .../activation/JdkPrefixProfileActivator.java   |  3 ++
 .../OperatingSystemProfileActivator.java|  3 ++
 .../activation/ProfileActivationException.java  |  3 ++
 .../profiles/activation/ProfileActivator.java   |  3 ++
 .../SystemPropertyProfileActivator.java |  3 ++
 .../DefaultProjectBuilderConfiguration.java |  3 ++
 .../project/InvalidProjectModelException.java   |  3 ++
 .../MissingRepositoryElementException.java  |  4 +-
 .../org/apache/maven/project/ProjectUtils.java  |  3 ++
 .../DefaultModelInheritanceAssembler.java   |  3 ++
 .../StringSearchModelInterpolator.java  |  7 ++-
 .../project/path/DefaultPathTranslator.java |  3 ++
 .../validation/DefaultModelValidator.java   |  2 +-
 .../maven/repository/DefaultMirrorSelector.java |  3 ++
 .../repository/MetadataResolutionResult.java|  5 +-
 .../repository/UserLocalArtifactRepository.java |  3 ++
 .../legacy/DefaultUpdateCheckManager.java   |  3 ++
 .../repository/legacy/DefaultWagonManager.java  |  5 ++
 .../legacy/LegacyRepositorySystem.java  |  2 +-
 .../maven/repository/legacy/MavenArtifact.java  |  2 +-
 .../legacy/TransferListenerAdapter.java |  3 ++
 .../repository/legacy/UpdateCheckManager.java   |  3 ++
 .../legacy/WagonConfigurationException.java |  4 +-
 .../maven/repository/legacy/WagonManager.java   |  3 ++
 .../DefaultLegacyArtifactCollector.java |  4 ++
 .../resolver/LegacyArtifactCollector.java   |  1 +
 .../ArtifactTransformationManager.java  |  4 +-
 .../transform/LatestArtifactTransformation.java |  3 ++
 .../repository/metadata/ArtifactMetadata.java   | 21 +++-
 .../repository/metadata/MetadataGraphEdge.java  |  1 +
 .../metadata/MetadataResolutionException.java   |  3 ++
 .../MetadataResolutionRequestTypeEnum.java  |  3 ++
 .../ExpressionDocumentationException.java   |  3 ++
 .../usability/plugin/ExpressionDocumenter.java  |  3 ++
 maven-core/pom.xml  |  4 --
 .../org/apache/maven/ArtifactFilterManager.java |  3 ++
 .../DefaultProjectDependenciesResolver.java |  5 ++
 .../src/main/java/org/apache/maven/Maven.java   |  1 +
 .../apache/maven/MissingModuleException.java|  3 ++
 .../maven/ProjectDependenciesResolver.java  |  2 +-
 .../maven/artifact/factory/ArtifactFactory.java |  4 ++
 .../factory/DefaultArtifactFactory.java |  5 ++
 .../metadata/AbstractArtifactMetadata.java  |  3 ++
 .../ArtifactMetadataRetrievalException.java |  3 ++
 .../metadata/ArtifactMetadataSource.java|  4 ++
 .../artifact/metadata/ResolutionGroup.java  |  3 ++
 

[37/50] [abbrv] maven git commit: [MNG-6255] Maven script cannot parse jvm.config with CRLF

[khmarbaise]

[MNG-6255] Maven script cannot parse jvm.config with CRLF

Both \r and \n should also be replaced with a space to deal with CRLF line 
endings properly


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

Branch: refs/heads/MNG-6069
Commit: 867e5d50be0bca17b1ba23c78e8c7c6d74c6aecd
Parents: a03489b
Author: Andrew Donald Kennedy 
Authored: Mon Jul 10 16:58:33 2017 +0100
Committer: Hervé Boutemy 
Committed: Sat Feb 10 11:42:31 2018 +0100

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


http://git-wip-us.apache.org/repos/asf/maven/blob/867e5d50/apache-maven/src/bin/mvn
--
diff --git a/apache-maven/src/bin/mvn b/apache-maven/src/bin/mvn
index e3a5848..65be711 100755
--- a/apache-maven/src/bin/mvn
+++ b/apache-maven/src/bin/mvn
@@ -167,7 +167,7 @@ find_file_argument_basedir() {
 # concatenates all lines of a file
 concat_lines() {
   if [ -f "$1" ]; then
-echo "`tr -s '\n' ' ' < "$1"`"
+echo "`tr -s '\r\n' '  ' < "$1"`"
   fi
 }
 

[08/50] [abbrv] maven git commit: Add the serverId to scm-publish so that we do not need to rely on cached svn credentials

[khmarbaise]

Add the serverId to scm-publish so that we do not need to rely on cached svn 
credentials


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

Branch: refs/heads/MNG-6069
Commit: 69c512a8203030f3fee657673b0416bc2a121eae
Parents: 3d0efa3
Author: Stephen Connolly 
Authored: Wed Oct 18 09:54:02 2017 +0100
Committer: Stephen Connolly 
Committed: Wed Oct 18 09:54:02 2017 +0100

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


http://git-wip-us.apache.org/repos/asf/maven/blob/69c512a8/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 6649634..a572e4b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -508,6 +508,9 @@ under the License.
   org.apache.maven.plugins
   maven-scm-publish-plugin
   1.1
+  
+apache.releases.https
+  
 
 
   org.apache.rat

[03/50] [abbrv] maven git commit: [MNG-6242] detect Cygwin/Mingw pseudo terminal for Jansi

[khmarbaise]

[MNG-6242] detect Cygwin/Mingw pseudo terminal for Jansi

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

Branch: refs/heads/MNG-6069
Commit: c19e9dcac3d200094c770521b9b1b10df76f26c4
Parents: 4f530c4
Author: Hervé Boutemy 
Authored: Mon Sep 25 22:52:48 2017 +0200
Committer: Hervé Boutemy 
Committed: Sun Oct 15 10:16:00 2017 +0200

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


http://git-wip-us.apache.org/repos/asf/maven/blob/c19e9dca/apache-maven/src/bin/mvn
--
diff --git a/apache-maven/src/bin/mvn b/apache-maven/src/bin/mvn
index fa6164b..e3a5848 100755
--- a/apache-maven/src/bin/mvn
+++ b/apache-maven/src/bin/mvn
@@ -188,6 +188,14 @@ export MAVEN_PROJECTBASEDIR
 MAVEN_CMD_LINE_ARGS="$MAVEN_CONFIG $@"
 export MAVEN_CMD_LINE_ARGS
 
+# detect cygwin or mingw pseudo-terminal for Jansi
+# workaround for https://github.com/fusesource/jansi-native/issues/11
+if $cygwin || $mingw; then
+  if [ -t 1 ]; then
+MAVEN_OPTS="-Djansi.passthrough=true $MAVEN_OPTS"
+  fi
+fi
+
 exec "$JAVACMD" \
   $MAVEN_OPTS \
   $MAVEN_DEBUG_OPTS \

[43/50] [abbrv] maven git commit: [MNG-6353] Upgrade maven-shared-utils to 3.2.1

[khmarbaise]

[MNG-6353] Upgrade maven-shared-utils to 3.2.1


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

Branch: refs/heads/MNG-6069
Commit: 24b8820f08f3ff1535931288b7782bb615b1f53d
Parents: 40cf506
Author: rfscholte 
Authored: Sat Feb 10 15:17:03 2018 +0100
Committer: rfscholte 
Committed: Sat Feb 10 15:17:03 2018 +0100

--
 .../src/main/java/org/apache/maven/cli/MavenCli.java |  9 +
 .../src/main/java/org/slf4j/impl/MavenSimpleLogger.java  | 11 ++-
 pom.xml  |  2 +-
 3 files changed, 12 insertions(+), 10 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/24b8820f/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 77ef134..fa224d0 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
@@ -576,10 +576,11 @@ public class MavenCli
 {
 MessageBuilder buff = MessageUtils.buffer();
 buff.a( "Message styles: " );
-buff.debug( "debug" ).a( ' ' );
-buff.info( "info" ).a( ' ' );
-buff.warning( "warning" ).a( ' ' );
-buff.error( "error" ).a( ' ' );
+buff.a( MessageUtils.level().debug( "debug" ) ).a( ' ' );
+buff.a( MessageUtils.level().info( "info" ) ).a( ' ' );
+buff.a( MessageUtils.level().warning( "warning" ) ).a( ' ' );
+buff.a( MessageUtils.level().error( "error" ) ).a( ' ' );
+
 buff.success( "success" ).a( ' ' );
 buff.failure( "failure" ).a( ' ' );
 buff.strong( "strong" ).a( ' ' );

http://git-wip-us.apache.org/repos/asf/maven/blob/24b8820f/maven-slf4j-provider/src/main/java/org/slf4j/impl/MavenSimpleLogger.java
--
diff --git 
a/maven-slf4j-provider/src/main/java/org/slf4j/impl/MavenSimpleLogger.java 
b/maven-slf4j-provider/src/main/java/org/slf4j/impl/MavenSimpleLogger.java
index 3c1ca4f..9366687 100644
--- a/maven-slf4j-provider/src/main/java/org/slf4j/impl/MavenSimpleLogger.java
+++ b/maven-slf4j-provider/src/main/java/org/slf4j/impl/MavenSimpleLogger.java
@@ -19,6 +19,7 @@ package org.slf4j.impl;
  * under the License.
  */
 
+import static org.apache.maven.shared.utils.logging.MessageUtils.level;
 import static org.apache.maven.shared.utils.logging.MessageUtils.buffer;
 
 import java.io.PrintStream;
@@ -42,16 +43,16 @@ public class MavenSimpleLogger
 switch ( level )
 {
 case LOG_LEVEL_TRACE:
-return buffer().debug( "TRACE" ).toString();
+return level().debug( "TRACE" ).toString();
 case LOG_LEVEL_DEBUG:
-return buffer().debug( "DEBUG" ).toString();
+return level().debug( "DEBUG" ).toString();
 case LOG_LEVEL_INFO:
-return buffer().info( "INFO" ).toString();
+return level().info( "INFO" ).toString();
 case LOG_LEVEL_WARN:
-return buffer().warning( "WARNING" ).toString();
+return level().warning( "WARNING" ).toString();
 case LOG_LEVEL_ERROR:
 default:
-return buffer().error( "ERROR" ).toString();
+return level().error( "ERROR" ).toString();
 }
 }
 

http://git-wip-us.apache.org/repos/asf/maven/blob/24b8820f/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 66b9d27..618a215 100644
--- a/pom.xml
+++ b/pom.xml
@@ -287,7 +287,7 @@ under the License.
   
 org.apache.maven.shared
 maven-shared-utils
-3.1.0
+3.2.1
   
   
 org.fusesource.jansi

[32/50] [abbrv] maven git commit: [MNG-6298] 3.5.2: ClassNotFoundException: javax.annotation.security.RolesAllowed

[khmarbaise]

[MNG-6298] 3.5.2: ClassNotFoundException: javax.annotation.security.RolesAllowed

Adding exportedPackage to find class:
javax.annotation.security.RolesAllowed

First maven commit :) Works but might be deeper issue

Signed-off-by: Karl Heinz Marbaise 
Now with correct issue reference.


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

Branch: refs/heads/MNG-6069
Commit: 6285bb96c5104a9eabd4e35131aec917b4f9e048
Parents: 42918c3
Author: Bengt Söderberg 
Authored: Mon Nov 27 19:19:48 2017 +0100
Committer: Karl Heinz Marbaise 
Committed: Fri Jan 19 19:40:50 2018 +0100

--
 maven-core/src/main/resources/META-INF/maven/extension.xml | 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/6285bb96/maven-core/src/main/resources/META-INF/maven/extension.xml
--
diff --git a/maven-core/src/main/resources/META-INF/maven/extension.xml 
b/maven-core/src/main/resources/META-INF/maven/extension.xml
index c5f40b5..6329aaa 100644
--- a/maven-core/src/main/resources/META-INF/maven/extension.xml
+++ b/maven-core/src/main/resources/META-INF/maven/extension.xml
@@ -100,6 +100,7 @@ under the License.
 
 
 javax.annotation.*
+javax.annotation.security.*
 
 

[48/50] [abbrv] maven git commit: Remove Google Guava usage (move to Java7)

[khmarbaise]

Remove Google Guava usage (move to Java7)

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

Branch: refs/heads/MNG-6069
Commit: b8c06e61ab73cd9e25a5b2c93d9e5077b2196751
Parents: d925081
Author: Sylwester Lachiewicz 
Authored: Wed Nov 8 22:29:50 2017 +0100
Committer: Hervé Boutemy 
Committed: Sun Feb 11 11:54:17 2018 +0100

--
 .../java/org/apache/maven/DefaultMaven.java |   8 +-
 .../execution/DefaultMavenExecutionRequest.java |   4 +-
 .../scope/internal/MojoExecutionScope.java  |   6 +-
 .../maven/extension/internal/CoreExports.java   |  10 +-
 .../extension/internal/CoreExtensionEntry.java  |   7 +-
 .../apache/maven/graph/DefaultGraphBuilder.java |  18 +--
 .../maven/lifecycle/DefaultLifecycles.java  |   7 +-
 ...DefaultLifecycleExecutionPlanCalculator.java |   5 +-
 .../maven/project/ProjectModelResolver.java |  14 +--
 .../session/scope/internal/SessionScope.java|   3 +-
 .../java/org/apache/maven/cli/MavenCli.java |   5 +-
 .../org/apache/maven/model/building/Result.java | 109 +++
 12 files changed, 101 insertions(+), 95 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/b8c06e61/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
--
diff --git a/maven-core/src/main/java/org/apache/maven/DefaultMaven.java 
b/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
index 7e46ad0..7f052c1 100644
--- a/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
+++ b/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
@@ -60,8 +60,6 @@ import org.eclipse.aether.RepositorySystemSession;
 import org.eclipse.aether.repository.WorkspaceReader;
 import org.eclipse.aether.util.repository.ChainedWorkspaceReader;
 
-import com.google.common.collect.Iterables;
-
 /**
  * @author Jason van Zyl
  */
@@ -222,8 +220,7 @@ public class DefaultMaven
 
 if ( graphResult.hasErrors() )
 {
-return addExceptionToResult( result, Iterables.toArray( 
graphResult.getProblems(),
-
ModelProblem.class )[0].getException() );
+return addExceptionToResult( result, 
graphResult.getProblems().iterator().next().getException() );
 }
 
 try
@@ -289,8 +286,7 @@ public class DefaultMaven
 
 if ( graphResult.hasErrors() )
 {
-return addExceptionToResult( result, Iterables.toArray( 
graphResult.getProblems(),
-
ModelProblem.class )[0].getException() );
+return addExceptionToResult( result, 
graphResult.getProblems().iterator().next().getException() );
 }
 
 try

http://git-wip-us.apache.org/repos/asf/maven/blob/b8c06e61/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java
--
diff --git 
a/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java
 
b/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java
index 089a7db..fe558cd 100644
--- 
a/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java
+++ 
b/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java
@@ -43,8 +43,6 @@ import org.eclipse.aether.RepositoryCache;
 import org.eclipse.aether.repository.WorkspaceReader;
 import org.eclipse.aether.transfer.TransferListener;
 
-import com.google.common.collect.Maps;
-
 /**
  * @author Jason van Zyl
  */
@@ -1280,7 +1278,7 @@ public class DefaultMavenExecutionRequest
 {
 if ( data == null )
 {
-data = Maps.newHashMap();
+data = new HashMap<>();
 }
 
 return data;

http://git-wip-us.apache.org/repos/asf/maven/blob/b8c06e61/maven-core/src/main/java/org/apache/maven/execution/scope/internal/MojoExecutionScope.java
--
diff --git 
a/maven-core/src/main/java/org/apache/maven/execution/scope/internal/MojoExecutionScope.java
 
b/maven-core/src/main/java/org/apache/maven/execution/scope/internal/MojoExecutionScope.java
index 168a87f..785877e 100644
--- 
a/maven-core/src/main/java/org/apache/maven/execution/scope/internal/MojoExecutionScope.java
+++ 
b/maven-core/src/main/java/org/apache/maven/execution/scope/internal/MojoExecutionScope.java
@@ -20,6 +20,7 @@ package org.apache.maven.execution.scope.internal;
  */
 
 import 

[31/50] [abbrv] maven git commit: Revert "[MNG-6296] 3.5.2: ClassNotFoundException: javax.annotation.security.RolesAllowed"

[khmarbaise]

Revert "[MNG-6296] 3.5.2: ClassNotFoundException: 
javax.annotation.security.RolesAllowed"

This reverts commit c311e0d812eadd782a59b7f8e939becf7c1da74b.


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

Branch: refs/heads/MNG-6069
Commit: 42918c37c55e9ff83358ced305bc1f0b711b83d0
Parents: c311e0d
Author: Karl Heinz Marbaise 
Authored: Thu Jan 18 20:18:32 2018 +0100
Committer: Karl Heinz Marbaise 
Committed: Thu Jan 18 20:18:32 2018 +0100

--
 maven-core/src/main/resources/META-INF/maven/extension.xml | 1 -
 1 file changed, 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/42918c37/maven-core/src/main/resources/META-INF/maven/extension.xml
--
diff --git a/maven-core/src/main/resources/META-INF/maven/extension.xml 
b/maven-core/src/main/resources/META-INF/maven/extension.xml
index 6329aaa..c5f40b5 100644
--- a/maven-core/src/main/resources/META-INF/maven/extension.xml
+++ b/maven-core/src/main/resources/META-INF/maven/extension.xml
@@ -100,7 +100,6 @@ under the License.
 
 
 javax.annotation.*
-javax.annotation.security.*
 
 

[30/50] [abbrv] maven git commit: [MNG-6296] 3.5.2: ClassNotFoundException: javax.annotation.security.RolesAllowed

[khmarbaise]

[MNG-6296] 3.5.2: ClassNotFoundException: javax.annotation.security.RolesAllowed

Adding exportedPackage to find class:
javax.annotation.security.RolesAllowed

First maven commit :) Works but might be deeper issue

Signed-off-by: Karl Heinz Marbaise 


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

Branch: refs/heads/MNG-6069
Commit: c311e0d812eadd782a59b7f8e939becf7c1da74b
Parents: 2b336ff
Author: Bengt Söderberg 
Authored: Mon Nov 27 19:19:48 2017 +0100
Committer: Karl Heinz Marbaise 
Committed: Wed Jan 17 19:16:02 2018 +0100

--
 maven-core/src/main/resources/META-INF/maven/extension.xml | 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/c311e0d8/maven-core/src/main/resources/META-INF/maven/extension.xml
--
diff --git a/maven-core/src/main/resources/META-INF/maven/extension.xml 
b/maven-core/src/main/resources/META-INF/maven/extension.xml
index c5f40b5..6329aaa 100644
--- a/maven-core/src/main/resources/META-INF/maven/extension.xml
+++ b/maven-core/src/main/resources/META-INF/maven/extension.xml
@@ -100,6 +100,7 @@ under the License.
 
 
 javax.annotation.*
+javax.annotation.security.*
 
 

[46/50] [abbrv] maven git commit: Reduce number of global checkstyle rule violations

[khmarbaise]

http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/maven-core/src/main/java/org/apache/maven/artifact/repository/MavenArtifactRepository.java
--
diff --git 
a/maven-core/src/main/java/org/apache/maven/artifact/repository/MavenArtifactRepository.java
 
b/maven-core/src/main/java/org/apache/maven/artifact/repository/MavenArtifactRepository.java
index 9765c73..d4c64f0 100644
--- 
a/maven-core/src/main/java/org/apache/maven/artifact/repository/MavenArtifactRepository.java
+++ 
b/maven-core/src/main/java/org/apache/maven/artifact/repository/MavenArtifactRepository.java
@@ -28,6 +28,10 @@ import org.apache.maven.artifact.metadata.ArtifactMetadata;
 import org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout;
 import org.apache.maven.repository.Proxy;
 
+/**
+ * Abstraction of an artifact repository. Artifact repositories can be remote, 
local, or even build reactor or
+ * IDE workspace.
+ */
 //TODO completely separate local and remote artifact repositories
 public class MavenArtifactRepository
 implements ArtifactRepository

http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/maven-core/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadataManager.java
--
diff --git 
a/maven-core/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadataManager.java
 
b/maven-core/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadataManager.java
index 35626e5..0caeeb5 100644
--- 
a/maven-core/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadataManager.java
+++ 
b/maven-core/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadataManager.java
@@ -25,6 +25,9 @@ import org.apache.maven.artifact.metadata.ArtifactMetadata;
 import org.apache.maven.artifact.repository.ArtifactRepository;
 import org.apache.maven.artifact.repository.RepositoryRequest;
 
+/**
+ * RepositoryMetadataManager
+ */
 public interface RepositoryMetadataManager
 {
 

http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/maven-core/src/main/java/org/apache/maven/artifact/resolver/ResolutionNode.java
--
diff --git 
a/maven-core/src/main/java/org/apache/maven/artifact/resolver/ResolutionNode.java
 
b/maven-core/src/main/java/org/apache/maven/artifact/resolver/ResolutionNode.java
index cd824c4..a156871 100644
--- 
a/maven-core/src/main/java/org/apache/maven/artifact/resolver/ResolutionNode.java
+++ 
b/maven-core/src/main/java/org/apache/maven/artifact/resolver/ResolutionNode.java
@@ -32,6 +32,9 @@ import 
org.apache.maven.artifact.resolver.filter.ArtifactFilter;
 import org.apache.maven.artifact.versioning.ArtifactVersion;
 import org.apache.maven.artifact.versioning.OverConstrainedVersionException;
 
+/**
+ * ResolutionNode
+ */
 public class ResolutionNode
 {
 private Artifact artifact;

http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/maven-core/src/main/java/org/apache/maven/bridge/MavenRepositorySystem.java
--
diff --git 
a/maven-core/src/main/java/org/apache/maven/bridge/MavenRepositorySystem.java 
b/maven-core/src/main/java/org/apache/maven/bridge/MavenRepositorySystem.java
index 9331710..84ad93c 100644
--- 
a/maven-core/src/main/java/org/apache/maven/bridge/MavenRepositorySystem.java
+++ 
b/maven-core/src/main/java/org/apache/maven/bridge/MavenRepositorySystem.java
@@ -76,13 +76,13 @@ public class MavenRepositorySystem
 // DefaultProjectBuilder
 public Artifact createArtifact( String groupId, String artifactId, String 
version, String scope, String type )
 {
-return XcreateArtifact( groupId, artifactId, version, scope, type );
+return createArtifactX( groupId, artifactId, version, scope, type );
 }
 
 // DefaultProjectBuilder
 public Artifact createProjectArtifact( String groupId, String artifactId, 
String metaVersionId )
 {
-return XcreateProjectArtifact( groupId, artifactId, metaVersionId );
+return createProjectArtifactX( groupId, artifactId, metaVersionId );
 }
 
 // DefaultProjectBuilder
@@ -104,7 +104,7 @@ public class MavenRepositorySystem
 }
 
 Artifact artifact =
-XcreateDependencyArtifact( d.getGroupId(), d.getArtifactId(), 
versionRange, d.getType(),
+createDependencyArtifactX( d.getGroupId(), d.getArtifactId(), 
versionRange, d.getType(),
   d.getClassifier(), 
d.getScope(), d.isOptional() );
 
 if ( Artifact.SCOPE_SYSTEM.equals( d.getScope() ) && d.getSystemPath() 
!= null )
@@ -140,13 +140,13 @@ public class MavenRepositorySystem
 return null;
 }
 
-return XcreateExtensionArtifact( groupId, artifactId, 

[04/50] [abbrv] maven git commit: Revert "[MNG-6275] Maven Embedder compatible fix"

[khmarbaise]

Revert "[MNG-6275] Maven Embedder compatible fix"

This reverts commit 27a2bda3f4a8f5385c4cab360ed7365d3d3d3c09.


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

Branch: refs/heads/MNG-6069
Commit: cae779e4fbc6565a581f2c6adf9fb15348005603
Parents: c19e9dc
Author: Stephen Connolly 
Authored: Tue Oct 17 19:17:17 2017 +0100
Committer: Stephen Connolly 
Committed: Tue Oct 17 19:17:17 2017 +0100

--
 .../classrealm/DefaultClassRealmManager.java|   2 +-
 .../DefaultClassRealmManagerTest.java   | 107 ---
 2 files changed, 1 insertion(+), 108 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/cae779e4/maven-core/src/main/java/org/apache/maven/classrealm/DefaultClassRealmManager.java
--
diff --git 
a/maven-core/src/main/java/org/apache/maven/classrealm/DefaultClassRealmManager.java
 
b/maven-core/src/main/java/org/apache/maven/classrealm/DefaultClassRealmManager.java
index 013ab23..6ce1925 100644
--- 
a/maven-core/src/main/java/org/apache/maven/classrealm/DefaultClassRealmManager.java
+++ 
b/maven-core/src/main/java/org/apache/maven/classrealm/DefaultClassRealmManager.java
@@ -120,7 +120,7 @@ public class DefaultClassRealmManager
 {
 try
 {
-ClassRealm classRealm = world.newRealm( realmId, 
PARENT_CLASSLOADER );
+ClassRealm classRealm = world.newRealm( realmId, null );
 
 if ( logger.isDebugEnabled() )
 {

http://git-wip-us.apache.org/repos/asf/maven/blob/cae779e4/maven-core/src/test/java/org/apache/maven/classrealm/DefaultClassRealmManagerTest.java
--
diff --git 
a/maven-core/src/test/java/org/apache/maven/classrealm/DefaultClassRealmManagerTest.java
 
b/maven-core/src/test/java/org/apache/maven/classrealm/DefaultClassRealmManagerTest.java
deleted file mode 100644
index 6d074b9..000
--- 
a/maven-core/src/test/java/org/apache/maven/classrealm/DefaultClassRealmManagerTest.java
+++ /dev/null
@@ -1,107 +0,0 @@
-package org.apache.maven.classrealm;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import java.util.ServiceLoader;
-
-import javax.script.ScriptEngineFactory;
-
-import org.apache.maven.model.Model;
-import org.apache.maven.model.Plugin;
-import org.codehaus.plexus.ContainerConfiguration;
-import org.codehaus.plexus.PlexusConstants;
-import org.codehaus.plexus.PlexusTestCase;
-import org.codehaus.plexus.classworlds.realm.ClassRealm;
-import org.junit.Test;
-
-public class DefaultClassRealmManagerTest extends PlexusTestCase
-{
-private ClassRealmManager classRealmManager;
-private boolean haveScriptEngineFactory;
-
-@Override
-protected void setUp()
-throws Exception
-{
-super.setUp();
-this.classRealmManager = lookup( ClassRealmManager.class );
-ClassLoader testRealm = getClass().getClassLoader();
-ServiceLoader sef = ServiceLoader.load( 
ScriptEngineFactory.class, testRealm );
-// TODO switch to Assume.assumeTrue( sef.iterator().hasNext() ) when 
PlexusTestCase
-// supports assumptions. Not every Java 7 JRE has a 
ScriptEngineFactory.
-this.haveScriptEngineFactory = sef.iterator().hasNext();
-}
-
-@Override
-protected void customizeContainerConfiguration( ContainerConfiguration 
configuration )
-{
-configuration.setClassPathScanning( PlexusConstants.SCANNING_INDEX );
-}
-
-@Test
-public void testMNG6275_pluginRealmDefaultParentClassLoader()
-{
-Plugin plugin = new Plugin();
-plugin.setVersion( "VERSION" );
-
-ClassLoader parent = null;
-
-ClassRealm pluginRealm = 

[36/50] [abbrv] maven git commit: [ MNG-6335] Update Mockito to 2.12.0

[khmarbaise]

[ MNG-6335] Update Mockito to 2.12.0

Also change scope to test

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

Branch: refs/heads/MNG-6069
Commit: a03489b67d04a4b014ff5d1c151b331a39bf100b
Parents: 085ee9f
Author: Sylwester Lachiewicz 
Authored: Sun Jan 7 01:17:32 2018 +0100
Committer: Hervé Boutemy 
Committed: Fri Feb 9 00:20:03 2018 +0100

--
 .../DefaultToolchainManagerPrivateTest.java  | 15 ++-
 .../maven/toolchain/DefaultToolchainManagerTest.java |  4 ++--
 .../building/DefaultToolchainsBuilderTest.java   | 14 +++---
 maven-embedder/pom.xml   |  1 +
 pom.xml  |  3 ++-
 5 files changed, 18 insertions(+), 19 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/a03489b6/maven-core/src/test/java/org/apache/maven/toolchain/DefaultToolchainManagerPrivateTest.java
--
diff --git 
a/maven-core/src/test/java/org/apache/maven/toolchain/DefaultToolchainManagerPrivateTest.java
 
b/maven-core/src/test/java/org/apache/maven/toolchain/DefaultToolchainManagerPrivateTest.java
index 1e48441..c937564 100644
--- 
a/maven-core/src/test/java/org/apache/maven/toolchain/DefaultToolchainManagerPrivateTest.java
+++ 
b/maven-core/src/test/java/org/apache/maven/toolchain/DefaultToolchainManagerPrivateTest.java
@@ -20,8 +20,7 @@ package org.apache.maven.toolchain;
  */
 
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
-import static org.mockito.Matchers.anyString;
+import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.verify;
@@ -145,9 +144,8 @@ public class DefaultToolchainManagerPrivateTest
 verify( logger, never() ).error( anyString() );
 assertEquals( 2, toolchains.length );
 }
-
-@SuppressWarnings( "unchecked" )
-@Test( expected = MisconfiguredToolchainException.class )
+
+@Test
 public void testMisconfiguredToolchain()
 throws Exception
 {
@@ -155,12 +153,11 @@ public class DefaultToolchainManagerPrivateTest
 MavenSession session = mock( MavenSession.class );
 MavenExecutionRequest req = new DefaultMavenExecutionRequest();
 when( session.getRequest() ).thenReturn( req );
-when(toolchainFactory_basicType.createDefaultToolchain()).thenThrow( 
MisconfiguredToolchainException.class );
 
 // execute
-toolchainManager.getToolchainsForType( "basic", session );
-
+ToolchainPrivate[] basics = 
toolchainManager.getToolchainsForType("basic", session);
+
 // verify
-fail( "Should exit with a MisconfiguredToolchainException" );
+assertEquals( 0, basics.length );
 }
 }

http://git-wip-us.apache.org/repos/asf/maven/blob/a03489b6/maven-core/src/test/java/org/apache/maven/toolchain/DefaultToolchainManagerTest.java
--
diff --git 
a/maven-core/src/test/java/org/apache/maven/toolchain/DefaultToolchainManagerTest.java
 
b/maven-core/src/test/java/org/apache/maven/toolchain/DefaultToolchainManagerTest.java
index 6e85c42..8c0 100644
--- 
a/maven-core/src/test/java/org/apache/maven/toolchain/DefaultToolchainManagerTest.java
+++ 
b/maven-core/src/test/java/org/apache/maven/toolchain/DefaultToolchainManagerTest.java
@@ -20,7 +20,6 @@ package org.apache.maven.toolchain;
  */
 
 import static org.junit.Assert.assertEquals;
-import static org.mockito.Matchers.anyMap;
 import static org.mockito.Matchers.isA;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
@@ -39,6 +38,7 @@ import org.apache.maven.toolchain.model.ToolchainModel;
 import org.codehaus.plexus.logging.Logger;
 import org.junit.Before;
 import org.junit.Test;
+import org.mockito.ArgumentMatchers;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
@@ -142,7 +142,7 @@ public class DefaultToolchainManagerTest
 executionRequest.setToolchains( toolchainModels );
 when( session.getRequest() ).thenReturn( executionRequest );
 ToolchainPrivate basicPrivate = mock( ToolchainPrivate.class );
-when( basicPrivate.matchesRequirements( anyMap() ) ).thenReturn( false 
).thenReturn( true );
+when( basicPrivate.matchesRequirements( ArgumentMatchers.anyMap() ) ).thenReturn( false ).thenReturn( true );
 when( 

[13/50] [abbrv] maven git commit: Merge branch 'MNG-6296'

[khmarbaise]

Merge branch 'MNG-6296'


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

Branch: refs/heads/MNG-6069
Commit: 909fb7c59b87286b6eae36195f65db4776ccf92a
Parents: f5f76c7 b2afafe
Author: rfscholte 
Authored: Tue Nov 21 23:32:27 2017 +0100
Committer: rfscholte 
Committed: Tue Nov 21 23:32:27 2017 +0100

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

[41/50] [abbrv] maven git commit: upgraded parent pom to version 31

[khmarbaise]

upgraded parent pom to version 31

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

Branch: refs/heads/MNG-6069
Commit: 40cf506220cd3121fdca8b8bb8a9b9f47faad421
Parents: 0dc70cc
Author: Hervé Boutemy 
Authored: Thu Feb 8 22:46:22 2018 +0100
Committer: Hervé Boutemy 
Committed: Sat Feb 10 11:42:33 2018 +0100

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


http://git-wip-us.apache.org/repos/asf/maven/blob/40cf5062/pom.xml
--
diff --git a/pom.xml b/pom.xml
index f540aa3..66b9d27 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,7 +25,7 @@ under the License.
   
 org.apache.maven
 maven-parent
-27
+31
 ../pom/maven/pom.xml
   
 
@@ -497,22 +497,6 @@ under the License.
   1.4
 
 
-  org.apache.maven.plugins
-  maven-site-plugin
-  3.7
-  
-
scm:svn:https://svn.apache.org/repos/infra/websites/production/maven/components/${maven.site.path}
-  
-
-
-  org.apache.maven.plugins
-  maven-scm-publish-plugin
-  1.1
-  
-apache.releases.https
-  
-
-
   org.apache.rat
   apache-rat-plugin
   
@@ -549,16 +533,6 @@ under the License.
 
   
 
-
-  org.codehaus.mojo
-  findbugs-maven-plugin
-  3.0.4
-
-
-  org.apache.maven.plugins
-  maven-assembly-plugin
-  3.0.0
-
   
 
 
@@ -604,32 +578,10 @@ under the License.
   
 bootstrap/**
 README.bootstrap.txt
-.repository/** 
-.maven/spy.log 
-.java-version
 README.md
   
 
   
-  
-org.apache.maven.plugins
-maven-enforcer-plugin
-
-  
-enforce-maven
-
-  enforce
-
-
-  
-
-  ${maven.version}
-
-  
-
-  
-
-  
 
   
 
@@ -660,10 +612,7 @@ under the License.
   
 org.apache.maven.plugins
 maven-javadoc-plugin
-3.0.0-M1
 
-  
-  en
   
 
   provisional

[20/50] [abbrv] maven git commit: [MNG-6300] Multi module release creates empty directories in war file instead of jars

[khmarbaise]

[MNG-6300] Multi module release creates empty directories in war file instead 
of jars


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

Branch: refs/heads/MNG-6069
Commit: 98af937bc6298e82e489b5f0cd3fb0a1c3d37109
Parents: eee06f7
Author: rfscholte 
Authored: Fri Dec 22 14:25:46 2017 +0100
Committer: rfscholte 
Committed: Fri Dec 22 14:25:46 2017 +0100

--
 .../java/org/apache/maven/RepositoryUtils.java  |  69 +
 .../internal/LifecycleDependencyResolver.java   |  36 ++-
 .../org/apache/maven/plugin/CacheUtils.java |  68 -
 .../plugin/DefaultPluginArtifactsCache.java |  32 +--
 .../plugin/DefaultPluginDescriptorCache.java|   7 +-
 .../maven/plugin/DefaultPluginRealmCache.java   |  36 ++-
 .../plugin/DefaultProjectArtifactsCache.java| 256 ---
 .../maven/plugin/ProjectArtifactsCache.java |  90 ---
 .../artifact/DefaultProjectArtifactsCache.java  | 246 ++
 .../project/artifact/ProjectArtifactsCache.java |  90 +++
 .../AbstractCoreMavenComponentTestCase.java |  30 ++-
 .../LifecycleDependencyResolverTest.java|  90 +++
 .../lifecycle-dependency-resolver/lib/pom.xml   |  32 +++
 .../lifecycle-dependency-resolver/pom.xml   |  58 +
 .../lifecycle-dependency-resolver/war/pom.xml   |  53 
 15 files changed, 723 insertions(+), 470 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/98af937b/maven-core/src/main/java/org/apache/maven/RepositoryUtils.java
--
diff --git a/maven-core/src/main/java/org/apache/maven/RepositoryUtils.java 
b/maven-core/src/main/java/org/apache/maven/RepositoryUtils.java
index 52442b7..00f1327 100644
--- a/maven-core/src/main/java/org/apache/maven/RepositoryUtils.java
+++ b/maven-core/src/main/java/org/apache/maven/RepositoryUtils.java
@@ -22,14 +22,17 @@ package org.apache.maven;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
+import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 
 import org.apache.maven.artifact.handler.ArtifactHandler;
 import org.apache.maven.artifact.handler.DefaultArtifactHandler;
 import org.apache.maven.artifact.handler.manager.ArtifactHandlerManager;
 import org.apache.maven.artifact.repository.ArtifactRepository;
 import org.apache.maven.artifact.repository.ArtifactRepositoryPolicy;
+import org.eclipse.aether.RepositorySystemSession;
 import org.eclipse.aether.artifact.Artifact;
 import org.eclipse.aether.artifact.ArtifactProperties;
 import org.eclipse.aether.artifact.ArtifactType;
@@ -44,6 +47,8 @@ import org.eclipse.aether.repository.Authentication;
 import org.eclipse.aether.repository.Proxy;
 import org.eclipse.aether.repository.RemoteRepository;
 import org.eclipse.aether.repository.RepositoryPolicy;
+import org.eclipse.aether.repository.WorkspaceReader;
+import org.eclipse.aether.repository.WorkspaceRepository;
 import org.eclipse.aether.util.repository.AuthenticationBuilder;
 
 /**
@@ -364,4 +369,68 @@ public class RepositoryUtils
 }
 return artifacts;
 }
+
+public static WorkspaceRepository getWorkspace( RepositorySystemSession 
session )
+{
+WorkspaceReader reader = session.getWorkspaceReader();
+return ( reader != null ) ? reader.getRepository() : null;
+}
+
+public static boolean repositoriesEquals( List r1, 
List r2 )
+{
+if ( r1.size() != r2.size() )
+{
+return false;
+}
+
+for ( Iterator it1 = r1.iterator(), it2 = 
r2.iterator(); it1.hasNext(); )
+{
+if ( !repositoryEquals( it1.next(), it2.next() ) )
+{
+return false;
+}
+}
+
+return true;
+}
+
+public static int repositoriesHashCode( List 
repositories )
+{
+int result = 17;
+for ( RemoteRepository repository : repositories )
+{
+result = 31 * result + repositoryHashCode( repository );
+}
+return result;
+}
+
+private static int repositoryHashCode( RemoteRepository repository )
+{
+int result = 17;
+Object obj = repository.getUrl();
+result = 31 * result + ( obj != null ? obj.hashCode() : 0 );
+return result;
+}
+
+private static boolean policyEquals( RepositoryPolicy p1, RepositoryPolicy 
p2 )
+{
+if ( p1 == p2 )
+{
+return true;
+}
+// update policy doesn't affect contents
+return p1.isEnabled() == 

[49/50] [abbrv] maven git commit: Merge remote-tracking branch 'remotes/origin/MNG-6353'

[khmarbaise]

Merge remote-tracking branch 'remotes/origin/MNG-6353'


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

Branch: refs/heads/MNG-6069
Commit: cd34b08df1f378b44fae3d8020aa1fda8089dc79
Parents: b8c06e6 22f782a
Author: rfscholte 
Authored: Sun Feb 11 18:29:43 2018 +0100
Committer: rfscholte 
Committed: Sun Feb 11 18:29:43 2018 +0100

--
 .../src/main/java/org/apache/maven/cli/MavenCli.java | 10 ++
 .../src/main/java/org/slf4j/impl/MavenSimpleLogger.java  | 11 ++-
 pom.xml  |  2 +-
 3 files changed, 13 insertions(+), 10 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/cd34b08d/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
--

http://git-wip-us.apache.org/repos/asf/maven/blob/cd34b08d/pom.xml
--

[01/50] [abbrv] maven git commit: [MNG-6196] removed remaining Monkey patching, not really necessary [Forced Update!]

[khmarbaise]

Repository: maven
Updated Branches:
  refs/heads/MNG-6069 f8a4e0288 -> fca861199 (forced update)


[MNG-6196] removed remaining Monkey patching, not really necessary

done after Emmanuel Bourg #118 PR idea

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

Branch: refs/heads/MNG-6069
Commit: 4f530c4f006b8d22da90d968a1d32797280804b9
Parents: eb2db7b
Author: Hervé Boutemy 
Authored: Sun May 21 19:02:46 2017 +0200
Committer: Hervé Boutemy 
Committed: Tue Sep 26 00:19:57 2017 +0200

--
 maven-slf4j-provider/pom.xml| 20 +
 .../java/org/slf4j/impl/StaticLoggerBinder.java | 89 
 .../src/main/script/patch-slf4j-simple.groovy   | 36 
 3 files changed, 91 insertions(+), 54 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/4f530c4f/maven-slf4j-provider/pom.xml
--
diff --git a/maven-slf4j-provider/pom.xml b/maven-slf4j-provider/pom.xml
index 68912f5..4bb0b2a 100644
--- a/maven-slf4j-provider/pom.xml
+++ b/maven-slf4j-provider/pom.xml
@@ -32,7 +32,7 @@ under the License.
 
   Maven SLF4J Simple Provider
   
-Maven SLF4J provider based on SLF4J's simple provider, monkey-patched to 
support Maven styled colors
+Maven SLF4J provider based on SLF4J's simple provider, extended to support 
Maven styled colors
 for levels and stacktraces rendering.
   
 
@@ -63,6 +63,7 @@ under the License.
   false
   
${project.build.directory}/generated-sources/slf4j-simple
   org/slf4j/impl/*.java
+  org/slf4j/impl/StaticLoggerBinder*
 
   
 
@@ -94,23 +95,6 @@ under the License.
   
 
   
-  
-org.codehaus.gmaven
-groovy-maven-plugin
-2.0
-
-  
-patch-slf4j-simple
-process-sources
-
-  execute
-
-
-  
${project.basedir}/src/main/script/patch-slf4j-simple.groovy
-
-  
-
-  
 
   
 
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/maven/blob/4f530c4f/maven-slf4j-provider/src/main/java/org/slf4j/impl/StaticLoggerBinder.java
--
diff --git 
a/maven-slf4j-provider/src/main/java/org/slf4j/impl/StaticLoggerBinder.java 
b/maven-slf4j-provider/src/main/java/org/slf4j/impl/StaticLoggerBinder.java
new file mode 100644
index 000..ba01d83
--- /dev/null
+++ b/maven-slf4j-provider/src/main/java/org/slf4j/impl/StaticLoggerBinder.java
@@ -0,0 +1,89 @@
+package org.slf4j.impl;
+
+/*
+ * 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.slf4j.ILoggerFactory;
+import org.slf4j.spi.LoggerFactoryBinder;
+
+/**
+ * SLF4J LoggerFactoryBinder implementation using MavenSimpleLogger.
+ * This class is part of the required classes used to specify an
+ * SLF4J logger provider implementation.
+ *
+ * @since 3.5.1
+ */
+public final class StaticLoggerBinder
+implements LoggerFactoryBinder
+{
+/**
+ * Declare the version of the SLF4J API this implementation is compiled
+ * against. The value of this field is usually modified with each release.
+ */
+// to avoid constant folding by the compiler, this field must *not* be 
final
+@SuppressWarnings( { "checkstyle:staticvariablename", 
"checkstyle:visibilitymodifier" } )
+public static String REQUESTED_API_VERSION = "1.7.25"; // !final
+
+private static final String LOGGER_FACTORY_CLASS_STR = 
MavenSimpleLoggerFactory.class.getName();
+
+/**
+ * The unique instance of this class.
+ */
+private static final StaticLoggerBinder SINGLETON = new 
StaticLoggerBinder();
+
+/**
+ * The ILoggerFactory instance returned by the {@link 

[40/50] [abbrv] maven git commit: upgrade m-site-p to 3.7 + Fluido 1.7 + edit button

[khmarbaise]

upgrade m-site-p to 3.7 + Fluido 1.7 + edit button

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

Branch: refs/heads/MNG-6069
Commit: 0dc70cc691e8968627ce099df02e0570838f04fa
Parents: cf7b0a3
Author: Hervé Boutemy 
Authored: Thu Feb 8 07:38:58 2018 +0100
Committer: Hervé Boutemy 
Committed: Sat Feb 10 11:42:33 2018 +0100

--
 apache-maven/src/site/site.xml  | 8 +---
 maven-artifact/src/site/site.xml| 8 +---
 maven-builder-support/src/site/site.xml | 8 +---
 maven-compat/src/site/site.xml  | 8 +---
 maven-core/src/site/site.xml| 8 +---
 maven-embedder/src/site/site.xml| 8 +---
 maven-model-builder/src/site/site.xml   | 8 +---
 maven-model/src/site/site.xml   | 8 +---
 maven-plugin-api/src/site/site.xml  | 8 +---
 maven-repository-metadata/src/site/site.xml | 8 +---
 maven-resolver-provider/src/site/site.xml   | 8 +---
 maven-settings-builder/src/site/site.xml| 8 +---
 maven-settings/src/site/site.xml| 8 +---
 maven-slf4j-provider/src/site/site.xml  | 8 +---
 pom.xml | 1 +
 src/site/site.xml   | 8 +---
 16 files changed, 76 insertions(+), 45 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/0dc70cc6/apache-maven/src/site/site.xml
--
diff --git a/apache-maven/src/site/site.xml b/apache-maven/src/site/site.xml
index cd5a745..cd7807c 100644
--- a/apache-maven/src/site/site.xml
+++ b/apache-maven/src/site/site.xml
@@ -19,9 +19,11 @@ specific language governing permissions and limitations
 under the License.
 -->
 
-http://maven.apache.org/DECORATION/1.0.0;
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
-  xsi:schemaLocation="http://maven.apache.org/DECORATION/1.0.0 
http://maven.apache.org/xsd/decoration-1.0.0.xsd;>
+http://maven.apache.org/DECORATION/1.8.0; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
+  xsi:schemaLocation="http://maven.apache.org/DECORATION/1.8.0 
http://maven.apache.org/xsd/decoration-1.8.0.xsd;>
+
+  ${project.scm.url}
+
   
 
 

http://git-wip-us.apache.org/repos/asf/maven/blob/0dc70cc6/maven-artifact/src/site/site.xml
--
diff --git a/maven-artifact/src/site/site.xml b/maven-artifact/src/site/site.xml
index 3a16bf9..e475330 100644
--- a/maven-artifact/src/site/site.xml
+++ b/maven-artifact/src/site/site.xml
@@ -19,9 +19,11 @@ specific language governing permissions and limitations
 under the License.
 -->
 
-http://maven.apache.org/DECORATION/1.0.0;
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
-  xsi:schemaLocation="http://maven.apache.org/DECORATION/1.0.0 
http://maven.apache.org/xsd/decoration-1.0.0.xsd;>
+http://maven.apache.org/DECORATION/1.8.0; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
+  xsi:schemaLocation="http://maven.apache.org/DECORATION/1.8.0 
http://maven.apache.org/xsd/decoration-1.8.0.xsd;>
+
+  ${project.scm.url}
+
   
 
   

http://git-wip-us.apache.org/repos/asf/maven/blob/0dc70cc6/maven-builder-support/src/site/site.xml
--
diff --git a/maven-builder-support/src/site/site.xml 
b/maven-builder-support/src/site/site.xml
index 3a16bf9..e475330 100644
--- a/maven-builder-support/src/site/site.xml
+++ b/maven-builder-support/src/site/site.xml
@@ -19,9 +19,11 @@ specific language governing permissions and limitations
 under the License.
 -->
 
-http://maven.apache.org/DECORATION/1.0.0;
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
-  xsi:schemaLocation="http://maven.apache.org/DECORATION/1.0.0 
http://maven.apache.org/xsd/decoration-1.0.0.xsd;>
+http://maven.apache.org/DECORATION/1.8.0; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
+  xsi:schemaLocation="http://maven.apache.org/DECORATION/1.8.0 
http://maven.apache.org/xsd/decoration-1.8.0.xsd;>
+
+  ${project.scm.url}
+
   
 
   

http://git-wip-us.apache.org/repos/asf/maven/blob/0dc70cc6/maven-compat/src/site/site.xml
--
diff --git a/maven-compat/src/site/site.xml b/maven-compat/src/site/site.xml
index 3a16bf9..e475330 100644
--- a/maven-compat/src/site/site.xml
+++ b/maven-compat/src/site/site.xml
@@ -19,9 +19,11 @@ specific language governing permissions and limitations
 under the License.
 -->
 
-http://maven.apache.org/DECORATION/1.0.0;
- 

[35/50] [abbrv] maven git commit: [MNG-5992] Upgrade default version of maven-release-plugin to 2.5.3

[khmarbaise]

[MNG-5992] Upgrade default version of maven-release-plugin to 2.5.3

avoids exposing Git password during release
this fixes #152

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

Branch: refs/heads/MNG-6069
Commit: 085ee9f27508f29ff5cbe418eff0eabc98ad1a95
Parents: 99e6622
Author: Hervé Boutemy 
Authored: Wed Feb 7 22:06:37 2018 +0100
Committer: Hervé Boutemy 
Committed: Thu Feb 8 08:02:04 2018 +0100

--
 .../src/main/resources/org/apache/maven/model/pom-4.0.0.xml| 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/085ee9f2/maven-model-builder/src/main/resources/org/apache/maven/model/pom-4.0.0.xml
--
diff --git 
a/maven-model-builder/src/main/resources/org/apache/maven/model/pom-4.0.0.xml 
b/maven-model-builder/src/main/resources/org/apache/maven/model/pom-4.0.0.xml
index 91492a9..8c26f71 100644
--- 
a/maven-model-builder/src/main/resources/org/apache/maven/model/pom-4.0.0.xml
+++ 
b/maven-model-builder/src/main/resources/org/apache/maven/model/pom-4.0.0.xml
@@ -86,7 +86,7 @@ under the License.
 
 
   maven-release-plugin
-  2.3.2
+  2.5.3
 
   
 

[45/50] [abbrv] maven git commit: Reduce number of global checkstyle rule violations

[khmarbaise]

http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/maven-embedder/src/main/java/org/apache/maven/cli/configuration/ConfigurationProcessor.java
--
diff --git 
a/maven-embedder/src/main/java/org/apache/maven/cli/configuration/ConfigurationProcessor.java
 
b/maven-embedder/src/main/java/org/apache/maven/cli/configuration/ConfigurationProcessor.java
index 75fb9b9..50a5854 100644
--- 
a/maven-embedder/src/main/java/org/apache/maven/cli/configuration/ConfigurationProcessor.java
+++ 
b/maven-embedder/src/main/java/org/apache/maven/cli/configuration/ConfigurationProcessor.java
@@ -21,6 +21,9 @@ package org.apache.maven.cli.configuration;
 
 import org.apache.maven.cli.CliRequest;
 
+/**
+ * ConfigurationProcessor
+ */
 public interface ConfigurationProcessor
 {
 void process( CliRequest request )

http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/maven-embedder/src/main/java/org/apache/maven/cli/configuration/SettingsXmlConfigurationProcessor.java
--
diff --git 
a/maven-embedder/src/main/java/org/apache/maven/cli/configuration/SettingsXmlConfigurationProcessor.java
 
b/maven-embedder/src/main/java/org/apache/maven/cli/configuration/SettingsXmlConfigurationProcessor.java
index d9a6954..2536a22 100644
--- 
a/maven-embedder/src/main/java/org/apache/maven/cli/configuration/SettingsXmlConfigurationProcessor.java
+++ 
b/maven-embedder/src/main/java/org/apache/maven/cli/configuration/SettingsXmlConfigurationProcessor.java
@@ -47,6 +47,9 @@ import org.codehaus.plexus.component.annotations.Component;
 import org.codehaus.plexus.component.annotations.Requirement;
 import org.slf4j.Logger;
 
+/**
+ * SettingsXmlConfigurationProcessor
+ */
 @Component( role = ConfigurationProcessor.class, hint = 
SettingsXmlConfigurationProcessor.HINT )
 public class SettingsXmlConfigurationProcessor
 implements ConfigurationProcessor

http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/maven-embedder/src/main/java/org/apache/maven/cli/event/DefaultEventSpyContext.java
--
diff --git 
a/maven-embedder/src/main/java/org/apache/maven/cli/event/DefaultEventSpyContext.java
 
b/maven-embedder/src/main/java/org/apache/maven/cli/event/DefaultEventSpyContext.java
index f62b57e..55b1155 100644
--- 
a/maven-embedder/src/main/java/org/apache/maven/cli/event/DefaultEventSpyContext.java
+++ 
b/maven-embedder/src/main/java/org/apache/maven/cli/event/DefaultEventSpyContext.java
@@ -24,6 +24,9 @@ import java.util.Map;
 
 import org.apache.maven.eventspy.EventSpy;
 
+/**
+ * DefaultEventSpyContext
+ */
 public class DefaultEventSpyContext
 implements EventSpy.Context
 {

http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/maven-embedder/src/main/java/org/apache/maven/cli/internal/BootstrapCoreExtensionManager.java
--
diff --git 
a/maven-embedder/src/main/java/org/apache/maven/cli/internal/BootstrapCoreExtensionManager.java
 
b/maven-embedder/src/main/java/org/apache/maven/cli/internal/BootstrapCoreExtensionManager.java
index 2a7d3e3..9fada05 100644
--- 
a/maven-embedder/src/main/java/org/apache/maven/cli/internal/BootstrapCoreExtensionManager.java
+++ 
b/maven-embedder/src/main/java/org/apache/maven/cli/internal/BootstrapCoreExtensionManager.java
@@ -49,6 +49,9 @@ import org.eclipse.aether.repository.RemoteRepository;
 import org.eclipse.aether.util.filter.ExclusionsDependencyFilter;
 import org.eclipse.aether.util.graph.visitor.PreorderNodeListGenerator;
 
+/**
+ * BootstrapCoreExtensionManager
+ */
 @Named
 public class BootstrapCoreExtensionManager
 {

http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/maven-embedder/src/main/java/org/apache/maven/cli/logging/Slf4jConfiguration.java
--
diff --git 
a/maven-embedder/src/main/java/org/apache/maven/cli/logging/Slf4jConfiguration.java
 
b/maven-embedder/src/main/java/org/apache/maven/cli/logging/Slf4jConfiguration.java
index f64f330..8dc81c7 100644
--- 
a/maven-embedder/src/main/java/org/apache/maven/cli/logging/Slf4jConfiguration.java
+++ 
b/maven-embedder/src/main/java/org/apache/maven/cli/logging/Slf4jConfiguration.java
@@ -28,6 +28,9 @@ package org.apache.maven.cli.logging;
  */
 public interface Slf4jConfiguration
 {
+/**
+ * Level
+ */
 enum Level
 {
 DEBUG, INFO, ERROR

http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/maven-embedder/src/main/java/org/apache/maven/cli/transfer/AbstractMavenTransferListener.java
--
diff --git 
a/maven-embedder/src/main/java/org/apache/maven/cli/transfer/AbstractMavenTransferListener.java
 
b/maven-embedder/src/main/java/org/apache/maven/cli/transfer/AbstractMavenTransferListener.java

[12/50] [abbrv] maven git commit: Parse properties before configuring the logging settings

[khmarbaise]

Parse properties before configuring the logging settings


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

Branch: refs/heads/MNG-6069
Commit: b2afafe5a252d9f86b3e43cce8a06dc9cdc7a6d7
Parents: 5919b74
Author: Robin Müller 
Authored: Thu Oct 26 09:41:20 2017 +0200
Committer: rfscholte 
Committed: Fri Nov 17 16:41:38 2017 +0100

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


http://git-wip-us.apache.org/repos/asf/maven/blob/b2afafe5/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 3474fab..977f174 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
@@ -277,9 +277,9 @@ public class MavenCli
 {
 initialize( cliRequest );
 cli( cliRequest );
+properties( cliRequest );
 logging( cliRequest );
 version( cliRequest );
-properties( cliRequest );
 localContainer = container( cliRequest );
 commands( cliRequest );
 configure( cliRequest );

[26/50] [abbrv] maven git commit: [MNG-6308] display groupId:artifactId in Building message header

[khmarbaise]

[MNG-6308] display groupId:artifactId in Building message header

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

Branch: refs/heads/MNG-6069
Commit: c2e3b3e301a96e36670206db0c215f3026937d33
Parents: 98d2e19
Author: Hervé Boutemy 
Authored: Sat Jan 6 22:12:08 2018 +0100
Committer: Hervé Boutemy 
Committed: Sat Jan 6 22:40:29 2018 +0100

--
 .../maven/cli/event/ExecutionEventLogger.java   | 21 --
 .../cli/event/ExecutionEventLoggerTest.java | 30 +++-
 2 files changed, 48 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/c2e3b3e3/maven-embedder/src/main/java/org/apache/maven/cli/event/ExecutionEventLogger.java
--
diff --git 
a/maven-embedder/src/main/java/org/apache/maven/cli/event/ExecutionEventLogger.java
 
b/maven-embedder/src/main/java/org/apache/maven/cli/event/ExecutionEventLogger.java
index 513d56a..3da9ad3 100644
--- 
a/maven-embedder/src/main/java/org/apache/maven/cli/event/ExecutionEventLogger.java
+++ 
b/maven-embedder/src/main/java/org/apache/maven/cli/event/ExecutionEventLogger.java
@@ -261,9 +261,26 @@ public class ExecutionEventLogger
 {
 if ( logger.isInfoEnabled() )
 {
+MavenProject project = event.getProject();
+
 logger.info( "" );
-infoLine( '-' );
 
+// ---< groupId:artifactId >---
+String projectKey = project.getGroupId() + ':' + 
project.getArtifactId();
+
+final String preHeader  = "--< ";
+final String postHeader = " >--";
+
+final int headerLen = preHeader.length() + projectKey.length() + 
postHeader.length();
+
+String prefix = chars( '-', Math.max( 0, ( LINE_LENGTH - headerLen 
) / 2 ) ) + preHeader;
+
+String suffix = postHeader
++ chars( '-', Math.max( 0, LINE_LENGTH - headerLen - 
prefix.length() + preHeader.length() ) );
+
+logger.info( buffer().strong( prefix ).project( projectKey 
).strong( suffix ).toString() );
+
+// Building Project Name Version[i/n]
 String building = "Building " + event.getProject().getName() + " " 
+ event.getProject().getVersion();
 
 if ( totalProjects <= 1 )
@@ -283,7 +300,7 @@ public class ExecutionEventLogger
 int pad = LINE_LENGTH - building.length() - progress.length();
 
 infoMain( building + ( ( pad > 0 ) ? chars( ' ', pad ) : "" ) 
+ progress );
-} // else what's the point
+}
 
 infoLine( '-' );
 }

http://git-wip-us.apache.org/repos/asf/maven/blob/c2e3b3e3/maven-embedder/src/test/java/org/apache/maven/cli/event/ExecutionEventLoggerTest.java
--
diff --git 
a/maven-embedder/src/test/java/org/apache/maven/cli/event/ExecutionEventLoggerTest.java
 
b/maven-embedder/src/test/java/org/apache/maven/cli/event/ExecutionEventLoggerTest.java
index 515f9fe..4c0539d 100644
--- 
a/maven-embedder/src/test/java/org/apache/maven/cli/event/ExecutionEventLoggerTest.java
+++ 
b/maven-embedder/src/test/java/org/apache/maven/cli/event/ExecutionEventLoggerTest.java
@@ -71,8 +71,36 @@ public class ExecutionEventLoggerTest
 // verify
 InOrder inOrder = inOrder( logger );
 inOrder.verify( logger ).info( "" );
-inOrder.verify( logger ).info( 
"" );
+inOrder.verify( logger ).info( "--< 
org.apache.maven:maven-embedder >---" );
 inOrder.verify( logger ).info( "Building Apache Maven Embedder 
3.5.4-SNAPSHOT" );
 inOrder.verify( logger ).info( 
"" );
 }
+
+@Test
+public void testProjectStartedOverflow()
+{
+// prepare
+Logger logger = mock( Logger.class );
+when( logger.isInfoEnabled() ).thenReturn( true );
+executionEventLogger = new ExecutionEventLogger( logger );
+
+ExecutionEvent event = mock( ExecutionEvent.class );
+MavenProject project = mock( MavenProject.class );
+when( project.getGroupId() ).thenReturn( 
"org.apache.maven.plugins.overflow" );
+when( project.getArtifactId() ).thenReturn( 
"maven-project-info-reports-plugin" );
+when( project.getPackaging() ).thenReturn( "maven-plugin" );
+when( project.getName() ).thenReturn( "Apache Maven Project Info 
Reports 

[27/50] [abbrv] maven git commit: [MNG-6308] added unit test for "Building" message

[khmarbaise]

[MNG-6308] added unit test for "Building" message

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

Branch: refs/heads/MNG-6069
Commit: 98d2e197d111d4863d1e420a9f9c1548690bc7e1
Parents: 68a9d79
Author: Hervé Boutemy 
Authored: Sat Jan 6 22:07:17 2018 +0100
Committer: Hervé Boutemy 
Committed: Sat Jan 6 22:40:29 2018 +0100

--
 maven-embedder/pom.xml  |  4 +
 .../cli/event/ExecutionEventLoggerTest.java | 78 
 2 files changed, 82 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/98d2e197/maven-embedder/pom.xml
--
diff --git a/maven-embedder/pom.xml b/maven-embedder/pom.xml
index d6576f9..cfc126f 100644
--- a/maven-embedder/pom.xml
+++ b/maven-embedder/pom.xml
@@ -139,6 +139,10 @@ under the License.
   commons-lang3
 
 
+  org.mockito
+  mockito-core
+
+
   org.fusesource.jansi
   jansi
   test

http://git-wip-us.apache.org/repos/asf/maven/blob/98d2e197/maven-embedder/src/test/java/org/apache/maven/cli/event/ExecutionEventLoggerTest.java
--
diff --git 
a/maven-embedder/src/test/java/org/apache/maven/cli/event/ExecutionEventLoggerTest.java
 
b/maven-embedder/src/test/java/org/apache/maven/cli/event/ExecutionEventLoggerTest.java
new file mode 100644
index 000..515f9fe
--- /dev/null
+++ 
b/maven-embedder/src/test/java/org/apache/maven/cli/event/ExecutionEventLoggerTest.java
@@ -0,0 +1,78 @@
+package org.apache.maven.cli.event;
+
+/*
+ * 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 static org.mockito.Mockito.inOrder;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import org.apache.maven.execution.ExecutionEvent;
+import org.apache.maven.project.MavenProject;
+import org.apache.maven.shared.utils.logging.MessageUtils;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.mockito.InOrder;
+import org.slf4j.Logger;
+
+public class ExecutionEventLoggerTest
+{
+private ExecutionEventLogger executionEventLogger;
+
+@BeforeClass
+public static void setUp() 
+{
+MessageUtils.setColorEnabled( false );
+}
+
+@AfterClass
+public static void tearDown()
+{
+MessageUtils.setColorEnabled( true );
+}
+
+@Test
+public void testProjectStarted()
+{
+// prepare
+Logger logger = mock( Logger.class );
+when( logger.isInfoEnabled() ).thenReturn( true );
+executionEventLogger = new ExecutionEventLogger( logger );
+
+ExecutionEvent event = mock( ExecutionEvent.class );
+MavenProject project = mock( MavenProject.class );
+when( project.getGroupId() ).thenReturn( "org.apache.maven" );
+when( project.getArtifactId() ).thenReturn( "maven-embedder" );
+when( project.getPackaging() ).thenReturn( "jar" );
+when( project.getName() ).thenReturn( "Apache Maven Embedder" );
+when( project.getVersion() ).thenReturn( "3.5.4-SNAPSHOT" );
+when( event.getProject() ).thenReturn( project );
+
+// execute
+executionEventLogger.projectStarted( event );
+
+// verify
+InOrder inOrder = inOrder( logger );
+inOrder.verify( logger ).info( "" );
+inOrder.verify( logger ).info( 
"" );
+inOrder.verify( logger ).info( "Building Apache Maven Embedder 
3.5.4-SNAPSHOT" );
+inOrder.verify( logger ).info( 
"" );
+}
+}

[42/50] [abbrv] maven git commit: fixed new issues reported by Checkstyle 6.18

[khmarbaise]

fixed new issues reported by Checkstyle 6.18

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

Branch: refs/heads/MNG-6069
Commit: cf7b0a3ec0c9333f646da8694bdcd9d2eb91a4b0
Parents: e2bc17b
Author: Hervé Boutemy 
Authored: Thu Feb 8 07:37:05 2018 +0100
Committer: Hervé Boutemy 
Committed: Sat Feb 10 11:42:33 2018 +0100

--
 .../apache/maven/artifact/versioning/ComparableVersion.java   | 4 ++--
 .../main/java/org/apache/maven/building/DefaultProblem.java   | 2 +-
 .../org/apache/maven/building/DefaultProblemCollector.java| 2 +-
 maven-core/src/main/java/org/apache/maven/ReactorReader.java  | 2 +-
 .../src/main/java/org/apache/maven/RepositoryUtils.java   | 2 +-
 .../artifact/repository/LegacyLocalRepositoryManager.java | 4 ++--
 .../maven/classrealm/ArtifactClassRealmConstituent.java   | 2 +-
 .../org/apache/maven/classrealm/DefaultClassRealmRequest.java | 4 ++--
 .../maven/configuration/internal/DefaultBeanConfigurator.java | 2 +-
 .../maven/eventspy/internal/EventSpyExecutionListener.java| 2 +-
 .../maven/eventspy/internal/EventSpyRepositoryListener.java   | 2 +-
 .../main/java/org/apache/maven/execution/SettingsAdapter.java | 2 +-
 .../apache/maven/graph/FilteredProjectDependencyGraph.java| 4 ++--
 .../maven/internal/aether/LoggingRepositoryListener.java  | 2 +-
 .../lifecycle/internal/CompoundProjectExecutionListener.java  | 2 +-
 .../maven/lifecycle/internal/DefaultExecutionEvent.java   | 2 +-
 .../maven/lifecycle/internal/LifecycleDependencyResolver.java | 2 +-
 .../internal/builder/multithreaded/ThreadOutputMuxer.java | 2 +-
 .../apache/maven/plugin/CompoundMojoExecutionListener.java| 2 +-
 .../org/apache/maven/plugin/DefaultPluginDescriptorCache.java | 2 +-
 .../java/org/apache/maven/plugin/ExtensionRealmCache.java | 4 ++--
 .../java/org/apache/maven/plugin/PluginArtifactsCache.java| 4 ++--
 .../main/java/org/apache/maven/plugin/PluginRealmCache.java   | 4 ++--
 .../plugin/internal/PluginDependencyResolutionListener.java   | 2 +-
 .../plugin/internal/ValidatingConfigurationListener.java  | 2 +-
 .../java/org/apache/maven/plugin/internal/WagonExcluder.java  | 2 +-
 .../plugin/prefix/internal/DefaultPluginPrefixResult.java | 6 +++---
 .../plugin/version/internal/DefaultPluginVersionResult.java   | 4 ++--
 .../apache/maven/project/DefaultProjectBuildingResult.java| 6 +++---
 .../maven/project/DefaultProjectDependenciesResolver.java | 2 +-
 .../main/java/org/apache/maven/project/ProjectRealmCache.java | 4 ++--
 .../main/java/org/apache/maven/project/ReactorModelCache.java | 2 +-
 .../main/java/org/apache/maven/project/ReactorModelPool.java  | 2 +-
 .../apache/maven/project/artifact/ProjectArtifactsCache.java  | 6 +++---
 .../org/apache/maven/toolchain/java/JavaToolchainImpl.java| 2 +-
 .../src/main/java/org/apache/maven/cli/MavenCli.java  | 2 +-
 .../java/org/apache/maven/cli/logging/Slf4jConfiguration.java | 2 +-
 .../maven/cli/transfer/AbstractMavenTransferListener.java | 4 ++--
 .../maven/model/building/DefaultModelBuildingEvent.java   | 2 +-
 .../maven/model/building/DefaultModelBuildingResult.java  | 2 +-
 .../maven/model/building/DefaultModelProblemCollector.java| 2 +-
 .../maven/model/building/FilterModelBuildingRequest.java  | 2 +-
 .../main/java/org/apache/maven/model/building/ModelData.java  | 4 ++--
 .../maven/model/interpolation/BuildTimestampValueSource.java  | 2 +-
 .../model/interpolation/PathTranslatingPostProcessor.java | 2 +-
 .../model/interpolation/ProblemDetectingValueSource.java  | 2 +-
 .../model/interpolation/StringSearchModelInterpolator.java| 7 +++
 .../model/interpolation/UrlNormalizingPostProcessor.java  | 2 +-
 .../apache/maven/repository/internal/DefaultModelCache.java   | 2 +-
 .../maven/repository/internal/DefaultModelResolver.java   | 6 +++---
 .../maven/repository/internal/DefaultVersionResolver.java | 6 +++---
 .../maven/repository/internal/LocalSnapshotMetadata.java  | 4 ++--
 .../repository/internal/LocalSnapshotMetadataGenerator.java   | 2 +-
 .../apache/maven/repository/internal/RelocatedArtifact.java   | 2 +-
 .../maven/repository/internal/RemoteSnapshotMetadata.java | 2 +-
 .../repository/internal/RemoteSnapshotMetadataGenerator.java  | 2 +-
 .../apache/maven/repository/internal/VersionsMetadata.java| 4 ++--
 .../maven/repository/internal/VersionsMetadataGenerator.java  | 4 ++--
 .../settings/building/DefaultSettingsBuildingResult.java  | 2 +-
 .../settings/building/DefaultSettingsProblemCollector.java| 2 +-
 .../settings/crypto/DefaultSettingsDecryptionResult.java  | 2 +-
 61 files changed, 87 

[09/50] [abbrv] maven git commit: Update DOAP

[khmarbaise]

Update DOAP


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

Branch: refs/heads/MNG-6069
Commit: 5919b7450d2e01f079e930d92df7910af39d489a
Parents: 69c512a
Author: Stephen Connolly 
Authored: Thu Oct 26 09:30:12 2017 +0100
Committer: Stephen Connolly 
Committed: Thu Oct 26 09:30:12 2017 +0100

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


http://git-wip-us.apache.org/repos/asf/maven/blob/5919b745/doap_Maven.rdf
--
diff --git a/doap_Maven.rdf b/doap_Maven.rdf
index 7b671d7..79a9141 100644
--- a/doap_Maven.rdf
+++ b/doap_Maven.rdf
@@ -33,6 +33,17 @@ under the License.
 
   
 Latest stable release
+2017-10-24
+3.5.2
+
http://archive.apache.org/dist/maven/maven-3/3.5.2/binaries/apache-maven-3.5.2-bin.zip
+
http://archive.apache.org/dist/maven/maven-3/3.5.2/binaries/apache-maven-3.5.2-bin.tar.gz
+
http://archive.apache.org/dist/maven/maven-3/3.5.2/source/apache-maven-3.5.2-src.zip
+
http://archive.apache.org/dist/maven/maven-3/3.5.2/source/apache-maven-3.5.2-src.tar.gz
+  
+
+
+  
+Apache Maven 3.5.0
 2017-04-07
 3.5.0
 
http://archive.apache.org/dist/maven/maven-3/3.5.0/binaries/apache-maven-3.5.0-bin.zip

[05/50] [abbrv] maven git commit: Revert "MNG-6209 better executeMojo thread context classloader"

[khmarbaise]

Revert "MNG-6209 better executeMojo thread context classloader"

This reverts commit ec629f7d511eb910b4e80112a9fbe85ed8786f10.


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

Branch: refs/heads/MNG-6069
Commit: 4b95ad9fce6dfe7eec2be88f5837e96c7fbd7292
Parents: cae779e
Author: Stephen Connolly 
Authored: Tue Oct 17 19:18:43 2017 +0100
Committer: Stephen Connolly 
Committed: Tue Oct 17 19:18:43 2017 +0100

--
 .../java/org/apache/maven/plugin/DefaultBuildPluginManager.java | 5 +
 1 file changed, 1 insertion(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/4b95ad9f/maven-core/src/main/java/org/apache/maven/plugin/DefaultBuildPluginManager.java
--
diff --git 
a/maven-core/src/main/java/org/apache/maven/plugin/DefaultBuildPluginManager.java
 
b/maven-core/src/main/java/org/apache/maven/plugin/DefaultBuildPluginManager.java
index 3af1125..b4f7a4d 100644
--- 
a/maven-core/src/main/java/org/apache/maven/plugin/DefaultBuildPluginManager.java
+++ 
b/maven-core/src/main/java/org/apache/maven/plugin/DefaultBuildPluginManager.java
@@ -106,11 +106,8 @@ public class DefaultBuildPluginManager
 throw new PluginExecutionException( mojoExecution, project, e );
 }
 
-// use project realm as thread context classloader to enable 
components from all extensions=true plugins
-ClassRealm tccl = mojoExecution.getPlugin().isExtensions() ? 
project.getClassRealm() : pluginRealm;
-
 ClassLoader oldClassLoader = 
Thread.currentThread().getContextClassLoader();
-Thread.currentThread().setContextClassLoader( tccl );
+Thread.currentThread().setContextClassLoader( pluginRealm );
 
 MavenSession oldSession = legacySupport.getSession();
 

[16/50] [abbrv] maven git commit: Syntax

[khmarbaise]

Syntax


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

Branch: refs/heads/MNG-6069
Commit: 3f04e94ea45033fa2768f40148b5e06a141e066e
Parents: 35f3586
Author: Stephen Connolly 
Authored: Mon Dec 11 13:45:00 2017 +
Committer: Stephen Connolly 
Committed: Mon Dec 11 13:45:00 2017 +

--
 Jenkinsfile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/3f04e94e/Jenkinsfile
--
diff --git a/Jenkinsfile b/Jenkinsfile
index 39111e8..9f16f6f 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -39,10 +39,10 @@ node(jenkinsEnv.labelForOS(buildOs)) {
 String jdkName = jenkinsEnv.jdkFromVersion(buildOs, buildJdk)
 String mvnName = jenkinsEnv.mvnFromVersion(buildOs, buildMvn)
 withMaven(jdk: jdkName, maven: mvnName, 
mavenLocalRepo:"${WORK_DIR}/.repository", options:[
-artifactsPublisher(disabled: disablePublishers),
+artifactsPublisher(disabled: false),
 junitPublisher(ignoreAttachments: false),
-findbugsPublisher(disabled: disablePublishers),
-openTasksPublisher(disabled: disablePublishers),
+findbugsPublisher(disabled: false),
+openTasksPublisher(disabled: false),
 dependenciesFingerprintPublisher(),
 invokerPublisher(),
 pipelineGraphPublisher()

[07/50] [abbrv] maven git commit: [maven-release-plugin] prepare for next development iteration

[khmarbaise]

[maven-release-plugin] prepare for next development iteration


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

Branch: refs/heads/MNG-6069
Commit: 3d0efa36963c217527230228a11ab44050ca1b10
Parents: 138edd6
Author: Stephen Connolly 
Authored: Wed Oct 18 08:55:05 2017 +0100
Committer: Stephen Connolly 
Committed: Wed Oct 18 08:55:05 2017 +0100

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


http://git-wip-us.apache.org/repos/asf/maven/blob/3d0efa36/apache-maven/pom.xml
--
diff --git a/apache-maven/pom.xml b/apache-maven/pom.xml
index ba28fa2..6802a99 100644
--- a/apache-maven/pom.xml
+++ b/apache-maven/pom.xml
@@ -25,7 +25,7 @@ under the License.
   
 org.apache.maven
 maven
-3.5.2
+3.5.3-SNAPSHOT
   
 
   apache-maven

http://git-wip-us.apache.org/repos/asf/maven/blob/3d0efa36/maven-artifact/pom.xml
--
diff --git a/maven-artifact/pom.xml b/maven-artifact/pom.xml
index 3772dd9..8a9c404 100644
--- a/maven-artifact/pom.xml
+++ b/maven-artifact/pom.xml
@@ -25,7 +25,7 @@ under the License.
   
 org.apache.maven
 maven
-3.5.2
+3.5.3-SNAPSHOT
   
 
   maven-artifact

http://git-wip-us.apache.org/repos/asf/maven/blob/3d0efa36/maven-builder-support/pom.xml
--
diff --git a/maven-builder-support/pom.xml b/maven-builder-support/pom.xml
index 0b6328e..a09816d 100644
--- a/maven-builder-support/pom.xml
+++ b/maven-builder-support/pom.xml
@@ -25,7 +25,7 @@ under the License.
   
 org.apache.maven
 maven
-3.5.2
+3.5.3-SNAPSHOT
   
 
   maven-builder-support

http://git-wip-us.apache.org/repos/asf/maven/blob/3d0efa36/maven-compat/pom.xml
--
diff --git a/maven-compat/pom.xml b/maven-compat/pom.xml
index 1935ebf..7ec94e2 100644
--- a/maven-compat/pom.xml
+++ b/maven-compat/pom.xml
@@ -25,7 +25,7 @@ under the License.
   
 org.apache.maven
 maven
-3.5.2
+3.5.3-SNAPSHOT
   
 
   maven-compat

http://git-wip-us.apache.org/repos/asf/maven/blob/3d0efa36/maven-core/pom.xml
--
diff --git a/maven-core/pom.xml b/maven-core/pom.xml
index 8ab5bcc..7c2cde1 100644
--- a/maven-core/pom.xml
+++ b/maven-core/pom.xml
@@ -25,7 +25,7 @@ under the License.
   
 org.apache.maven
 maven
-3.5.2
+3.5.3-SNAPSHOT
   
 
   maven-core

http://git-wip-us.apache.org/repos/asf/maven/blob/3d0efa36/maven-embedder/pom.xml
--
diff --git a/maven-embedder/pom.xml b/maven-embedder/pom.xml
index 6dd1641..d6576f9 100644
--- a/maven-embedder/pom.xml
+++ b/maven-embedder/pom.xml
@@ -25,7 +25,7 @@ under the License.
   
 org.apache.maven
 maven
-3.5.2
+3.5.3-SNAPSHOT
   
 
   maven-embedder

http://git-wip-us.apache.org/repos/asf/maven/blob/3d0efa36/maven-model-builder/pom.xml
--
diff --git a/maven-model-builder/pom.xml b/maven-model-builder/pom.xml
index f6ebe27..b2ef0e7 100644
--- a/maven-model-builder/pom.xml
+++ b/maven-model-builder/pom.xml
@@ -25,7 +25,7 @@ under the License.
   
 org.apache.maven
 maven
-3.5.2
+3.5.3-SNAPSHOT
   
 
   maven-model-builder

http://git-wip-us.apache.org/repos/asf/maven/blob/3d0efa36/maven-model/pom.xml
--
diff --git a/maven-model/pom.xml b/maven-model/pom.xml
index 6897154..594c3ec 100644
--- a/maven-model/pom.xml
+++ b/maven-model/pom.xml
@@ -25,7 +25,7 @@ under the License.
   
 org.apache.maven
 maven
-3.5.2
+3.5.3-SNAPSHOT
   
 
   maven-model

http://git-wip-us.apache.org/repos/asf/maven/blob/3d0efa36/maven-plugin-api/pom.xml