git commit: IT is only valid for Maven 3.2+
Repository: maven-integration-testing
Updated Branches:
refs/heads/master f2932b84c - 9f11d8d70
IT is only valid for Maven 3.2+
Project: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/repo
Commit:
http://git-wip-us.apache.org/repos/asf/maven-integration-testing/commit/9f11d8d7
Tree:
http://git-wip-us.apache.org/repos/asf/maven-integration-testing/tree/9f11d8d7
Diff:
http://git-wip-us.apache.org/repos/asf/maven-integration-testing/diff/9f11d8d7
Branch: refs/heads/master
Commit: 9f11d8d707ea241d5426d9613c57a2203749c0c2
Parents: f2932b8
Author: Hervé Boutemy hbout...@apache.org
Authored: Sun Mar 9 12:10:06 2014 +0100
Committer: Hervé Boutemy hbout...@apache.org
Committed: Sun Mar 9 12:10:06 2014 +0100
--
.../org/apache/maven/it/MavenITmng5576CdFriendlyVersions.java| 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/9f11d8d7/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5576CdFriendlyVersions.java
--
diff --git
a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5576CdFriendlyVersions.java
b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5576CdFriendlyVersions.java
index 79691f6..c99082e 100644
---
a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5576CdFriendlyVersions.java
+++
b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5576CdFriendlyVersions.java
@@ -36,7 +36,7 @@ public class MavenITmng5576CdFriendlyVersions
{
public MavenITmng5576CdFriendlyVersions()
{
-super( ALL_MAVEN_VERSIONS );
+super( [3.2,) );
}
/**
@@ -62,7 +62,7 @@ public class MavenITmng5576CdFriendlyVersions
ListString lines = verifier.loadFile( new File( testDir, log.txt
), false );
for( String line : lines )
{
-assertFalse( line.contains( WARNING ) );
+assertFalse( line, line.contains( WARNING ) );
}
}
git commit: [MNG-5595] name field missing in plugin.xml documentation
Repository: maven Updated Branches: refs/heads/master ac8e59ac6 - fe1cfee6d [MNG-5595] name field missing in plugin.xml documentation Project: http://git-wip-us.apache.org/repos/asf/maven/repo Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/fe1cfee6 Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/fe1cfee6 Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/fe1cfee6 Branch: refs/heads/master Commit: fe1cfee6d90f848a2551b0abadb49352452723b8 Parents: ac8e59a Author: Hervé Boutemy hbout...@apache.org Authored: Sun Mar 9 12:21:26 2014 +0100 Committer: Hervé Boutemy hbout...@apache.org Committed: Sun Mar 9 12:21:26 2014 +0100 -- maven-plugin-api/src/main/mdo/plugin.mdo | 6 ++ 1 file changed, 6 insertions(+) -- http://git-wip-us.apache.org/repos/asf/maven/blob/fe1cfee6/maven-plugin-api/src/main/mdo/plugin.mdo -- diff --git a/maven-plugin-api/src/main/mdo/plugin.mdo b/maven-plugin-api/src/main/mdo/plugin.mdo index fd7e0c4..de5f7d1 100644 --- a/maven-plugin-api/src/main/mdo/plugin.mdo +++ b/maven-plugin-api/src/main/mdo/plugin.mdo @@ -44,6 +44,12 @@ under the License. !-- see o.a.m.plugin.descriptor.PluginDescriptor -- fields field + namename/name + version1.0.0/version + descriptionName of the plugin./description + typeString/type +/field +field namedescription/name version1.0.0/version descriptionDescription of the plugin./description
svn commit: r1575711 - /maven/plugins/trunk/maven-checkstyle-plugin/src/it/inlinerules/pom.xml
Author: khmarbaise Date: Sun Mar 9 14:19:44 2014 New Revision: 1575711 URL: http://svn.apache.org/r1575711 Log: - Fixed failing integration test based on a hard coded plugin version in the pom file. Modified: maven/plugins/trunk/maven-checkstyle-plugin/src/it/inlinerules/pom.xml Modified: maven/plugins/trunk/maven-checkstyle-plugin/src/it/inlinerules/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-checkstyle-plugin/src/it/inlinerules/pom.xml?rev=1575711r1=1575710r2=1575711view=diff == --- maven/plugins/trunk/maven-checkstyle-plugin/src/it/inlinerules/pom.xml (original) +++ maven/plugins/trunk/maven-checkstyle-plugin/src/it/inlinerules/pom.xml Sun Mar 9 14:19:44 2014 @@ -34,7 +34,7 @@ under the License. plugin groupIdorg.apache.maven.plugins/groupId artifactIdmaven-checkstyle-plugin/artifactId -version2.12-SNAPSHOT/version +version@project.version@/version executions execution idcheck/id
svn commit: r1575724 - /maven/pom/trunk/maven/pom.xml
Author: hboutemy Date: Sun Mar 9 16:46:37 2014 New Revision: 1575724 URL: http://svn.apache.org/r1575724 Log: updated plugins Modified: maven/pom/trunk/maven/pom.xml Modified: maven/pom/trunk/maven/pom.xml URL: http://svn.apache.org/viewvc/maven/pom/trunk/maven/pom.xml?rev=1575724r1=1575723r2=1575724view=diff == --- maven/pom/trunk/maven/pom.xml (original) +++ maven/pom/trunk/maven/pom.xml Sun Mar 9 16:46:37 2014 @@ -814,7 +814,6 @@ under the License. plugin groupIdorg.apache.maven.plugins/groupId artifactIdmaven-compiler-plugin/artifactId - version3.1/version configuration source1.5/source target1.5/target @@ -831,7 +830,7 @@ under the License. plugin groupIdorg.codehaus.modello/groupId artifactIdmodello-maven-plugin/artifactId - version1.7/version + version1.8.1/version configuration useJava5true/useJava5 /configuration @@ -858,12 +857,12 @@ under the License. plugin groupIdorg.codehaus.mojo/groupId artifactIdfindbugs-maven-plugin/artifactId - version2.5.2/version + version2.5.3/version /plugin plugin groupIdorg.apache.maven.plugins/groupId artifactIdmaven-release-plugin/artifactId - version2.4.1/version + version2.5/version configuration useReleaseProfilestrue/useReleaseProfiles releaseProfilesapache-release,rat/releaseProfiles @@ -914,7 +913,7 @@ under the License. dependency groupIdorg.codehaus.mojo/groupId artifactIdextra-enforcer-rules/artifactId -version1.0-alpha-4/version +version1.0-beta-2/version /dependency /dependencies /plugin @@ -1064,12 +1063,12 @@ under the License. plugin groupIdorg.apache.maven.plugins/groupId artifactIdmaven-surefire-report-plugin/artifactId -version2.14.1/version +version2.16/version /plugin plugin groupIdorg.apache.maven.plugins/groupId artifactIdmaven-checkstyle-plugin/artifactId -version2.10/version +version2.11/version configuration configLocationconfig/maven_checks.xml/configLocation headerLocationconfig/maven-header.txt/headerLocation @@ -1101,7 +1100,7 @@ under the License. plugin groupIdorg.apache.maven.plugins/groupId artifactIdmaven-jxr-plugin/artifactId -version2.3/version +version2.4/version reportSets reportSet iddefault/id @@ -1162,7 +1161,7 @@ under the License. plugin groupIdorg.codehaus.mojo/groupId artifactIdfindbugs-maven-plugin/artifactId -version2.5.2/version +version2.5.3/version /plugin plugin groupIdorg.codehaus.sonar-plugins/groupId
svn commit: r1575725 - /maven/pom/trunk/maven/site-pom.xml
Author: hboutemy
Date: Sun Mar 9 16:49:12 2014
New Revision: 1575725
URL: http://svn.apache.org/r1575725
Log:
simplified site publication configuration
Modified:
maven/pom/trunk/maven/site-pom.xml
Modified: maven/pom/trunk/maven/site-pom.xml
URL:
http://svn.apache.org/viewvc/maven/pom/trunk/maven/site-pom.xml?rev=1575725r1=1575724r2=1575725view=diff
==
--- maven/pom/trunk/maven/site-pom.xml (original)
+++ maven/pom/trunk/maven/site-pom.xml Sun Mar 9 16:49:12 2014
@@ -67,7 +67,6 @@ under the License.
artifactIdmaven-site-plugin/artifactId
configuration
siteDirectory${basedir}/src/site-docs/siteDirectory
- skipDeploytrue/skipDeploy!-- don't deploy site with
maven-site-plugin --
/configuration
/plugin
plugin
@@ -76,15 +75,6 @@ under the License.
configuration
content${project.reporting.outputDirectory}/content
/configuration
-executions
- execution
-idscm-publish/id
-phasesite-deploy/phase!-- deploy site with
maven-scm-publish-plugin --
-goals
- goalpublish-scm/goal
-/goals
- /execution
-/executions
/plugin
/plugins
/build
[05/11] git commit: unit tests for algorithm
unit tests for algorithm
Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/c85e6e83
Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/c85e6e83
Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/c85e6e83
Branch: refs/heads/master
Commit: c85e6e83eee7513d9e1d4ae9c5aa7286b4ee3920
Parents: eaeaa28
Author: Tibor Digana tibo...@lycos.com
Authored: Fri Feb 28 02:56:39 2014 +0100
Committer: Andreas Gudian agud...@apache.org
Committed: Sun Mar 9 19:46:40 2014 +0100
--
.../junitcore/ParallelComputerFactory.java | 51 ++-
.../surefire/junitcore/pc/RunnerCounter.java| 2 +-
.../OptimizedParallelComputerTest.java | 323 +++
3 files changed, 363 insertions(+), 13 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/c85e6e83/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/ParallelComputerFactory.java
--
diff --git
a/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/ParallelComputerFactory.java
b/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/ParallelComputerFactory.java
index 91ef5bc..70d4a64 100644
---
a/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/ParallelComputerFactory.java
+++
b/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/ParallelComputerFactory.java
@@ -207,9 +207,9 @@ final class ParallelComputerFactory
// Estimate parallel thread counts.
double ratio = 1d / parallelEntities;
int threads = multiplyByCoreCount( params, ratio *
params.getThreadCount() );
-concurrency.suites = params.isParallelSuites() ? threads : 0;
-concurrency.classes = params.isParallelClasses() ? threads : 0;
-concurrency.methods = params.isParallelMethods() ? threads : 0;
+concurrency.suites = params.isParallelSuites() ? minSuites(
threads, counts ) : 0;
+concurrency.classes = params.isParallelClasses() ? minClasses(
threads, counts ) : 0;
+concurrency.methods = params.isParallelMethods() ? minMethods(
threads, counts ) : 0;
if ( parallelEntities == 1 )
{
concurrency.capacity = 0;
@@ -222,11 +222,11 @@ final class ParallelComputerFactory
else
{
// Try to allocate suites+classes+methods within threadCount,
-concurrency.suites = params.isParallelSuites() ?
multiplyByCoreCount( params, counts.suites ) : 0;
-concurrency.classes = params.isParallelClasses() ?
multiplyByCoreCount( params, counts.classes ) : 0;
+concurrency.suites = params.isParallelSuites() ? toNonNegative(
counts.suites ) : 0;
+concurrency.classes = params.isParallelClasses() ? toNonNegative(
counts.classes ) : 0;
concurrency.methods =
-params.isParallelMethods() ? multiplyByCoreCount( params,
counts.methods / counts.classes ) : 0;
-double sum = (double) concurrency.suites + concurrency.classes +
concurrency.methods;
+params.isParallelMethods() ? toNonNegative( Math.ceil(
counts.methods / (double) counts.classes ) ) : 0;
+double sum = toNonNegative( concurrency.suites +
concurrency.classes + concurrency.methods );
if ( concurrency.capacity sum sum != 0 )
{
// otherwise allocate them using the weighting factor 1.
@@ -234,7 +234,6 @@ final class ParallelComputerFactory
concurrency.suites *= weight;
concurrency.classes *= weight;
concurrency.methods *= weight;
-adjustPrecisionInLeaf( params, concurrency );
}
adjustLeaf( params, concurrency );
}
@@ -255,8 +254,8 @@ final class ParallelComputerFactory
if ( counts != null )
{
-concurrency.suites = (int) Math.min( Math.min( concurrency.suites,
counts.suites ), Integer.MAX_VALUE );
-concurrency.classes = (int) Math.min( Math.min(
concurrency.classes, counts.classes ), Integer.MAX_VALUE );
+concurrency.suites = toNonNegative( Math.min( concurrency.suites,
counts.suites ) );
+concurrency.classes = toNonNegative( Math.min(
concurrency.classes, counts.classes ) );
}
setLeafInfinite( params, concurrency );
@@ -293,7 +292,7 @@ final class ParallelComputerFactory
concurrency.suites = params.isParallelSuites() ? threadCountSuites(
params ) : 0;
concurrency.classes = params.isParallelClasses() ?
[11/11] git commit: [SUREFIRE-1041] Created integration test based on sample project provided by Dan Fabulich
[SUREFIRE-1041] Created integration test based on sample project provided by
Dan Fabulich
Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/56972416
Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/56972416
Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/56972416
Branch: refs/heads/master
Commit: 569724167048c945c9b316547536ec96bae97806
Parents: ec46baf
Author: Andreas Gudian agud...@apache.org
Authored: Sat Mar 8 20:54:36 2014 +0100
Committer: Andreas Gudian agud...@apache.org
Committed: Sun Mar 9 20:18:58 2014 +0100
--
.../jiras/Surefire1041FailingJUnitRunnerIT.java | 38 +
.../pom.xml | 60
.../src/test/java/test/AppTest.java | 38 +
.../src/test/java/test/BadRunner.java | 43 ++
4 files changed, 179 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/56972416/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1041FailingJUnitRunnerIT.java
--
diff --git
a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1041FailingJUnitRunnerIT.java
b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1041FailingJUnitRunnerIT.java
new file mode 100644
index 000..bb65682
--- /dev/null
+++
b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1041FailingJUnitRunnerIT.java
@@ -0,0 +1,38 @@
+package org.apache.maven.surefire.its.jiras;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * License); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * AS IS BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import org.apache.maven.surefire.its.fixture.SurefireJUnit4IntegrationTestCase;
+import org.junit.Test;
+
+/**
+ * SUREFIRE-1041: An error in a JUnit runner should not lead to an error in
Surefire
+ *
+ * @author Andreas Gudian
+ */
+public class Surefire1041FailingJUnitRunnerIT
+extends SurefireJUnit4IntegrationTestCase
+{
+@Test
+public void reportErrorInJUnitRunnerAsTestError()
+{
+unpack( surefire-1041-exception-in-junit-runner
).mavenTestFailureIgnore( true ).executeTest().assertTestSuiteResults( 1, 1, 0,
0 );
+}
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/56972416/surefire-integration-tests/src/test/resources/surefire-1041-exception-in-junit-runner/pom.xml
--
diff --git
a/surefire-integration-tests/src/test/resources/surefire-1041-exception-in-junit-runner/pom.xml
b/surefire-integration-tests/src/test/resources/surefire-1041-exception-in-junit-runner/pom.xml
new file mode 100644
index 000..e1331cb
--- /dev/null
+++
b/surefire-integration-tests/src/test/resources/surefire-1041-exception-in-junit-runner/pom.xml
@@ -0,0 +1,60 @@
+?xml version=1.0 encoding=UTF-8?
+!--
+ ~ 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.
+ --
+
+project xmlns=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/maven-v4_0_0.xsd;
+ modelVersion4.0.0/modelVersion
+ parent
+
[06/11] git commit: [SUREFIRE-1055] Integration Tests
[SUREFIRE-1055] 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/1c843d67
Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/1c843d67
Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/1c843d67
Branch: refs/heads/master
Commit: 1c843d672ad8c7406ac2c62b93684771aff81014
Parents: 01c39b0
Author: Tibor Digana tibo...@lycos.com
Authored: Sun Mar 9 12:57:10 2014 +0100
Committer: Andreas Gudian agud...@apache.org
Committed: Sun Mar 9 19:46:42 2014 +0100
--
.../maven/surefire/its/JUnit47ParallelIT.java | 202 +--
.../surefire/its/fixture/SurefireLauncher.java | 8 +-
.../src/test/resources/junit47-parallel/pom.xml | 15 +-
.../test/java/surefireparallel/TestClass.java | 5 +-
4 files changed, 157 insertions(+), 73 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/1c843d67/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit47ParallelIT.java
--
diff --git
a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit47ParallelIT.java
b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit47ParallelIT.java
index 5edfb6a..03c0628 100644
---
a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit47ParallelIT.java
+++
b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit47ParallelIT.java
@@ -26,7 +26,7 @@ import org.junit.Test;
/**
* Testing JUnitCoreWrapper with ParallelComputerBuilder.
*
- * @author Tibor Digana (tibor17)
+ * @author a href=mailto:tibor.dig...@gmail.com;Tibor Digana (tibor17)/a
* @since 2.16
*/
public class JUnit47ParallelIT
@@ -124,59 +124,59 @@ public class JUnit47ParallelIT
}
@Test
-public void useUnlimitedThreadsSuites1()
+public void unlimitedThreadsSuites1()
{
// takes 3.6 sec
-unpack().parallelSuites().useUnlimitedThreads().setTestToRun(
Suite*Test ).executeTest()
-.verifyErrorFree( 24 );
+unpack().parallelSuites().useUnlimitedThreads().setTestToRun(
Suite*Test ).executeTest().verifyErrorFree(
+24 );
}
@Test
-public void useUnlimitedThreadsSuites2()
+public void unlimitedThreadsSuites2()
{
// takes 3.6 sec
-unpack().parallelSuites().useUnlimitedThreads().threadCountSuites( 5
).setTestToRun( Suite*Test )
-.executeTest().verifyErrorFree( 24 );
+unpack().parallelSuites().useUnlimitedThreads().threadCountSuites( 5
).setTestToRun(
+Suite*Test ).executeTest().verifyErrorFree( 24 );
}
@Test
-public void useUnlimitedThreadsClasses1()
+public void unlimitedThreadsClasses1()
{
// takes 1.8 sec
-unpack().parallelClasses().useUnlimitedThreads().setTestToRun(
Suite*Test ).executeTest()
-.verifyErrorFree( 24 );
+unpack().parallelClasses().useUnlimitedThreads().setTestToRun(
Suite*Test ).executeTest().verifyErrorFree(
+24 );
}
@Test
-public void useUnlimitedThreadsClasses2()
+public void unlimitedThreadsClasses2()
{
// takes 1.8 sec
-unpack().parallelClasses().useUnlimitedThreads().threadCountClasses( 5
).setTestToRun( Suite*Test )
-.executeTest().verifyErrorFree( 24 );
+unpack().parallelClasses().useUnlimitedThreads().threadCountClasses( 5
).setTestToRun(
+Suite*Test ).executeTest().verifyErrorFree( 24 );
}
@Test
-public void useUnlimitedThreadsMethods1()
+public void unlimitedThreadsMethods1()
{
// takes 2.4 sec
-unpack().parallelMethods().useUnlimitedThreads().setTestToRun(
Suite*Test ).executeTest()
-.verifyErrorFree( 24 );
+unpack().parallelMethods().useUnlimitedThreads().setTestToRun(
Suite*Test ).executeTest().verifyErrorFree(
+24 );
}
@Test
-public void useUnlimitedThreadsMethods2()
+public void unlimitedThreadsMethods2()
{
// takes 2.4 sec
-unpack().parallelMethods().useUnlimitedThreads().threadCountMethods( 5
).setTestToRun( Suite*Test )
-.executeTest().verifyErrorFree( 24 );
+unpack().parallelMethods().useUnlimitedThreads().threadCountMethods( 5
).setTestToRun(
+Suite*Test ).executeTest().verifyErrorFree( 24 );
}
@Test
public void unlimitedThreadsSuitesAndClasses1()
{
// takes 0.9 sec
-
unpack().parallelSuitesAndClasses().useUnlimitedThreads().setTestToRun(
Suite*Test ).executeTest()
-.verifyErrorFree( 24 );
+unpack().parallelSuitesAndClasses().useUnlimitedThreads().setTestToRun(
+
[07/11] git commit: fixed typos and simplification of documentation
fixed typos and simplification of documentation Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/aff26226 Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/aff26226 Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/aff26226 Branch: refs/heads/master Commit: aff2622662becd48c933531b149f20f32f877555 Parents: 1c843d6 Author: Tibor Digana tibo...@lycos.com Authored: Sun Mar 9 18:33:20 2014 +0100 Committer: Andreas Gudian agud...@apache.org Committed: Sun Mar 9 19:46:43 2014 +0100 -- .../plugin/surefire/AbstractSurefireMojo.java | 63 ++-- .../fork-options-and-parallel-execution.apt.vm | 8 +-- 2 files changed, 34 insertions(+), 37 deletions(-) -- http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/aff26226/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 f4da5a3..730b0ad 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 @@ -458,7 +458,8 @@ public abstract class AbstractSurefireMojo private boolean reuseForks; /** - * (JUnit 4.7 provider) Indicates that threadCount is per cpu core. + * (JUnit 4.7 provider) Indicates that threadCount, threadCountSuites, threadCountClasses, threadCountMethods + * are per cpu core. * * @since 2.5 */ @@ -506,21 +507,14 @@ public abstract class AbstractSurefireMojo protected boolean parallelOptimized; /** - * (JUnit 4.7 provider) The attribute thread-count-suites allows you to specify the concurrency in test suites, i.e.: + * (JUnit 4.7 provider) This attribute allows you to specify the concurrency in test suites, i.e.: * ul - * linumber of threads executing JUnit test suites if codethreadCount/code is 0 or unspecified/li - * liIn a special case codethreadCountSuites/code and codethreadCount/code are specified - * without codethreadCountMethods/code for codeparallel/code=codesuitesAndMethods/code. - * br/Example1: threadCount=8 and threadCountSuites=3, the number of parallel methods is varying from 5 to 7 in your tests. - * br/In another special case when codeparallel/code=codeall/code and the only codethreadCountMethods/code - * is unspecified, then threads from suites and classes are reused in favor of methods. - * br/Example2: parallel=all, threadCount=16 , threadCountSuites=2 , threadCountClasses=5, - * the number of parallel methods is varying from 9 to 14 in your tests. - * /li - * liinteger number which represents the weight in ratio between - * emthreadCountSuites/em:codethreadCountClasses/code:codethreadCountMethods/code. - * As an example 2 is 20% of codethreadCount/code if the ratio is em2/em:3:5/li - * liYou can impose limitation on parallel suites if codeuseUnlimitedThreads/code is specified./li + * linumber of concurrent suites if codethreadCount/code is 0 or unspecified/li + * lilimited suites concurrency if codeuseUnlimitedThreads/code is set to strongtrue/strong/li + * liif codethreadCount/code and certain thread-count parameters are gt; 0 for codeparallel/code, the + * concurrency is computed from ratio. For instance parallel=all and the ratio between + * emthreadCountSuites/em:codethreadCountClasses/code:codethreadCountMethods/code is + * em2/em:3:5, there is 20% of codethreadCount/code in concurrent suites./li * /ul * * Only makes sense to use in conjunction with the codeparallel/code parameter. @@ -532,21 +526,18 @@ public abstract class AbstractSurefireMojo protected int threadCountSuites; /** - * (JUnit 4.7 provider) The attribute thread-count-classes allows you to specify the concurrency in test classes, i.e.: + * (JUnit 4.7 provider) This attribute allows you to specify the concurrency in test classes, i.e.: * ul - * linumber of threads executing JUnit test classes if codethreadCount/code is 0 or unspecified/li - * liIn a special case codethreadCountClasses/code and codethreadCount/code are specified - * without codethreadCountMethods/code for codeparallel/code=codeclassesAndMethods/code. - * br/Example1: threadCount=8 and threadCountClasses=3, the number of parallel methods is varying from 5
[10/11] git commit: [SUREFIRE-1041] Do not crash with NPE in case a JUnit runner fails Submitted by: Dan Fabulich
[SUREFIRE-1041] Do not crash with NPE in case a JUnit runner fails
Submitted by: Dan Fabulich
o Applied without changes
Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/ec46bafc
Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/ec46bafc
Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/ec46bafc
Branch: refs/heads/master
Commit: ec46bafca72b1b8b243a48d47023d1e750da08f5
Parents: a1d86c7
Author: Andreas Gudian agud...@apache.org
Authored: Sat Mar 8 20:53:35 2014 +0100
Committer: Andreas Gudian agud...@apache.org
Committed: Sun Mar 9 20:18:58 2014 +0100
--
.../java/org/apache/maven/surefire/report/SimpleReportEntry.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/ec46bafc/surefire-api/src/main/java/org/apache/maven/surefire/report/SimpleReportEntry.java
--
diff --git
a/surefire-api/src/main/java/org/apache/maven/surefire/report/SimpleReportEntry.java
b/surefire-api/src/main/java/org/apache/maven/surefire/report/SimpleReportEntry.java
index ca33a5f..2229815 100644
---
a/surefire-api/src/main/java/org/apache/maven/surefire/report/SimpleReportEntry.java
+++
b/surefire-api/src/main/java/org/apache/maven/surefire/report/SimpleReportEntry.java
@@ -55,11 +55,11 @@ public class SimpleReportEntry
{
if ( source == null )
{
-throw new NullPointerException( source is null );
+source = null;
}
if ( name == null )
{
-throw new NullPointerException( name is null );
+name = null;
}
this.source = source;
[08/11] git commit: [SUREFIRE-1063] Fix typos and grammatical errors
[SUREFIRE-1063] Fix typos and grammatical errors
Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/4f97226d
Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/4f97226d
Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/4f97226d
Branch: refs/heads/master
Commit: 4f97226d279c67d480bf52eb326011060bddf0a0
Parents: aff2622
Author: Eric Dahl eric.c.d...@gmail.com
Authored: Fri Feb 21 18:25:01 2014 -0600
Committer: Andreas Gudian agud...@apache.org
Committed: Sun Mar 9 20:16:02 2014 +0100
--
.../maven/plugin/surefire/booterclient/ForkConfiguration.java| 2 +-
.../apache/maven/plugin/surefire/booterclient/ForkStarter.java | 4 ++--
maven-surefire-plugin/src/site/fml/faq.fml | 2 +-
.../org/apache/maven/surefire/booter/ForkingRunListener.java | 2 +-
.../apache/maven/surefire/providerapi/ProviderParameters.java| 2 +-
.../org/apache/maven/surefire/report/ConsoleOutputCapture.java | 2 +-
.../java/org/apache/maven/surefire/booter/ProviderFactory.java | 2 +-
.../src/test/resources/fork-mode-testng/pom.xml | 2 +-
.../resources/testng-junit-together/src/test/java/JunitTest.java | 2 +-
.../src/test/java/Junit4NoRunWithTest.java | 2 +-
.../src/test/java/Junit4SimpleRunWithTest.java | 2 +-
surefire-shadefire/pom.xml | 2 +-
12 files changed, 13 insertions(+), 13 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4f97226d/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkConfiguration.java
--
diff --git
a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkConfiguration.java
b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkConfiguration.java
index 079ee32..ca9bff1 100644
---
a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkConfiguration.java
+++
b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkConfiguration.java
@@ -210,7 +210,7 @@ public class ForkConfiguration
/**
* Replaces expressions pre@{property-name}/pre with the corresponding
properties
- * from the model. This allows late evaluation of property values when the
plugin is exexcuted (as compared
+ * from the model. This allows late evaluation of property values when the
plugin is executed (as compared
* to evaluation when the pom is parsed as is done with
pre${property-name}/pre expressions).
*
* This allows other plugins to modify or set properties with the changes
getting picked up by surefire.
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4f97226d/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 95bc007..8861e51 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
@@ -483,8 +483,8 @@ public class ForkStarter
{
// noinspection ThrowFromFinallyBlock
throw new RuntimeException(
-The forked VM terminated without saying properly
goodbye. VM crash or System.exit called ?
-+ \nCommand was + cli.toString() );
+The forked VM terminated without properly saying
goodbye. VM crash or System.exit called?
++ \nCommand was + cli.toString() );
}
}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4f97226d/maven-surefire-plugin/src/site/fml/faq.fml
--
diff --git a/maven-surefire-plugin/src/site/fml/faq.fml
b/maven-surefire-plugin/src/site/fml/faq.fml
index a518c57..8308a9a 100644
--- a/maven-surefire-plugin/src/site/fml/faq.fml
+++ b/maven-surefire-plugin/src/site/fml/faq.fml
@@ -51,7 +51,7 @@ under the License.
/answer
/faq
faq id=vm-termination
- questionSurefire fails with the message The forked VM terminated
without saying properly goodbye/question
+ questionSurefire fails with the message The forked VM terminated
without properly saying
git commit: fix ITs when current path contains a Unix symbolic link (failures reproduced on ASF Jenkins https://builds.apache.org/job/core-integration-testing-maven-3-embedded)
Repository: maven-integration-testing Updated Branches: refs/heads/master 9f11d8d70 - b79791ee7 fix ITs when current path contains a Unix symbolic link (failures reproduced on ASF Jenkins https://builds.apache.org/job/core-integration-testing-maven-3-embedded) Project: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/repo Commit: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/commit/b79791ee Tree: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/tree/b79791ee Diff: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/diff/b79791ee Branch: refs/heads/master Commit: b79791ee7dfc7c1f943ed03ded2875e1b5073503 Parents: 9f11d8d Author: Hervé Boutemy hbout...@apache.org Authored: Sun Mar 9 20:43:44 2014 +0100 Committer: Hervé Boutemy hbout...@apache.org Committed: Sun Mar 9 20:43:44 2014 +0100 -- .../maven/it/MavenITmng2201PluginConfigInterpolationTest.java| 2 +- .../org/apache/maven/it/MavenITmng3475BaseAlignedDirTest.java| 2 +- .../maven/it/MavenITmng3747PrefixedPathExpressionTest.java | 2 +- .../org/apache/maven/it/MavenITmng3760BaseUriPropertyTest.java | 4 ++-- .../java/org/apache/maven/it/MavenITmng3827PluginConfigTest.java | 2 +- .../apache/maven/it/MavenITmng3864PerExecPluginConfigTest.java | 2 +- .../apache/maven/it/MavenITmng3877BasedirAlignedModelTest.java | 2 +- .../maven/it/MavenITmng3904NestedBuildDirInterpolationTest.java | 2 +- .../apache/maven/it/MavenITmng3944BasedirInterpolationTest.java | 4 ++-- .../org/apache/maven/it/MavenITmng3951AbsolutePathsTest.java | 2 +- 10 files changed, 12 insertions(+), 12 deletions(-) -- http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/b79791ee/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2201PluginConfigInterpolationTest.java -- diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2201PluginConfigInterpolationTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2201PluginConfigInterpolationTest.java index 39e5585..13ba7ed 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2201PluginConfigInterpolationTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2201PluginConfigInterpolationTest.java @@ -53,7 +53,7 @@ public class MavenITmng2201PluginConfigInterpolationTest verifier.verifyErrorFreeLog(); verifier.resetStreams(); -testDir = testDir.getCanonicalFile(); +//testDir = testDir.getCanonicalFile(); Properties props = verifier.loadProperties( target/config.properties ); assertEquals( new File( testDir, target ), new File( props.getProperty( stringParam ) ) ); http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/b79791ee/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3475BaseAlignedDirTest.java -- diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3475BaseAlignedDirTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3475BaseAlignedDirTest.java index 0baebdf..f3a4e6c 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3475BaseAlignedDirTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3475BaseAlignedDirTest.java @@ -56,7 +56,7 @@ public class MavenITmng3475BaseAlignedDirTest verifier.verifyErrorFreeLog(); verifier.resetStreams(); -testDir = testDir.getCanonicalFile(); +//testDir = testDir.getCanonicalFile(); Properties configProps = verifier.loadProperties( target/config.properties ); http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/b79791ee/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3747PrefixedPathExpressionTest.java -- diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3747PrefixedPathExpressionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3747PrefixedPathExpressionTest.java index dea9ae0..62fb2ad 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3747PrefixedPathExpressionTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3747PrefixedPathExpressionTest.java @@ -54,7 +54,7 @@ public class MavenITmng3747PrefixedPathExpressionTest verifier.verifyErrorFreeLog(); verifier.resetStreams(); -testDir = testDir.getCanonicalFile(); +//testDir = testDir.getCanonicalFile(); Properties props = verifier.loadProperties( target/config.properties ); assertEquals( path is: + new File( testDir, relative ).getAbsolutePath() +
svn commit: r1575781 - /maven/site/trunk/content/apt/pom/index.apt
Author: hboutemy
Date: Sun Mar 9 23:05:04 2014
New Revision: 1575781
URL: http://svn.apache.org/r1575781
Log: (empty)
Modified:
maven/site/trunk/content/apt/pom/index.apt
Modified: maven/site/trunk/content/apt/pom/index.apt
URL:
http://svn.apache.org/viewvc/maven/site/trunk/content/apt/pom/index.apt?rev=1575781r1=1575780r2=1575781view=diff
==
--- maven/site/trunk/content/apt/pom/index.apt (original)
+++ maven/site/trunk/content/apt/pom/index.apt Sun Mar 9 23:05:04 2014
@@ -34,7 +34,7 @@ Parent POMs
*--+--++--+++
|| POM || Version || Release
Date || Description || Source Repository || Issue Tracking
*--+--++--+++
-| {{{./asf/} ASF}} | 13 | 2013-01-21 |
ASF wide configuration. |
{{{http://svn.apache.org/repos/asf/maven/pom/trunk/asf/}SVN}} |
{{{https://issues.apache.org/jira/browse/MPOM/component/12314370}JIRA}}
+| {{{./asf/} ASF}} | 14 | 2014-03-06 |
ASF wide configuration. |
{{{http://svn.apache.org/repos/asf/maven/pom/trunk/asf/}SVN}} |
{{{https://issues.apache.org/jira/browse/MPOM/component/12314370}JIRA}}
*--+--++--+++
| {{{./maven/} Maven}} | 23 | 2013-01-21 |
Maven wide configuration.|
{{{http://svn.apache.org/repos/asf/maven/pom/trunk/maven/}SVN}} |
{{{https://issues.apache.org/jira/browse/MPOM/component/12314371}JIRA}}
*--+--++--+++
svn commit: r900795 - in /websites/production/maven/content: pom-archives/asf-14/ pom/asf/
Author: hboutemy Date: Sun Mar 9 23:08:56 2014 New Revision: 900795 Log: ASF parent released Added: websites/production/maven/content/pom-archives/asf-14/ - copied from r900794, websites/production/maven/content/pom-archives/asf-LATEST/ websites/production/maven/content/pom/asf/ - copied from r900794, websites/production/maven/content/pom-archives/asf-LATEST/
svn commit: r4612 - in /release/maven/pom: ./ apache-14-source-release.zip apache-14-source-release.zip.asc apache-14-source-release.zip.md5
Author: hboutemy Date: Sun Mar 9 23:14:05 2014 New Revision: 4612 Log: ASF parent released Added: release/maven/pom/ release/maven/pom/apache-14-source-release.zip (with props) release/maven/pom/apache-14-source-release.zip.asc release/maven/pom/apache-14-source-release.zip.md5 Added: release/maven/pom/apache-14-source-release.zip == Binary file - no diff available. Propchange: release/maven/pom/apache-14-source-release.zip -- svn:mime-type = application/octet-stream Added: release/maven/pom/apache-14-source-release.zip.asc == --- release/maven/pom/apache-14-source-release.zip.asc (added) +++ release/maven/pom/apache-14-source-release.zip.asc Sun Mar 9 23:14:05 2014 @@ -0,0 +1,7 @@ +-BEGIN PGP SIGNATURE- +Version: GnuPG v1.4.14 (GNU/Linux) + +iEYEABECAAYFAlMY4nIACgkQySxf7HAWHGKTdgCfXLrLUeprdSZV4UVH85AJ5xmj +3fMAn1J9e8X3ApvalGO8iuyQOBRIT9qD +=pUqU +-END PGP SIGNATURE- Added: release/maven/pom/apache-14-source-release.zip.md5 == --- release/maven/pom/apache-14-source-release.zip.md5 (added) +++ release/maven/pom/apache-14-source-release.zip.md5 Sun Mar 9 23:14:05 2014 @@ -0,0 +1 @@ +146beb73403ca56a7cf9b9f18bebed34 \ No newline at end of file
svn commit: r1575782 - /maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/resources/dist-tool.conf
Author: hboutemy Date: Sun Mar 9 23:14:58 2014 New Revision: 1575782 URL: http://svn.apache.org/r1575782 Log: ASF parent now in dist area Modified: maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/resources/dist-tool.conf Modified: maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/resources/dist-tool.conf URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/resources/dist-tool.conf?rev=1575782r1=1575781r2=1575782view=diff == --- maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/resources/dist-tool.conf (original) +++ maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/resources/dist-tool.conf Sun Mar 9 23:14:58 2014 @@ -12,10 +12,6 @@ maven-parent index-path = /maven/ maven-parent site = http://maven.apache.org/pom/maven/ maven-parent -/_not_in_distribution_area_: org.apache http://maven.apache.org/pom/ - apache index-path = /asf/ - apache site = http://maven.apache.org/pom/asf/ - apache /ant-tasks: org.apache.maven src+bin maven-ant-tasks @@ -119,6 +115,11 @@ maven-verifier-plugin maven-war-plugin +/pom: org.apache http://maven.apache.org/pom/ + apache index-path = /asf/ + apache site = http://maven.apache.org/pom/asf/ + apache + /release: org.apache.maven.release ## release version is restricted because maven-release (=parent pom) versions 3, 4 and 5 ## were released in the past separately, with integer value to actual 2.x version
