You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ti...@apache.org on 2018/03/03 03:11:27 UTC
[1/5] maven-surefire git commit: README.md actual Jenkins CI links
https://builds.apache.org/job/maven-wip/job/maven-surefire/job/master/
Repository: maven-surefire
Updated Branches:
refs/heads/master e8af50c72 -> 3ddcd1f67
README.md actual Jenkins CI links https://builds.apache.org/job/maven-wip/job/maven-surefire/job/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/8fdcd200
Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/8fdcd200
Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/8fdcd200
Branch: refs/heads/master
Commit: 8fdcd200b8c41b259f8111c68ea761461b586757
Parents: e8af50c
Author: Tibor17 <ti...@apache.org>
Authored: Fri Mar 2 21:35:00 2018 +0100
Committer: Tibor17 <ti...@apache.org>
Committed: Fri Mar 2 21:35:00 2018 +0100
----------------------------------------------------------------------
README.md | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/8fdcd200/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
index 639422f..6fc0397 100644
--- a/README.md
+++ b/README.md
@@ -20,9 +20,9 @@ Usage of [maven-surefire-plugin], [maven-failsafe-plugin], [maven-surefire-repor
# Build Status
-[](https://builds.apache.org/job/maven-surefire/depgraph-view/) Maven 2.2.1 Plugin API
+[](https://builds.apache.org/job/maven-wip/job/maven-surefire/depgraph-view/) Maven 2.2.1 Plugin API
-[](http://www.apache.org/licenses/LICENSE-2.0.html) [](https://builds.apache.org/view/M-R/view/Maven/job/maven-surefire-pipeline/job/master/lastBuild/testReport/) [](https://builds.apache.org/view/M-R/view/Maven/job/maven-surefire-pipeline/job/master/)
+[](http://www.apache.org/licenses/LICENSE-2.0.html) [](https://builds.apache.org/job/maven-wip/job/maven-surefire/job/master/lastBuild/testReport/) [](https://builds.apache.org/job/maven-wip/job/maven-surefire/job/master/)
# Development Information
[5/5] maven-surefire git commit: [SUREFIRE-1488] Native library in
Surefire1295AttributeJvmCrashesToTestsIT caused unstable test
Posted by ti...@apache.org.
[SUREFIRE-1488] Native library in Surefire1295AttributeJvmCrashesToTestsIT caused unstable 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/3ddcd1f6
Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/3ddcd1f6
Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/3ddcd1f6
Branch: refs/heads/master
Commit: 3ddcd1f6795c6fde703cbb848a1005694b7ee878
Parents: 7bd6194
Author: Tibor17 <ti...@apache.org>
Authored: Sat Mar 3 04:05:20 2018 +0100
Committer: Tibor17 <ti...@apache.org>
Committed: Sat Mar 3 04:05:20 2018 +0100
----------------------------------------------------------------------
.../jiras/Surefire1295AttributeJvmCrashesToTestsIT.java | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/3ddcd1f6/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1295AttributeJvmCrashesToTestsIT.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1295AttributeJvmCrashesToTestsIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1295AttributeJvmCrashesToTestsIT.java
index 96e6f41..f756816 100644
--- a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1295AttributeJvmCrashesToTestsIT.java
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1295AttributeJvmCrashesToTestsIT.java
@@ -66,9 +66,11 @@ public class Surefire1295AttributeJvmCrashesToTestsIT
public static Iterable<Object[]> parameters()
{
return asList(new Object[][] {
- { "exit", DEFAULT },
- { "exit", ONE_FORK_NO_REUSE },
- { "exit", ONE_FORK_REUSE },
+// unused, exit() does not stop all Threads immediately,
+// see https://github.com/michaeltandy/crashjvm/issues/1
+// { "exit", DEFAULT },
+// { "exit", ONE_FORK_NO_REUSE },
+// { "exit", ONE_FORK_REUSE },
{ "abort", DEFAULT },
{ "abort", ONE_FORK_NO_REUSE },
{ "abort", ONE_FORK_REUSE },
@@ -127,7 +129,7 @@ public class Surefire1295AttributeJvmCrashesToTestsIT
// Waiting for the stream to become flushed on disk.
SECONDS.sleep( 1L );
- for ( Iterator< String > it = validator.loadLogLines().iterator(); it.hasNext(); )
+ for ( Iterator<String> it = validator.loadLogLines().iterator(); it.hasNext(); )
{
String line = it.next();
if ( line.contains( "Crashed tests:" ) )
[4/5] maven-surefire git commit: [SUREFIRE-1484] maven-clean-plugin
should be used in integration test resource junit-pathWithUmlaut
Posted by ti...@apache.org.
[SUREFIRE-1484] maven-clean-plugin should be used in integration test resource junit-pathWithUmlaut
Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/7bd61946
Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/7bd61946
Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/7bd61946
Branch: refs/heads/master
Commit: 7bd61946b2faa5d1e207e8e8dd12d257dc31fe87
Parents: 773f3eb
Author: Tibor17 <ti...@apache.org>
Authored: Fri Mar 2 23:41:38 2018 +0100
Committer: Tibor17 <ti...@apache.org>
Committed: Fri Mar 2 23:41:38 2018 +0100
----------------------------------------------------------------------
.../src/test/resources/crash-during-test/pom.xml | 12 ------------
.../src/test/resources/junit-pathWithUmlaut/pom.xml | 12 ++++++++++++
2 files changed, 12 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/7bd61946/surefire-its/src/test/resources/crash-during-test/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/crash-during-test/pom.xml b/surefire-its/src/test/resources/crash-during-test/pom.xml
index 3929e83..8dd83ec 100644
--- a/surefire-its/src/test/resources/crash-during-test/pom.xml
+++ b/surefire-its/src/test/resources/crash-during-test/pom.xml
@@ -51,18 +51,6 @@
</dependencies>
<build>
- <pluginManagement>
- <plugins>
- <!--
- mvn clean is called beforehand.
- The German word Umlaut which is not ASCII must be deleted the same on all M3 versions.
- -->
- <plugin>
- <artifactId>maven-clean-plugin</artifactId>
- <version>3.0.0</version>
- </plugin>
- </plugins>
- </pluginManagement>
<plugins>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/7bd61946/surefire-its/src/test/resources/junit-pathWithUmlaut/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/junit-pathWithUmlaut/pom.xml b/surefire-its/src/test/resources/junit-pathWithUmlaut/pom.xml
index e7366a2..9f947e0 100644
--- a/surefire-its/src/test/resources/junit-pathWithUmlaut/pom.xml
+++ b/surefire-its/src/test/resources/junit-pathWithUmlaut/pom.xml
@@ -43,6 +43,18 @@
</dependencies>
<build>
+ <pluginManagement>
+ <plugins>
+ <!--
+ mvn clean is called beforehand.
+ The German word Umlaut which is not ASCII must be deleted the same on all M3 versions.
+ -->
+ <plugin>
+ <artifactId>maven-clean-plugin</artifactId>
+ <version>3.0.0</version>
+ </plugin>
+ </plugins>
+ </pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
[2/5] maven-surefire git commit: [SUREFIRE-1486]
maven-failsafe-plugin does not use JUnit adapter for JUnit4 annotations and
TestNG providers do not have maven-surefire-plugin config in POM
Posted by ti...@apache.org.
[SUREFIRE-1486] maven-failsafe-plugin does not use JUnit adapter for JUnit4 annotations and TestNG providers do not have maven-surefire-plugin config in POM
Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/63e0aa41
Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/63e0aa41
Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/63e0aa41
Branch: refs/heads/master
Commit: 63e0aa41dbd8483b36d50c2e68b237e75d0a2d78
Parents: 8fdcd20
Author: Tibor17 <ti...@apache.org>
Authored: Fri Mar 2 23:01:16 2018 +0100
Committer: Tibor17 <ti...@apache.org>
Committed: Fri Mar 2 23:01:16 2018 +0100
----------------------------------------------------------------------
maven-failsafe-plugin/pom.xml | 5 +++
.../maven/plugin/failsafe/JUnit4SuiteTest.java | 46 ++++++++++++++++++++
.../surefire/junitcore/JUnit47SuiteTest.java | 1 -
.../surefire-testng-utils/pom.xml | 10 +++++
surefire-providers/surefire-testng/pom.xml | 12 +++++
5 files changed, 73 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/63e0aa41/maven-failsafe-plugin/pom.xml
----------------------------------------------------------------------
diff --git a/maven-failsafe-plugin/pom.xml b/maven-failsafe-plugin/pom.xml
index 199f34c..ea2c07f 100644
--- a/maven-failsafe-plugin/pom.xml
+++ b/maven-failsafe-plugin/pom.xml
@@ -110,6 +110,11 @@
<version>2.12.4</version> <!-- ${shadedVersion}, but resolved due to https://issues.apache.org/jira/browse/MRELEASE-799 -->
</dependency>
</dependencies>
+ <configuration>
+ <includes>
+ <include>**/JUnit4SuiteTest.java</include>
+ </includes>
+ </configuration>
</plugin>
<plugin>
<artifactId>maven-dependency-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/63e0aa41/maven-failsafe-plugin/src/test/java/org/apache/maven/plugin/failsafe/JUnit4SuiteTest.java
----------------------------------------------------------------------
diff --git a/maven-failsafe-plugin/src/test/java/org/apache/maven/plugin/failsafe/JUnit4SuiteTest.java b/maven-failsafe-plugin/src/test/java/org/apache/maven/plugin/failsafe/JUnit4SuiteTest.java
new file mode 100644
index 0000000..decaf86
--- /dev/null
+++ b/maven-failsafe-plugin/src/test/java/org/apache/maven/plugin/failsafe/JUnit4SuiteTest.java
@@ -0,0 +1,46 @@
+package org.apache.maven.plugin.failsafe;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import junit.framework.JUnit4TestAdapter;
+import junit.framework.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite;
+import org.junit.runners.Suite.SuiteClasses;
+
+/**
+ * Adapt the JUnit4 tests which use only annotations to the JUnit3 test suite.
+ *
+ * @author Tibor Digana (tibor17)
+ * @since 2.21.0
+ */
+@SuiteClasses( {
+ IntegrationTestMojoTest.class,
+ MarshallerUnmarshallerTest.class,
+ RunResultTest.class
+} )
+@RunWith( Suite.class )
+public class JUnit4SuiteTest
+{
+ public static Test suite()
+ {
+ return new JUnit4TestAdapter( JUnit4SuiteTest.class );
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/63e0aa41/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore/JUnit47SuiteTest.java
----------------------------------------------------------------------
diff --git a/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore/JUnit47SuiteTest.java b/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore/JUnit47SuiteTest.java
index 5392cc8..9954627 100644
--- a/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore/JUnit47SuiteTest.java
+++ b/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore/JUnit47SuiteTest.java
@@ -40,7 +40,6 @@ import org.junit.runners.Suite;
ParallelComputerUtilTest.class,
ParallelComputerBuilderTest.class,
SchedulingStrategiesTest.class,
- JUnitCoreParametersTest.class,
OptimizedParallelComputerTest.class,
ConcurrentRunListenerTest.class,
ConfigurableParallelComputerTest.class,
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/63e0aa41/surefire-providers/surefire-testng-utils/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-providers/surefire-testng-utils/pom.xml b/surefire-providers/surefire-testng-utils/pom.xml
index 66df28e..0f0a6cd 100644
--- a/surefire-providers/surefire-testng-utils/pom.xml
+++ b/surefire-providers/surefire-testng-utils/pom.xml
@@ -83,6 +83,16 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven.surefire</groupId>
+ <artifactId>surefire-shadefire</artifactId>
+ <version>2.12.4</version> <!-- ${shadedVersion}, but resolved due to https://issues.apache.org/jira/browse/MRELEASE-799 -->
+ </dependency>
+ </dependencies>
+ </plugin>
</plugins>
</build>
</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/63e0aa41/surefire-providers/surefire-testng/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-providers/surefire-testng/pom.xml b/surefire-providers/surefire-testng/pom.xml
index 22fcc15..d21aa89 100644
--- a/surefire-providers/surefire-testng/pom.xml
+++ b/surefire-providers/surefire-testng/pom.xml
@@ -64,5 +64,17 @@
<targetPath>META-INF</targetPath>
</resource>
</resources>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven.surefire</groupId>
+ <artifactId>surefire-shadefire</artifactId>
+ <version>2.12.4</version> <!-- ${shadedVersion}, but resolved due to https://issues.apache.org/jira/browse/MRELEASE-799 -->
+ </dependency>
+ </dependencies>
+ </plugin>
+ </plugins>
</build>
</project>
[3/5] maven-surefire git commit: [SUREFIRE-1485] surefire-shadefire
project should not be deployed in Maven Central
Posted by ti...@apache.org.
[SUREFIRE-1485] surefire-shadefire project should not be deployed in Maven Central
Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/773f3eb0
Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/773f3eb0
Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/773f3eb0
Branch: refs/heads/master
Commit: 773f3eb0510fc18ef131b2ccc5f9a627266b36e5
Parents: 63e0aa4
Author: Tibor17 <ti...@apache.org>
Authored: Fri Mar 2 23:29:05 2018 +0100
Committer: Tibor17 <ti...@apache.org>
Committed: Fri Mar 2 23:29:05 2018 +0100
----------------------------------------------------------------------
surefire-shadefire/pom.xml | 6 ++++++
1 file changed, 6 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/773f3eb0/surefire-shadefire/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-shadefire/pom.xml b/surefire-shadefire/pom.xml
index e662409..f574613 100644
--- a/surefire-shadefire/pom.xml
+++ b/surefire-shadefire/pom.xml
@@ -98,6 +98,12 @@
<skip>true</skip>
</configuration>
</plugin>
+ <plugin>
+ <artifactId>maven-deploy-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
</plugins>
</build>