svn commit: r1437376 - /maven/plugins/branches/maven-shade-plugin-3/
Author: bimargulies Date: Wed Jan 23 13:16:51 2013 New Revision: 1437376 URL: http://svn.apache.org/viewvc?rev=1437376view=rev Log: [maven-release-plugin] copy for branch maven-shade-plugin-3 Added: maven/plugins/branches/maven-shade-plugin-3/ - copied from r1437375, maven/plugins/trunk/maven-shade-plugin/
svn commit: r1437378 - in /maven/plugins/branches/maven-shade-plugin-3: pom.xml src/main/java/org/apache/maven/plugins/shade/mojo/ShadeMojo.java src/main/mdo/ src/main/mdo/AttachArtifact.mdo
Author: bimargulies
Date: Wed Jan 23 13:20:33 2013
New Revision: 1437378
URL: http://svn.apache.org/viewvc?rev=1437378view=rev
Log:
MSHADE-139: Change the default output file name so that it does not replace the
ordinary jar
o Begin to set up modello support for a nice XML spec of the artifact produced
by shade.
Added:
maven/plugins/branches/maven-shade-plugin-3/src/main/mdo/
maven/plugins/branches/maven-shade-plugin-3/src/main/mdo/AttachArtifact.mdo
Modified:
maven/plugins/branches/maven-shade-plugin-3/pom.xml
maven/plugins/branches/maven-shade-plugin-3/src/main/java/org/apache/maven/plugins/shade/mojo/ShadeMojo.java
Modified: maven/plugins/branches/maven-shade-plugin-3/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/branches/maven-shade-plugin-3/pom.xml?rev=1437378r1=1437377r2=1437378view=diff
==
--- maven/plugins/branches/maven-shade-plugin-3/pom.xml (original)
+++ maven/plugins/branches/maven-shade-plugin-3/pom.xml Wed Jan 23 13:20:33 2013
@@ -57,6 +57,7 @@ under the License.
mavenVersion3.0/mavenVersion
currentVersion${project.version}/currentVersion
mavenPluginVersion3.2/mavenPluginVersion
+mdoVersion1.1.2/mdoVersion
/properties
contributors
@@ -163,6 +164,37 @@ under the License.
build
plugins
plugin
+groupIdorg.codehaus.modello/groupId
+artifactIdmodello-maven-plugin/artifactId
+configuration
+ version${mdoVersion}/version
+ models
+modelsrc/main/mdo/AttachArtifact.mdo/model
+ /models
+/configuration
+executions
+ execution
+idmdo/id
+phasegenerate-sources/phase
+goals
+ goalxpp3-reader/goal
+ goalxpp3-writer/goal
+ goaljava/goal
+ goalxsd/goal
+/goals
+ /execution
+ execution
+idmdo-site/id
+phasepre-site/phase
+goals
+ goalxdoc/goal
+ goalxsd/goal
+/goals
+ /execution
+/executions
+ /plugin
+
+ plugin
groupIdorg.apache.maven.plugins/groupId
artifactIdmaven-plugin-plugin/artifactId
version${mavenPluginVersion}/version
Modified:
maven/plugins/branches/maven-shade-plugin-3/src/main/java/org/apache/maven/plugins/shade/mojo/ShadeMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/branches/maven-shade-plugin-3/src/main/java/org/apache/maven/plugins/shade/mojo/ShadeMojo.java?rev=1437378r1=1437377r2=1437378view=diff
==
---
maven/plugins/branches/maven-shade-plugin-3/src/main/java/org/apache/maven/plugins/shade/mojo/ShadeMojo.java
(original)
+++
maven/plugins/branches/maven-shade-plugin-3/src/main/java/org/apache/maven/plugins/shade/mojo/ShadeMojo.java
Wed Jan 23 13:20:33 2013
@@ -23,7 +23,6 @@ import org.apache.maven.artifact.Artifac
import org.apache.maven.artifact.factory.ArtifactFactory;
import org.apache.maven.artifact.metadata.ArtifactMetadataSource;
import org.apache.maven.artifact.repository.ArtifactRepository;
-import org.apache.maven.artifact.resolver.ArtifactCollector;
import org.apache.maven.artifact.resolver.ArtifactNotFoundException;
import org.apache.maven.artifact.resolver.ArtifactResolutionException;
import org.apache.maven.artifact.resolver.ArtifactResolver;
@@ -33,6 +32,7 @@ import org.apache.maven.model.Exclusion;
import org.apache.maven.model.Model;
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.plugin.MojoFailureException;
import org.apache.maven.plugins.annotations.Component;
import org.apache.maven.plugins.annotations.LifecyclePhase;
import org.apache.maven.plugins.annotations.Mojo;
@@ -54,9 +54,9 @@ import org.apache.maven.project.ProjectB
import org.apache.maven.project.ProjectBuildingException;
import org.apache.maven.project.ProjectBuildingRequest;
import org.apache.maven.project.ProjectBuildingResult;
-import org.apache.maven.shared.dependency.graph.DependencyNode;
import org.apache.maven.shared.dependency.graph.DependencyGraphBuilder;
import
org.apache.maven.shared.dependency.graph.DependencyGraphBuilderException;
+import org.apache.maven.shared.dependency.graph.DependencyNode;
import org.codehaus.plexus.PlexusConstants;
import org.codehaus.plexus.PlexusContainer;
import
org.codehaus.plexus.component.repository.exception.ComponentLookupException;
@@ -229,31 +229,21 @@ public class ShadeMojo
private ArchiveFilter[] filters;
/**
- * The destination directory for the shaded artifact.
+ * The destination directory for the shaded artifact. This is just here to
inject the project
+ * output directory.
*/
-@Parameter( defaultValue = ${project.build.directory} )
+@Parameter(
svn commit: r1437377 - /maven/plugins/trunk/maven-shade-plugin/pom.xml
Author: bimargulies Date: Wed Jan 23 13:16:52 2013 New Revision: 1437377 URL: http://svn.apache.org/viewvc?rev=1437377view=rev Log: [maven-release-plugin] rollback changes from release preparation of maven-shade-plugin-3 Modified: maven/plugins/trunk/maven-shade-plugin/pom.xml Modified: maven/plugins/trunk/maven-shade-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/pom.xml?rev=1437377r1=1437376r2=1437377view=diff == --- maven/plugins/trunk/maven-shade-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-shade-plugin/pom.xml Wed Jan 23 13:16:52 2013 @@ -44,9 +44,9 @@ under the License. /prerequisites scm - connectionscm:svn:https://svn.apache.org/repos/asf/maven/plugins/branches/maven-shade-plugin-3/connection - developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/plugins/branches/maven-shade-plugin-3/developerConnection - urlhttps://svn.apache.org/repos/asf/maven/plugins/branches/maven-shade-plugin-3/url + connectionscm:svn:http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-shade-plugin/connection + developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-shade-plugin/developerConnection + urlhttp://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/url /scm issueManagement systemjira/system
svn commit: r1437375 - /maven/plugins/trunk/maven-shade-plugin/pom.xml
Author: bimargulies Date: Wed Jan 23 13:16:49 2013 New Revision: 1437375 URL: http://svn.apache.org/viewvc?rev=1437375view=rev Log: [maven-release-plugin] prepare branch maven-shade-plugin-3 Modified: maven/plugins/trunk/maven-shade-plugin/pom.xml Modified: maven/plugins/trunk/maven-shade-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/pom.xml?rev=1437375r1=1437374r2=1437375view=diff == --- maven/plugins/trunk/maven-shade-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-shade-plugin/pom.xml Wed Jan 23 13:16:49 2013 @@ -44,9 +44,9 @@ under the License. /prerequisites scm - connectionscm:svn:http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-shade-plugin/connection - developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-shade-plugin/developerConnection - urlhttp://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/url + connectionscm:svn:https://svn.apache.org/repos/asf/maven/plugins/branches/maven-shade-plugin-3/connection + developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/plugins/branches/maven-shade-plugin-3/developerConnection + urlhttps://svn.apache.org/repos/asf/maven/plugins/branches/maven-shade-plugin-3/url /scm issueManagement systemjira/system
svn commit: r1437746 - in /maven/plugins/trunk/maven-compiler-plugin: ./ src/it/groovy-project-with-new-plexus-compiler/ src/it/groovy-project-with-new-plexus-compiler/src/main/java/ src/it/groovy-pro
Author: olamy
Date: Wed Jan 23 21:27:18 2013
New Revision: 1437746
URL: http://svn.apache.org/viewvc?rev=1437746view=rev
Log:
improve groovy test
Removed:
maven/plugins/trunk/maven-compiler-plugin/src/it/groovy-project-with-new-plexus-compiler/src/main/java/JavaHello.java
maven/plugins/trunk/maven-compiler-plugin/src/it/groovy-project-with-new-plexus-compiler/src/main/java/JavaMain.java
maven/plugins/trunk/maven-compiler-plugin/src/it/groovy-project-with-new-plexus-compiler/src/test/java/JavaTest.java
Modified:
maven/plugins/trunk/maven-compiler-plugin/pom.xml
maven/plugins/trunk/maven-compiler-plugin/src/it/groovy-project-with-new-plexus-compiler/pom.xml
Modified: maven/plugins/trunk/maven-compiler-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-compiler-plugin/pom.xml?rev=1437746r1=1437745r2=1437746view=diff
==
--- maven/plugins/trunk/maven-compiler-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-compiler-plugin/pom.xml Wed Jan 23 21:27:18 2013
@@ -56,7 +56,9 @@ under the License.
mavenPluginPluginVersion3.2/mavenPluginPluginVersion
plexusCompilerVersion2.2-SNAPSHOT/plexusCompilerVersion
groovyVersion1.8.0/groovyVersion
-groovyEclipseCompilerVersion2.6.0-01/groovyEclipseCompilerVersion
+groovyEclipseCompilerVersion2.7.0-01/groovyEclipseCompilerVersion
+groovy-eclipse-batch2.0.4-04/groovy-eclipse-batch
+openJpaVersion2.2.0/openJpaVersion
/properties
dependencies
@@ -275,10 +277,21 @@ under the License.
/dependency
dependency
groupIdorg.codehaus.groovy/groupId
+ artifactIdgroovy-eclipse-batch/artifactId
+ version${groovy-eclipse-batch}/version
+ scopetest/scope
+/dependency
+dependency
+ groupIdorg.codehaus.groovy/groupId
artifactIdgroovy-all/artifactId
version${groovyVersion}/version
scopetest/scope
/dependency
+dependency
+ groupIdorg.apache.openjpa/groupId
+ artifactIdopenjpa/artifactId
+ version${openJpaVersion}/version
+/dependency
/dependencies
/profile
/profiles
Modified:
maven/plugins/trunk/maven-compiler-plugin/src/it/groovy-project-with-new-plexus-compiler/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-compiler-plugin/src/it/groovy-project-with-new-plexus-compiler/pom.xml?rev=1437746r1=1437745r2=1437746view=diff
==
---
maven/plugins/trunk/maven-compiler-plugin/src/it/groovy-project-with-new-plexus-compiler/pom.xml
(original)
+++
maven/plugins/trunk/maven-compiler-plugin/src/it/groovy-project-with-new-plexus-compiler/pom.xml
Wed Jan 23 21:27:18 2013
@@ -25,6 +25,7 @@ xsi:schemaLocation=http://maven.apache.
version1.0-SNAPSHOT/version
build
+sourceDirectorysrc/main/groovy/sourceDirectory
plugins
plugin
groupIdorg.apache.maven.plugins/groupId
@@ -32,6 +33,11 @@ xsi:schemaLocation=http://maven.apache.
version@project.version@/version
configuration
compilerIdgroovy-eclipse-compiler/compilerId
+ verbosetrue/verbose
+ !-- see https://jira.codehaus.org/browse/MCOMPILER-199 --
+ includes
+include**/*.groovy/include
+ /includes
/configuration
dependencies
dependency
@@ -39,40 +45,29 @@ xsi:schemaLocation=http://maven.apache.
artifactIdgroovy-eclipse-compiler/artifactId
version@groovyEclipseCompilerVersion@/version
/dependency
+ dependency
+groupIdorg.codehaus.groovy/groupId
+artifactIdgroovy-eclipse-batch/artifactId
+version@groovy-eclipse-batch@/version
+ /dependency
/dependencies
/plugin
plugin
-groupIdorg.codehaus.mojo/groupId
-artifactIdbuild-helper-maven-plugin/artifactId
-version1.5/version
-executions
- execution
-idadd-source/id
-phasegenerate-sources/phase
-goals
- goaladd-source/goal
-/goals
-configuration
- sources
-sourcesrc/main/groovy/source
- /sources
-/configuration
- /execution
- execution
-idadd-test-source/id
-phasegenerate-test-sources/phase
-goals
- goaladd-test-source/goal
-/goals
-configuration
- sources
-sourcesrc/test/groovy/source
- /sources
-/configuration
- /execution
-/executions
+groupIdorg.codehaus.groovy/groupId
+artifactIdgroovy-eclipse-compiler/artifactId
+version@groovyEclipseCompilerVersion@/version
+
svn commit: r1437781 - in /maven/plugins/trunk/maven-source-plugin/src: it/MSOURCES-64/ it/MSOURCES-64/pom.xml it/MSOURCES-64/verify.groovy main/java/org/apache/maven/plugin/source/AbstractSourceJarMo
Author: olamy Date: Wed Jan 23 22:22:37 2013 New Revision: 1437781 URL: http://svn.apache.org/viewvc?rev=1437781view=rev Log: [MSOURCES-64] forceCreation=true doesn't create test source package when src/test missing Added: maven/plugins/trunk/maven-source-plugin/src/it/MSOURCES-64/ maven/plugins/trunk/maven-source-plugin/src/it/MSOURCES-64/pom.xml (with props) maven/plugins/trunk/maven-source-plugin/src/it/MSOURCES-64/verify.groovy (with props) Modified: maven/plugins/trunk/maven-source-plugin/src/main/java/org/apache/maven/plugin/source/AbstractSourceJarMojo.java Added: maven/plugins/trunk/maven-source-plugin/src/it/MSOURCES-64/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-source-plugin/src/it/MSOURCES-64/pom.xml?rev=1437781view=auto == --- maven/plugins/trunk/maven-source-plugin/src/it/MSOURCES-64/pom.xml (added) +++ maven/plugins/trunk/maven-source-plugin/src/it/MSOURCES-64/pom.xml Wed Jan 23 22:22:37 2013 @@ -0,0 +1,37 @@ +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/xsd/maven-4.0.0.xsd; + modelVersion4.0.0/modelVersion + groupIdmsources/groupId + artifactId64/artifactId + version1.0-SNAPSHOT/version + packagingjar/packaging + build +pluginManagement + plugins +plugin + groupIdorg.apache.maven.plugins/groupId + artifactIdmaven-source-plugin/artifactId + version@project.version@/version + configuration +forceCreationtrue/forceCreation + /configuration + executions +execution + idattach-test-sources/id + goals +goaltest-jar-no-fork/goal + /goals +/execution + /executions +/plugin + /plugins +/pluginManagement +plugins + plugin +groupIdorg.apache.maven.plugins/groupId +artifactIdmaven-source-plugin/artifactId +version@project.version@/version + /plugin +/plugins + /build +/project Propchange: maven/plugins/trunk/maven-source-plugin/src/it/MSOURCES-64/pom.xml -- svn:eol-style = native Propchange: maven/plugins/trunk/maven-source-plugin/src/it/MSOURCES-64/pom.xml -- svn:keywords = Author Date Id Revision Added: maven/plugins/trunk/maven-source-plugin/src/it/MSOURCES-64/verify.groovy URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-source-plugin/src/it/MSOURCES-64/verify.groovy?rev=1437781view=auto == --- maven/plugins/trunk/maven-source-plugin/src/it/MSOURCES-64/verify.groovy (added) +++ maven/plugins/trunk/maven-source-plugin/src/it/MSOURCES-64/verify.groovy Wed Jan 23 22:22:37 2013 @@ -0,0 +1,22 @@ + +/* + * 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. + */ + +assert new File(basedir,target/64-1.0-SNAPSHOT-test-sources.jar).exists() + Propchange: maven/plugins/trunk/maven-source-plugin/src/it/MSOURCES-64/verify.groovy -- svn:eol-style = native Propchange: maven/plugins/trunk/maven-source-plugin/src/it/MSOURCES-64/verify.groovy -- svn:keywords = Author Date Id Revision Modified: maven/plugins/trunk/maven-source-plugin/src/main/java/org/apache/maven/plugin/source/AbstractSourceJarMojo.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-source-plugin/src/main/java/org/apache/maven/plugin/source/AbstractSourceJarMojo.java?rev=1437781r1=1437780r2=1437781view=diff == --- maven/plugins/trunk/maven-source-plugin/src/main/java/org/apache/maven/plugin/source/AbstractSourceJarMojo.java (original) +++
svn commit: r1437789 - /maven/ant-tasks/trunk/pom.xml
Author: olamy Date: Wed Jan 23 22:52:17 2013 New Revision: 1437789 URL: http://svn.apache.org/viewvc?rev=1437789view=rev Log: fix ci url Modified: maven/ant-tasks/trunk/pom.xml Modified: maven/ant-tasks/trunk/pom.xml URL: http://svn.apache.org/viewvc/maven/ant-tasks/trunk/pom.xml?rev=1437789r1=1437788r2=1437789view=diff == --- maven/ant-tasks/trunk/pom.xml (original) +++ maven/ant-tasks/trunk/pom.xml Wed Jan 23 22:52:17 2013 @@ -122,7 +122,7 @@ ciManagement systemJenkins/system -urlhttps://builds.apache.org/hudson/job/maven-ant-tasks//url +urlhttps://builds.apache.org/job/maven-ant-tasks//url /ciManagement distributionManagement
[2/2] git commit: fix test (parenthesis were missing in the computation)
Updated Branches: refs/heads/master 9a3996262 - 0eced625b fix test (parenthesis were missing in the computation) Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/0eced625 Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/0eced625 Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/0eced625 Branch: refs/heads/master Commit: 0eced625b5046bb502b1d6884f885c6ba6aeeb99 Parents: 01f5ddb Author: Andreas Gudian andreas.gud...@gmail.com Authored: Mon Jan 21 20:55:11 2013 +0100 Committer: Kristian Rosenvold krosenv...@apache.org Committed: Tue Jan 22 09:26:45 2013 +0100 -- .../maven/plugin/surefire/SurefirePluginTest.java |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) -- http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/0eced625/maven-surefire-plugin/src/test/java/org/apache/maven/plugin/surefire/SurefirePluginTest.java -- diff --git a/maven-surefire-plugin/src/test/java/org/apache/maven/plugin/surefire/SurefirePluginTest.java b/maven-surefire-plugin/src/test/java/org/apache/maven/plugin/surefire/SurefirePluginTest.java index 11abd51..8d97ffc 100644 --- a/maven-surefire-plugin/src/test/java/org/apache/maven/plugin/surefire/SurefirePluginTest.java +++ b/maven-surefire-plugin/src/test/java/org/apache/maven/plugin/surefire/SurefirePluginTest.java @@ -52,7 +52,7 @@ public class SurefirePluginTest int availableProcessors = Runtime.getRuntime().availableProcessors(); assertForkCount( surefirePlugin, 3*availableProcessors, 3C ); -assertForkCount( surefirePlugin, (int) 2.5*availableProcessors, 2.5C ); +assertForkCount( surefirePlugin, (int) ( 2.5*availableProcessors ), 2.5C ); assertForkCount( surefirePlugin, availableProcessors, 1.0001 C ); }
[1/2] git commit: [SUREFIRE-949] add forkCount parameter, making the inconsitent forkMode parameter deprecated.
[SUREFIRE-949] add forkCount parameter, making the inconsitent forkMode
parameter deprecated.
- All defaulting works as in the previous versions, with the exception of
reuseForks (introduced in the last release). It's now true by default.
- forkCount supports C notation as in -T of maven-core
Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/01f5ddbc
Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/01f5ddbc
Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/01f5ddbc
Branch: refs/heads/master
Commit: 01f5ddbcfe5db33e5518c36199ababc60228e90a
Parents: 9a39962
Author: Andreas Gudian andreas.gud...@gmail.com
Authored: Fri Jan 18 21:15:09 2013 +0100
Committer: Kristian Rosenvold krosenv...@apache.org
Committed: Mon Jan 21 20:08:45 2013 +0100
--
.../plugin/surefire/AbstractSurefireMojo.java | 141 +--
.../surefire/booterclient/ForkConfiguration.java |4 +-
.../plugin/surefire/booterclient/ForkStarter.java | 26 ++-
.../maven/plugin/surefire/SurefirePluginTest.java | 192 +--
.../org/apache/maven/surefire/its/ForkModeIT.java | 84 ++-
.../surefire/its/fixture/SurefireLauncher.java | 18 +-
6 files changed, 337 insertions(+), 128 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/01f5ddbc/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 fd00d5f..bc8eb0b 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
@@ -329,10 +329,12 @@ public abstract class AbstractSurefireMojo
protected Boolean failIfNoTests;
/**
+ * strongDEPRECATED/strong since version 2.14. Use
codeforkCount/code and codereuseForks/code instead.br/
+ * br/
* Option to specify the forking mode. Can be never, once, always,
perthread. none and pertest are also accepted
- * for backwards compatibility. always forks for each test-class.
perthread will create threadCount parallel forks, each executing one
test-class, see also parameter reuseForks.br/
+ * for backwards compatibility. always forks for each test-class.
perthread will create codethreadCount/code parallel forks, each executing
one test-class, see also parameter codereuseForks/code.br/
* The system properties and the argLine of the forked processes may
contain the place holder string code${surefire.threadNumber}/code,
- * which is replaced with a fixed number for each thread, ranging from 1
to threadCount.
+ * which is replaced with a fixed number for each thread, ranging from 1
to codethreadCount/code.
*
* @since 2.1
*/
@@ -433,8 +435,8 @@ public abstract class AbstractSurefireMojo
protected String testNGArtifactName;
/**
- * (forkMode=perthread or TestNG/JUnit 4.7 provider) The attribute
thread-count allows you to specify how many threads should be
- * allocated for this execution. Only makes sense to use in conjunction
with the codeparallel/code parameter or with forkMode=perthread.
+ * (TestNG/JUnit 4.7 provider) The attribute thread-count allows you to
specify how many threads should be
+ * allocated for this execution. Only makes sense to use in conjunction
with the codeparallel/code parameter.
*
* @since 2.2
*/
@@ -443,13 +445,28 @@ public abstract class AbstractSurefireMojo
/**
- * Indicates if forks can be reused. Currently only meaningful
- * when forking N parallel forks
+ * Option to specify the number of VMs to fork in parallel in order to
execute the tests.
+ * When terminated with C, the number part is multiplied with the number
of CPU cores. Floating point value are only accepted together with C.
+ * If set to 0, no VM is forked and all tests are executed within the
main process.br/
+ * br/
+ * Example values: 1.5C, 4br/
+ * br/
+ * The system properties and the codeargLine/code of the forked
processes may contain the place holder string
code${surefire.forkNumber}/code,
+ * which is replaced with a fixed number for each of the parallel forks,
ranging from code1/code to the effective value of codeforkCount/code.
+ *
+ * @since 2.14
+ */
+@Parameter( property = forkCount, defaultValue=1)
+private String forkCount;
+
+/**
+ * Indicates if forked VMs can be reused. If
