maven-surefire git commit: [SUREFIRE] Mojo Javadoc should not have absolute URL path, and new line with br/
Repository: maven-surefire
Updated Branches:
refs/heads/master 6c8bab59a - 22154d6b3
[SUREFIRE] Mojo Javadoc should not have absolute URL path, and new line with
br/
Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/22154d6b
Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/22154d6b
Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/22154d6b
Branch: refs/heads/master
Commit: 22154d6b371822ff1c46a2b23de7c8739c32f547
Parents: 6c8bab5
Author: Tibor17 tibo...@lycos.com
Authored: Thu Dec 18 22:10:54 2014 +0100
Committer: Tibor17 tibo...@lycos.com
Committed: Thu Dec 18 22:10:54 2014 +0100
--
.../plugin/failsafe/IntegrationTestMojo.java| 27 +++-
.../plugin/surefire/AbstractSurefireMojo.java | 5 +---
.../maven/plugin/surefire/SurefirePlugin.java | 27 +++-
3 files changed, 31 insertions(+), 28 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/22154d6b/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/IntegrationTestMojo.java
--
diff --git
a/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/IntegrationTestMojo.java
b/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/IntegrationTestMojo.java
index b507e47..870ae0e 100644
---
a/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/IntegrationTestMojo.java
+++
b/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/IntegrationTestMojo.java
@@ -199,10 +199,9 @@ public class IntegrationTestMojo
/**
* By default, Surefire forks your tests using a manifest-only JAR; set
this parameter to false to force it to
- * launch your tests with a plain old Java classpath. (See
- *
http://maven.apache.org/plugins/maven-surefire-plugin/examples/class-loading.html
for a more detailed explanation
- * of manifest-only JARs and their benefits.)
- * p/
+ * launch your tests with a plain old Java classpath. (See the a
href=examples/class-loading.htmlexamples/a
+ * for a more detailed explanation of manifest-only JARs and their
benefits.)
+ * br/
* Beware, setting this to false may cause your tests to fail on Windows
if your classpath is too long.
*
* @since 2.4.3
@@ -240,16 +239,20 @@ public class IntegrationTestMojo
/**
* Defines the order the tests will be run in. Supported values are
alphabetical, reversealphabetical, random,
* hourly (alphabetical on even hours, reverse alphabetical on odd
hours), failedfirst, balanced and
- * filesystem.p/
- * p/
+ * filesystem.
+ * br/
+ * br/
* Odd/Even for hourly is determined at the time the of scanning the
classpath, meaning it could change during a
- * multi-module build.p/
- * p/
- * Failed first will run tests that failed on previous run first, as well
as new tests for this run.p/
- * p/
+ * multi-module build.
+ * br/
+ * br/
+ * Failed first will run tests that failed on previous run first, as well
as new tests for this run.
+ * br/
+ * br/
* Balanced is only relevant with parallel=classes, and will try to
optimize the run-order of the tests reducing the
- * overall execution time. Initially a statistics file is created and
every next test run will reorder classes.p/
- * p/
+ * overall execution time. Initially a statistics file is created and
every next test run will reorder classes.
+ * br/
+ * br/
* Note that the statistics are stored in a file named .surefire-X
beside pom.xml, and should not be checked
* into version control. The X is the SHA1 checksum of the entire
surefire configuration, so different
* configurations will have different statistics files, meaning if you
change any config settings you will re-run
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/22154d6b/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 dee273d..f305b6a 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
@@ -353,10 +353,7 @@ public abstract class AbstractSurefireMojo
* Using an alternate syntax for emargLine/em, pre@{...}/pre
allows late replacement of properties
svn commit: r1646543 - in /maven/plugins/trunk/maven-remote-resources-plugin: pom.xml src/main/java/org/apache/maven/plugin/resources/remote/ProcessRemoteResourcesMojo.java
Author: krosenvold
Date: Thu Dec 18 21:36:41 2014
New Revision: 1646543
URL: http://svn.apache.org/r1646543
Log:
[MRRESOURCES-91] Avoid overwrite of the destination file if the produced
contents is the same
maven-remote-resource-plugin is used in Apache pom to add DEPENDENCIES, and the
resulting file is overwritten on each build.
It leads to jar being rebuild, etc leading to longer compilation times.
Patch by Vladimir Sitnikov sitnikov.vladi...@gmail.com
This closes #40
Modified:
maven/plugins/trunk/maven-remote-resources-plugin/pom.xml
maven/plugins/trunk/maven-remote-resources-plugin/src/main/java/org/apache/maven/plugin/resources/remote/ProcessRemoteResourcesMojo.java
Modified: maven/plugins/trunk/maven-remote-resources-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-remote-resources-plugin/pom.xml?rev=1646543r1=1646542r2=1646543view=diff
==
--- maven/plugins/trunk/maven-remote-resources-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-remote-resources-plugin/pom.xml Thu Dec 18
21:36:41 2014
@@ -146,6 +146,11 @@ under the License.
!-- other --
dependency
+ groupIdcommons-io/groupId
+ artifactIdcommons-io/artifactId
+ version2.2/version
+/dependency
+dependency
groupIdorg.apache.velocity/groupId
artifactIdvelocity/artifactId
version1.7/version
Modified:
maven/plugins/trunk/maven-remote-resources-plugin/src/main/java/org/apache/maven/plugin/resources/remote/ProcessRemoteResourcesMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-remote-resources-plugin/src/main/java/org/apache/maven/plugin/resources/remote/ProcessRemoteResourcesMojo.java?rev=1646543r1=1646542r2=1646543view=diff
==
---
maven/plugins/trunk/maven-remote-resources-plugin/src/main/java/org/apache/maven/plugin/resources/remote/ProcessRemoteResourcesMojo.java
(original)
+++
maven/plugins/trunk/maven-remote-resources-plugin/src/main/java/org/apache/maven/plugin/resources/remote/ProcessRemoteResourcesMojo.java
Thu Dec 18 21:36:41 2014
@@ -19,6 +19,7 @@ package org.apache.maven.plugin.resource
* under the License.
*/
+import java.io.ByteArrayInputStream;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
@@ -50,6 +51,7 @@ import java.util.Properties;
import java.util.Set;
import java.util.TreeMap;
+import org.apache.commons.io.output.DeferredFileOutputStream;
import org.apache.maven.ProjectDependenciesResolver;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.factory.ArtifactFactory;
@@ -305,6 +307,16 @@ public class ProcessRemoteResourcesMojo
protected boolean includeProjectProperties = false;
/**
+ * When the result of velocity transformation fits in memory, it is
compared with the actual contents on disk
+ * to eliminate unnecessary destination file overwrite. This improves
build times since further build steps
+ * typically rely on the modification date.
+ *
+ * @since 1.6
+ */
+@Parameter( defaultValue = 5242880 )
+protected int velocityFilterInMemoryThreshold = 5 * 1024 * 1024;
+
+/**
* The list of resources defined for the project.
*/
@Parameter( defaultValue = ${project.resources}, readonly = true,
required = true )
@@ -808,39 +820,41 @@ public class ProcessRemoteResourcesMojo
{
Reader reader = null;
Writer writer = null;
+DeferredFileOutputStream os = new
DeferredFileOutputStream( velocityFilterInMemoryThreshold, file );
try
{
+
if ( encoding != null )
{
reader = new InputStreamReader( new
FileInputStream( source ), encoding );
-writer = new OutputStreamWriter( new
FileOutputStream( file ), encoding );
+writer = new OutputStreamWriter( os, encoding );
}
else
{
reader = ReaderFactory.newPlatformReader( source );
-writer = WriterFactory.newPlatformWriter( file );
+writer = WriterFactory.newPlatformWriter( os );
}
velocity.evaluate( context, writer, , reader );
-velocity.evaluate( context, writer, , reader );
}
catch ( ParseErrorException e )
{
-throw new MojoExecutionException( Error rendering
velocity resource., e );
+throw new MojoExecutionException( Error rendering
velocity resource: + source, e );
