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=1437376&view=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=1437378&view=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=1437378&r1=1437377&r2=1437378&view=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.
3.0
${project.version}
3.2
+1.1.2
@@ -163,6 +164,37 @@ under the License.
+org.codehaus.modello
+modello-maven-plugin
+
+ ${mdoVersion}
+
+src/main/mdo/AttachArtifact.mdo
+
+
+
+
+mdo
+generate-sources
+
+ xpp3-reader
+ xpp3-writer
+ java
+ xsd
+
+
+
+mdo-site
+pre-site
+
+ xdoc
+ xsd
+
+
+
+
+
+
org.apache.maven.plugins
maven-plugin-plugin
${mavenPluginVersion}
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=1437378&r1=1437377&r2=1437378&view=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( defaultValue = "${project.build.directory}", readonly = true)
private File outputDirectory;
/**
- * The name of the shaded artifactId.
+ * The name of the shaded jar.
*
- * If you like to change the name of the native artifact, you may use the
setting.
- * If this is set to something different than , no
file replacement
- * will be performed, even if shadedArtifactAttached is being used.
+ * The name of
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=1437377&view=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=1437377&r1=1437376&r2=1437377&view=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. - scm:svn:https://svn.apache.org/repos/asf/maven/plugins/branches/maven-shade-plugin-3 - scm:svn:https://svn.apache.org/repos/asf/maven/plugins/branches/maven-shade-plugin-3 - https://svn.apache.org/repos/asf/maven/plugins/branches/maven-shade-plugin-3 + scm:svn:http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-shade-plugin + scm:svn:https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-shade-plugin + http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin jira
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=1437375&view=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=1437375&r1=1437374&r2=1437375&view=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. - scm:svn:http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-shade-plugin - scm:svn:https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-shade-plugin - http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin + scm:svn:https://svn.apache.org/repos/asf/maven/plugins/branches/maven-shade-plugin-3 + scm:svn:https://svn.apache.org/repos/asf/maven/plugins/branches/maven-shade-plugin-3 + https://svn.apache.org/repos/asf/maven/plugins/branches/maven-shade-plugin-3 jira
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=1437746&view=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=1437746&r1=1437745&r2=1437746&view=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.
3.2
2.2-SNAPSHOT
1.8.0
-2.6.0-01
+2.7.0-01
+2.0.4-04
+2.2.0
@@ -275,10 +277,21 @@ under the License.
org.codehaus.groovy
+ groovy-eclipse-batch
+ ${groovy-eclipse-batch}
+ test
+
+
+ org.codehaus.groovy
groovy-all
${groovyVersion}
test
+
+ org.apache.openjpa
+ openjpa
+ ${openJpaVersion}
+
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=1437746&r1=1437745&r2=1437746&view=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.
1.0-SNAPSHOT
+src/main/groovy
org.apache.maven.plugins
@@ -32,6 +33,11 @@ xsi:schemaLocation="http://maven.apache.
@project.version@
groovy-eclipse-compiler
+ true
+
+
+**/*.groovy
+
@@ -39,40 +45,29 @@ xsi:schemaLocation="http://maven.apache.
groovy-eclipse-compiler
@groovyEclipseCompilerVersion@
+
+org.codehaus.groovy
+groovy-eclipse-batch
+@groovy-eclipse-batch@
+
-org.codehaus.mojo
-build-helper-maven-plugin
-1.5
-
-
-add-source
-generate-sources
-
- add-source
-
-
-
-src/main/groovy
-
-
-
-
-add-test-source
-generate-test-sources
-
- add-test-source
-
-
-
-src/test/groovy
-
-
-
-
+org.codehaus.groovy
+groovy-eclipse-compiler
+@groovyEclipseCompilerVersion@
+true
+
+
+org.codehaus.groovy
+groovy-eclipse-batch
+@groovy-eclipse-batch@
+
+
+
+
svn commit: r1437747 - /maven/plugins/trunk/maven-compiler-plugin/src/it/groovy-project-with-new-plexus-compiler/verify.groovy
Author: olamy Date: Wed Jan 23 21:27:29 2013 New Revision: 1437747 URL: http://svn.apache.org/viewvc?rev=1437747&view=rev Log: add verify Added: maven/plugins/trunk/maven-compiler-plugin/src/it/groovy-project-with-new-plexus-compiler/verify.groovy (with props) Added: maven/plugins/trunk/maven-compiler-plugin/src/it/groovy-project-with-new-plexus-compiler/verify.groovy URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-compiler-plugin/src/it/groovy-project-with-new-plexus-compiler/verify.groovy?rev=1437747&view=auto == --- maven/plugins/trunk/maven-compiler-plugin/src/it/groovy-project-with-new-plexus-compiler/verify.groovy (added) +++ maven/plugins/trunk/maven-compiler-plugin/src/it/groovy-project-with-new-plexus-compiler/verify.groovy Wed Jan 23 21:27:29 2013 @@ -0,0 +1,29 @@ + +/* + * 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/classes/GroovyMain.class").exists() +assert new File(basedir,"target/test-classes/GroovyTest.class").exists() + +def logFile = new File( basedir, 'build.log' ) +assert logFile.exists() +//content = logFile.text + +//assert content.contains( 'Usage: javac ' ) + Propchange: maven/plugins/trunk/maven-compiler-plugin/src/it/groovy-project-with-new-plexus-compiler/verify.groovy -- svn:eol-style = native Propchange: maven/plugins/trunk/maven-compiler-plugin/src/it/groovy-project-with-new-plexus-compiler/verify.groovy -- svn:keywords = Author Date Id Revision
svn commit: r1437748 - in /maven/plugins/trunk/maven-compiler-plugin/src: it/groovy-project-with-new-plexus-compiler/pom.xml main/java/org/apache/maven/plugin/compiler/AbstractCompilerMojo.java
Author: olamy
Date: Wed Jan 23 21:27:46 2013
New Revision: 1437748
URL: http://svn.apache.org/viewvc?rev=1437748&view=rev
Log:
[MCOMPILER-199] Plugin 3.0 does not compile src/main/groovy if neither
src/main/java nor src/main/resources folders exist
Modified:
maven/plugins/trunk/maven-compiler-plugin/src/it/groovy-project-with-new-plexus-compiler/pom.xml
maven/plugins/trunk/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/compiler/AbstractCompilerMojo.java
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=1437748&r1=1437747&r2=1437748&view=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:46 2013
@@ -26,6 +26,7 @@ xsi:schemaLocation="http://maven.apache.
src/main/groovy
+src/test/groovy
org.apache.maven.plugins
@@ -35,9 +36,9 @@ xsi:schemaLocation="http://maven.apache.
groovy-eclipse-compiler
true
-
+
Modified:
maven/plugins/trunk/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/compiler/AbstractCompilerMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/compiler/AbstractCompilerMojo.java?rev=1437748&r1=1437747&r2=1437748&view=diff
==
---
maven/plugins/trunk/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/compiler/AbstractCompilerMojo.java
(original)
+++
maven/plugins/trunk/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/compiler/AbstractCompilerMojo.java
Wed Jan 23 21:27:46 2013
@@ -81,49 +81,49 @@ public abstract class AbstractCompilerMo
*
* @since 2.0.2
*/
-@Parameter ( property = "maven.compiler.failOnError", defaultValue =
"true" )
+@Parameter(property = "maven.compiler.failOnError", defaultValue = "true")
private boolean failOnError = true;
/**
* Set to true to include debugging information in the
compiled class files.
*/
-@Parameter ( property = "maven.compiler.debug", defaultValue = "true" )
+@Parameter(property = "maven.compiler.debug", defaultValue = "true")
private boolean debug = true;
/**
* Set to true to show messages about what the compiler is
doing.
*/
-@Parameter ( property = "maven.compiler.verbose", defaultValue = "false" )
+@Parameter(property = "maven.compiler.verbose", defaultValue = "false")
private boolean verbose;
/**
* Sets whether to show source locations where deprecated APIs are used.
*/
-@Parameter ( property = "maven.compiler.showDeprecation", defaultValue =
"false" )
+@Parameter(property = "maven.compiler.showDeprecation", defaultValue =
"false")
private boolean showDeprecation;
/**
* Set to true to optimize the compiled code using the
compiler's optimization methods.
*/
-@Parameter ( property = "maven.compiler.optimize", defaultValue = "false" )
+@Parameter(property = "maven.compiler.optimize", defaultValue = "false")
private boolean optimize;
/**
* Set to true to show compilation warnings.
*/
-@Parameter ( property = "maven.compiler.showWarnings", defaultValue =
"false" )
+@Parameter(property = "maven.compiler.showWarnings", defaultValue =
"false")
private boolean showWarnings;
/**
* The -source argument for the Java compiler.
*/
-@Parameter ( property = "maven.compiler.source", defaultValue = "1.5" )
+@Parameter(property = "maven.compiler.source", defaultValue = "1.5")
protected String source;
/**
* The -target argument for the Java compiler.
*/
-@Parameter ( property = "maven.compiler.target", defaultValue = "1.5" )
+@Parameter(property = "maven.compiler.target", defaultValue = "1.5")
protected String target;
/**
@@ -131,34 +131,34 @@ public abstract class AbstractCompilerMo
*
* @since 2.1
*/
-@Parameter ( property = "encoding", defaultValue =
"${project.build.sourceEncoding}" )
+@Parameter(property = "encoding", defaultValue =
"${project.build.sourceEncoding}")
private String encoding;
/**
* Sets the granularity in milliseconds of the last modification
* date for testing whether a source needs recompilation.
*/
-@Parameter ( property = "lastModGranularityMs", defaultValue = "0" )
+@Parameter(property = "lastModGranularityMs", defaultValue = "0")
priva
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=1437781&view=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=1437781&view=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 @@
+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
+ msources
+ 64
+ 1.0-SNAPSHOT
+ jar
+
+
+
+
+ org.apache.maven.plugins
+ maven-source-plugin
+ @project.version@
+
+true
+
+
+
+ attach-test-sources
+
+test-jar-no-fork
+
+
+
+
+
+
+
+
+org.apache.maven.plugins
+maven-source-plugin
+@project.version@
+
+
+
+
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=1437781&view=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=1437781&r1=1437780&r2=1437781&view=diff
==
---
maven/plugins/trunk/maven-source-plugin/src/main/java/org/apache/maven/plugin/source/AbstractSourceJarMojo.java
(original)
+++
maven/plugins/trunk/maven-source-plugin/src/main/java/org/apache/maven/plugin/source/AbstractSourceJarMojo.java
Wed Jan 23 22:22:37 2013
@@ -267,7 +267,7 @@ public abstract class AbstractSourceJarM
archiveProjectContent( subProject, archiver.getArchiver() );
}
-if ( !archiver.getArchiver().getFiles().isEmpty() )
+if ( !archiver.getArchiver().getFiles().isEmpty() || forceCreation )
{
if ( useDefaultManifestFile && def
svn commit: r1437788 - /maven/ant-tasks/trunk/pom.xml
Author: olamy Date: Wed Jan 23 22:46:55 2013 New Revision: 1437788 URL: http://svn.apache.org/viewvc?rev=1437788&view=rev Log: use last parent pom 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=1437788&r1=1437787&r2=1437788&view=diff == --- maven/ant-tasks/trunk/pom.xml (original) +++ maven/ant-tasks/trunk/pom.xml Wed Jan 23 22:46:55 2013 @@ -25,7 +25,7 @@ org.apache.maven maven-parent -22 +23 org.apache.maven
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=1437789&view=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=1437789&r1=1437788&r2=1437789&view=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 @@ Jenkins -https://builds.apache.org/hudson/job/maven-ant-tasks/ +https://builds.apache.org/job/maven-ant-tasks/
[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 Authored: Mon Jan 21 20:55:11 2013 +0100 Committer: Kristian Rosenvold 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
Authored: Fri Jan 18 21:15:09 2013 +0100
Committer: Kristian Rosenvold
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;
/**
+ * DEPRECATED since version 2.14. Use
forkCount and reuseForks instead.
+ *
* 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.
+ * for backwards compatibility. "always" forks for each test-class.
"perthread" will create threadCount parallel forks, each executing
one test-class, see also parameter reuseForks.
* The system properties and the "argLine" of the forked processes may
contain the place holder string ${surefire.threadNumber},
- * 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 threadCount.
*
* @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 parallel 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 parallel 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.
+ *
+ * Example values: "1.5C", "4"
+ *
+ * The system properties and the argLine of the forked
processes may contain the place holder string
${surefire.forkNumber},
+ * which is replaced with a fixed number for each of the parallel forks,
ranging from 1 to the effective value of forkCount.
+ *
+ * @since 2.14
+ */
+@Parameter( property = "forkCount", defaultValue="1")
+private String forkCount;
+
+/**
+ * Indicates if forked VMs can be reused. If set to "false", a new VM is
forked for each test class to be executed.
+ * If set to "true", up to forkCount VMs will be forked and
then reused
