svn commit: r1764745 - /maven/project/KEYS

[adangel]

Author: adangel
Date: Thu Oct 13 17:47:00 2016
New Revision: 1764745

URL: http://svn.apache.org/viewvc?rev=1764745=rev
Log:
Added keys for adan...@users.sourceforge.net and adan...@apache.org

Modified:
maven/project/KEYS

Modified: maven/project/KEYS
URL: 
http://svn.apache.org/viewvc/maven/project/KEYS?rev=1764745=1764744=1764745=diff
==
--- maven/project/KEYS (original)
+++ maven/project/KEYS Thu Oct 13 17:47:00 2016
@@ -2864,3 +2864,130 @@ UULWiY7Admp+aWTE3hmQY1ztzzlbaT3Ezb77sZRT
 JQ6v7zYk/Wo9odWBxrvoJ3o=
 =Jdgg
 -END PGP PUBLIC KEY BLOCK-
+
+pub   rsa2048 2011-09-28 [SC] [expires: 2017-06-08]
+  B9780824E07F1C42456595F176C898A0C6C9B113
+uid   [ultimate] Andreas Dangel 
+sub   rsa2048 2011-09-28 [E] [expires: 2017-06-08]
+
+-BEGIN PGP PUBLIC KEY BLOCK-
+
+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
+=wIxr
+-END PGP PUBLIC KEY BLOCK-
+
+pub   rsa4096 2016-02-05 [SCA] [expires: 2017-02-04]
+  C870735180244047DA600FDEC171A58398EEC284
+uid   [ultimate] Andreas Dangel 
+sub   

svn commit: r16503 - /release/maven/KEYS

[hboutemy]

Author: hboutemy
Date: Thu Oct 13 18:19:42 2016
New Revision: 16503

Log:
updated KEYS from https://svn.apache.org/repos/asf/maven/project/KEYS

Modified:
release/maven/KEYS

Modified: release/maven/KEYS
==
--- release/maven/KEYS (original)
+++ release/maven/KEYS Thu Oct 13 18:19:42 2016
@@ -8,6 +8,109 @@ svn cat https://svn.apache.org/repos/asf
 then commit: This is a PMC activity. If you are not a PMC member then email
 priv...@maven.apache.org with a request to update this file for you
 
+pub   8192R/160788A2 2015-03-04 [expires: 2017-03-03]
+uid  Karl Heinz Marbaise (ASF Key) 
+sig 3160788A2 2015-03-04  Karl Heinz Marbaise (ASF Key) 

+sub   8192R/C5CDC967 2015-03-04 [expires: 2017-03-03]
+sig  160788A2 2015-03-04  Karl Heinz Marbaise (ASF Key) 

+
+-BEGIN PGP PUBLIC KEY BLOCK-
+Version: GnuPG/MacGPG2 v2.0.19 (Darwin)
+Comment: GPGTools - http://gpgtools.org
+
+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

svn commit: r1764759 - in /maven/plugins/trunk/maven-site-plugin/src: it/MSITE-705-debug/ it/MSITE-705-no-debug/ main/java/org/apache/maven/plugins/site/deploy/

[gboue]

Author: gboue
Date: Thu Oct 13 19:03:08 2016
New Revision: 1764759

URL: http://svn.apache.org/viewvc?rev=1764759=rev
Log:
[MSITE-705] Too much information in maven logs during site:deploy in sftp...

The debug listener on the Wagon instance is only added if we're running Maven 
in debug mode. This closes #95.

Added:
maven/plugins/trunk/maven-site-plugin/src/it/MSITE-705-debug/

maven/plugins/trunk/maven-site-plugin/src/it/MSITE-705-debug/invoker.properties 
  (with props)
maven/plugins/trunk/maven-site-plugin/src/it/MSITE-705-debug/pom.xml   
(with props)
maven/plugins/trunk/maven-site-plugin/src/it/MSITE-705-debug/verify.groovy  
 (with props)
maven/plugins/trunk/maven-site-plugin/src/it/MSITE-705-no-debug/

maven/plugins/trunk/maven-site-plugin/src/it/MSITE-705-no-debug/invoker.properties
   (with props)
maven/plugins/trunk/maven-site-plugin/src/it/MSITE-705-no-debug/pom.xml   
(with props)

maven/plugins/trunk/maven-site-plugin/src/it/MSITE-705-no-debug/verify.groovy   
(with props)
Modified:

maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/deploy/AbstractDeployMojo.java

Added: 
maven/plugins/trunk/maven-site-plugin/src/it/MSITE-705-debug/invoker.properties
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/MSITE-705-debug/invoker.properties?rev=1764759=auto
==
--- 
maven/plugins/trunk/maven-site-plugin/src/it/MSITE-705-debug/invoker.properties 
(added)
+++ 
maven/plugins/trunk/maven-site-plugin/src/it/MSITE-705-debug/invoker.properties 
Thu Oct 13 19:03:08 2016
@@ -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.goals = clean site:site site:deploy 
+invoker.debug = true

Propchange: 
maven/plugins/trunk/maven-site-plugin/src/it/MSITE-705-debug/invoker.properties
--
svn:eol-style = native

Propchange: 
maven/plugins/trunk/maven-site-plugin/src/it/MSITE-705-debug/invoker.properties
--
svn:keywords = Author Date Id Revision

Added: maven/plugins/trunk/maven-site-plugin/src/it/MSITE-705-debug/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/MSITE-705-debug/pom.xml?rev=1764759=auto
==
--- maven/plugins/trunk/maven-site-plugin/src/it/MSITE-705-debug/pom.xml (added)
+++ maven/plugins/trunk/maven-site-plugin/src/it/MSITE-705-debug/pom.xml Thu 
Oct 13 19:03:08 2016
@@ -0,0 +1,50 @@
+
+
+
+
+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.its.site
+  msite-705-debug
+  1.0-SNAPSHOT
+  
+Tests that Wagon debug logs (session/transfer) are only displayed if debug 
mode is activated
+  
+  
+UTF-8
+UTF-8
+  
+  
+
+  
+org.apache.maven.plugins
+maven-site-plugin
+@project.version@
+  
+
+  
+  
+
+  MSITE-705
+  Test publish
+  
file://@project.build.directory@/it/MSITE-705/deploy/MSITE-705/junk/
+
+  
+

Propchange: maven/plugins/trunk/maven-site-plugin/src/it/MSITE-705-debug/pom.xml
--
svn:eol-style = native

Propchange: maven/plugins/trunk/maven-site-plugin/src/it/MSITE-705-debug/pom.xml
--
svn:keywords = Author Date Id Revision

Added: 
maven/plugins/trunk/maven-site-plugin/src/it/MSITE-705-debug/verify.groovy
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/MSITE-705-debug/verify.groovy?rev=1764759=auto
==
--- maven/plugins/trunk/maven-site-plugin/src/it/MSITE-705-debug/verify.groovy 
(added)
+++ maven/plugins/trunk/maven-site-plugin/src/it/MSITE-705-debug/verify.groovy 
Thu Oct 13 19:03:08 

maven-surefire git commit: Pass suffix parameter to unpack method in order to generate separate test workspaces

[tibordigana]

Repository: maven-surefire
Updated Branches:
  refs/heads/master 5e9f5637c -> b1d11c64b


Pass suffix parameter to unpack method in order to generate separate test 
workspaces


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

Branch: refs/heads/master
Commit: b1d11c64b05273f0a802a4ddcb1935f2c5de0a35
Parents: 5e9f563
Author: Benedikt Ritter 
Authored: Thu Oct 13 08:50:51 2016 +0200
Committer: Benedikt Ritter 
Committed: Thu Oct 13 08:50:51 2016 +0200

--
 .../test/java/org/apache/maven/surefire/its/JUnit4VersionsIT.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b1d11c64/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit4VersionsIT.java
--
diff --git 
a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit4VersionsIT.java
 
b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit4VersionsIT.java
index 87fe140..8dd8f0c 100644
--- 
a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit4VersionsIT.java
+++ 
b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit4VersionsIT.java
@@ -69,7 +69,7 @@ public class JUnit4VersionsIT
 
 private SurefireLauncher unpack()
 {
-return unpack( "/junit4" );
+return unpack( "/junit4", version );
 }
 
 @Test

svn commit: r1764765 - /maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/render/AbstractSiteRenderingMojo.java

[gboue]

Author: gboue
Date: Thu Oct 13 19:21:45 2016
New Revision: 1764765

URL: http://svn.apache.org/viewvc?rev=1764765=rev
Log:
[MSITE-785] Documentation of saveProcessedContent parameter is empty

Escaping the '<' and '>' inside Javadoc with '' and '', so that the 
documentation of the parameter is correctly present in the generated site.

Modified:

maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/render/AbstractSiteRenderingMojo.java

Modified: 
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/render/AbstractSiteRenderingMojo.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/render/AbstractSiteRenderingMojo.java?rev=1764765=1764764=1764765=diff
==
--- 
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/render/AbstractSiteRenderingMojo.java
 (original)
+++ 
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/render/AbstractSiteRenderingMojo.java
 Thu Oct 13 19:21:45 2016
@@ -200,7 +200,7 @@ public abstract class AbstractSiteRender
 }
 
 /**
- * Whether to save Velocity processed Doxia content 
(*..vm)
+ * Whether to save Velocity processed Doxia content 
(*.ext.vm)
  * to ${generatedSiteDirectory}/processed.
  *
  * @since 3.5

[25/25] maven-surefire git commit: Merge branch 'master' into merge-with-master

[tibordigana]

Merge branch 'master' into merge-with-master


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

Branch: refs/heads/junit5
Commit: da928141270c2e8bcadf7dcdf24ec80ec357
Parents: 8eae287 b1d11c6
Author: Benedikt Ritter 
Authored: Thu Oct 13 21:12:42 2016 +0200
Committer: Benedikt Ritter 
Committed: Thu Oct 13 21:12:42 2016 +0200

--
 maven-failsafe-plugin/pom.xml   |   5 +
 .../plugin/failsafe/IntegrationTestMojo.java|  63 +--
 .../failsafe/IntegrationTestMojoTest.java   |   1 +
 .../plugin/surefire/AbstractSurefireMojo.java   |  34 --
 .../maven/plugin/surefire/CommonReflector.java  |   4 +-
 .../surefire/StartupReportConfiguration.java|  19 ++--
 .../surefire/SurefireExecutionParameters.java   |   4 +
 .../plugin/surefire/SurefireProperties.java |   2 +-
 .../surefire/booterclient/BooterSerializer.java |   4 +-
 .../surefire/booterclient/ForkStarter.java  |  45 ++--
 .../AbstractForkInputStream.java|   2 +-
 .../booterclient/output/ForkClient.java |   9 ++
 .../report/ConsoleOutputFileReporter.java   |   5 +-
 .../surefire/report/DefaultReporterFactory.java |  50 +++--
 .../report/NullConsoleOutputReceiver.java   |  55 ++
 .../surefire/report/NullConsoleReporter.java|  58 ++
 .../surefire/report/NullFileReporter.java   |  45 
 .../report/NullStatelessXmlReporter.java|  48 +
 .../surefire/report/NullStatisticsReporter.java |  66 
 .../surefire/report/StatelessXmlReporter.java   |  21 ++--
 .../surefire/report/TestSetRunListener.java |  87 ---
 .../surefire/report/WrappedReportEntry.java |   4 +-
 .../surefire/runorder/StatisticsReporter.java   |  11 +-
 ...erDeserializerProviderConfigurationTest.java |   2 +-
 ...terDeserializerStartupConfigurationTest.java |   2 +-
 .../booterclient/ForkingRunListenerTest.java|   7 +-
 .../report/DefaultReporterFactoryTest.java  |   6 +-
 .../maven/plugin/surefire/SurefirePlugin.java   |  23 
 .../apt/examples/configuring-classpath.apt.vm   |   1 +
 .../fork-options-and-parallel-execution.apt.vm  |   2 +-
 .../src/site/apt/examples/shutdown.apt.vm   |   3 +-
 maven-surefire-plugin/src/site/fml/faq.fml  |  11 ++
 .../src/site/markdown/multilineexceptions.md|   2 +-
 pom.xml |   7 +-
 .../surefire/booter/BaseProviderFactory.java|  12 +++
 .../apache/maven/surefire/booter/Command.java   |   2 +-
 .../maven/surefire/booter/CommandReader.java|   2 +-
 .../surefire/booter/ForkingRunListener.java |   6 +-
 .../surefire/booter/MasterProcessCommand.java   |   2 +-
 .../surefire/booter/SurefireReflector.java  |  18 ++--
 .../providerapi/ProviderParameters.java |   2 +
 .../surefire/report/ConsoleOutputCapture.java   |   3 +-
 .../surefire/testset/RunOrderParameters.java|   4 +-
 .../surefire/util/internal/ObjectUtils.java |   1 +
 .../surefire/util/internal/StringUtils.java |  31 ++
 .../maven/surefire/booter/BooterConstants.java  |   1 +
 .../surefire/booter/BooterDeserializer.java |  10 +-
 .../maven/surefire/booter/ForkedBooter.java |  22 ++--
 .../surefire/booter/ProviderConfiguration.java  |  19 +++-
 .../maven/surefire/booter/ProviderFactory.java  |   5 +-
 .../booter/SurefireBooterForkException.java |  51 +
 surefire-integration-tests/pom.xml  |   3 +-
 .../surefire/its/JUnit47ConcurrencyIT.java  |  58 ++
 .../its/JUnit47StaticInnerClassTestsIT.java |  34 ++
 .../surefire/its/JUnit47WithCucumberIT.java |  71 
 .../maven/surefire/its/JUnit4IgnoreIT.java  |  52 +
 .../maven/surefire/its/JUnit4VersionsIT.java|  87 +++
 .../its/Junit47StaticInnerClassTestsIT.java |  32 --
 .../surefire/its/Junit47WithCucumberIT.java |  71 
 .../surefire/its/Junit47concurrencyIT.java  |  58 --
 .../maven/surefire/its/Junit4IgnoreIT.java  |  52 -
 .../maven/surefire/its/Junit4VersionsIT.java| 108 ---
 .../jiras/Surefire1028UnableToRunSingleIT.java  |  59 ++
 .../Surefire1028UnableToRunSingleTest.java  |  59 --
 ...refire747MethodParallelWithSuiteCountIT.java |  86 ++-
 .../test/resources/concurrentjunit47/pom.xml|  62 ---
 .../src/test/java/junit47/BasicTest.java|  71 
 .../src/test/java/pkg/ATest.java|   2 +-
 .../src/test/java/pkg/BTest.java|   2 +-
 .../src/test/java/pkg/CTest.java|   2 +-
 

[21/25] maven-surefire git commit: Consistently rename JUnit 4.x integration tests

[tibordigana]

Consistently rename JUnit 4.x integration tests


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

Branch: refs/heads/junit5
Commit: 77cafbe36d5b3ca82b4fc3837b26be1aab73c537
Parents: e6b3921
Author: Benedikt Ritter 
Authored: Mon Oct 3 18:06:38 2016 +0200
Committer: Benedikt Ritter 
Committed: Wed Oct 12 07:07:56 2016 +0200

--
 .../surefire/its/JUnit47ConcurrencyIT.java  | 58 +
 .../its/JUnit47StaticInnerClassTestsIT.java | 34 
 .../surefire/its/JUnit47WithCucumberIT.java | 71 
 .../maven/surefire/its/JUnit4IgnoreIT.java  | 52 
 .../maven/surefire/its/JUnit4VersionsIT.java| 87 
 .../its/Junit47StaticInnerClassTestsIT.java | 34 
 .../surefire/its/Junit47WithCucumberIT.java | 71 
 .../surefire/its/Junit47concurrencyIT.java  | 58 -
 .../maven/surefire/its/Junit4IgnoreIT.java  | 52 
 .../maven/surefire/its/Junit4VersionsIT.java| 87 
 .../test/resources/concurrentjunit47/pom.xml| 62 --
 .../src/test/java/junit47/BasicTest.java| 71 
 .../test/resources/junit47-concurrency/pom.xml  | 61 ++
 .../src/test/java/junit47/BasicTest.java| 71 
 14 files changed, 434 insertions(+), 435 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/77cafbe3/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit47ConcurrencyIT.java
--
diff --git 
a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit47ConcurrencyIT.java
 
b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit47ConcurrencyIT.java
new file mode 100644
index 000..57007a7
--- /dev/null
+++ 
b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit47ConcurrencyIT.java
@@ -0,0 +1,58 @@
+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.junit.Test;
+
+import static org.hamcrest.CoreMatchers.containsString;
+import static org.junit.Assert.*;
+import static org.hamcrest.CoreMatchers.*;
+
+/**
+ * Basic suite test using all known versions of JUnit 4.x
+ *
+ * @author Kristian Rosenvold
+ */
+public class JUnit47ConcurrencyIT
+extends SurefireJUnit4IntegrationTestCase
+{
+@Test
+public void test47()
+throws Exception
+{
+OutputValidator validator = unpack( "junit47-concurrency" )
+.executeTest()
+.verifyErrorFree( 4 );
+String result = null;
+for ( String line : validator.loadLogLines() )
+{
+if ( line.startsWith( "[INFO] Tests run: 4, Failures: 0, Errors: 
0, Skipped: 0, Time elapsed:" ) )
+{
+result = line;
+break;
+}
+}
+assertNotNull( result);
+assertThat( result, anyOf( containsString( "Time elapsed: 1." ), 
containsString( "Time elapsed: 0.9" ) ) );
+assertThat( result, endsWith( " s - in 
concurrentjunit47.src.test.java.junit47.BasicTest" ) );
+}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/77cafbe3/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit47StaticInnerClassTestsIT.java
--
diff --git 
a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit47StaticInnerClassTestsIT.java
 

[09/25] maven-surefire git commit: [SUREFIRE] refactoring

[tibordigana]

[SUREFIRE] refactoring


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

Branch: refs/heads/junit5
Commit: 4f3f59e2dcdeba154c7d22dea05f906e6f54d0e7
Parents: 02a8a59
Author: Tibor17 
Authored: Sat Oct 1 02:32:11 2016 +0200
Committer: Tibor17 
Committed: Sun Oct 2 11:12:37 2016 +0200

--
 .../maven/plugin/surefire/report/StatelessXmlReporter.java| 7 +++
 1 file changed, 3 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4f3f59e2/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/StatelessXmlReporter.java
--
diff --git 
a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/StatelessXmlReporter.java
 
b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/StatelessXmlReporter.java
index 9e22f1e..f30e54f 100644
--- 
a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/StatelessXmlReporter.java
+++ 
b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/StatelessXmlReporter.java
@@ -293,7 +293,6 @@ public class StatelessXmlReporter
 
 try
 {
-
 return new FileOutputStream( reportFile );
 }
 catch ( Exception e )
@@ -322,9 +321,9 @@ public class StatelessXmlReporter
 private static File getReportFile( ReportEntry report, File 
reportsDirectory, String reportNameSuffix )
 {
 String reportName = "TEST-" + report.getName();
-return isNotBlank( reportNameSuffix )
-? new File( reportsDirectory, stripIllegalFilenameChars( 
reportName + "-" + reportNameSuffix + ".xml" ) )
-: new File( reportsDirectory, stripIllegalFilenameChars( 
reportName + ".xml" ) );
+String reportFileName =
+isNotBlank( reportNameSuffix ) ? reportName + "-" + 
reportNameSuffix + ".xml" : reportName + ".xml";
+return new File( reportsDirectory, stripIllegalFilenameChars( 
reportFileName ) );
 }
 
 private static void startTestElement( XMLWriter ppw, WrappedReportEntry 
report, String reportNameSuffix,

[18/25] maven-surefire git commit: Fix formatting, convert tabs to spaces

[tibordigana]

Fix formatting, convert tabs to spaces


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

Branch: refs/heads/junit5
Commit: 86f89a8c8d98d4e1b210ec7b494184a81d4940bf
Parents: f37a8d4
Author: Benedikt Ritter 
Authored: Mon Oct 3 17:49:07 2016 +0200
Committer: Tibor17 
Committed: Mon Oct 10 21:46:23 2016 +0200

--
 .../surefire/its/Junit47StaticInnerClassTestsIT.java  | 10 ++
 1 file changed, 6 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/86f89a8c/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Junit47StaticInnerClassTestsIT.java
--
diff --git 
a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Junit47StaticInnerClassTestsIT.java
 
b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Junit47StaticInnerClassTestsIT.java
index 0901d58..b8d38bf 100644
--- 
a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Junit47StaticInnerClassTestsIT.java
+++ 
b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Junit47StaticInnerClassTestsIT.java
@@ -22,11 +22,13 @@ package org.apache.maven.surefire.its;
 import org.apache.maven.surefire.its.fixture.SurefireJUnit4IntegrationTestCase;
 import org.junit.Test;
 
-public class Junit47StaticInnerClassTestsIT extends 
SurefireJUnit4IntegrationTestCase
+public class Junit47StaticInnerClassTestsIT
+extends SurefireJUnit4IntegrationTestCase
 {
 
 @Test
-   public void testStaticInnerClassTests() {
-   executeErrorFreeTest( "junit47-static-inner-class-tests", 3 );
-   }
+public void testStaticInnerClassTests()
+{
+executeErrorFreeTest( "junit47-static-inner-class-tests", 3 );
+}
 }

[20/25] maven-surefire git commit: Add missing JUnit 4 versions to Junit4VersionsIT

[tibordigana]

Add missing JUnit 4 versions to Junit4VersionsIT


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

Branch: refs/heads/junit5
Commit: e6b39217de0ebb968b36945a4b5e086b9925e26d
Parents: 41d1cfc
Author: Benedikt Ritter 
Authored: Sun Oct 9 15:40:55 2016 +0200
Committer: Tibor17 
Committed: Tue Oct 11 00:25:29 2016 +0200

--
 .../apache/maven/surefire/its/Junit4VersionsIT.java   | 14 +++---
 1 file changed, 11 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e6b39217/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Junit4VersionsIT.java
--
diff --git 
a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Junit4VersionsIT.java
 
b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Junit4VersionsIT.java
index 2296cf8..500591a 100644
--- 
a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Junit4VersionsIT.java
+++ 
b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Junit4VersionsIT.java
@@ -42,8 +42,9 @@ public class Junit4VersionsIT
 {
 
 @Parameters( name = "{index}: JUnit {0}" )
-public static Collection junitVersions() {
-return Arrays.asList( new Object[][]{
+public static Collection junitVersions()
+{
+return Arrays.asList( new Object[][] {
 { "4.0" },
 { "4.1" },
 { "4.2" },
@@ -52,7 +53,14 @@ public class Junit4VersionsIT
 { "4.4" },
 { "4.5" },
 { "4.6" },
-{ "4.7" }
+{ "4.7" },
+{ "4.8" },
+{ "4.8.1" },
+{ "4.8.2" },
+{ "4.9" },
+{ "4.10" },
+{ "4.11" },
+{ "4.12" }
 } );
 }
 

[22/25] maven-surefire git commit: [SUREFIRE-1293] Simplify org.apache.maven.plugin.surefire.report.TestSetRunListener by using the null object pattern

[tibordigana]

[SUREFIRE-1293] Simplify 
org.apache.maven.plugin.surefire.report.TestSetRunListener
by using the null object pattern


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

Branch: refs/heads/junit5
Commit: fd9f6e5598e7ce6cdb4168ce15cf6ca138b7753f
Parents: 77cafbe
Author: Benedikt Ritter 
Authored: Sun Oct 9 16:41:49 2016 +0200
Committer: Tibor17 
Committed: Wed Oct 12 11:26:20 2016 +0200

--
 .../surefire/report/DefaultReporterFactory.java | 46 +--
 .../report/NullConsoleOutputReceiver.java   | 55 +
 .../surefire/report/NullConsoleReporter.java| 58 +
 .../surefire/report/NullFileReporter.java   | 45 ++
 .../report/NullStatelessXmlReporter.java| 48 +++
 .../surefire/report/NullStatisticsReporter.java | 66 +++
 .../surefire/report/TestSetRunListener.java | 87 
 .../surefire/runorder/StatisticsReporter.java   | 11 ++-
 8 files changed, 335 insertions(+), 81 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/fd9f6e55/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/DefaultReporterFactory.java
--
diff --git 
a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/DefaultReporterFactory.java
 
b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/DefaultReporterFactory.java
index a2bc7ec..e011fee 100644
--- 
a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/DefaultReporterFactory.java
+++ 
b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/DefaultReporterFactory.java
@@ -20,9 +20,9 @@ package org.apache.maven.plugin.surefire.report;
  */
 
 import org.apache.maven.plugin.surefire.StartupReportConfiguration;
-import org.apache.maven.plugin.surefire.runorder.StatisticsReporter;
 import org.apache.maven.plugin.surefire.log.api.ConsoleLogger;
 import org.apache.maven.plugin.surefire.log.api.NullConsoleLogger;
+import org.apache.maven.plugin.surefire.runorder.StatisticsReporter;
 import org.apache.maven.shared.utils.logging.MessageBuilder;
 import org.apache.maven.surefire.report.ReporterFactory;
 import org.apache.maven.surefire.report.RunListener;
@@ -39,6 +39,7 @@ import java.util.Map;
 import java.util.TreeMap;
 import java.util.concurrent.ConcurrentLinkedQueue;
 
+import static org.apache.commons.lang3.ObjectUtils.defaultIfNull;
 import static org.apache.maven.plugin.surefire.report.ConsoleReporter.PLAIN;
 import static 
org.apache.maven.plugin.surefire.report.DefaultReporterFactory.TestResultType.error;
 import static 
org.apache.maven.plugin.surefire.report.DefaultReporterFactory.TestResultType.failure;
@@ -64,7 +65,6 @@ public class DefaultReporterFactory
 {
 private final StartupReportConfiguration reportConfiguration;
 private final ConsoleLogger consoleLogger;
-private final StatisticsReporter statisticsReporter;
 private final Collection listeners;
 
 private RunStatistics globalStats = new RunStatistics();
@@ -82,19 +82,17 @@ public class DefaultReporterFactory
 {
 this.reportConfiguration = reportConfiguration;
 this.consoleLogger = consoleLogger;
-statisticsReporter = reportConfiguration.getStatisticsReporter();
 listeners = new ConcurrentLinkedQueue();
 }
 
 public RunListener createReporter()
 {
-ConsoleReporter consoleReporter = shouldReportToConsole() ? new 
ConsoleReporter( consoleLogger ) : null;
 TestSetRunListener testSetRunListener =
-new TestSetRunListener( consoleReporter,
-
reportConfiguration.instantiateFileReporter(),
-
reportConfiguration.instantiateStatelessXmlReporter(),
-
reportConfiguration.instantiateConsoleOutputFileReporter(),
-statisticsReporter,
+new TestSetRunListener( createConsoleReporter(),
+createFileReporter(),
+createSimpleXMLReporter(),
+createConsoleOutputReceiver(),
+createStatisticsReporter(),
 reportConfiguration.isTrimStackTrace(),
 PLAIN.equals( 
reportConfiguration.getReportFormat() ),
 reportConfiguration.isBriefOrPlainFormat() 
);
@@ 

[24/25] maven-surefire git commit: Pass suffix parameter to unpack method in order to generate separate test workspaces

[tibordigana]

Pass suffix parameter to unpack method in order to generate separate test 
workspaces


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

Branch: refs/heads/junit5
Commit: b1d11c64b05273f0a802a4ddcb1935f2c5de0a35
Parents: 5e9f563
Author: Benedikt Ritter 
Authored: Thu Oct 13 08:50:51 2016 +0200
Committer: Benedikt Ritter 
Committed: Thu Oct 13 08:50:51 2016 +0200

--
 .../test/java/org/apache/maven/surefire/its/JUnit4VersionsIT.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b1d11c64/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit4VersionsIT.java
--
diff --git 
a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit4VersionsIT.java
 
b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit4VersionsIT.java
index 87fe140..8dd8f0c 100644
--- 
a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit4VersionsIT.java
+++ 
b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit4VersionsIT.java
@@ -69,7 +69,7 @@ public class JUnit4VersionsIT
 
 private SurefireLauncher unpack()
 {
-return unpack( "/junit4" );
+return unpack( "/junit4", version );
 }
 
 @Test

[23/25] maven-surefire git commit: refactoring and build fix

[tibordigana]

refactoring and build fix


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

Branch: refs/heads/junit5
Commit: 5e9f5637cead161f5e210b86febcc23d502d3f67
Parents: fd9f6e5
Author: Tibor17 
Authored: Wed Oct 12 22:20:48 2016 +0200
Committer: Tibor17 
Committed: Wed Oct 12 22:20:48 2016 +0200

--
 .../surefire/booterclient/ForkStarter.java  |  2 +-
 .../AbstractForkInputStream.java|  2 +-
 .../surefire/report/DefaultReporterFactory.java | 14 +-
 .../apache/maven/surefire/booter/Command.java   |  2 +-
 .../maven/surefire/booter/CommandReader.java|  2 +-
 .../surefire/booter/MasterProcessCommand.java   |  2 +-
 .../surefire/util/internal/ObjectUtils.java |  1 +
 .../surefire/util/internal/StringUtils.java | 29 
 8 files changed, 19 insertions(+), 35 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/5e9f5637/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkStarter.java
--
diff --git 
a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkStarter.java
 
b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkStarter.java
index 2eb8259..d512f24 100644
--- 
a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkStarter.java
+++ 
b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkStarter.java
@@ -96,7 +96,7 @@ import static 
org.apache.maven.surefire.util.internal.ConcurrencyUtils.countDown
 import static 
org.apache.maven.surefire.util.internal.DaemonThreadFactory.newDaemonThread;
 import static 
org.apache.maven.surefire.util.internal.DaemonThreadFactory.newDaemonThreadFactory;
 import static 
org.apache.maven.surefire.util.internal.StringUtils.FORK_STREAM_CHARSET_NAME;
-import static 
org.apache.maven.surefire.util.internal.StringUtils.requireNonNull;
+import static 
org.apache.maven.surefire.util.internal.ObjectUtils.requireNonNull;
 
 /**
  * Starts the fork or runs in-process.

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/5e9f5637/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/lazytestprovider/AbstractForkInputStream.java
--
diff --git 
a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/lazytestprovider/AbstractForkInputStream.java
 
b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/lazytestprovider/AbstractForkInputStream.java
index 281c05d..8cc0cdd 100644
--- 
a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/lazytestprovider/AbstractForkInputStream.java
+++ 
b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/lazytestprovider/AbstractForkInputStream.java
@@ -22,7 +22,7 @@ package 
org.apache.maven.plugin.surefire.booterclient.lazytestprovider;
 import java.io.IOException;
 import java.io.InputStream;
 
-import static 
org.apache.maven.surefire.util.internal.StringUtils.requireNonNull;
+import static 
org.apache.maven.surefire.util.internal.ObjectUtils.requireNonNull;
 
 /**
  * Reader stream sends bytes to forked jvm std-{@link InputStream 
input-stream}.

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/5e9f5637/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/DefaultReporterFactory.java
--
diff --git 
a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/DefaultReporterFactory.java
 
b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/DefaultReporterFactory.java
index e011fee..2332856 100644
--- 
a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/DefaultReporterFactory.java
+++ 
b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/DefaultReporterFactory.java
@@ -21,6 +21,7 @@ package org.apache.maven.plugin.surefire.report;
 
 import org.apache.maven.plugin.surefire.StartupReportConfiguration;
 import org.apache.maven.plugin.surefire.log.api.ConsoleLogger;
+import org.apache.maven.plugin.surefire.log.api.Level;
 import org.apache.maven.plugin.surefire.log.api.NullConsoleLogger;
 import org.apache.maven.plugin.surefire.runorder.StatisticsReporter;
 import org.apache.maven.shared.utils.logging.MessageBuilder;
@@ -28,7 +29,6 @@ 

[01/25] maven-surefire git commit: [SUREFIRE] optimized writings to the PrintStream

[tibordigana]

Repository: maven-surefire
Updated Branches:
  refs/heads/junit5 8eae2878c -> da9281412


[SUREFIRE] optimized writings to the PrintStream


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

Branch: refs/heads/junit5
Commit: 61c7257a33b08076ccd3fab407af6a0ee0006b99
Parents: ef06e41
Author: Tibor17 
Authored: Wed Sep 21 01:46:10 2016 +0200
Committer: Tibor17 
Committed: Sat Sep 24 10:38:16 2016 +0200

--
 .../org/apache/maven/surefire/booter/ForkingRunListener.java   | 6 --
 1 file changed, 4 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/61c7257a/surefire-api/src/main/java/org/apache/maven/surefire/booter/ForkingRunListener.java
--
diff --git 
a/surefire-api/src/main/java/org/apache/maven/surefire/booter/ForkingRunListener.java
 
b/surefire-api/src/main/java/org/apache/maven/surefire/booter/ForkingRunListener.java
index d0d8cca..282c4d4 100644
--- 
a/surefire-api/src/main/java/org/apache/maven/surefire/booter/ForkingRunListener.java
+++ 
b/surefire-api/src/main/java/org/apache/maven/surefire/booter/ForkingRunListener.java
@@ -199,11 +199,13 @@ public class ForkingRunListener
 new byte[buf.length * 3 + 1]; // Hex-escaping can be up to 3 times 
length of a regular byte.
 int i = escapeBytesToPrintable( content, 0, buf, off, len );
 content[i++] = (byte) '\n';
+byte[] encodeBytes = new byte[header.length + i];
+System.arraycopy( header, 0, encodeBytes, 0, header.length );
+System.arraycopy( content, 0, encodeBytes, header.length, i );
 
 synchronized ( target ) // See notes about synchronization/thread 
safety in class javadoc
 {
-target.write( header, 0, header.length );
-target.write( content, 0, i );
+target.write( encodeBytes, 0, encodeBytes.length );
 }
 }
 

[14/25] maven-surefire git commit: [SUREFIRE-1246] Surefire + Cobertura: Shutdown of Forked JVM timeouts before all thread ends

[tibordigana]

[SUREFIRE-1246] Surefire + Cobertura: Shutdown of Forked JVM timeouts before 
all thread ends


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

Branch: refs/heads/junit5
Commit: 9dc15743de2c9ba189837d41752cf973507d6c31
Parents: a9162ee
Author: Tibor17 
Authored: Sun Oct 2 23:32:04 2016 +0200
Committer: Tibor17 
Committed: Sun Oct 2 23:32:04 2016 +0200

--
 .../main/java/org/apache/maven/plugin/surefire/SurefirePlugin.java | 1 +
 .../org/apache/maven/surefire/booter/ProviderConfiguration.java| 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/9dc15743/maven-surefire-plugin/src/main/java/org/apache/maven/plugin/surefire/SurefirePlugin.java
--
diff --git 
a/maven-surefire-plugin/src/main/java/org/apache/maven/plugin/surefire/SurefirePlugin.java
 
b/maven-surefire-plugin/src/main/java/org/apache/maven/plugin/surefire/SurefirePlugin.java
index f508372..97f1a79 100644
--- 
a/maven-surefire-plugin/src/main/java/org/apache/maven/plugin/surefire/SurefirePlugin.java
+++ 
b/maven-surefire-plugin/src/main/java/org/apache/maven/plugin/surefire/SurefirePlugin.java
@@ -143,6 +143,7 @@ public class SurefirePlugin
  * by System.exit(). Use this parameter in order to determine the 
timeout of terminating the process.
  * http://maven.apache.org/surefire/maven-surefire-plugin/examples/shutdown.html;>see
 the documentation:
  * 
http://maven.apache.org/surefire/maven-surefire-plugin/examples/shutdown.html
+ * Turns to default fallback value of 30 seconds if negative integer.
  *
  * @since 2.19.2
  */

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/9dc15743/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ProviderConfiguration.java
--
diff --git 
a/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ProviderConfiguration.java
 
b/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ProviderConfiguration.java
index c2d61e0..b0825a8 100644
--- 
a/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ProviderConfiguration.java
+++ 
b/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ProviderConfiguration.java
@@ -182,6 +182,6 @@ public class ProviderConfiguration
 
 public long systemExitTimeout( long fallback )
 {
-return systemExitTimeout == null ? fallback : systemExitTimeout;
+return systemExitTimeout == null || systemExitTimeout < 0 ? fallback : 
systemExitTimeout;
 }
 }

[02/25] maven-surefire git commit: [SUREFIRE-1246] Surefire + Cobertura: Shutdown of Forked JVM timeouts before all thread ends

[tibordigana]

[SUREFIRE-1246] Surefire + Cobertura: Shutdown of Forked JVM timeouts before 
all thread ends


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

Branch: refs/heads/junit5
Commit: 2c6105c5e5a1d148e2edcbc385bb2ed66969e667
Parents: 61c7257
Author: Tibor17 
Authored: Sat Sep 24 10:30:30 2016 +0200
Committer: Tibor17 
Committed: Sat Sep 24 10:38:17 2016 +0200

--
 .../plugin/failsafe/IntegrationTestMojo.java| 22 
 .../plugin/surefire/AbstractSurefireMojo.java   |  3 ++-
 .../surefire/SurefireExecutionParameters.java   |  4 
 .../surefire/booterclient/BooterSerializer.java |  4 +++-
 ...erDeserializerProviderConfigurationTest.java |  2 +-
 ...terDeserializerStartupConfigurationTest.java |  2 +-
 .../maven/plugin/surefire/SurefirePlugin.java   | 22 
 .../src/site/apt/examples/shutdown.apt.vm   |  3 ++-
 .../surefire/booter/BaseProviderFactory.java| 12 +++
 .../surefire/booter/SurefireReflector.java  | 12 +--
 .../providerapi/ProviderParameters.java |  2 ++
 .../maven/surefire/booter/BooterConstants.java  |  1 +
 .../surefire/booter/BooterDeserializer.java |  7 ++-
 .../maven/surefire/booter/ForkedBooter.java | 16 +++---
 .../surefire/booter/ProviderConfiguration.java  | 19 ++---
 .../maven/surefire/booter/ProviderFactory.java  |  5 -
 16 files changed, 112 insertions(+), 24 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/2c6105c5/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/IntegrationTestMojo.java
--
diff --git 
a/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/IntegrationTestMojo.java
 
b/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/IntegrationTestMojo.java
index 78a3cd7..9f30534 100644
--- 
a/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/IntegrationTestMojo.java
+++ 
b/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/IntegrationTestMojo.java
@@ -154,6 +154,18 @@ public class IntegrationTestMojo
 private int forkedProcessTimeoutInSeconds;
 
 /**
+ * Forked process is normally terminated without any significant delay 
after given tests have completed.
+ * If the particular tests started non-daemon Thread(s), the process hangs 
instead of been properly terminated
+ * by System.exit(). Use this parameter in order to determine the 
timeout of terminating the process.
+ * http://maven.apache.org/surefire/maven-failsafe-plugin/examples/shutdown.html;>see
 the documentation:
+ * 
http://maven.apache.org/surefire/maven-failsafe-plugin/examples/shutdown.html
+ *
+ * @since 2.19.2
+ */
+@Parameter( property = "failsafe.exitTimeout", defaultValue = "30" )
+private int forkedProcessExitTimeoutInSeconds;
+
+/**
  * Stop executing queued parallel JUnit tests after a certain number of 
seconds.
  * 
  * Example values: "3.5", "4"
@@ -563,6 +575,16 @@ public class IntegrationTestMojo
 this.forkedProcessTimeoutInSeconds = forkedProcessTimeoutInSeconds;
 }
 
+public int getForkedProcessExitTimeoutInSeconds()
+{
+return forkedProcessExitTimeoutInSeconds;
+}
+
+public void setForkedProcessExitTimeoutInSeconds( int 
forkedProcessExitTimeoutInSeconds )
+{
+this.forkedProcessExitTimeoutInSeconds = 
forkedProcessExitTimeoutInSeconds;
+}
+
 public double getParallelTestsTimeoutInSeconds()
 {
 return parallelTestsTimeoutInSeconds;

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/2c6105c5/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java
--
diff --git 
a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java
 
b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java
index cd27edf..5e22b70 100644
--- 
a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java
+++ 
b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java
@@ -1543,7 +1543,8 @@ public abstract class AbstractSurefireMojo
   testNg, // Not really used in 
provider. Limited to de/serializer.
   testSuiteDefinition, 
providerProperties, null,
 

[11/25] maven-surefire git commit: [SUREFIRE-1289] forkedProcessTimeoutInSeconds should not use ping timer of 10 seconds but 0.1 sec period timer

[tibordigana]

[SUREFIRE-1289] forkedProcessTimeoutInSeconds should not use ping timer of 10 
seconds but 0.1 sec period timer


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

Branch: refs/heads/junit5
Commit: b2488b64567934c341d2643856d57dd48aa88359
Parents: e563566
Author: Tibor17 
Authored: Sun Oct 2 11:08:51 2016 +0200
Committer: Tibor17 
Committed: Sun Oct 2 11:12:39 2016 +0200

--
 .../org/apache/maven/plugin/surefire/booterclient/ForkStarter.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b2488b64/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkStarter.java
--
diff --git 
a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkStarter.java
 
b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkStarter.java
index 4f9c813..baea043 100644
--- 
a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkStarter.java
+++ 
b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkStarter.java
@@ -716,7 +716,7 @@ public class ForkStarter
 
 private ScheduledFuture triggerTimeoutCheck()
 {
-return pingThreadScheduler.scheduleAtFixedRate( new Runnable()
+return timeoutCheckScheduler.scheduleAtFixedRate( new Runnable()
 {
 public void run()
 {

[16/25] maven-surefire git commit: [SUREFIRE-1287] Improve logging to understand why test run failed and report the right failed category

[tibordigana]

[SUREFIRE-1287] Improve logging to understand why test run failed and report 
the right failed category


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

Branch: refs/heads/junit5
Commit: e0ce6cb021d42d021704f77a689e3b663aebf084
Parents: 4b43807
Author: Tibor17 
Authored: Tue Oct 4 01:06:18 2016 +0200
Committer: Tibor17 
Committed: Tue Oct 4 01:06:18 2016 +0200

--
 .../surefire/booterclient/ForkStarter.java  | 33 +
 .../booterclient/output/ForkClient.java |  1 +
 .../maven/surefire/booter/ForkedBooter.java |  6 +--
 .../booter/SurefireBooterForkException.java | 51 
 4 files changed, 79 insertions(+), 12 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e0ce6cb0/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkStarter.java
--
diff --git 
a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkStarter.java
 
b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkStarter.java
index 57c31b6..2eb8259 100644
--- 
a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkStarter.java
+++ 
b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkStarter.java
@@ -567,7 +567,7 @@ public class ForkStarter
 log.debug( "Forking command line: " + cli );
 
 RunResult runResult = null;
-
+SurefireBooterForkException booterForkException = null;
 try
 {
 CommandLineCallable future =
@@ -585,13 +585,17 @@ public class ForkStarter
 }
 else if ( result != SUCCESS )
 {
-throw new SurefireBooterForkException( "Error occurred in 
starting fork, check output in log" );
+booterForkException =
+new SurefireBooterForkException( "Error occurred in 
starting fork, check output in log" );
 }
 }
 catch ( CommandLineException e )
 {
 runResult = failure( 
forkClient.getDefaultReporterFactory().getGlobalRunStatistics().getRunResult(), 
e );
-throw new SurefireBooterForkException( "Error while executing 
forked tests.", e.getCause() );
+String cliErr = e.getLocalizedMessage();
+Throwable cause = e.getCause();
+booterForkException =
+new SurefireBooterForkException( "Error while executing 
forked tests.", cliErr, cause, runResult );
 }
 finally
 {
@@ -600,25 +604,36 @@ public class ForkStarter
 {
 runResult = 
forkClient.getDefaultReporterFactory().getGlobalRunStatistics().getRunResult();
 }
+forkClient.close( runResult.isTimeout() );
 
 if ( !runResult.isTimeout() )
 {
-StackTraceWriter errorInFork = forkClient.getErrorInFork();
-if ( errorInFork != null )
+Throwable cause = booterForkException == null ? null : 
booterForkException.getCause();
+String detail = booterForkException == null ? "" : "\n" + 
booterForkException.getMessage();
+
+if ( forkClient.isErrorInFork() )
 {
+StackTraceWriter errorInFork = forkClient.getErrorInFork();
 // noinspection ThrowFromFinallyBlock
-throw new RuntimeException(
-"There was an error in the forked process\n" + 
errorInFork.writeTraceToString() );
+throw new RuntimeException( "There was an error in the 
forked process"
++ detail
++ '\n'
++ 
errorInFork.writeTraceToString(), cause );
 }
 if ( !forkClient.isSaidGoodBye() )
 {
 // noinspection ThrowFromFinallyBlock
 throw new RuntimeException(
 "The forked VM terminated without properly saying 
goodbye. VM crash or System.exit called?"
-+ "\nCommand was " + cli.toString() );
++ "\nCommand was " + cli.toString() + detail, 
cause );
 }
 }
-forkClient.close( runResult.isTimeout() );
+
+if ( booterForkException 

[17/25] maven-surefire git commit: [SUREFIRE-1281] Fix permanently failing Surefire Windows Build

[tibordigana]

[SUREFIRE-1281] Fix permanently failing Surefire Windows Build


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

Branch: refs/heads/junit5
Commit: f37a8d4dcb59b0ea8fd982f3d8db9b158088fa28
Parents: e0ce6cb
Author: Tibor17 
Authored: Fri Oct 7 07:46:16 2016 +0200
Committer: Tibor17 
Committed: Fri Oct 7 07:46:16 2016 +0200

--
 surefire-integration-tests/pom.xml  |  1 +
 ...refire747MethodParallelWithSuiteCountIT.java | 86 ++--
 .../junit47-parallel-with-suite/pom.xml |  5 +-
 .../src/test/java/surefire747/SuiteTest1.java   |  8 +-
 .../src/test/java/surefire747/SuiteTest2.java   |  8 +-
 5 files changed, 76 insertions(+), 32 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/f37a8d4d/surefire-integration-tests/pom.xml
--
diff --git a/surefire-integration-tests/pom.xml 
b/surefire-integration-tests/pom.xml
index 43d4b0a..beab2be 100644
--- a/surefire-integration-tests/pom.xml
+++ b/surefire-integration-tests/pom.xml
@@ -116,6 +116,7 @@
 
${project.build.testOutputDirectory}
 ${verifier.forkMode}
   
+  false
 
 
   

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/f37a8d4d/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire747MethodParallelWithSuiteCountIT.java
--
diff --git 
a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire747MethodParallelWithSuiteCountIT.java
 
b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire747MethodParallelWithSuiteCountIT.java
index 6166b3e..c5dbc84 100644
--- 
a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire747MethodParallelWithSuiteCountIT.java
+++ 
b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire747MethodParallelWithSuiteCountIT.java
@@ -23,12 +23,18 @@ 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.junit.Before;
 import org.junit.Test;
 
+import java.text.Format;
+import java.text.NumberFormat;
 import java.util.Iterator;
 import java.util.Set;
 import java.util.TreeSet;
 
+import static java.lang.String.format;
+import static java.math.RoundingMode.DOWN;
+import static java.util.Locale.ROOT;
 import static org.hamcrest.CoreMatchers.anyOf;
 import static org.hamcrest.CoreMatchers.containsString;
 import static org.hamcrest.CoreMatchers.endsWith;
@@ -40,11 +46,15 @@ import static org.junit.Assert.assertTrue;
  * @author Kristian Rosenvold
  */
 public class Surefire747MethodParallelWithSuiteCountIT
-extends SurefireJUnit4IntegrationTestCase
+extends SurefireJUnit4IntegrationTestCase
 {
+// if you want to change his constant, change it in SuiteTest1.java and 
SuiteTest2.java as well
+private static final int PERFORMANCE_TEST_MULTIPLICATION_FACTOR = 4;
+
+private Format lowerScaleFormatter, noFractionalDigitsFormatter;
 
 private static Set printTestLines( OutputValidator validator, 
String pattern )
-throws VerificationException
+throws VerificationException
 {
 Set log = new TreeSet( validator.loadLogLines() );
 for ( Iterator it = log.iterator(); it.hasNext(); )
@@ -63,9 +73,25 @@ public class Surefire747MethodParallelWithSuiteCountIT
 return Integer.decode( logLine.split( "=" )[1] );
 }
 
+@Before
+public void init()
+{
+NumberFormat lowScaleFormatter = NumberFormat.getInstance( ROOT );
+lowScaleFormatter.setRoundingMode( DOWN );
+lowScaleFormatter.setMinimumFractionDigits( 1 );
+lowScaleFormatter.setMaximumFractionDigits( 1 );
+this.lowerScaleFormatter = lowScaleFormatter;
+
+NumberFormat noFractionalDigitsFormatter = NumberFormat.getInstance( 
ROOT );
+noFractionalDigitsFormatter.setRoundingMode( DOWN );
+noFractionalDigitsFormatter.setMinimumFractionDigits( 0 );
+noFractionalDigitsFormatter.setMaximumFractionDigits( 0 );
+this.noFractionalDigitsFormatter = noFractionalDigitsFormatter;
+}
+
 @Test
 public void testMethodsParallelWithSuite()
-throws VerificationException
+throws 

[04/25] maven-surefire git commit: [SUREFIRE-1284] Statistics file should not be determined as (directory of surefire-reports).getParentFile().getParentFile(). It is a problem if report directory is c

[tibordigana]

[SUREFIRE-1284] Statistics file should not be determined as (directory of 
surefire-reports).getParentFile().getParentFile(). It is a problem if report 
directory is customized. Statistics file should be located in project dir.


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

Branch: refs/heads/junit5
Commit: 53c79809e20b30a6ff08dea2075602b7e790c2e2
Parents: ada12d4
Author: Tibor17 
Authored: Sat Sep 24 14:04:44 2016 +0200
Committer: Tibor17 
Committed: Sat Sep 24 14:04:44 2016 +0200

--
 .../plugin/surefire/AbstractSurefireMojo.java| 12 +---
 .../maven/plugin/surefire/CommonReflector.java   |  4 ++--
 .../surefire/StartupReportConfiguration.java | 19 ---
 .../plugin/surefire/SurefireProperties.java  |  2 +-
 .../report/DefaultReporterFactoryTest.java   |  6 +++---
 .../maven/surefire/booter/SurefireReflector.java |  6 ++
 .../surefire/testset/RunOrderParameters.java |  4 ++--
 .../surefire/booter/BooterDeserializer.java  |  3 ++-
 8 files changed, 25 insertions(+), 31 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/53c79809/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java
--
diff --git 
a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java
 
b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java
index bd9e0bd..1dd80b2 100644
--- 
a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java
+++ 
b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java
@@ -1029,7 +1029,7 @@ public abstract class AbstractSurefireMojo
 ClassLoaderConfiguration classLoaderConfiguration = 
getClassLoaderConfiguration();
 provider.addProviderProperties();
 RunOrderParameters runOrderParameters =
-new RunOrderParameters( getRunOrder(), getStatisticsFileName( 
getConfigChecksum() ) );
+new RunOrderParameters( getRunOrder(), getStatisticsFile( 
getConfigChecksum() ) );
 
 if ( isNotForking() )
 {
@@ -1562,10 +1562,9 @@ public abstract class AbstractSurefireMojo
 return h;
 }
 
-public String getStatisticsFileName( String configurationHash )
+public File getStatisticsFile( String configurationHash )
 {
-return getReportsDirectory().getParentFile().getParentFile() + 
File.separator + ".surefire-"
-+ configurationHash;
+return new File( getBasedir(), ".surefire-" + configurationHash );
 }
 
 StartupConfiguration createStartupConfiguration( ProviderInfo provider,
@@ -1631,8 +1630,8 @@ public abstract class AbstractSurefireMojo
 return new StartupReportConfiguration( isUseFile(), isPrintSummary(), 
getReportFormat(),
isRedirectTestOutputToFile(), 
isDisableXmlReport(),
getReportsDirectory(), 
isTrimStackTrace(), getReportNameSuffix(),
-   configChecksum, 
requiresRunHistory(), getRerunFailingTestsCount(),
-   getReportSchemaLocation() );
+   getStatisticsFile( 
configChecksum ), requiresRunHistory(),
+   getRerunFailingTestsCount(), 
getReportSchemaLocation() );
 }
 
 private boolean isSpecificTestSpecified()
@@ -2091,7 +2090,6 @@ public abstract class AbstractSurefireMojo
 checksum.add( getRerunFailingTestsCount() );
 addPluginSpecificChecksumItems( checksum );
 return checksum.getSha1();
-
 }
 
 protected void addPluginSpecificChecksumItems( ChecksumCalculator checksum 
)

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/53c79809/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/CommonReflector.java
--
diff --git 
a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/CommonReflector.java
 
b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/CommonReflector.java
index 4ae589f..1918930 100644
--- 
a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/CommonReflector.java
+++ 
b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/CommonReflector.java
@@ -71,14 +71,14 @@ 

[06/25] maven-surefire git commit: [SUREFIRE-1198] Failsafe does not allow to configure the jar file to use

[tibordigana]

[SUREFIRE-1198] Failsafe does not allow to configure the jar file to use


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

Branch: refs/heads/junit5
Commit: 432231e7e9d01b9ef109acd39176045e0b18e5a5
Parents: f1aea63
Author: Tibor17 
Authored: Sun Sep 25 05:04:39 2016 +0200
Committer: Tibor17 
Committed: Sun Sep 25 05:04:39 2016 +0200

--
 .../java/org/apache/maven/plugin/failsafe/IntegrationTestMojo.java  | 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/432231e7/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/IntegrationTestMojo.java
--
diff --git 
a/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/IntegrationTestMojo.java
 
b/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/IntegrationTestMojo.java
index b3f76db..c0048d5 100644
--- 
a/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/IntegrationTestMojo.java
+++ 
b/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/IntegrationTestMojo.java
@@ -56,6 +56,7 @@ public class IntegrationTestMojo
 /**
  * The path representing project JAR file, if exists; Otherwise 
the directory containing generated
  * classes of the project being tested. This will be included after the 
test classes in the test classpath.
+ * Defaults to built artifact JAR file or 
${project.build.outputDirectory}.
  */
 @Parameter
 private File classesDirectory;

[19/25] maven-surefire git commit: Make Junit4VersionsIT a parameterized test

[tibordigana]

Make Junit4VersionsIT a parameterized test


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

Branch: refs/heads/junit5
Commit: 41d1cfca8519b1e0419609a9f5b15b84e89ac3d6
Parents: 86f89a8
Author: Benedikt Ritter 
Authored: Sun Oct 9 15:38:44 2016 +0200
Committer: Tibor17 
Committed: Tue Oct 11 00:25:28 2016 +0200

--
 .../maven/surefire/its/Junit4VersionsIT.java| 85 +++-
 1 file changed, 28 insertions(+), 57 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/41d1cfca/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Junit4VersionsIT.java
--
diff --git 
a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Junit4VersionsIT.java
 
b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Junit4VersionsIT.java
index cf82e64..2296cf8 100644
--- 
a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Junit4VersionsIT.java
+++ 
b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Junit4VersionsIT.java
@@ -19,85 +19,56 @@ package org.apache.maven.surefire.its;
  * under the License.
  */
 
+import java.util.Arrays;
+import java.util.Collection;
+
 import org.apache.maven.surefire.its.fixture.SurefireJUnit4IntegrationTestCase;
 import org.apache.maven.surefire.its.fixture.SurefireLauncher;
 import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.junit.runners.Parameterized.Parameter;
+
+import static org.junit.runners.Parameterized.*;
 
 /**
  * Basic suite test using all known versions of JUnit 4.x
  *
  * @author mailto:dfabul...@apache.org;>Dan Fabulich
  */
+@RunWith( Parameterized.class )
 public class Junit4VersionsIT
 extends SurefireJUnit4IntegrationTestCase
 {
 
-private SurefireLauncher unpack()
-{
-return unpack( "/junit4" );
-}
-
-@Test
-public void test40()
-throws Exception
-{
-runJUnitTest( "4.0" );
-}
-
-@Test
-public void test41()
-throws Exception
-{
-runJUnitTest( "4.1" );
+@Parameters( name = "{index}: JUnit {0}" )
+public static Collection junitVersions() {
+return Arrays.asList( new Object[][]{
+{ "4.0" },
+{ "4.1" },
+{ "4.2" },
+{ "4.3" },
+{ "4.3.1" },
+{ "4.4" },
+{ "4.5" },
+{ "4.6" },
+{ "4.7" }
+} );
 }
 
-@Test
-public void test42()
-throws Exception
-{
-runJUnitTest( "4.2" );
-}
+@Parameter
+public String version;
 
-@Test
-public void test43()
-throws Exception
-{
-runJUnitTest( "4.3" );
-}
-
-@Test
-public void test431()
-throws Exception
-{
-runJUnitTest( "4.3.1" );
-}
-
-@Test
-public void test44()
-throws Exception
-{
-runJUnitTest( "4.4" );
-}
-
-@Test
-public void test45()
-throws Exception
-{
-runJUnitTest( "4.5" );
-}
-
-@Test
-public void test46()
-throws Exception
+private SurefireLauncher unpack()
 {
-runJUnitTest( "4.6" );
+return unpack( "/junit4" );
 }
 
 @Test
-public void test47()
+public void testJunit()
 throws Exception
 {
-runJUnitTest( "4.7" );
+runJUnitTest( version );
 }
 
 public void runJUnitTest( String version )

[12/25] maven-surefire git commit: [SUREFIRE-1290] Orphan Fork JVMs should be killed after any previous finished with fatal error

[tibordigana]

[SUREFIRE-1290] Orphan Fork JVMs should be killed after any previous finished 
with fatal error


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

Branch: refs/heads/junit5
Commit: 33a32d132922e3ab22502f95bb42aeecfe1531fb
Parents: b2488b6
Author: Tibor17 
Authored: Sun Oct 2 12:33:42 2016 +0200
Committer: Tibor17 
Committed: Sun Oct 2 12:33:42 2016 +0200

--
 .../plugin/surefire/AbstractSurefireMojo.java  | 17 ++---
 .../plugin/surefire/booterclient/ForkStarter.java  |  8 
 .../surefire/booterclient/output/ForkClient.java   |  8 
 3 files changed, 30 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/33a32d13/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java
--
diff --git 
a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java
 
b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java
index 1dd80b2..a3ab13e 100644
--- 
a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java
+++ 
b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java
@@ -1048,13 +1048,24 @@ public abstract class AbstractSurefireMojo
 }
 
 Properties originalSystemProperties = (Properties) 
System.getProperties().clone();
+ForkStarter forkStarter = null;
 try
 {
-ForkStarter forkStarter =
-createForkStarter( provider, forkConfiguration, 
classLoaderConfiguration, runOrderParameters,
-   getConsoleLogger() );
+forkStarter = createForkStarter( provider, forkConfiguration, 
classLoaderConfiguration,
+   runOrderParameters, 
getConsoleLogger() );
+
 return forkStarter.run( effectiveProperties, scanResult );
 }
+catch ( SurefireExecutionException e )
+{
+forkStarter.killOrphanForks();
+throw e;
+}
+catch ( SurefireBooterForkException e )
+{
+forkStarter.killOrphanForks();
+throw e;
+}
 finally
 {
 System.setProperties( originalSystemProperties );

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/33a32d13/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkStarter.java
--
diff --git 
a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkStarter.java
 
b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkStarter.java
index baea043..57c31b6 100644
--- 
a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkStarter.java
+++ 
b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkStarter.java
@@ -237,6 +237,14 @@ public class ForkStarter
 }
 }
 
+public void killOrphanForks()
+{
+for ( ForkClient fork : currentForkClients )
+{
+fork.kill();
+}
+}
+
 private RunResult run( SurefireProperties effectiveSystemProperties, 
Map providerProperties )
 throws SurefireBooterForkException
 {

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/33a32d13/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/output/ForkClient.java
--
diff --git 
a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/output/ForkClient.java
 
b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/output/ForkClient.java
index be3b09f..d59fdd0 100644
--- 
a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/output/ForkClient.java
+++ 
b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/output/ForkClient.java
@@ -112,6 +112,14 @@ public class ForkClient
 {
 }
 
+public void kill()
+{
+if ( !saidGoodBye )
+{
+notifiableTestStream.shutdown( KILL );
+}
+}
+
 /**
  * Called in concurrent Thread.
  */

[08/25] maven-surefire git commit: [SUREFIRE] refactoring

[tibordigana]

[SUREFIRE] refactoring


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

Branch: refs/heads/junit5
Commit: 02a8a599aa9d73b799e8de9899a2eec4735936ad
Parents: 308d941
Author: Tibor17 
Authored: Sun Sep 25 11:32:43 2016 +0200
Committer: Tibor17 
Committed: Sun Oct 2 11:12:36 2016 +0200

--
 .../plugin/surefire/report/ConsoleOutputFileReporter.java | 5 +++--
 .../maven/plugin/surefire/report/WrappedReportEntry.java  | 4 ++--
 .../plugin/surefire/booterclient/ForkingRunListenerTest.java  | 7 +--
 .../apache/maven/surefire/report/ConsoleOutputCapture.java| 3 +--
 .../org/apache/maven/surefire/util/internal/StringUtils.java  | 2 ++
 5 files changed, 13 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/02a8a599/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/ConsoleOutputFileReporter.java
--
diff --git 
a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/ConsoleOutputFileReporter.java
 
b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/ConsoleOutputFileReporter.java
index d7e0df7..f9e59fe 100644
--- 
a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/ConsoleOutputFileReporter.java
+++ 
b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/ConsoleOutputFileReporter.java
@@ -25,6 +25,8 @@ import java.io.IOException;
 
 import org.apache.maven.surefire.report.ReportEntry;
 
+import static 
org.apache.maven.plugin.surefire.report.FileReporter.getReportFile;
+
 /**
  * Surefire output consumer proxy that writes test output to a {@link 
java.io.File} for each test suite.
  * 
@@ -88,8 +90,7 @@ public class ConsoleOutputFileReporter
 //noinspection ResultOfMethodCallIgnored
 reportsDirectory.mkdirs();
 }
-File file =
-FileReporter.getReportFile( reportsDirectory, 
reportEntryName, reportNameSuffix, "-output.txt" );
+File file = getReportFile( reportsDirectory, reportEntryName, 
reportNameSuffix, "-output.txt" );
 fileOutputStream = new FileOutputStream( file );
 }
 fileOutputStream.write( buf, off, len );

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/02a8a599/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/WrappedReportEntry.java
--
diff --git 
a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/WrappedReportEntry.java
 
b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/WrappedReportEntry.java
index 12f63e5..2394ff0 100644
--- 
a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/WrappedReportEntry.java
+++ 
b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/WrappedReportEntry.java
@@ -22,14 +22,14 @@ package org.apache.maven.plugin.surefire.report;
 import org.apache.maven.surefire.report.ReportEntry;
 import org.apache.maven.surefire.report.StackTraceWriter;
 
+import static org.apache.maven.surefire.util.internal.StringUtils.NL;
+
 /**
  * @author Kristian Rosenvold
  */
 public class WrappedReportEntry
 implements ReportEntry
 {
-private static final String NL = System.getProperty( "line.separator" );
-
 private final ReportEntry original;
 
 private final ReportEntryType reportEntryType;

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/02a8a599/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/booterclient/ForkingRunListenerTest.java
--
diff --git 
a/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/booterclient/ForkingRunListenerTest.java
 
b/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/booterclient/ForkingRunListenerTest.java
index cccb14b..5b8867b 100644
--- 
a/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/booterclient/ForkingRunListenerTest.java
+++ 
b/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/booterclient/ForkingRunListenerTest.java
@@ -268,8 +268,11 @@ public class ForkingRunListenerTest
 ReportEntry expected = createDefaultReportEntry();
 final SimpleReportEntry secondExpected = 
createAnotherDefaultReportEntry();
 
-new ForkingRunListener( printStream, 

[15/25] maven-surefire git commit: [SUREFIRE-1281] Fix permanently failing Surefire Windows Build

[tibordigana]

[SUREFIRE-1281] Fix permanently failing Surefire Windows Build


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

Branch: refs/heads/junit5
Commit: 4b43807504d36d624ba9f72649fabd74579eceff
Parents: 9dc1574
Author: Tibor17 
Authored: Mon Oct 3 02:06:19 2016 +0200
Committer: Tibor17 
Committed: Mon Oct 3 02:06:19 2016 +0200

--
 .../test/resources/fail-fast-junit/src/test/java/pkg/ATest.java| 2 +-
 .../test/resources/fail-fast-junit/src/test/java/pkg/BTest.java| 2 +-
 .../test/resources/fail-fast-junit/src/test/java/pkg/CTest.java| 2 +-
 .../test/resources/fail-fast-junit/src/test/java/pkg/DTest.java| 2 +-
 .../test/resources/fail-fast-testng/src/test/java/pkg/ATest.java   | 2 +-
 .../test/resources/fail-fast-testng/src/test/java/pkg/BTest.java   | 2 +-
 .../test/resources/fail-fast-testng/src/test/java/pkg/CTest.java   | 2 +-
 .../test/resources/fail-fast-testng/src/test/java/pkg/DTest.java   | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4b438075/surefire-integration-tests/src/test/resources/fail-fast-junit/src/test/java/pkg/ATest.java
--
diff --git 
a/surefire-integration-tests/src/test/resources/fail-fast-junit/src/test/java/pkg/ATest.java
 
b/surefire-integration-tests/src/test/resources/fail-fast-junit/src/test/java/pkg/ATest.java
index 5a3fb4e..4d09bab 100644
--- 
a/surefire-integration-tests/src/test/resources/fail-fast-junit/src/test/java/pkg/ATest.java
+++ 
b/surefire-integration-tests/src/test/resources/fail-fast-junit/src/test/java/pkg/ATest.java
@@ -12,7 +12,7 @@ public class ATest
 throws Exception
 {
 // checking processros # due to very slow Windows Jenkins machines
-TimeUnit.MILLISECONDS.sleep( 
Runtime.getRuntime().availableProcessors() == 1 ? 1200 : 500 );
+TimeUnit.MILLISECONDS.sleep( 
Runtime.getRuntime().availableProcessors() == 1 ? 3600 : 1500 );
 throw new RuntimeException( "assert \"foo\" == \"bar\"\n" +
 " |\n"
 + " false" );

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4b438075/surefire-integration-tests/src/test/resources/fail-fast-junit/src/test/java/pkg/BTest.java
--
diff --git 
a/surefire-integration-tests/src/test/resources/fail-fast-junit/src/test/java/pkg/BTest.java
 
b/surefire-integration-tests/src/test/resources/fail-fast-junit/src/test/java/pkg/BTest.java
index 3015f40..1dc76b7 100644
--- 
a/surefire-integration-tests/src/test/resources/fail-fast-junit/src/test/java/pkg/BTest.java
+++ 
b/surefire-integration-tests/src/test/resources/fail-fast-junit/src/test/java/pkg/BTest.java
@@ -11,7 +11,7 @@ public class BTest
 throws InterruptedException
 {
 // checking processros # due to very slow Windows Jenkins machines
-TimeUnit.MILLISECONDS.sleep( 
Runtime.getRuntime().availableProcessors() == 1 ? 3000 : 1250 );
+TimeUnit.MILLISECONDS.sleep( 
Runtime.getRuntime().availableProcessors() == 1 ? 9000 : 3750 );
 throw new RuntimeException();
 }
 

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4b438075/surefire-integration-tests/src/test/resources/fail-fast-junit/src/test/java/pkg/CTest.java
--
diff --git 
a/surefire-integration-tests/src/test/resources/fail-fast-junit/src/test/java/pkg/CTest.java
 
b/surefire-integration-tests/src/test/resources/fail-fast-junit/src/test/java/pkg/CTest.java
index 9865e69..2660779 100644
--- 
a/surefire-integration-tests/src/test/resources/fail-fast-junit/src/test/java/pkg/CTest.java
+++ 
b/surefire-integration-tests/src/test/resources/fail-fast-junit/src/test/java/pkg/CTest.java
@@ -11,7 +11,7 @@ public class CTest
 throws InterruptedException
 {
 // checking processros # due to very slow Windows Jenkins machines
-TimeUnit.MILLISECONDS.sleep( 
Runtime.getRuntime().availableProcessors() == 1 ? 3000 : 1250 );
+TimeUnit.MILLISECONDS.sleep( 
Runtime.getRuntime().availableProcessors() == 1 ? 9000 : 3750 );
 }
 
 }

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4b438075/surefire-integration-tests/src/test/resources/fail-fast-junit/src/test/java/pkg/DTest.java
--
diff --git 

[10/25] maven-surefire git commit: [SUREFIRE] refactoring

[tibordigana]

[SUREFIRE] refactoring


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

Branch: refs/heads/junit5
Commit: e563566b4d3713cc121c31a86defbeb7ddbe
Parents: 4f3f59e
Author: Tibor17 
Authored: Sun Oct 2 11:08:09 2016 +0200
Committer: Tibor17 
Committed: Sun Oct 2 11:12:38 2016 +0200

--
 .../surefire/report/StatelessXmlReporter.java   | 20 +++-
 1 file changed, 7 insertions(+), 13 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e563566b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/StatelessXmlReporter.java
--
diff --git 
a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/StatelessXmlReporter.java
 
b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/StatelessXmlReporter.java
index f30e54f..8ebeb96 100644
--- 
a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/StatelessXmlReporter.java
+++ 
b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/StatelessXmlReporter.java
@@ -45,7 +45,7 @@ import java.util.StringTokenizer;
 
 import static 
org.apache.maven.plugin.surefire.report.DefaultReporterFactory.TestResultType;
 import static 
org.apache.maven.plugin.surefire.report.FileReporterUtils.stripIllegalFilenameChars;
-import static org.apache.maven.surefire.util.internal.StringUtils.isNotBlank;
+import static org.apache.maven.surefire.util.internal.StringUtils.isBlank;
 
 // CHECKSTYLE_OFF: LineLength
 /**
@@ -321,9 +321,8 @@ public class StatelessXmlReporter
 private static File getReportFile( ReportEntry report, File 
reportsDirectory, String reportNameSuffix )
 {
 String reportName = "TEST-" + report.getName();
-String reportFileName =
-isNotBlank( reportNameSuffix ) ? reportName + "-" + 
reportNameSuffix + ".xml" : reportName + ".xml";
-return new File( reportsDirectory, stripIllegalFilenameChars( 
reportFileName ) );
+String customizedReportName = isBlank( reportNameSuffix ) ? reportName 
: reportName + "-" + reportNameSuffix;
+return new File( reportsDirectory, stripIllegalFilenameChars( 
customizedReportName + ".xml" ) );
 }
 
 private static void startTestElement( XMLWriter ppw, WrappedReportEntry 
report, String reportNameSuffix,
@@ -490,7 +489,6 @@ public class StatelessXmlReporter
 xmlWriter.addAttribute( "value", extraEscape( value, true ) );
 
 xmlWriter.endElement();
-
 }
 }
 xmlWriter.endElement();
@@ -506,14 +504,10 @@ public class StatelessXmlReporter
 private static String extraEscape( String message, boolean attribute )
 {
 // Someday convert to xml 1.1 which handles everything but 0 inside 
string
-if ( !containsEscapesIllegalnXml10( message ) )
-{
-return message;
-}
-return escapeXml( message, attribute );
+return containsEscapesIllegalXml10( message ) ? escapeXml( message, 
attribute ) : message;
 }
 
-private static class EncodingOutputStream
+private static final class EncodingOutputStream
 extends FilterOutputStream
 {
 private int c1;
@@ -563,7 +557,7 @@ public class StatelessXmlReporter
 }
 }
 
-private static boolean containsEscapesIllegalnXml10( String message )
+private static boolean containsEscapesIllegalXml10( String message )
 {
 int size = message.length();
 for ( int i = 0; i < size; i++ )
@@ -611,7 +605,7 @@ public class StatelessXmlReporter
 return sb.toString();
 }
 
-private static class ByteConstantsHolder
+private static final class ByteConstantsHolder
 {
 private static final byte[] CDATA_START_BYTES;
 

[07/25] maven-surefire git commit: [SUREFIRE-1280] Replace "http://jira.codehaus.org" with "https://issues.apache.org/jira"

[tibordigana]

[SUREFIRE-1280] Replace "http://jira.codehaus.org; with
"https://issues.apache.org/jira;

Updated links present in the documentation as well.

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

Branch: refs/heads/junit5
Commit: 308d941c9b6ebb695aba9630f81fc5b400f21322
Parents: 432231e
Author: Tunaki 
Authored: Sun Sep 25 14:00:49 2016 +0200
Committer: Tunaki 
Committed: Sun Sep 25 14:00:49 2016 +0200

--
 .../site/apt/examples/fork-options-and-parallel-execution.apt.vm   | 2 +-
 maven-surefire-plugin/src/site/markdown/multilineexceptions.md | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/308d941c/maven-surefire-plugin/src/site/apt/examples/fork-options-and-parallel-execution.apt.vm
--
diff --git 
a/maven-surefire-plugin/src/site/apt/examples/fork-options-and-parallel-execution.apt.vm
 
b/maven-surefire-plugin/src/site/apt/examples/fork-options-and-parallel-execution.apt.vm
index eebe525..2f9429c 100644
--- 
a/maven-surefire-plugin/src/site/apt/examples/fork-options-and-parallel-execution.apt.vm
+++ 
b/maven-surefire-plugin/src/site/apt/examples/fork-options-and-parallel-execution.apt.vm
@@ -323,4 +323,4 @@ Fork Options and Parallel Test Execution
 
  * <<<$\{surefire.forkNumber\}>>> is properly propagated within 
<<>>
  since ${project.artifactId}:2.19, more details in
- {{{https://jira.codehaus.org/browse/SUREFIRE-1136}SUREFIRE-1136}}
+ {{{https://issues.apache.org/jira/browse/SUREFIRE-1136}SUREFIRE-1136}}

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/308d941c/maven-surefire-plugin/src/site/markdown/multilineexceptions.md
--
diff --git a/maven-surefire-plugin/src/site/markdown/multilineexceptions.md 
b/maven-surefire-plugin/src/site/markdown/multilineexceptions.md
index 69c70c8..4421d49 100644
--- a/maven-surefire-plugin/src/site/markdown/multilineexceptions.md
+++ b/maven-surefire-plugin/src/site/markdown/multilineexceptions.md
@@ -34,4 +34,4 @@ becomes:
  May not contain whitespace
 
 The plugin supports Groovy assertion output.
-For more information see the issue 
https://jira.codehaus.org/browse/SUREFIRE-986.
+For more information see the issue 
https://issues.apache.org/jira/browse/SUREFIRE-986.

[03/25] maven-surefire git commit: [SUREFIRE] getForkedProcessExitTimeoutInSeconds() and getRerunFailingTestsCount() missing in computation of checksum

[tibordigana]

[SUREFIRE] getForkedProcessExitTimeoutInSeconds() and 
getRerunFailingTestsCount() missing in computation of checksum


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

Branch: refs/heads/junit5
Commit: ada12d4073bcde0be1b7c4324fceb72915b72c59
Parents: 2c6105c
Author: Tibor17 
Authored: Sat Sep 24 11:55:00 2016 +0200
Committer: Tibor17 
Committed: Sat Sep 24 11:55:00 2016 +0200

--
 .../org/apache/maven/plugin/surefire/AbstractSurefireMojo.java | 2 ++
 1 file changed, 2 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/ada12d40/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java
--
diff --git 
a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java
 
b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java
index 5e22b70..bd9e0bd 100644
--- 
a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java
+++ 
b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java
@@ -2087,6 +2087,8 @@ public abstract class AbstractSurefireMojo
 checksum.add( getFailIfNoTests() );
 checksum.add( getRunOrder() );
 checksum.add( getDependenciesToScan() );
+checksum.add( getForkedProcessExitTimeoutInSeconds() );
+checksum.add( getRerunFailingTestsCount() );
 addPluginSpecificChecksumItems( checksum );
 return checksum.getSha1();
 

[13/25] maven-surefire git commit: [SUREFIRE-1291] enable unit tests in surefire-integration-tests and rename Surefire1028UnableToRunSingleTest to *IT

[tibordigana]

[SUREFIRE-1291] enable unit tests in surefire-integration-tests and rename 
Surefire1028UnableToRunSingleTest to *IT


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

Branch: refs/heads/junit5
Commit: a9162eed51b0ac0017bee8144c97a290553589bf
Parents: 33a32d1
Author: Tibor17 
Authored: Sun Oct 2 20:42:50 2016 +0200
Committer: Tibor17 
Committed: Sun Oct 2 20:42:50 2016 +0200

--
 surefire-integration-tests/pom.xml  |  2 +-
 .../jiras/Surefire1028UnableToRunSingleIT.java  | 59 
 .../Surefire1028UnableToRunSingleTest.java  | 59 
 3 files changed, 60 insertions(+), 60 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/a9162eed/surefire-integration-tests/pom.xml
--
diff --git a/surefire-integration-tests/pom.xml 
b/surefire-integration-tests/pom.xml
index 3fe4f55..43d4b0a 100644
--- a/surefire-integration-tests/pom.xml
+++ b/surefire-integration-tests/pom.xml
@@ -86,7 +86,7 @@
   
 maven-surefire-plugin
 
-  true
+  *Test
 
   
   

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/a9162eed/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1028UnableToRunSingleIT.java
--
diff --git 
a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1028UnableToRunSingleIT.java
 
b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1028UnableToRunSingleIT.java
new file mode 100644
index 000..74cb281
--- /dev/null
+++ 
b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1028UnableToRunSingleIT.java
@@ -0,0 +1,59 @@
+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;
+
+/**
+ * Plugin Configuration: parallel=classes
+ * 
+ * With Surefire 2.15
+ * {@code $ mvn test -Dtest=MyTest#testFoo}
+ * Results :
+ * Tests run: 1, Failures: 0, Errors: 0, Skipped: 0
+ * 
+ * With Surefire 2.16
+ * {@code $ mvn test -Dtest=MyTest#testFoo}
+ * 
+ * Results :
+ * Tests run: 0, Failures: 0, Errors: 0, Skipped: 0
+ *
+ * @author mailto:tibordig...@apache.org;>Tibor Digana (tibor17)
+ * @see {@linkplain https://jira.codehaus.org/browse/SUREFIRE-1028}
+ * @since 2.18
+ */
+public class Surefire1028UnableToRunSingleIT
+extends SurefireJUnit4IntegrationTestCase
+{
+
+@Test
+public void methodFilteringParallelExecution()
+{
+unpack().setTestToRun( "SomeTest#test" 
).parallelClasses().useUnlimitedThreads()
+.executeTest().verifyErrorFree( 1 ).verifyTextInLog( "OK!" );
+}
+
+private SurefireLauncher unpack()
+{
+return unpack( "surefire-1028-unable-to-run-single-test" );
+}
+}

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/a9162eed/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1028UnableToRunSingleTest.java
--
diff --git 
a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1028UnableToRunSingleTest.java
 
b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1028UnableToRunSingleTest.java
deleted file mode 100644
index ac40212..000
--- 
a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1028UnableToRunSingleTest.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package 

[05/25] maven-surefire git commit: [SUREFIRE-1198] Failsafe does not allow to configure the jar file to use

[tibordigana]

[SUREFIRE-1198] Failsafe does not allow to configure the jar file to use


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

Branch: refs/heads/junit5
Commit: f1aea63320b66e635e0dc27e4f9ecd0e155099d9
Parents: 53c7980
Author: Tibor17 
Authored: Sun Sep 25 04:19:47 2016 +0200
Committer: Tibor17 
Committed: Sun Sep 25 04:19:47 2016 +0200

--
 maven-failsafe-plugin/pom.xml   |  5 +++
 .../plugin/failsafe/IntegrationTestMojo.java| 40 +++-
 .../failsafe/IntegrationTestMojoTest.java   |  1 +
 .../apt/examples/configuring-classpath.apt.vm   |  1 +
 maven-surefire-plugin/src/site/fml/faq.fml  | 11 ++
 pom.xml |  7 ++--
 6 files changed, 51 insertions(+), 14 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/f1aea633/maven-failsafe-plugin/pom.xml
--
diff --git a/maven-failsafe-plugin/pom.xml b/maven-failsafe-plugin/pom.xml
index ff02870..91c7677 100644
--- a/maven-failsafe-plugin/pom.xml
+++ b/maven-failsafe-plugin/pom.xml
@@ -73,6 +73,11 @@
   zip
   site-source
 
+
+  org.mockito
+  mockito-core
+  test
+
   
 
   

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/f1aea633/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/IntegrationTestMojo.java
--
diff --git 
a/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/IntegrationTestMojo.java
 
b/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/IntegrationTestMojo.java
index 9f30534..b3f76db 100644
--- 
a/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/IntegrationTestMojo.java
+++ 
b/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/IntegrationTestMojo.java
@@ -25,7 +25,6 @@ import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 
-import org.apache.maven.artifact.Artifact;
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugin.MojoFailureException;
 import org.apache.maven.plugin.surefire.AbstractSurefireMojo;
@@ -58,9 +57,12 @@ public class IntegrationTestMojo
  * The path representing project JAR file, if exists; Otherwise 
the directory containing generated
  * classes of the project being tested. This will be included after the 
test classes in the test classpath.
  */
-@Parameter( defaultValue = "${project.build.outputDirectory}" )
+@Parameter
 private File classesDirectory;
 
+@Parameter( readonly = true, defaultValue = 
"${project.build.outputDirectory}" )
+private File defaultClassesDirectory;
+
 /**
  * Set this to "true" to skip running integration tests, but still compile 
them. Its use is NOT RECOMMENDED, but
  * quite convenient on occasion.
@@ -388,6 +390,23 @@ public class IntegrationTestMojo
 }
 }
 
+private boolean isJarArtifact( File artifactFile )
+{
+return artifactFile != null && artifactFile.isFile() && 
artifactFile.getName().toLowerCase().endsWith( ".jar" );
+}
+
+private static File toAbsoluteCanonical( File f )
+{
+try
+{
+return f == null ? null : f.getAbsoluteFile().getCanonicalFile();
+}
+catch ( IOException e )
+{
+throw new IllegalStateException( e.getLocalizedMessage(), e );
+}
+}
+
 @SuppressWarnings( "deprecation" )
 protected boolean isSkipExecution()
 {
@@ -481,18 +500,19 @@ public class IntegrationTestMojo
  */
 public File getClassesDirectory()
 {
-Artifact artifact = getProject().getArtifact();
-File artifactFile = artifact.getFile();
-
-boolean useArtifactFile = artifactFile != null && artifactFile.isFile()
-&& artifactFile.getName().toLowerCase().endsWith( ".jar" );
-
-return useArtifactFile ? artifactFile : classesDirectory;
+File artifact = getProject().getArtifact().getFile();
+boolean isDefaultClsDir = classesDirectory == null;
+return isDefaultClsDir ? ( isJarArtifact( artifact ) ? artifact : 
defaultClassesDirectory ) : classesDirectory;
 }
 
 public void setClassesDirectory( File classesDirectory )
 {
-this.classesDirectory = classesDirectory;
+this.classesDirectory = toAbsoluteCanonical( classesDirectory );
+}
+
+public void setDefaultClassesDirectory( File defaultClassesDirectory )
+

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

[gboue]

Repository: maven
Updated Branches:
  refs/heads/master 8fe10c341 -> d8e3585e0


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

If a property is concurrently removed from System.getProperties(), we
shouldn't try to insert 'null' since this is not allowed by Properties:
adding a null-check.

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

Branch: refs/heads/master
Commit: d8e3585e051db0293ddd41c781b39e0bf9ce350b
Parents: 8fe10c3
Author: Guillaume Boué 
Authored: Thu Oct 13 23:28:16 2016 +0200
Committer: Guillaume Boué 
Committed: Thu Oct 13 23:28:16 2016 +0200

--
 .../apache/maven/properties/internal/SystemProperties.java| 7 ++-
 .../settings/building/DefaultSettingsBuildingRequest.java | 7 ++-
 2 files changed, 12 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/d8e3585e/maven-core/src/main/java/org/apache/maven/properties/internal/SystemProperties.java
--
diff --git 
a/maven-core/src/main/java/org/apache/maven/properties/internal/SystemProperties.java
 
b/maven-core/src/main/java/org/apache/maven/properties/internal/SystemProperties.java
index 0372558..0a77376 100644
--- 
a/maven-core/src/main/java/org/apache/maven/properties/internal/SystemProperties.java
+++ 
b/maven-core/src/main/java/org/apache/maven/properties/internal/SystemProperties.java
@@ -35,7 +35,12 @@ public class SystemProperties
 {
 for ( String key : System.getProperties().stringPropertyNames() )
 {
-props.put( key, System.getProperty( key ) );
+String value = System.getProperty( key );
+// could be null if another thread concurrently removed this key 
(MNG-6105)
+if ( value != null )
+{
+props.put( key, value );
+}
 }
 }
 

http://git-wip-us.apache.org/repos/asf/maven/blob/d8e3585e/maven-settings-builder/src/main/java/org/apache/maven/settings/building/DefaultSettingsBuildingRequest.java
--
diff --git 
a/maven-settings-builder/src/main/java/org/apache/maven/settings/building/DefaultSettingsBuildingRequest.java
 
b/maven-settings-builder/src/main/java/org/apache/maven/settings/building/DefaultSettingsBuildingRequest.java
index 5a4824e..d917a9c 100644
--- 
a/maven-settings-builder/src/main/java/org/apache/maven/settings/building/DefaultSettingsBuildingRequest.java
+++ 
b/maven-settings-builder/src/main/java/org/apache/maven/settings/building/DefaultSettingsBuildingRequest.java
@@ -119,7 +119,12 @@ public class DefaultSettingsBuildingRequest
 // MNG-5670 guard against ConcurrentModificationException
 for ( String key : System.getProperties().stringPropertyNames() )
 {
-this.systemProperties.put( key, System.getProperty( key ) );
+String value = System.getProperty( key );
+// could be null if another thread concurrently removed this 
key (MNG-6105)
+if ( value != null )
+{
+this.systemProperties.put( key, value );
+}
 }
 }
 else