svn commit: r1729442 - /maven/site/trunk/content/apt/plugins/index.apt
Author: agudian
Date: Tue Feb 9 19:36:46 2016
New Revision: 1729442
URL: http://svn.apache.org/viewvc?rev=1729442&view=rev
Log:
maven-compiler-plugin 3.5.1
Modified:
maven/site/trunk/content/apt/plugins/index.apt
Modified: maven/site/trunk/content/apt/plugins/index.apt
URL:
http://svn.apache.org/viewvc/maven/site/trunk/content/apt/plugins/index.apt?rev=1729442&r1=1729441&r2=1729442&view=diff
==
--- maven/site/trunk/content/apt/plugins/index.apt (original)
+++ maven/site/trunk/content/apt/plugins/index.apt Tue Feb 9 19:36:46 2016
@@ -69,7 +69,7 @@ Available Plugins
*--++--++--+++
| {{{/plugins/maven-clean-plugin/} <<>>}} | B |
3.0.0| 2015-10-22 | Clean up after the build. |
{{{http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-clean-plugin}SVN}}
| {{{https://issues.apache.org/jira/browse/MCLEAN}JIRA}}
*--++--++--+++
-| {{{/plugins/maven-compiler-plugin/} <<>>}} | B |
3.5 | 2016-01-20 | Compiles Java sources. |
{{{http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-compiler-plugin}SVN}}
| {{{https://issues.apache.org/jira/browse/MCOMPILER}JIRA}}
+| {{{/plugins/maven-compiler-plugin/} <<>>}} | B |
3.5.1| 2016-02-09 | Compiles Java sources. |
{{{http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-compiler-plugin}SVN}}
| {{{https://issues.apache.org/jira/browse/MCOMPILER}JIRA}}
*--++--++--+++
| {{{/plugins/maven-deploy-plugin/} <<>>}} | B |
2.8.2| 2014-08-27 | Deploy the built artifact to the remote repository.
|
{{{http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-deploy-plugin}SVN}}
| {{{https://issues.apache.org/jira/browse/MDEPLOY}JIRA}}
*--++--++--+++
svn commit: r12325 - /release/maven/plugins/
Author: agudian Date: Tue Feb 9 19:31:55 2016 New Revision: 12325 Log: Maven Compiler Plugin 3.5.1 Added: release/maven/plugins/maven-compiler-plugin-3.5.1-source-release.zip (with props) release/maven/plugins/maven-compiler-plugin-3.5.1-source-release.zip.asc release/maven/plugins/maven-compiler-plugin-3.5.1-source-release.zip.md5 Removed: release/maven/plugins/maven-compiler-plugin-3.5-source-release.zip release/maven/plugins/maven-compiler-plugin-3.5-source-release.zip.asc release/maven/plugins/maven-compiler-plugin-3.5-source-release.zip.md5 Added: release/maven/plugins/maven-compiler-plugin-3.5.1-source-release.zip == Binary file - no diff available. Propchange: release/maven/plugins/maven-compiler-plugin-3.5.1-source-release.zip -- svn:mime-type = application/octet-stream Added: release/maven/plugins/maven-compiler-plugin-3.5.1-source-release.zip.asc == --- release/maven/plugins/maven-compiler-plugin-3.5.1-source-release.zip.asc (added) +++ release/maven/plugins/maven-compiler-plugin-3.5.1-source-release.zip.asc Tue Feb 9 19:31:55 2016 @@ -0,0 +1,7 @@ +-BEGIN PGP SIGNATURE- +Version: GnuPG v2 + +iF4EABEIAAYFAla2Q7kACgkQpfCU/Tlh3wXgzAD/V+cKlidaH5gLD0ejoAZas0fW +GjxTlgzBSzfHfupz5FgBAM0bsmE+QMPz2qidFriJQGlCk3jYUK0a5OmDjIaGh3dM +=6Otn +-END PGP SIGNATURE- Added: release/maven/plugins/maven-compiler-plugin-3.5.1-source-release.zip.md5 == --- release/maven/plugins/maven-compiler-plugin-3.5.1-source-release.zip.md5 (added) +++ release/maven/plugins/maven-compiler-plugin-3.5.1-source-release.zip.md5 Tue Feb 9 19:31:55 2016 @@ -0,0 +1 @@ +a21d867622ec70b5c29163be763b8389 \ No newline at end of file
svn commit: r1728868 - /maven/plugins/trunk/maven-compiler-plugin/pom.xml
Author: agudian Date: Sat Feb 6 18:59:02 2016 New Revision: 1728868 URL: http://svn.apache.org/viewvc?rev=1728868&view=rev Log: [maven-release-plugin] prepare release maven-compiler-plugin-3.5.1 Modified: maven/plugins/trunk/maven-compiler-plugin/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=1728868&r1=1728867&r2=1728868&view=diff == --- maven/plugins/trunk/maven-compiler-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-compiler-plugin/pom.xml Sat Feb 6 18:59:02 2016 @@ -30,7 +30,7 @@ under the License. maven-compiler-plugin - 3.6-SNAPSHOT + 3.5.1 maven-plugin Apache Maven Compiler Plugin @@ -42,9 +42,9 @@ under the License. - scm:svn:http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-compiler-plugin/ - scm:svn:https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-compiler-plugin/ - http://svn.apache.org/viewvc/maven/plugins/trunk/maven-compiler-plugin/ + scm:svn:http://svn.apache.org/repos/asf/maven/plugins/tags/maven-compiler-plugin-3.5.1 + scm:svn:https://svn.apache.org/repos/asf/maven/plugins/tags/maven-compiler-plugin-3.5.1 + http://svn.apache.org/viewvc/maven/plugins/tags/maven-compiler-plugin-3.5.1 JIRA
svn commit: r1728869 - /maven/plugins/tags/maven-compiler-plugin-3.5.1/
Author: agudian Date: Sat Feb 6 18:59:16 2016 New Revision: 1728869 URL: http://svn.apache.org/viewvc?rev=1728869&view=rev Log: [maven-release-plugin] copy for tag maven-compiler-plugin-3.5.1 Added: maven/plugins/tags/maven-compiler-plugin-3.5.1/ (props changed) - copied from r1728868, maven/plugins/trunk/maven-compiler-plugin/ Propchange: maven/plugins/tags/maven-compiler-plugin-3.5.1/ -- --- svn:ignore (added) +++ svn:ignore Sat Feb 6 18:59:16 2016 @@ -0,0 +1,12 @@ +target +*~ +*.log +*.ipr +*.iws +*.iml +.idea +.wtpmodules +.project +.classpath +.settings +bin Propchange: maven/plugins/tags/maven-compiler-plugin-3.5.1/ -- --- svn:mergeinfo (added) +++ svn:mergeinfo Sat Feb 6 18:59:16 2016 @@ -0,0 +1 @@ +/maven/plugins/branches/maven-compiler-plugin-annotations:1337379-1351482
svn commit: r1728870 - /maven/plugins/trunk/maven-compiler-plugin/pom.xml
Author: agudian Date: Sat Feb 6 18:59:18 2016 New Revision: 1728870 URL: http://svn.apache.org/viewvc?rev=1728870&view=rev Log: [maven-release-plugin] prepare for next development iteration Modified: maven/plugins/trunk/maven-compiler-plugin/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=1728870&r1=1728869&r2=1728870&view=diff == --- maven/plugins/trunk/maven-compiler-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-compiler-plugin/pom.xml Sat Feb 6 18:59:18 2016 @@ -30,7 +30,7 @@ under the License. maven-compiler-plugin - 3.5.1 + 3.6-SNAPSHOT maven-plugin Apache Maven Compiler Plugin @@ -42,9 +42,9 @@ under the License. - scm:svn:http://svn.apache.org/repos/asf/maven/plugins/tags/maven-compiler-plugin-3.5.1 - scm:svn:https://svn.apache.org/repos/asf/maven/plugins/tags/maven-compiler-plugin-3.5.1 - http://svn.apache.org/viewvc/maven/plugins/tags/maven-compiler-plugin-3.5.1 + scm:svn:http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-compiler-plugin/ + scm:svn:https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-compiler-plugin/ + http://svn.apache.org/viewvc/maven/plugins/trunk/maven-compiler-plugin/ JIRA
svn commit: r1728863 - in /maven/plugins/trunk/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/compiler: AbstractCompilerMojo.java CompilationFailureException.java
Author: agudian Date: Sat Feb 6 18:11:24 2016 New Revision: 1728863 URL: http://svn.apache.org/viewvc?rev=1728863&view=rev Log: Fix some javadoc issues reported in JDK8 Modified: maven/plugins/trunk/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/compiler/AbstractCompilerMojo.java maven/plugins/trunk/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/compiler/CompilationFailureException.java 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=1728863&r1=1728862&r2=1728863&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 Sat Feb 6 18:11:24 2016 @@ -1273,10 +1273,9 @@ public abstract class AbstractCompilerMo } /** - * We just compare the timestamps of all local dependency files (inter-module dependency classpath) - * and the own generated classes - * and if we got a file which is >= the buid-started timestamp, then we catched a file which got - * changed during this build. + * We just compare the timestamps of all local dependency files (inter-module dependency classpath) and the own + * generated classes and if we got a file which is >= the buid-started timestamp, then we catched a file which + * got changed during this build. * * @return true if at least one single dependency has changed. */ Modified: maven/plugins/trunk/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/compiler/CompilationFailureException.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/compiler/CompilationFailureException.java?rev=1728863&r1=1728862&r2=1728863&view=diff == --- maven/plugins/trunk/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/compiler/CompilationFailureException.java (original) +++ maven/plugins/trunk/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/compiler/CompilationFailureException.java Sat Feb 6 18:11:24 2016 @@ -26,7 +26,6 @@ import java.util.List; /** * @author mailto:ja...@maven.org";>Jason van Zyl - * @version $Id$ * @since 2.0 */ @SuppressWarnings( "serial" ) @@ -57,7 +56,7 @@ public class CompilationFailureException /** * Short message will have the error message if there's only one, useful for errors forking the compiler * - * @param messages + * @param messages the messages * @return the short error message * @since 2.0.2 */ @@ -75,7 +74,7 @@ public class CompilationFailureException sb.append( compilerError ).append( LS ); } - + return sb.toString(); } }
svn commit: r1727176 - in /maven/plugins/trunk/maven-compiler-plugin/src: it/MCOMPILER-203-processorpath/annotation-processor/ it/MCOMPILER-203-processorpath/annotation-processor/src/main/java/org/iss
Author: agudian
Date: Wed Jan 27 20:20:58 2016
New Revision: 1727176
URL: http://svn.apache.org/viewvc?rev=1727176&view=rev
Log:
[MCOMPILER-262] Don't add project dependencies to -processorpath when using the
annotationProcessorPaths option, but only the dependencies of the processor
artifacts.
Modified:
maven/plugins/trunk/maven-compiler-plugin/src/it/MCOMPILER-203-processorpath/annotation-processor/pom.xml
maven/plugins/trunk/maven-compiler-plugin/src/it/MCOMPILER-203-processorpath/annotation-processor/src/main/java/org/issue/SimpleAnnotationProcessor.java
maven/plugins/trunk/maven-compiler-plugin/src/it/MCOMPILER-203-processorpath/annotation-user/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/MCOMPILER-203-processorpath/annotation-processor/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-compiler-plugin/src/it/MCOMPILER-203-processorpath/annotation-processor/pom.xml?rev=1727176&r1=1727175&r2=1727176&view=diff
==
---
maven/plugins/trunk/maven-compiler-plugin/src/it/MCOMPILER-203-processorpath/annotation-processor/pom.xml
(original)
+++
maven/plugins/trunk/maven-compiler-plugin/src/it/MCOMPILER-203-processorpath/annotation-processor/pom.xml
Wed Jan 27 20:20:58 2016
@@ -31,4 +31,12 @@ under the License.
annotation-processor
+
+
+
+ org.apache.commons
+ commons-lang3
+ 3.4
+
+
Modified:
maven/plugins/trunk/maven-compiler-plugin/src/it/MCOMPILER-203-processorpath/annotation-processor/src/main/java/org/issue/SimpleAnnotationProcessor.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-compiler-plugin/src/it/MCOMPILER-203-processorpath/annotation-processor/src/main/java/org/issue/SimpleAnnotationProcessor.java?rev=1727176&r1=1727175&r2=1727176&view=diff
==
---
maven/plugins/trunk/maven-compiler-plugin/src/it/MCOMPILER-203-processorpath/annotation-processor/src/main/java/org/issue/SimpleAnnotationProcessor.java
(original)
+++
maven/plugins/trunk/maven-compiler-plugin/src/it/MCOMPILER-203-processorpath/annotation-processor/src/main/java/org/issue/SimpleAnnotationProcessor.java
Wed Jan 27 20:20:58 2016
@@ -52,6 +52,29 @@ public class SimpleAnnotationProcessor
return true;
}
+// assert that commons-lang3 is on the classpath
+try
+{
+getClass().getClassLoader().loadClass(
"org.apache.commons.lang3.StringUtils" );
+}
+catch ( ClassNotFoundException expected )
+{
+throw new RuntimeException( "Expected
org.apache.commons.lang3.StringUtils to be on the processorpath,"
++ "because it is a declared dependency of the annotation
processor." );
+}
+
+// assert that commons-io is NOT on the classpath, as it is only a
project dependency in "annotation-user"
+try
+{
+getClass().getClassLoader().loadClass(
"org.apache.commons.io.IOUtils" );
+throw new RuntimeException( "Expected a ClassNotFoundException
because "
++ "org.apache.commons.io.IOUtils is not supposed to be on the
processorpath." );
+}
+catch ( ClassNotFoundException expected )
+{
+// expected.
+}
+
Filer filer = processingEnv.getFiler();
Elements elementUtils = processingEnv.getElementUtils();
Modified:
maven/plugins/trunk/maven-compiler-plugin/src/it/MCOMPILER-203-processorpath/annotation-user/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-compiler-plugin/src/it/MCOMPILER-203-processorpath/annotation-user/pom.xml?rev=1727176&r1=1727175&r2=1727176&view=diff
==
---
maven/plugins/trunk/maven-compiler-plugin/src/it/MCOMPILER-203-processorpath/annotation-user/pom.xml
(original)
+++
maven/plugins/trunk/maven-compiler-plugin/src/it/MCOMPILER-203-processorpath/annotation-user/pom.xml
Wed Jan 27 20:20:58 2016
@@ -33,6 +33,11 @@ under the License.
+ commons-io
+ commons-io
+ 2.4
+
+
junit
junit
4.10
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=1727176&r1=1727175&r2=1727176&view=diff
==
---
maven/plugins/trunk/maven-compiler-plugin/src/main/java
svn commit: r1727173 - in /maven/plugins/trunk/maven-compiler-plugin/src/it/MCOMPILER-203-processorpath: annotation-processor/src/main/java/org/issue/SimpleAnnotationProcessor.java invoker.properties
Author: agudian
Date: Wed Jan 27 20:08:03 2016
New Revision: 1727173
URL: http://svn.apache.org/viewvc?rev=1727173&view=rev
Log:
[MCOMPILER-235] extend IT to verify that the repeated build without a clean
works when using an annotation processor that generates java sources.
Modified:
maven/plugins/trunk/maven-compiler-plugin/src/it/MCOMPILER-203-processorpath/annotation-processor/src/main/java/org/issue/SimpleAnnotationProcessor.java
maven/plugins/trunk/maven-compiler-plugin/src/it/MCOMPILER-203-processorpath/invoker.properties
Modified:
maven/plugins/trunk/maven-compiler-plugin/src/it/MCOMPILER-203-processorpath/annotation-processor/src/main/java/org/issue/SimpleAnnotationProcessor.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-compiler-plugin/src/it/MCOMPILER-203-processorpath/annotation-processor/src/main/java/org/issue/SimpleAnnotationProcessor.java?rev=1727173&r1=1727172&r2=1727173&view=diff
==
---
maven/plugins/trunk/maven-compiler-plugin/src/it/MCOMPILER-203-processorpath/annotation-processor/src/main/java/org/issue/SimpleAnnotationProcessor.java
(original)
+++
maven/plugins/trunk/maven-compiler-plugin/src/it/MCOMPILER-203-processorpath/annotation-processor/src/main/java/org/issue/SimpleAnnotationProcessor.java
Wed Jan 27 20:08:03 2016
@@ -35,6 +35,7 @@ import javax.lang.model.element.PackageE
import javax.lang.model.element.TypeElement;
import javax.lang.model.util.Elements;
import javax.tools.FileObject;
+import javax.tools.JavaFileObject;
import javax.tools.StandardLocation;
@SupportedSourceVersion( SourceVersion.RELEASE_6 )
@@ -65,13 +66,25 @@ public class SimpleAnnotationProcessor
try
{
+Name packageName = packageElement.getQualifiedName();
FileObject resource =
-filer.createResource( StandardLocation.SOURCE_OUTPUT,
packageElement.getQualifiedName(), name
+filer.createResource( StandardLocation.SOURCE_OUTPUT,
packageName, name
+ ".txt", element );
Writer writer = resource.openWriter();
writer.write( name.toString() );
writer.close();
+
+String className = name + "Companion";
+JavaFileObject javaFile = filer.createSourceFile( packageName
+ "." + className, element );
+
+Writer javaWriter = javaFile.openWriter();
+javaWriter.append( "package " ).append( packageName ).append(
";\n\n" );
+javaWriter.append( "public class " ).append( className
).append( " {\n" );
+javaWriter.append( "public " ).append( className ).append(
"() {\n" );
+javaWriter.append( "System.out.println(\"Hey
there!\");\n" );
+javaWriter.append( "}\n}\n" );
+javaWriter.close();
}
catch ( IOException e )
{
Modified:
maven/plugins/trunk/maven-compiler-plugin/src/it/MCOMPILER-203-processorpath/invoker.properties
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-compiler-plugin/src/it/MCOMPILER-203-processorpath/invoker.properties?rev=1727173&r1=1727172&r2=1727173&view=diff
==
---
maven/plugins/trunk/maven-compiler-plugin/src/it/MCOMPILER-203-processorpath/invoker.properties
(original)
+++
maven/plugins/trunk/maven-compiler-plugin/src/it/MCOMPILER-203-processorpath/invoker.properties
Wed Jan 27 20:08:03 2016
@@ -17,3 +17,4 @@
invoker.java.version = 1.6+
invoker.goals=clean process-test-classes
+invoker.goals.2=process-test-classes
svn commit: r1726074 - /maven/plugins/trunk/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/compiler/AbstractCompilerMojo.java
Author: agudian
Date: Thu Jan 21 19:43:20 2016
New Revision: 1726074
URL: http://svn.apache.org/viewvc?rev=1726074&view=rev
Log:
[MCOMPILER-235] do not add files from generatedSourcesDirectory to the list of
source files to compile.
Modified:
maven/plugins/trunk/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/compiler/AbstractCompilerMojo.java
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=1726074&r1=1726073&r2=1726074&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
Thu Jan 21 19:43:20 2016
@@ -563,7 +563,8 @@ public abstract class AbstractCompilerMo
compilerConfiguration.setProc( proc );
File generatedSourcesDirectory = getGeneratedSourcesDirectory();
-compilerConfiguration.setGeneratedSourcesDirectory(
generatedSourcesDirectory );
+compilerConfiguration.setGeneratedSourcesDirectory(
generatedSourcesDirectory != null
+? generatedSourcesDirectory.getAbsoluteFile() : null );
if ( generatedSourcesDirectory != null )
{
@@ -1052,7 +1053,8 @@ public abstract class AbstractCompilerMo
{
File rootFile = new File( sourceRoot );
-if ( !rootFile.isDirectory() )
+if ( !rootFile.isDirectory()
+|| rootFile.getAbsoluteFile().equals(
compilerConfiguration.getGeneratedSourcesDirectory() ) )
{
continue;
}
svn commit: r1725791 - /maven/site/trunk/content/apt/plugins/index.apt
Author: agudian
Date: Wed Jan 20 19:32:16 2016
New Revision: 1725791
URL: http://svn.apache.org/viewvc?rev=1725791&view=rev
Log:
maven-compiler-plugin 3.5
Modified:
maven/site/trunk/content/apt/plugins/index.apt
Modified: maven/site/trunk/content/apt/plugins/index.apt
URL:
http://svn.apache.org/viewvc/maven/site/trunk/content/apt/plugins/index.apt?rev=1725791&r1=1725790&r2=1725791&view=diff
==
--- maven/site/trunk/content/apt/plugins/index.apt (original)
+++ maven/site/trunk/content/apt/plugins/index.apt Wed Jan 20 19:32:16 2016
@@ -8,7 +8,7 @@
Benson Margulies
Karl-Heinz Marbaise
-
- 2015-12-17
+ 2016-01-20
-
~~ Licensed to the Apache Software Foundation (ASF) under one
@@ -69,11 +69,11 @@ Available Plugins
*--++--++--+++
| {{{/plugins/maven-clean-plugin/} <<>>}} | B |
3.0.0| 2015-10-22 | Clean up after the build. |
{{{http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-clean-plugin}SVN}}
| {{{https://issues.apache.org/jira/browse/MCLEAN}JIRA}}
*--++--++--+++
-| {{{/plugins/maven-compiler-plugin/} <<>>}} | B |
3.3 | 2015-03-26 | Compiles Java sources. |
{{{http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-compiler-plugin}SVN}}
| {{{https://issues.apache.org/jira/browse/MCOMPILER}JIRA}}
+| {{{/plugins/maven-compiler-plugin/} <<>>}} | B |
3.5 | 2016-01-20 | Compiles Java sources. |
{{{http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-compiler-plugin}SVN}}
| {{{https://issues.apache.org/jira/browse/MCOMPILER}JIRA}}
*--++--++--+++
| {{{/plugins/maven-deploy-plugin/} <<>>}} | B |
2.8.2| 2014-08-27 | Deploy the built artifact to the remote repository.
|
{{{http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-deploy-plugin}SVN}}
| {{{https://issues.apache.org/jira/browse/MDEPLOY}JIRA}}
*--++--++--+++
-| {{{/surefire/maven-failsafe-plugin/} <<>>}}| B |
2.19.1 | 2016-01-03 | Run the JUnit integration tests in an isolated
classloader. |
{{{https://git-wip-us.apache.org/repos/asf/maven-surefire.git}GIT}} |
{{{https://issues.apache.org/jira/browse/SUREFIRE}JIRA}}
+| {{{/surefire/maven-failsafe-plugin/} <<>>}}| B |
2.19.1 | 2016-01-03 | Run the JUnit integration tests in an isolated
classloader. |
{{{https://git-wip-us.apache.org/repos/asf/maven-surefire.git}GIT}} |
{{{https://issues.apache.org/jira/browse/SUREFIRE}JIRA}}
*--++--++--+++
| {{{/plugins/maven-install-plugin/} <<>>}} | B |
2.5.2| 2014-08-27 | Install the built artifact into the local
repository. |
{{{http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-install-plugin}SVN}}
| {{{https://issues.apache.org/jira/browse/MINSTALL}JIRA}}
*--++--++--+++
@@ -81,15 +81,15 @@ Available Plugins
*--++--++--+++
| {{{/plugins/maven-site-plugin/} <<>>}} | B |
3.4 | 2014-07-07 | Generate a site for the current project. |
{{{http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-site-plugin/}SVN}}
| {{{https://issues.apache.org/jira/browse/MSITE}JIRA}}
*--++--++--+++
-| {{{/surefire/maven-surefire-plugin/} <<>>}}| B |
2.19.1 | 2016-01-03 | Run the JUnit unit tests in an isolated
classloader. |
{{{https://git-wip-us.apache.org/repos/asf/maven-surefire.git}GIT}} |
{{{https://issues.apache.org/jira/browse/SUREFIRE}JIRA}}
+| {{{/surefire/maven-surefire-plugin/} <<>>}}| B
svn commit: r11976 - /release/maven/plugins/
Author: agudian Date: Wed Jan 20 18:56:07 2016 New Revision: 11976 Log: Maven Compiler Plugin 3.5 Added: release/maven/plugins/maven-compiler-plugin-3.5-source-release.zip (with props) release/maven/plugins/maven-compiler-plugin-3.5-source-release.zip.asc release/maven/plugins/maven-compiler-plugin-3.5-source-release.zip.md5 Removed: release/maven/plugins/maven-compiler-plugin-3.3-source-release.zip release/maven/plugins/maven-compiler-plugin-3.3-source-release.zip.asc release/maven/plugins/maven-compiler-plugin-3.3-source-release.zip.md5 Added: release/maven/plugins/maven-compiler-plugin-3.5-source-release.zip == Binary file - no diff available. Propchange: release/maven/plugins/maven-compiler-plugin-3.5-source-release.zip -- svn:mime-type = application/octet-stream Added: release/maven/plugins/maven-compiler-plugin-3.5-source-release.zip.asc == --- release/maven/plugins/maven-compiler-plugin-3.5-source-release.zip.asc (added) +++ release/maven/plugins/maven-compiler-plugin-3.5-source-release.zip.asc Wed Jan 20 18:56:07 2016 @@ -0,0 +1,7 @@ +-BEGIN PGP SIGNATURE- +Version: GnuPG v2 + +iF4EABEIAAYFAlaawcAACgkQpfCU/Tlh3wUZLgEAzbRM3orNjZcAM9MKE50jyJas +++qSr+sd82XLed7TX28A/1/SzTdZga7cBgkmfAOBq/Wu8FhU9BsKb7Qu8MfnSRfv +=VyL7 +-END PGP SIGNATURE- Added: release/maven/plugins/maven-compiler-plugin-3.5-source-release.zip.md5 == --- release/maven/plugins/maven-compiler-plugin-3.5-source-release.zip.md5 (added) +++ release/maven/plugins/maven-compiler-plugin-3.5-source-release.zip.md5 Wed Jan 20 18:56:07 2016 @@ -0,0 +1 @@ +e4e6b06ecb6639e1819475f025245b77 \ No newline at end of file
svn commit: r1725037 - /maven/plugins/tags/maven-compiler-plugin-3.5/
Author: agudian Date: Sat Jan 16 21:54:12 2016 New Revision: 1725037 URL: http://svn.apache.org/viewvc?rev=1725037&view=rev Log: [maven-release-plugin] copy for tag maven-compiler-plugin-3.5 Added: maven/plugins/tags/maven-compiler-plugin-3.5/ (props changed) - copied from r1725036, maven/plugins/trunk/maven-compiler-plugin/ Propchange: maven/plugins/tags/maven-compiler-plugin-3.5/ -- --- svn:ignore (added) +++ svn:ignore Sat Jan 16 21:54:12 2016 @@ -0,0 +1,12 @@ +target +*~ +*.log +*.ipr +*.iws +*.iml +.idea +.wtpmodules +.project +.classpath +.settings +bin Propchange: maven/plugins/tags/maven-compiler-plugin-3.5/ -- --- svn:mergeinfo (added) +++ svn:mergeinfo Sat Jan 16 21:54:12 2016 @@ -0,0 +1 @@ +/maven/plugins/branches/maven-compiler-plugin-annotations:1337379-1351482
svn commit: r1725038 - /maven/plugins/trunk/maven-compiler-plugin/pom.xml
Author: agudian Date: Sat Jan 16 21:54:15 2016 New Revision: 1725038 URL: http://svn.apache.org/viewvc?rev=1725038&view=rev Log: [maven-release-plugin] prepare for next development iteration Modified: maven/plugins/trunk/maven-compiler-plugin/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=1725038&r1=1725037&r2=1725038&view=diff == --- maven/plugins/trunk/maven-compiler-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-compiler-plugin/pom.xml Sat Jan 16 21:54:15 2016 @@ -30,7 +30,7 @@ under the License. maven-compiler-plugin - 3.5 + 3.6-SNAPSHOT maven-plugin Apache Maven Compiler Plugin @@ -42,9 +42,9 @@ under the License. - scm:svn:http://svn.apache.org/repos/asf/maven/plugins/tags/maven-compiler-plugin-3.5 - scm:svn:https://svn.apache.org/repos/asf/maven/plugins/tags/maven-compiler-plugin-3.5 - http://svn.apache.org/viewvc/maven/plugins/tags/maven-compiler-plugin-3.5 + scm:svn:http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-compiler-plugin/ + scm:svn:https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-compiler-plugin/ + http://svn.apache.org/viewvc/maven/plugins/trunk/maven-compiler-plugin/ JIRA
svn commit: r1725036 - /maven/plugins/trunk/maven-compiler-plugin/pom.xml
Author: agudian Date: Sat Jan 16 21:53:59 2016 New Revision: 1725036 URL: http://svn.apache.org/viewvc?rev=1725036&view=rev Log: [maven-release-plugin] prepare release maven-compiler-plugin-3.5 Modified: maven/plugins/trunk/maven-compiler-plugin/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=1725036&r1=1725035&r2=1725036&view=diff == --- maven/plugins/trunk/maven-compiler-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-compiler-plugin/pom.xml Sat Jan 16 21:53:59 2016 @@ -19,8 +19,7 @@ specific language governing permissions under the License. --> -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";> +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 @@ -31,7 +30,7 @@ under the License. maven-compiler-plugin - 3.5-SNAPSHOT + 3.5 maven-plugin Apache Maven Compiler Plugin @@ -43,9 +42,9 @@ under the License. - scm:svn:http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-compiler-plugin/ - scm:svn:https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-compiler-plugin/ - http://svn.apache.org/viewvc/maven/plugins/trunk/maven-compiler-plugin/ + scm:svn:http://svn.apache.org/repos/asf/maven/plugins/tags/maven-compiler-plugin-3.5 + scm:svn:https://svn.apache.org/repos/asf/maven/plugins/tags/maven-compiler-plugin-3.5 + http://svn.apache.org/viewvc/maven/plugins/tags/maven-compiler-plugin-3.5 JIRA
svn commit: r1724892 - /maven/plugins/trunk/maven-compiler-plugin/pom.xml
Author: agudian Date: Fri Jan 15 23:24:52 2016 New Revision: 1724892 URL: http://svn.apache.org/viewvc?rev=1724892&view=rev Log: [MCOMPILER-203] Update plexus-compiler to released version 2.7 Modified: maven/plugins/trunk/maven-compiler-plugin/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=1724892&r1=1724891&r2=1724892&view=diff == --- maven/plugins/trunk/maven-compiler-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-compiler-plugin/pom.xml Fri Jan 15 23:24:52 2016 @@ -64,7 +64,7 @@ under the License. ! The following property is used in the integration tests MCOMPILER-157 --> 3.3 -2.7-SNAPSHOT +2.7 1.8.0 2.7.0-01 2.0.4-04
svn commit: r1723779 - in /maven/plugins/trunk/maven-compiler-plugin: ./ src/it/MCOMPILER-203-processorpath/ src/it/MCOMPILER-203-processorpath/annotation-processor/ src/it/MCOMPILER-203-processorpath
Author: agudian Date: Fri Jan 8 18:28:55 2016 New Revision: 1723779 URL: http://svn.apache.org/viewvc?rev=1723779&view=rev Log: [MCOMPILER-203] Allow specifying annotation processor path dependencies Added: maven/plugins/trunk/maven-compiler-plugin/src/it/MCOMPILER-203-processorpath/ maven/plugins/trunk/maven-compiler-plugin/src/it/MCOMPILER-203-processorpath/annotation-processor/ maven/plugins/trunk/maven-compiler-plugin/src/it/MCOMPILER-203-processorpath/annotation-processor/pom.xml maven/plugins/trunk/maven-compiler-plugin/src/it/MCOMPILER-203-processorpath/annotation-processor/src/ maven/plugins/trunk/maven-compiler-plugin/src/it/MCOMPILER-203-processorpath/annotation-processor/src/main/ maven/plugins/trunk/maven-compiler-plugin/src/it/MCOMPILER-203-processorpath/annotation-processor/src/main/java/ maven/plugins/trunk/maven-compiler-plugin/src/it/MCOMPILER-203-processorpath/annotation-processor/src/main/java/org/ maven/plugins/trunk/maven-compiler-plugin/src/it/MCOMPILER-203-processorpath/annotation-processor/src/main/java/org/issue/ maven/plugins/trunk/maven-compiler-plugin/src/it/MCOMPILER-203-processorpath/annotation-processor/src/main/java/org/issue/SimpleAnnotationProcessor.java maven/plugins/trunk/maven-compiler-plugin/src/it/MCOMPILER-203-processorpath/annotation-user/ maven/plugins/trunk/maven-compiler-plugin/src/it/MCOMPILER-203-processorpath/annotation-user/pom.xml maven/plugins/trunk/maven-compiler-plugin/src/it/MCOMPILER-203-processorpath/annotation-user/src/ maven/plugins/trunk/maven-compiler-plugin/src/it/MCOMPILER-203-processorpath/annotation-user/src/main/ maven/plugins/trunk/maven-compiler-plugin/src/it/MCOMPILER-203-processorpath/annotation-user/src/main/java/ maven/plugins/trunk/maven-compiler-plugin/src/it/MCOMPILER-203-processorpath/annotation-user/src/main/java/org/ maven/plugins/trunk/maven-compiler-plugin/src/it/MCOMPILER-203-processorpath/annotation-user/src/main/java/org/issue/ maven/plugins/trunk/maven-compiler-plugin/src/it/MCOMPILER-203-processorpath/annotation-user/src/main/java/org/issue/SimpleAnnotation.java maven/plugins/trunk/maven-compiler-plugin/src/it/MCOMPILER-203-processorpath/annotation-user/src/main/java/org/issue/SimpleObject.java maven/plugins/trunk/maven-compiler-plugin/src/it/MCOMPILER-203-processorpath/annotation-user/src/test/ maven/plugins/trunk/maven-compiler-plugin/src/it/MCOMPILER-203-processorpath/annotation-user/src/test/java/ maven/plugins/trunk/maven-compiler-plugin/src/it/MCOMPILER-203-processorpath/annotation-user/src/test/java/org/ maven/plugins/trunk/maven-compiler-plugin/src/it/MCOMPILER-203-processorpath/annotation-user/src/test/java/org/issue/ maven/plugins/trunk/maven-compiler-plugin/src/it/MCOMPILER-203-processorpath/annotation-user/src/test/java/org/issue/SimpleTestObject.java maven/plugins/trunk/maven-compiler-plugin/src/it/MCOMPILER-203-processorpath/annotation-verify/ maven/plugins/trunk/maven-compiler-plugin/src/it/MCOMPILER-203-processorpath/annotation-verify/pom.xml maven/plugins/trunk/maven-compiler-plugin/src/it/MCOMPILER-203-processorpath/annotation-verify/src/ maven/plugins/trunk/maven-compiler-plugin/src/it/MCOMPILER-203-processorpath/annotation-verify/src/main/ maven/plugins/trunk/maven-compiler-plugin/src/it/MCOMPILER-203-processorpath/annotation-verify/src/main/java/ maven/plugins/trunk/maven-compiler-plugin/src/it/MCOMPILER-203-processorpath/annotation-verify/src/main/java/org/ maven/plugins/trunk/maven-compiler-plugin/src/it/MCOMPILER-203-processorpath/annotation-verify/src/main/java/org/issue/ maven/plugins/trunk/maven-compiler-plugin/src/it/MCOMPILER-203-processorpath/annotation-verify/src/main/java/org/issue/SourcePathReadGoal.java maven/plugins/trunk/maven-compiler-plugin/src/it/MCOMPILER-203-processorpath/invoker.properties maven/plugins/trunk/maven-compiler-plugin/src/it/MCOMPILER-203-processorpath/pom.xml maven/plugins/trunk/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/compiler/DependencyCoordinate.java Modified: maven/plugins/trunk/maven-compiler-plugin/pom.xml maven/plugins/trunk/maven-compiler-plugin/src/it/jdk16-annotation/src/main/resources/META-INF/services/javax.annotation.processing.Processor maven/plugins/trunk/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/compiler/AbstractCompilerMojo.java Modified: maven/plugins/trunk/maven-compiler-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-compiler-plugin/pom.xml?rev=1723779&r1=1723778&r2=1723779&view=diff == --- maven/plugins/trunk/maven-compiler-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-compiler-plugin/pom.xml Fri Jan 8 18:28:55 2016 @@ -19,7 +19,8 @@ specific language governing permissions under the Licen
svn commit: r1721745 - /maven/plugins/trunk/maven-compiler-plugin/pom.xml
Author: agudian Date: Sat Dec 26 18:29:19 2015 New Revision: 1721745 URL: http://svn.apache.org/viewvc?rev=1721745&view=rev Log: Require Maven 3.0, update Snapshot version to 3.5-SNAPSHOT. Modified: maven/plugins/trunk/maven-compiler-plugin/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=1721745&r1=1721744&r2=1721745&view=diff == --- maven/plugins/trunk/maven-compiler-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-compiler-plugin/pom.xml Sat Dec 26 18:29:19 2015 @@ -30,7 +30,7 @@ under the License. maven-compiler-plugin - 3.4-SNAPSHOT + 3.5-SNAPSHOT maven-plugin Apache Maven Compiler Plugin @@ -58,7 +58,7 @@ under the License. -2.2.1 +3.0
svn commit: r1721738 - /maven/plugins/trunk/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/compiler/AbstractCompilerMojo.java
Author: agudian
Date: Sat Dec 26 15:57:13 2015
New Revision: 1721738
URL: http://svn.apache.org/viewvc?rev=1721738&view=rev
Log:
[MCOMPILER-211] Prevent possible NPE when m-compiler-p is used within an
m2e-execution in Eclipse
Modified:
maven/plugins/trunk/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/compiler/AbstractCompilerMojo.java
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=1721738&r1=1721737&r2=1721738&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
Sat Dec 26 15:57:13 2015
@@ -60,9 +60,8 @@ import java.util.Map;
import java.util.Set;
/**
- * TODO: At least one step could be optimized, currently the plugin will do two
- * scans of all the source code if the compiler has to have the entire set of
- * sources. This is currently the case for at least the C# compiler and most
+ * TODO: At least one step could be optimized, currently the plugin will do
two scans of all the source code if the
+ * compiler has to have the entire set of sources. This is currently the case
for at least the C# compiler and most
* likely all the other .NET compilers too.
*
* @author others
@@ -219,12 +218,12 @@ public abstract class AbstractCompilerMo
* Sets the arguments to be passed to the compiler (prepending a dash) if
{@link #fork} is set to true.
*
*
- * This is because the list of valid arguments passed to a Java compiler
- * varies based on the compiler version.
+ * This is because the list of valid arguments passed to a Java compiler
varies based on the compiler version.
*
*
* To pass -Xmaxerrs 1000 -Xlint -Xlint:-path -Averbose=true
you should include the following:
*
+ *
*
* <compilerArguments>
* <Xmaxerrs>1000</Xmaxerrs>
@@ -235,7 +234,7 @@ public abstract class AbstractCompilerMo
*
*
* @since 2.0.1
- * @deprecated use {@link #compilerArgs} instead.
+ * @deprecated use {@link #compilerArgs} instead.
*/
@Parameter
@Deprecated
@@ -257,7 +256,7 @@ public abstract class AbstractCompilerMo
*/
@Parameter
protected List compilerArgs;
-
+
/**
*
* Sets the unformatted single argument string to be passed to the
compiler if {@link #fork} is set to
@@ -405,6 +404,7 @@ public abstract class AbstractCompilerMo
protected abstract File getGeneratedSourcesDirectory();
+@Override
public void execute()
throws MojoExecutionException, CompilationFailureException
{
@@ -1058,20 +1058,25 @@ public abstract class AbstractCompilerMo
protected Date getBuildStartTime()
{
+Date buildStartTime = null;
try
{
Method getRequestMethod = session.getClass().getMethod(
"getRequest" );
Object mavenExecutionRequest = getRequestMethod.invoke( session );
Method getStartTimeMethod =
mavenExecutionRequest.getClass().getMethod( "getStartTime" );
-Date buildStartTime = (Date) getStartTimeMethod.invoke(
mavenExecutionRequest );
-return buildStartTime;
+buildStartTime = (Date) getStartTimeMethod.invoke(
mavenExecutionRequest );
}
catch ( Exception e )
{
getLog().debug( "unable to get start time for the current build: "
+ e.getMessage() );
}
-return new Date();
+if ( buildStartTime == null )
+{
+return new Date();
+}
+
+return buildStartTime;
}
svn commit: r1715687 - /maven/pom/trunk/maven/pom.xml
Author: agudian
Date: Sun Nov 22 20:09:05 2015
New Revision: 1715687
URL: http://svn.apache.org/viewvc?rev=1715687&view=rev
Log:
move agudian to the list of PMC members
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=1715687&r1=1715686&r2=1715687&view=diff
==
--- maven/pom/trunk/maven/pom.xml (original)
+++ maven/pom/trunk/maven/pom.xml Sun Nov 22 20:09:05 2015
@@ -53,6 +53,15 @@ under the License.
Europe/Paris
+ agudian
+ Andreas Gudian
+ agud...@apache.org
+
+PMC Member
+
+ Europe/Berlin
+
+
aheritier
Arnaud Héritier
aherit...@apache.org
@@ -271,15 +280,6 @@ under the License.
- agudian
- Andreas Gudian
- agud...@apache.org
-
-Committer
-
- Europe/Berlin
-
-
andham
Anders Hammar
and...@apache.org
maven git commit: [MNG-5813] pass debug-opts from mvnDebug to mvn script in the additional env-variable MAVEN_DEBUG_OPTS to not interfere with user-specified MAVEN_OPTS (e.g. when read from .mavenrc).
Repository: maven
Updated Branches:
refs/heads/master ad905af66 -> f104ef885
[MNG-5813] pass debug-opts from mvnDebug to mvn script in the additional
env-variable MAVEN_DEBUG_OPTS to not interfere with user-specified MAVEN_OPTS
(e.g. when read from .mavenrc).
Fixed as suggested by Robert Patrick on the ML
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/f104ef88
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/f104ef88
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/f104ef88
Branch: refs/heads/master
Commit: f104ef88507bb8b03c9cfe183c9cd6791305e4f7
Parents: ad905af
Author: Andreas Gudian
Authored: Sat Jun 27 17:41:33 2015 +0200
Committer: Andreas Gudian
Committed: Sat Jun 27 17:41:33 2015 +0200
--
apache-maven/src/bin/mvn | 1 +
apache-maven/src/bin/mvnDebug | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/maven/blob/f104ef88/apache-maven/src/bin/mvn
--
diff --git a/apache-maven/src/bin/mvn b/apache-maven/src/bin/mvn
index db0960b..4940a52 100755
--- a/apache-maven/src/bin/mvn
+++ b/apache-maven/src/bin/mvn
@@ -235,6 +235,7 @@ export MAVEN_CMD_LINE_ARGS
exec "$JAVACMD" \
$MAVEN_OPTS \
+ $MAVEN_DEBUG_OPTS \
-classpath "${M2_HOME}"/boot/plexus-classworlds-*.jar \
"-Dclassworlds.conf=${M2_HOME}/bin/m2.conf" \
"-Dmaven.home=${M2_HOME}"
"-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \
http://git-wip-us.apache.org/repos/asf/maven/blob/f104ef88/apache-maven/src/bin/mvnDebug
--
diff --git a/apache-maven/src/bin/mvnDebug b/apache-maven/src/bin/mvnDebug
index 73905fd..a1077ce 100755
--- a/apache-maven/src/bin/mvnDebug
+++ b/apache-maven/src/bin/mvnDebug
@@ -38,4 +38,4 @@ MAVEN_DEBUG_OPTS="-Xdebug
-Xrunjdwp:transport=dt_socket,server=y,suspend=y,addre
echo Preparing to Execute Maven in Debug Mode
-env MAVEN_OPTS="$MAVEN_OPTS $MAVEN_DEBUG_OPTS" $(dirname $0)/mvn "$@"
+env MAVEN_OPTS="$MAVEN_OPTS" MAVEN_DEBUG_OPTS="$MAVEN_DEBUG_OPTS" $(dirname
$0)/mvn "$@"
maven git commit: [MNG-5812] Project base dir not fully working in Cygwin
Repository: maven
Updated Branches:
refs/heads/master cfd1fbe61 -> ad905af66
[MNG-5812] Project base dir not fully working in Cygwin
Converted project base dir from Cygwin path to Windows path before
executing Maven.
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/ad905af6
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/ad905af6
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/ad905af6
Branch: refs/heads/master
Commit: ad905af669c7a8aea22151b56e14c941efdb55aa
Parents: cfd1fbe
Author: tssp
Authored: Wed Apr 29 08:02:05 2015 +0200
Committer: Andreas Gudian
Committed: Mon Jun 22 22:02:58 2015 +0200
--
apache-maven/src/bin/mvn | 21 +++--
1 file changed, 15 insertions(+), 6 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven/blob/ad905af6/apache-maven/src/bin/mvn
--
diff --git a/apache-maven/src/bin/mvn b/apache-maven/src/bin/mvn
index 902de4a..db0960b 100755
--- a/apache-maven/src/bin/mvn
+++ b/apache-maven/src/bin/mvn
@@ -57,27 +57,27 @@ case "`uname`" in
#
# Look for the Apple JDKs first to preserve the existing behaviour,
and then look
# for the new JDKs provided by Oracle.
- #
+ #
if [ -z "$JAVA_HOME" ] && [ -L
/System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK ] ; then
#
# Apple JDKs
#
export
JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK/Home
fi
-
+
if [ -z "$JAVA_HOME" ] && [ -L
/System/Library/Java/JavaVirtualMachines/CurrentJDK ] ; then
#
# Apple JDKs
#
export
JAVA_HOME=/System/Library/Java/JavaVirtualMachines/CurrentJDK/Contents/Home
fi
-
+
if [ -z "$JAVA_HOME" ] && [ -L
"/Library/Java/JavaVirtualMachines/CurrentJDK" ] ; then
#
# Oracle JDKs
#
export
JAVA_HOME=/Library/Java/JavaVirtualMachines/CurrentJDK/Contents/Home
- fi
+ fi
if [ -z "$JAVA_HOME" ] && [ -x "/usr/libexec/java_home" ]; then
#
@@ -216,10 +216,19 @@ concat_lines() {
fi
}
-export MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-$(find_maven_basedir)}
+MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-$(find_maven_basedir)}
MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config")
$MAVEN_OPTS"
-# Provide a "standardized" way to retrieve the CLI args that will
+# For Cygwin, switch project base directory path to Windows format before
+# executing Maven. Otherwise this will cause Maven not to consider it.
+if $cygwin; then
+ [ -n "$MAVEN_PROJECTBASEDIR" ] &&
+ MAVEN_PROJECTBASEDIR=`cygpath --path --windows "$MAVEN_PROJECTBASEDIR"`
+fi
+
+export MAVEN_PROJECTBASEDIR
+
+# Provide a "standardized" way to retrieve the CLI args that will
# work with both Windows and non-Windows executions.
MAVEN_CMD_LINE_ARGS="$MAVEN_CONFIG $@"
export MAVEN_CMD_LINE_ARGS
svn commit: r1682116 - /maven/site/trunk/content/apt/plugins/index.apt
Author: agudian
Date: Wed May 27 20:35:24 2015
New Revision: 1682116
URL: http://svn.apache.org/r1682116
Log:
release maven-eclipse-plugin 2.10
Modified:
maven/site/trunk/content/apt/plugins/index.apt
Modified: maven/site/trunk/content/apt/plugins/index.apt
URL:
http://svn.apache.org/viewvc/maven/site/trunk/content/apt/plugins/index.apt?rev=1682116&r1=1682115&r2=1682116&view=diff
==
--- maven/site/trunk/content/apt/plugins/index.apt (original)
+++ maven/site/trunk/content/apt/plugins/index.apt Wed May 27 20:35:24 2015
@@ -171,7 +171,7 @@ Available Plugins
*--++--++--+++
| <> ||
|| <> | |
*--++--++--+++
-| {{{/plugins/maven-eclipse-plugin/} <<>>}} | B |
2.9 | 2012-02-14 | Generate an Eclipse project file for the current
project. |
{{{http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-eclipse-plugin}SVN}}
| {{{https://issues.apache.org/jira/browse/MECLIPSE}JIRA}}
+| {{{/plugins/maven-eclipse-plugin/} <<>>}} | B |
2.10 | 2015-05-27 | Generate an Eclipse project file for the current
project. |
{{{http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-eclipse-plugin}SVN}}
| {{{https://issues.apache.org/jira/browse/MECLIPSE}JIRA}}
*--++--++--+++
\* <>uild or <>eporting plugin
svn commit: r1681513 - /maven/plugins/tags/maven-eclipse-plugin-2.10/
Author: agudian Date: Sun May 24 18:18:18 2015 New Revision: 1681513 URL: http://svn.apache.org/r1681513 Log: [maven-release-plugin] copy for tag maven-eclipse-plugin-2.10 Added: maven/plugins/tags/maven-eclipse-plugin-2.10/ - copied from r1681512, maven/plugins/trunk/maven-eclipse-plugin/
svn commit: r1681514 - /maven/plugins/trunk/maven-eclipse-plugin/pom.xml
Author: agudian Date: Sun May 24 18:18:22 2015 New Revision: 1681514 URL: http://svn.apache.org/r1681514 Log: [maven-release-plugin] prepare for next development iteration Modified: maven/plugins/trunk/maven-eclipse-plugin/pom.xml Modified: maven/plugins/trunk/maven-eclipse-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/pom.xml?rev=1681514&r1=1681513&r2=1681514&view=diff == --- maven/plugins/trunk/maven-eclipse-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-eclipse-plugin/pom.xml Sun May 24 18:18:22 2015 @@ -30,7 +30,7 @@ under the License. maven-eclipse-plugin - 2.10 + 3.0-SNAPSHOT maven-plugin Apache Maven Eclipse Plugin @@ -43,10 +43,10 @@ under the License. - scm:svn:http://svn.apache.org/repos/asf/maven/plugins/tags/maven-eclipse-plugin-2.10 - scm:svn:https://svn.apache.org/repos/asf/maven/plugins/tags/maven-eclipse-plugin-2.10 + scm:svn:http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-eclipse-plugin/ + scm:svn:https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-eclipse-plugin/ - http://svn.apache.org/viewvc/maven/plugins/tags/maven-eclipse-plugin-2.10 + http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/ JIRA
svn commit: r1681511 - /maven/plugins/trunk/maven-eclipse-plugin/pom.xml
Author: agudian Date: Sun May 24 18:17:21 2015 New Revision: 1681511 URL: http://svn.apache.org/r1681511 Log: [maven-release-plugin] prepare release maven-eclipse-plugin-2.10 Modified: maven/plugins/trunk/maven-eclipse-plugin/pom.xml Modified: maven/plugins/trunk/maven-eclipse-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/pom.xml?rev=1681511&r1=1681510&r2=1681511&view=diff == --- maven/plugins/trunk/maven-eclipse-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-eclipse-plugin/pom.xml Sun May 24 18:17:21 2015 @@ -19,7 +19,7 @@ specific language governing permissions under the License. --> - +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 @@ -30,7 +30,7 @@ under the License. maven-eclipse-plugin - 2.10-SNAPSHOT + 2.10 maven-plugin Apache Maven Eclipse Plugin @@ -43,10 +43,10 @@ under the License. - scm:svn:http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-eclipse-plugin/ - scm:svn:https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-eclipse-plugin/ + scm:svn:http://svn.apache.org/repos/asf/maven/plugins/tags/maven-eclipse-plugin-2.10 + scm:svn:https://svn.apache.org/repos/asf/maven/plugins/tags/maven-eclipse-plugin-2.10 - http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/ + http://svn.apache.org/viewvc/maven/plugins/tags/maven-eclipse-plugin-2.10 JIRA @@ -409,10 +409,9 @@ under the License. process-resources - - - + + + @@ -424,8 +423,8 @@ under the License. post-integration-test - - + +
svn commit: r1681510 - /maven/plugins/trunk/maven-eclipse-plugin/README-testing.txt
Author: agudian
Date: Sun May 24 18:16:35 2015
New Revision: 1681510
URL: http://svn.apache.org/r1681510
Log:
o removing some whitespace
Modified:
maven/plugins/trunk/maven-eclipse-plugin/README-testing.txt
Modified: maven/plugins/trunk/maven-eclipse-plugin/README-testing.txt
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/README-testing.txt?rev=1681510&r1=1681509&r2=1681510&view=diff
==
--- maven/plugins/trunk/maven-eclipse-plugin/README-testing.txt (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/README-testing.txt Sun May 24
18:16:35 2015
@@ -2,38 +2,38 @@ Testing maven-eclipse-plugin
This is a complicated beast, it generates a bunch of different files (all in
different formats: text, xml)
that have hard coded paths and other junk in them.
-
+
Most of the work is done in the integration tests.
You have to set M2_HOME to the appropriate maven version
you want to test with like this:
-
+
export M2_HOME=/usr/share/java/apache-maven-3.1.1
-
- Use
+
+ Use
mvn -Prun-its verify
to run the integration tests
-
+
One day these tests will be unified into whatever "sanctioned" way of doing
integration tests becomes.
-
+
Running a single test
-* Run mvn and tell surefire to only run your TestCase:
+* Run mvn and tell surefire to only run your TestCase:
(See
http://maven.apache.org/plugins/maven-surefire-plugin/examples/single-test.html
for more details)
-
+
mvn -Prun-its integration-test -Dit.test=EclipsePluginIT#testProject10
-
+
PluginTestTool
The bulk of the integration tests are using the old (and obsoleted) method
of PluginTestTool.
- These IT tests are invoked via maven-failsafe-plugin:integration-test which
looks for JUnit test cases
+ These IT tests are invoked via maven-failsafe-plugin:integration-test which
looks for JUnit test cases
from the ${project.build.testSourceDirectory} of the form:
(see
http://maven.apache.org/plugins/maven-failsafe-plugin/integration-test-mojo.html#includes)
**/IT*.java
**/*IT.java
**/*ITCase.java
-
-
+
+
The test classes all extends AbstractEclipsePluginIT which initialised the
testing area with a test
version of the plugin under test. Each actual test then needs to specify
which test project should be run
in a test method. e.g. EclipsePluginIT has methods like:
@@ -42,73 +42,73 @@ PluginTestTool
{
testProject( "project-63-MECLIPSE-388" );
}
- which delegates to AbstractEclipsePluginIT.testProject() and specifies the
test project directory that should
+ which delegates to AbstractEclipsePluginIT.testProject() and specifies the
test project directory that should
be used. All test projects are located in src/test/resources/projects/, so
in this example it would be
src/test/resources/projects/project-63-MECLIPSE-388
-
+
Each test project needs a pom.xml file. It's easiest to copy and hack an
existing file from another working test project.
These test projects will not pollute your local ~/.m2/repository. A
separate test repository inside target/ is created
that will house all the downloaded artifacts and installed test projects.
-
+
A negative consequence of using PluginTestTool is that anything downloaded
from central is not stored in
your ~/.m2/repository which means wasted bandwidth after doing "mvn clean".
-
+
Remember that your build/plugins/plugin for maven-eclipse-plugin needs:
test
for PluginTestTool to work. You may need additional configuration settings,
like workspace so that you dont accidentally pollute your tests with settings
from your actual eclipse workspace used to develop this plugin.
-
+
* Validating a successful test
Each test will automatically run a comparison of the generated files.
- A generated file will only be verified if the same file (including path
hierarchy) exists in the
+ A generated file will only be verified if the same file (including path
hierarchy) exists in the
under the "expected" directory. e.g.
src/test/resources/project-63-MECLIPSE-388/expected contains:
* settings/org.eclipse.jdt.core.prefs
* .classpath
* .project
-
+
Before comparison is done, each file (both expected and actual) is
preprocessed via
AbstractEclipsePluginIT.preprocess( File file, Map variables ) which
* removes windows drive details
* replaces any variables with their values, currently only "${basedir}" and
"${M2_REPO}" are supported variable.
- * specific hacks for specific files like eclipse *.prefs files and wst
files.
+ * specific hacks for specific files like eclipse *.prefs files and wst files.
See the method for more details.
-
- The comparator read the first few bytes of the actual file to see if it
contains a
svn commit: r1681502 - /maven/plugins/trunk/maven-eclipse-plugin/src/site/site.xml
Author: agudian
Date: Sun May 24 17:44:40 2015
New Revision: 1681502
URL: http://svn.apache.org/r1681502
Log:
o Use fluido-skin for the site
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/site/site.xml
Modified: maven/plugins/trunk/maven-eclipse-plugin/src/site/site.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/site/site.xml?rev=1681502&r1=1681501&r2=1681502&view=diff
==
--- maven/plugins/trunk/maven-eclipse-plugin/src/site/site.xml (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/site/site.xml Sun May 24
17:44:40 2015
@@ -22,6 +22,37 @@ under the License.
http://maven.apache.org/DECORATION/1.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/DECORATION/1.0.0
http://maven.apache.org/xsd/decoration-1.0.0.xsd";>
+
+
+${project.name}
+http://maven.apache.org/images/apache-maven-project.png
+http://maven.apache.org/
+
+
+http://maven.apache.org/images/maventxt_logo_200.gif
+
+
+
+org.apache.maven.skins
+maven-fluido-skin
+1.3.0
+
+
+
+
+ true
+ true
+
+${project.url}
+
+
+apache/maven-plugins
+right
+gray
+
+
+
+
svn commit: r1681500 - in /maven/plugins/trunk/maven-eclipse-plugin/src: main/java/org/apache/maven/plugin/eclipse/ main/java/org/apache/maven/plugin/eclipse/reader/ site/apt/
Author: agudian
Date: Sun May 24 17:25:06 2015
New Revision: 1681500
URL: http://svn.apache.org/r1681500
Log:
[MECLIPSE-759] Add goal resolve-workspace-dependencies to resolve the M2_REPO
classpath references of all projects contained in a workspace
Added:
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/WorkspaceDependencyResolveMojo.java
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipsePlugin.java
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/reader/ReadWorkspaceLocations.java
maven/plugins/trunk/maven-eclipse-plugin/src/site/apt/index.apt.vm
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipsePlugin.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipsePlugin.java?rev=1681500&r1=1681499&r2=1681500&view=diff
==
---
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipsePlugin.java
(original)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipsePlugin.java
Sun May 24 17:25:06 2015
@@ -451,6 +451,8 @@ public class EclipsePlugin
* If set to true, the standard execution environment
matching the compiler settings is set as JRE. If
* set to false, the JRE matching the configured
compiler-plugin executable or JAVA_HOME is selected by
* name, if it is configured in the workspace.
+ *
+ * @since 2.10
*/
@Parameter( property = "eclipse.preferStandardClasspathContainer",
defaultValue = "false" )
private boolean preferStandardClasspathContainer;
Added:
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/WorkspaceDependencyResolveMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/WorkspaceDependencyResolveMojo.java?rev=1681500&view=auto
==
---
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/WorkspaceDependencyResolveMojo.java
(added)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/WorkspaceDependencyResolveMojo.java
Sun May 24 17:25:06 2015
@@ -0,0 +1,182 @@
+package org.apache.maven.plugin.eclipse;
+
+import java.io.File;
+import java.io.FileReader;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.maven.artifact.Artifact;
+import org.apache.maven.artifact.factory.ArtifactFactory;
+import org.apache.maven.artifact.repository.ArtifactRepository;
+import org.apache.maven.artifact.resolver.ArtifactNotFoundException;
+import org.apache.maven.artifact.resolver.ArtifactResolutionException;
+import org.apache.maven.artifact.resolver.ArtifactResolver;
+import org.apache.maven.plugin.AbstractMojo;
+import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.plugin.MojoFailureException;
+import org.apache.maven.plugin.eclipse.reader.ReadWorkspaceLocations;
+import org.apache.maven.plugins.annotations.Component;
+import org.apache.maven.plugins.annotations.Mojo;
+import org.apache.maven.plugins.annotations.Parameter;
+import org.codehaus.plexus.util.StringUtils;
+import org.codehaus.plexus.util.xml.Xpp3Dom;
+import org.codehaus.plexus.util.xml.Xpp3DomBuilder;
+
+/**
+ * For all projects currently part of the workspace, all references to the
M2_REPO classpath variable are
+ * resolved.
+ *
+ * Note: not the projects of the reactor are inspected for unresolved
artifacts, but the projects that are part
+ * of the workspace.
+ *
+ * @since 2.10
+ * @author agudian
+ */
+@Mojo( name = "resolve-workspace-dependencies", aggregator = true,
requiresProject = false )
+public class WorkspaceDependencyResolveMojo
+extends AbstractMojo
+{
+/**
+ * The eclipse workspace directory.
+ *
+ * If omitted, the parent directories of the working directory are
checked. The first directory to contain a
+ * .metadata subdirectory is chosen.
+ */
+@Parameter( property = "eclipse.workspace" )
+private File workspace;
+
+@Component( role = ArtifactFactory.class )
+private ArtifactFactory artifactFactory;
+
+@Component( role = ArtifactResolver.class )
+private ArtifactResolver artifactResolver;
+
+@Parameter( property = "project.remoteArtifactRepositories", required =
true, readonly = true )
+private List remoteArtifactRepositories;
+
+@Parameter( property = "localRepository", required = true, readonly = true
)
+private ArtifactRepository localRepository;
+
+private List findProjectLocations
svn commit: r1677350 - /maven/plugins/trunk/maven-eclipse-plugin/src/site/apt/index.apt.vm
Author: agudian
Date: Sat May 2 20:37:40 2015
New Revision: 1677350
URL: http://svn.apache.org/r1677350
Log:
o Add a description that suggests using m2e instead of maven-eclipse-plugin,
albeit acknowledging that there are still project setups where m-eclipse-p is
more suitable.
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/site/apt/index.apt.vm
Modified: maven/plugins/trunk/maven-eclipse-plugin/src/site/apt/index.apt.vm
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/site/apt/index.apt.vm?rev=1677350&r1=1677349&r2=1677350&view=diff
==
--- maven/plugins/trunk/maven-eclipse-plugin/src/site/apt/index.apt.vm
(original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/site/apt/index.apt.vm Sat May
2 20:37:40 2015
@@ -28,13 +28,14 @@
${project.name}
- The Eclipse Plugin is used to generate Eclipse IDE files (*.classpath,
- *.wtpmodules and the .settings folder) for use with a project.
+ The Maven Eclipse Plugin is used to generate Eclipse IDE files (*.classpath,
+ *.project, *.wtpmodules and the .settings folder) for use with a project.
- Note: Starting at version 2.6, by default, the generated .classpath now
includes "**/*.java" for source directories
- and excludes "**/*.java" for resource directories. See the example on
-
{{{./examples/specifying-source-path-inclusions-and-exclusions.html}specifying
source path inclusions and exclusions}}
- for more details on how to change this behavior.
+ <> Users are advised to use m2e, the
{{{https://projects.eclipse.org/projects/technology.m2e}Eclipse Maven
Integration}}
+ instead of this plugin, as it can more closely resemble the actual build and
runtime classpaths as described in the
+ project pom.xml - among other advantages. However, there are project setups
and workflows that still work more
+ efficiently with statically generated Eclipse metadata - for example when
there is a large number of projects in
+ a reactor. That's where the Maven Eclipse Plugin can still help you.
* Goals Overview
svn commit: r1677345 - in /maven/plugins/trunk/maven-eclipse-plugin/src: main/java/org/apache/maven/plugin/eclipse/ main/java/org/apache/maven/plugin/eclipse/reader/ test/java/org/apache/maven/plugin/
Author: agudian Date: Sat May 2 20:02:31 2015 New Revision: 1677345 URL: http://svn.apache.org/r1677345 Log: [MECLIPSE-757] Support JavaSE-1.7 / JavaSE-1.8 execution environment names and add an option to favour those standard JVM names instead of explicit JRE ids. Modified: maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipsePlugin.java maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/reader/ReadWorkspaceLocations.java maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/reader/ReadWorkspaceLocationsTest.java Modified: maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipsePlugin.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipsePlugin.java?rev=1677345&r1=1677344&r2=1677345&view=diff == --- maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipsePlugin.java (original) +++ maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipsePlugin.java Sat May 2 20:02:31 2015 @@ -179,8 +179,8 @@ public class EclipsePlugin private List projectnatures; /** - * List of artifacts, represented as groupId:artifactId, to exclude from the eclipse classpath, - * being provided by some eclipse classPathContainer. + * List of artifacts, represented as groupId:artifactId, to exclude from the eclipse classpath, being + * provided by some eclipse classPathContainer. * * @see http://jira.codehaus.org/browse/MECLIPSE-79 * @since 2.5 @@ -310,8 +310,8 @@ public class EclipsePlugin private String wtpversion; /** - * JEE context name of the WTP module. ( ex. WEB context name ). You can use "ROOT" if you want to map the webapp - * to the root context. + * JEE context name of the WTP module. ( ex. WEB context name ). You can use "ROOT" if you want to map the webapp to + * the root context. */ @Parameter( property = "wtpContextName" ) private String wtpContextName; @@ -447,6 +447,14 @@ public class EclipsePlugin @Parameter( property = "eclipse.wtpdefaultserver" ) private String wtpdefaultserver; +/** + * If set to true, the standard execution environment matching the compiler settings is set as JRE. If + * set to false, the JRE matching the configured compiler-plugin executable or JAVA_HOME is selected by + * name, if it is configured in the workspace. + */ +@Parameter( property = "eclipse.preferStandardClasspathContainer", defaultValue = "false" ) +private boolean preferStandardClasspathContainer; + private WorkspaceConfiguration workspaceConfiguration; /** @@ -518,7 +526,8 @@ public class EclipsePlugin private List sourceIncludes; /** - * A list of links to local files in the system. A configuration like this one in the pom : + * A list of links to local files in the system. A configuration like this one in the pom : + * * * <plugin> * <groupId>org.apache.maven.plugins</groupId> @@ -534,7 +543,9 @@ public class EclipsePlugin * </configuration> * </plugin> * + * * will produce in the .project : + * * * <linkedResources> * <link> @@ -549,7 +560,7 @@ public class EclipsePlugin */ @Parameter private List linkedResources; - + /** * Put classpath container entries last in eclipse classpath configuration. Note that this behaviour, although * useful in situations were you want to override resources found in classpath containers, will made JRE classes @@ -559,35 +570,63 @@ public class EclipsePlugin */ @Parameter( property = "eclipse.classpathContainersLast", defaultValue = "false" ) protected boolean classpathContainersLast; - + /** - * Whether to place test resources after main resources. Note that the default behavior of Maven version 2.0.8 or + * Whether to place test resources after main resources. Note that the default behavior of Maven version 2.0.8 or * later is to have test dirs before main dirs in classpath so this is discouraged if you need to reproduce the * maven behavior during tests. The default behavior is also changed in eclipse plugin version 2.6 in order to - * better match the maven one. - * Switching to "test source last" can anyway be useful if you need to run your application in eclipse, since there - * is no concept in eclipse of "phases" with different set of source dirs and dependencies like we have in mave
maven git commit: MNG-5796 fix mvn.cmd execution when invoked at drive root
Repository: maven Updated Branches: refs/heads/master 4567c8319 -> f27c348bb MNG-5796 fix mvn.cmd execution when invoked at drive root Project: http://git-wip-us.apache.org/repos/asf/maven/repo Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/f27c348b Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/f27c348b Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/f27c348b Branch: refs/heads/master Commit: f27c348bbaf51046029ce2853feeaf98700f1aca Parents: 4567c83 Author: Andreas Gudian Authored: Sat May 2 19:33:38 2015 +0200 Committer: Andreas Gudian Committed: Sat May 2 19:33:38 2015 +0200 -- apache-maven/src/bin/mvn.cmd | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/maven/blob/f27c348b/apache-maven/src/bin/mvn.cmd -- diff --git a/apache-maven/src/bin/mvn.cmd b/apache-maven/src/bin/mvn.cmd index 4fad093..d35c1d2 100644 --- a/apache-maven/src/bin/mvn.cmd +++ b/apache-maven/src/bin/mvn.cmd @@ -121,7 +121,7 @@ IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir set EXEC_DIR=%CD% set WDIR=%EXEC_DIR% :findBaseDir -IF EXIST "%WDIR%"\.mvn goto baseDirFound +IF EXIST "%WDIR%\.mvn" goto baseDirFound cd .. IF "%WDIR%"=="%CD%" goto baseDirNotFound set WDIR=%CD% @@ -133,6 +133,8 @@ cd "%EXEC_DIR%" goto endDetectBaseDir :baseDirNotFound +if "_%EXEC_DIR:~-1%"=="_\" set EXEC_DIR=%EXEC_DIR:~0,-1% + set MAVEN_PROJECTBASEDIR=%EXEC_DIR% cd "%EXEC_DIR%"
svn commit: r1671088 - /maven/sandbox/trunk/other/jira/ASF-jira-groups.csv
Author: agudian Date: Fri Apr 3 15:21:49 2015 New Revision: 1671088 URL: http://svn.apache.org/r1671088 Log: added my jira id Modified: maven/sandbox/trunk/other/jira/ASF-jira-groups.csv Modified: maven/sandbox/trunk/other/jira/ASF-jira-groups.csv URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/other/jira/ASF-jira-groups.csv?rev=1671088&r1=1671087&r2=1671088&view=diff == --- maven/sandbox/trunk/other/jira/ASF-jira-groups.csv (original) +++ maven/sandbox/trunk/other/jira/ASF-jira-groups.csv Fri Apr 3 15:21:49 2015 @@ -31,7 +31,7 @@ wfay,Wayne Fay, ,, ,, maven-developers,Committers, -agudian,Andreas Gudian, +agudian,Andreas Gudian,agudian andham,Anders Hammar,afloom bdemers,Brian Demers, bellingard,Fabrice Bellingard,
svn commit: r1669194 - in /maven/plugins/trunk/maven-eclipse-plugin/src: main/java/org/apache/maven/plugin/eclipse/LinkedResource.java test/java/org/apache/maven/plugin/eclipse/LinkedResourceTest.java
Author: agudian
Date: Wed Mar 25 18:17:22 2015
New Revision: 1669194
URL: http://svn.apache.org/r1669194
Log:
[MECLIPSE-738] Fix constructing a LinkedResource with a locationURI in the XML.
Allow that either, but not both, and not neither, of the location properties
could be set. Include tests.
Submitted by: Joseph Walton
o Applied without changes
Added:
maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/LinkedResourceTest.java
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/LinkedResource.java
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/LinkedResource.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/LinkedResource.java?rev=1669194&r1=1669193&r2=1669194&view=diff
==
---
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/LinkedResource.java
(original)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/LinkedResource.java
Wed Mar 25 18:17:22 2015
@@ -128,7 +128,15 @@ public class LinkedResource
throw new IllegalArgumentException( "Both location and locationURI
nodes are set." );
}
-location = locationNode.getValue();
+if (locationNode != null)
+{
+location = locationNode.getValue();
+}
+
+if (locationURINode != null)
+{
+locationURI = locationURINode.getValue();
+}
}
public void print( XMLWriter writer )
Added:
maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/LinkedResourceTest.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/LinkedResourceTest.java?rev=1669194&view=auto
==
---
maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/LinkedResourceTest.java
(added)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/LinkedResourceTest.java
Wed Mar 25 18:17:22 2015
@@ -0,0 +1,60 @@
+/*
+ * 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.
+ */
+
+package org.apache.maven.plugin.eclipse;
+
+import static org.junit.Assert.assertEquals;
+
+import org.codehaus.plexus.util.xml.Xpp3Dom;
+import org.junit.Test;
+
+public class LinkedResourceTest
+{
+@Test
+public void nodeWithOnlyLocationIsAccepted()
+{
+Xpp3Dom node = new Xpp3Dom("test");
+node.addChild(new Xpp3Dom("name"));
+node.addChild(new Xpp3Dom("type"));
+
+Xpp3Dom location = new Xpp3Dom("location");
+location.setValue("the-location");
+
+node.addChild(location);
+
+LinkedResource lr = new LinkedResource(node);
+assertEquals("the-location", lr.getLocation());
+}
+
+@Test
+public void nodeWithOnlyLocationUriIsAccepted()
+{
+Xpp3Dom node = new Xpp3Dom("test");
+node.addChild(new Xpp3Dom("name"));
+node.addChild(new Xpp3Dom("type"));
+
+Xpp3Dom location = new Xpp3Dom("locationURI");
+location.setValue("the-location-uri");
+
+node.addChild(location);
+
+LinkedResource lr = new LinkedResource(node);
+assertEquals("the-location-uri", lr.getLocationURI());
+}
+}
svn commit: r1668965 - in /maven/plugins/trunk/maven-eclipse-plugin: ./ README-testing.txt pom.xml src/test/java/org/apache/maven/plugin/eclipse/it/EclipsePluginIT.java src/test/resources/projects/pro
Author: agudian
Date: Tue Mar 24 19:37:27 2015
New Revision: 1668965
URL: http://svn.apache.org/r1668965
Log:
o Fix ITs, allow to run a single test case from an IT by using the surefire
JUnit 4 test runner
Modified:
maven/plugins/trunk/maven-eclipse-plugin/ (props changed)
maven/plugins/trunk/maven-eclipse-plugin/README-testing.txt
maven/plugins/trunk/maven-eclipse-plugin/pom.xml
maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/EclipsePluginIT.java
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-50-MECLIPSE-415/pom.xml
Propchange: maven/plugins/trunk/maven-eclipse-plugin/
--
--- svn:ignore (original)
+++ svn:ignore Tue Mar 24 19:37:27 2015
@@ -11,3 +11,4 @@ bin
*.ipr
*.iws
placeholder.txt
+.git*
Modified: maven/plugins/trunk/maven-eclipse-plugin/README-testing.txt
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/README-testing.txt?rev=1668965&r1=1668964&r2=1668965&view=diff
==
--- maven/plugins/trunk/maven-eclipse-plugin/README-testing.txt (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/README-testing.txt Tue Mar 24
19:37:27 2015
@@ -17,21 +17,11 @@ Testing maven-eclipse-plugin
One day these tests will be unified into whatever "sanctioned" way of doing
integration tests becomes.
Running a single test
-* Comment out the TestCase file
- For the test case you want to run, you need to manually comment out *ALL*
the other tests.
- e.g.
-in EclipsePluginIT if you want to run just "testProject65" you need to
comment out
-everything but that one method.
-
-* Run mvn and tell surefire to only run your TestCase file
+* Run mvn and tell surefire to only run your TestCase:
(See
http://maven.apache.org/plugins/maven-surefire-plugin/examples/single-test.html
for more details)
- mvn -Prun-its -Dtest=EclipsePluginIT verify
-
-* Dont forget to undo this prior to committing
-
- You probably wont, since the file will have a massive change set, but you
have been warned.
+ mvn -Prun-its integration-test -Dit.test=EclipsePluginIT#testProject10
PluginTestTool
The bulk of the integration tests are using the old (and obsoleted) method
of PluginTestTool.
Modified: maven/plugins/trunk/maven-eclipse-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/pom.xml?rev=1668965&r1=1668964&r2=1668965&view=diff
==
--- maven/plugins/trunk/maven-eclipse-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/pom.xml Tue Mar 24 19:37:27 2015
@@ -62,6 +62,7 @@ under the License.
2.2.1
-Xmx1024m
+2.18.1
@@ -220,7 +221,7 @@ under the License.
junit
junit
- 3.8.2
+ 4.11
test
@@ -242,7 +243,7 @@ under the License.
org.apache.maven.plugins
maven-surefire-report-plugin
- 2.18.1
+ ${surefire.version}
${project.build.directory}/surefire-reports
@@ -251,6 +252,18 @@ under the License.
+ org.apache.maven.plugins
+ maven-failsafe-plugin
+ ${surefire.version}
+
+
+ org.apache.maven.surefire
+ surefire-junit47
+ ${surefire.version}
+
+
+
+
org.apache.rat
apache-rat-plugin
@@ -420,7 +433,6 @@ under the License.
org.apache.maven.plugins
maven-failsafe-plugin
-2.18.1
@@ -460,7 +472,7 @@ under the License.
org.apache.maven.plugins
maven-surefire-report-plugin
-2.18.1
+${surefire.version}
integration-tests
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/EclipsePluginIT.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/EclipsePluginIT.java?rev=1668965&r1=1668964&r2=1668965&view=diff
==
---
maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/EclipsePluginIT.java
(original)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/EclipsePluginIT.java
Tue Mar 24 19:37:27 2015
@@ -474,26 +474,25 @@ public class EclipsePluginIT
public void testProject40_a()
throws Exception
{
-String jre131 = new java.io.File
svn commit: r1668832 - /maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/AbstractEclipsePluginIT.java
Author: agudian
Date: Tue Mar 24 09:54:03 2015
New Revision: 1668832
URL: http://svn.apache.org/r1668832
Log:
o Ignore .svn subdirectories with old SVN-WC format when comparing directories
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/AbstractEclipsePluginIT.java
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/AbstractEclipsePluginIT.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/AbstractEclipsePluginIT.java?rev=1668832&r1=1668831&r2=1668832&view=diff
==
---
maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/AbstractEclipsePluginIT.java
(original)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/AbstractEclipsePluginIT.java
Tue Mar 24 09:54:03 2015
@@ -538,7 +538,7 @@ public abstract class AbstractEclipsePlu
Collection expectedDirectories = getExpectedDirectories( basedir
);
for (File expectedDirectory : expectedDirectories) {
-File[] expectedFilesToCompare =
getExpectedFilesToCompare(expectedDirectory);
+Collection expectedFilesToCompare =
getExpectedFilesToCompare(expectedDirectory);
for (File expectedFile : expectedFilesToCompare) {
File actualFile = getActualFile(projectOutputDir, basedir,
expectedFile);
@@ -790,31 +790,38 @@ public abstract class AbstractEclipsePlu
*/
private Collection getExpectedDirectories( File basedir )
{
-if (IGNORED_DIRS.contains( basedir.getName() ) ) {
+if ( IGNORED_DIRS.contains( basedir.getName() ) )
+{
return Collections.emptyList();
}
-
+
List expectedDirectories = new ArrayList();
List subdirectories = new ArrayList();
File[] allFiles = basedir.listFiles();
if ( allFiles != null )
{
-for (File currentFile : allFiles) {
-if (currentFile.isDirectory()) {
-if (currentFile.getName().equals(EXPECTED_DIRECTORY_NAME))
{
-expectedDirectories.add(currentFile);
-} else {
-subdirectories.add(currentFile);
+for ( File currentFile : allFiles )
+{
+if ( currentFile.isDirectory() )
+{
+if ( currentFile.getName().equals( EXPECTED_DIRECTORY_NAME
) )
+{
+expectedDirectories.add( currentFile );
+}
+else
+{
+subdirectories.add( currentFile );
}
}
}
}
if ( !subdirectories.isEmpty() )
{
-for (File subdirectory : subdirectories) {
-Collection subdirectoryFiles =
getExpectedDirectories(subdirectory);
-expectedDirectories.addAll(subdirectoryFiles);
+for ( File subdirectory : subdirectories )
+{
+Collection subdirectoryFiles = getExpectedDirectories(
subdirectory );
+expectedDirectories.addAll( subdirectoryFiles );
}
}
return expectedDirectories;
@@ -824,32 +831,41 @@ public abstract class AbstractEclipsePlu
* @param expectedDirectory the expected directory to locate expected Files
* @return an array of Files found under the expectedDirectory - will
recurse through the directory structure.
*/
-private File[] getExpectedFilesToCompare( File expectedDirectory )
+private Collection getExpectedFilesToCompare( File expectedDirectory
)
{
-List expectedFiles = new ArrayList();
-List subdirectories = new ArrayList();
+if ( IGNORED_DIRS.contains( expectedDirectory.getName() ) )
+{
+return Collections.emptyList();
+}
+
+List expectedFiles = new ArrayList();
+List subdirectories = new ArrayList();
File[] allFiles = expectedDirectory.listFiles();
if ( allFiles != null )
{
-for (File currentFile : allFiles) {
-if (currentFile.isDirectory()) {
-subdirectories.add(currentFile);
-} else {
-expectedFiles.add(currentFile);
+for ( File currentFile : allFiles )
+{
+if ( currentFile.isDirectory() )
+{
+subdirectories.add( currentFile );
+}
+else
+{
+expectedFiles.add( currentFile );
}
}
}
if ( !subdirecto
svn commit: r1668820 - in /maven/plugins/trunk/maven-eclipse-plugin/src/test: java/org/apache/maven/plugin/eclipse/it/AbstractEclipsePluginIT.java resources/projects/project-10/pom.xml
Author: agudian
Date: Tue Mar 24 08:13:55 2015
New Revision: 1668820
URL: http://svn.apache.org/r1668820
Log:
o Ignore .svn subdirectories with old SVN-WC format when comparing directories
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/AbstractEclipsePluginIT.java
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-10/pom.xml
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/AbstractEclipsePluginIT.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/AbstractEclipsePluginIT.java?rev=1668820&r1=1668819&r2=1668820&view=diff
==
---
maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/AbstractEclipsePluginIT.java
(original)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/AbstractEclipsePluginIT.java
Tue Mar 24 08:13:55 2015
@@ -26,7 +26,10 @@ import java.io.StringReader;
import java.net.MalformedURLException;
import java.util.ArrayList;
import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
import java.util.HashMap;
+import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
@@ -124,6 +127,8 @@ public abstract class AbstractEclipsePlu
*/
private static final String CLASSPATH_FILENAME = ".classpath";
+private static final Collection IGNORED_DIRS = new
HashSet( Arrays.asList( ".svn" ) );
+
private File mavenHome;
/**
@@ -530,7 +535,7 @@ public abstract class AbstractEclipsePlu
protected void compareDirectoryContent( File basedir, File
projectOutputDir )
throws MojoExecutionException
{
-File[] expectedDirectories = getExpectedDirectories( basedir );
+Collection expectedDirectories = getExpectedDirectories( basedir
);
for (File expectedDirectory : expectedDirectories) {
File[] expectedFilesToCompare =
getExpectedFilesToCompare(expectedDirectory);
@@ -783,10 +788,14 @@ public abstract class AbstractEclipsePlu
* @param basedir base directory to search for directories named "expected"
* @return an array of directories that match "expected"
*/
-private File[] getExpectedDirectories( File basedir )
+private Collection getExpectedDirectories( File basedir )
{
-List expectedDirectories = new ArrayList();
-List subdirectories = new ArrayList();
+if (IGNORED_DIRS.contains( basedir.getName() ) ) {
+return Collections.emptyList();
+}
+
+List expectedDirectories = new ArrayList();
+List subdirectories = new ArrayList();
File[] allFiles = basedir.listFiles();
if ( allFiles != null )
@@ -803,13 +812,12 @@ public abstract class AbstractEclipsePlu
}
if ( !subdirectories.isEmpty() )
{
-for (Object subdirectory1 : subdirectories) {
-File subdirectory = (File) subdirectory1;
-File[] subdirectoryFiles =
getExpectedDirectories(subdirectory);
-expectedDirectories.addAll(Arrays.asList(subdirectoryFiles));
+for (File subdirectory : subdirectories) {
+Collection subdirectoryFiles =
getExpectedDirectories(subdirectory);
+expectedDirectories.addAll(subdirectoryFiles);
}
}
-return (File[]) expectedDirectories.toArray( new
File[expectedDirectories.size()] );
+return expectedDirectories;
}
/**
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-10/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-10/pom.xml?rev=1668820&r1=1668819&r2=1668820&view=diff
==
---
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-10/pom.xml
(original)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-10/pom.xml
Tue Mar 24 08:13:55 2015
@@ -50,7 +50,7 @@ under the License.
${basedir}/../../eclipse/workspaceDoesNotExist
R7
- true
+ true
org.eclipse.jdt.core.javanature
svn commit: r1668744 - in /maven/plugins/trunk/maven-eclipse-plugin: ./ src/main/java/org/apache/maven/plugin/ide/ src/test/java/org/apache/maven/plugin/eclipse/ src/test/java/org/apache/maven/plugin/
Author: agudian
Date: Mon Mar 23 21:28:20 2015
New Revision: 1668744
URL: http://svn.apache.org/r1668744
Log:
o Fix a couple of unit tests / ITs on Windows
Modified:
maven/plugins/trunk/maven-eclipse-plugin/pom.xml
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/ide/AbstractIdeSupportMojo.java
maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/TempEclipseWorkspace.java
maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/EclipsePluginIT.java
maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/reader/ReadWorkspaceLocationsTest.java
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-10/pom.xml
Modified: maven/plugins/trunk/maven-eclipse-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/pom.xml?rev=1668744&r1=1668743&r2=1668744&view=diff
==
--- maven/plugins/trunk/maven-eclipse-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/pom.xml Mon Mar 23 21:28:20 2015
@@ -108,7 +108,7 @@ under the License.
commons-io
commons-io
- 1.4
+ 2.2
org.codehaus.plexus
@@ -237,12 +237,12 @@ under the License.
org.apache.maven.plugins
maven-resources-plugin
- 2.3
+ 2.7
org.apache.maven.plugins
maven-surefire-report-plugin
- 2.12
+ 2.18.1
${project.build.directory}/surefire-reports
@@ -420,7 +420,7 @@ under the License.
org.apache.maven.plugins
maven-failsafe-plugin
-2.12
+2.18.1
@@ -460,7 +460,7 @@ under the License.
org.apache.maven.plugins
maven-surefire-report-plugin
-2.12
+2.18.1
integration-tests
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/ide/AbstractIdeSupportMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/ide/AbstractIdeSupportMojo.java?rev=1668744&r1=1668743&r2=1668744&view=diff
==
---
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/ide/AbstractIdeSupportMojo.java
(original)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/ide/AbstractIdeSupportMojo.java
Mon Mar 23 21:28:20 2015
@@ -940,7 +940,7 @@ public abstract class AbstractIdeSupport
if (artifact.isResolved()) {
if ("sources".equals(inClassifier)) {
dependency.setSourceAttachment(artifact.getFile());
-} else if ("javadoc".equals(inClassifier)) {
+} else if ("javadoc".equals(inClassifier) &&
includeRemoteRepositories ) {
dependency.setJavadocAttachment(artifact.getFile());
}
} else {
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/TempEclipseWorkspace.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/TempEclipseWorkspace.java?rev=1668744&r1=1668743&r2=1668744&view=diff
==
---
maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/TempEclipseWorkspace.java
(original)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/TempEclipseWorkspace.java
Mon Mar 23 21:28:20 2015
@@ -29,20 +29,15 @@ import java.io.IOException;
import java.net.MalformedURLException;
import java.util.Properties;
+import org.apache.commons.io.FileUtils;
import org.apache.maven.plugin.eclipse.reader.ReadWorkspaceLocations;
import org.codehaus.plexus.util.IOUtil;
import org.eclipse.core.internal.localstore.ILocalStoreConstants;
public class TempEclipseWorkspace
{
-private static TempEclipseWorkspace rad7WithDefault14;
-
-private static TempEclipseWorkspace eclipseWithDefault15;
-
-private static TempEclipseWorkspace eclipseWithDefault13;
-
-private static TempEclipseWorkspace dynamicWorkspace;
-
+private static int workspaceNumber = 0;
+
/**
* @return RAD 7 workspace, JDK 14, includes projects: "direct-compile"
* @throws Exception
@@ -50,11 +45,7 @@ public class TempEclipseWorkspace
public static TempEclipseWorkspace
getFixtureEclipseWorkspaceWithRad7
maven git commit: MNG-5776 Drop support for Win9x in mvn launch scripts for Windows, rename .bat to .cmd, remove duplicate code from mvnDebug.cmd
Repository: maven Updated Branches: refs/heads/master 7b3e95675 -> c6faf8dd6 MNG-5776 Drop support for Win9x in mvn launch scripts for Windows, rename .bat to .cmd, remove duplicate code from mvnDebug.cmd Project: http://git-wip-us.apache.org/repos/asf/maven/repo Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/c6faf8dd Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/c6faf8dd Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/c6faf8dd Branch: refs/heads/master Commit: c6faf8dd65587c3ea6d79ccf48e25bb7b90e18df Parents: 7b3e956 Author: Andreas Gudian Authored: Sat Feb 28 15:50:58 2015 +0100 Committer: Andreas Gudian Committed: Sat Feb 28 15:50:58 2015 +0100 -- apache-maven/README.txt | 6 +- apache-maven/src/bin/mvn.bat | 239 apache-maven/src/bin/mvn.cmd | 176 apache-maven/src/bin/mvnDebug.bat | 243 - apache-maven/src/bin/mvnDebug.cmd | 31 + 5 files changed, 211 insertions(+), 484 deletions(-) -- http://git-wip-us.apache.org/repos/asf/maven/blob/c6faf8dd/apache-maven/README.txt -- diff --git a/apache-maven/README.txt b/apache-maven/README.txt index 668fb31..448ef6e 100644 --- a/apache-maven/README.txt +++ b/apache-maven/README.txt @@ -31,8 +31,10 @@ that, additional disk space will be used for your local Maven repository. The size of your local repository will vary depending on usage but expect at least 500MB. Operating System: -No minimum requirement. Start up scripts are included as shell scripts and Windows -batch files. +Windows: + Windows 2000 or above. +Unix based systems (Linux, Solaris and Mac OS X) and others: + No minimum requirement. Installing Maven http://git-wip-us.apache.org/repos/asf/maven/blob/c6faf8dd/apache-maven/src/bin/mvn.bat -- diff --git a/apache-maven/src/bin/mvn.bat b/apache-maven/src/bin/mvn.bat deleted file mode 100644 index 546842a..000 --- a/apache-maven/src/bin/mvn.bat +++ /dev/null @@ -1,239 +0,0 @@ -@REM -@REM Licensed to the Apache Software Foundation (ASF) under one -@REM or more contributor license agreements. See the NOTICE file -@REM distributed with this work for additional information -@REM regarding copyright ownership. The ASF licenses this file -@REM to you under the Apache License, Version 2.0 (the -@REM "License"); you may not use this file except in compliance -@REM with the License. You may obtain a copy of the License at -@REM -@REMhttp://www.apache.org/licenses/LICENSE-2.0 -@REM -@REM Unless required by applicable law or agreed to in writing, -@REM software distributed under the License is distributed on an -@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -@REM KIND, either express or implied. See the License for the -@REM specific language governing permissions and limitations -@REM under the License. -@REM - -@REM -@REM Maven2 Start Up Batch script -@REM -@REM Required ENV vars: -@REM JAVA_HOME - location of a JDK home dir -@REM -@REM Optional ENV vars -@REM M2_HOME - location of maven2's installed home dir -@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands -@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a key stroke before ending -@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven -@REM e.g. to debug Maven itself, use -@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 -@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files -@REM - -@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on' -@echo off -@REM enable echoing my setting MAVEN_BATCH_ECHO to 'on' -@if "%MAVEN_BATCH_ECHO%" == "on" echo %MAVEN_BATCH_ECHO% - -@REM set %HOME% to equivalent of $HOME -if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%") - -@REM Execute a user defined script before this one -if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre -if exist "%HOME%\mavenrc_pre.bat" call "%HOME%\mavenrc_pre.bat" -:skipRcPre - -set ERROR_CODE=0 - -@REM set local scope for the variables with windows NT shell -if "%OS%"=="Windows_NT" @setlocal -if "%OS%"=="WINNT" @setlocal - -@REM START VALIDATION -if not "%JAVA_HOME%" == "" goto OkJHome - -echo. -echo Error: JAVA_HOME not found in your environment. >&2 -echo Please set the JAVA_HOME variable in your environment to
maven git commit: MNG-5767 .mvn/ for project specific jvm options and maven parameters -- adapted Windows .bat scripts
Repository: maven
Updated Branches:
refs/heads/master e28be4d33 -> 562896a19
MNG-5767 .mvn/ for project specific jvm options and maven parameters -- adapted
Windows .bat scripts
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/562896a1
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/562896a1
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/562896a1
Branch: refs/heads/master
Commit: 562896a192072b9044a6b2fd37ff31bf638214c8
Parents: e28be4d
Author: Andreas Gudian
Authored: Wed Feb 25 21:58:29 2015 +0100
Committer: Andreas Gudian
Committed: Wed Feb 25 21:58:29 2015 +0100
--
apache-maven/src/bin/mvn.bat | 44 +++-
apache-maven/src/bin/mvnDebug.bat | 53 ++
2 files changed, 91 insertions(+), 6 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven/blob/562896a1/apache-maven/src/bin/mvn.bat
--
diff --git a/apache-maven/src/bin/mvn.bat b/apache-maven/src/bin/mvn.bat
index 9540492..abf793b 100644
--- a/apache-maven/src/bin/mvn.bat
+++ b/apache-maven/src/bin/mvn.bat
@@ -141,6 +141,48 @@ goto Win9xApp
@REM Reaching here means variables are defined and arguments have been captured
:endInit
+
+@REM Find the project base dir, i.e. the directory that contains the folder
".mvn".
+@REM Fallback to current working directory if not found.
+
+set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR%
+IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir
+
+set EXEC_DIR=%CD%
+set WDIR=%EXEC_DIR%
+:findBaseDir
+IF EXIST "%WDIR%"\.mvn goto baseDirFound
+cd ..
+IF "%WDIR%"=="%CD%" goto baseDirNotFound
+set WDIR=%CD%
+goto findBaseDir
+
+:baseDirFound
+set MAVEN_PROJECTBASEDIR=%WDIR%
+cd "%EXEC_DIR%"
+goto endDetectBaseDir
+
+:baseDirNotFound
+set MAVEN_PROJECTBASEDIR=%EXEC_DIR%
+cd "%EXEC_DIR%"
+
+:endDetectBaseDir
+
+IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto
endReadAdditionalConfig
+
+if NOT "%OS%"=="Windows_NT" goto Win9xAdditionalConfig
+
+setlocal EnableExtensions EnableDelayedExpansion
+for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do
set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a
+endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS%
+goto endReadAdditionalConfig
+
+:Win9xAdditionalConfig
+@REM -- Win9x can only read the first line of the file
+set /P JVM_CONFIG_MAVEN_PROPS=<"%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config"
+
+:endReadAdditionalConfig
+
SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe"
@REM -- 4NT shell
@@ -158,7 +200,7 @@ goto runm2
@REM Start MAVEN2
:runm2
set CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher
-%MAVEN_JAVA_EXE% %MAVEN_OPTS% -classpath %CLASSWORLDS_JAR%
"-Dclassworlds.conf=%M2_HOME%\bin\m2.conf" "-Dmaven.home=%M2_HOME%"
%CLASSWORLDS_LAUNCHER% %MAVEN_CMD_LINE_ARGS%
+%MAVEN_JAVA_EXE% %JVM_CONFIG_MAVEN_PROPS% %MAVEN_OPTS% -classpath
%CLASSWORLDS_JAR% "-Dclassworlds.conf=%M2_HOME%\bin\m2.conf"
"-Dmaven.home=%M2_HOME%" "-Dmaven.projectBasedir=%MAVEN_PROJECTBASEDIR%"
%CLASSWORLDS_LAUNCHER% %MAVEN_CMD_LINE_ARGS%
if ERRORLEVEL 1 goto error
goto end
http://git-wip-us.apache.org/repos/asf/maven/blob/562896a1/apache-maven/src/bin/mvnDebug.bat
--
diff --git a/apache-maven/src/bin/mvnDebug.bat
b/apache-maven/src/bin/mvnDebug.bat
index b7b42b9..2b2cc18 100644
--- a/apache-maven/src/bin/mvnDebug.bat
+++ b/apache-maven/src/bin/mvnDebug.bat
@@ -62,7 +62,7 @@ if not "%JAVA_HOME%" == "" goto OkJHome
echo.
echo Error: JAVA_HOME not found in your environment. >&2
echo Please set the JAVA_HOME variable in your environment to match the >&2
-echo location of your Java installation >&2
+echo location of your Java installation. >&2
echo.
goto error
@@ -73,7 +73,7 @@ echo.
echo Error: JAVA_HOME is set to an invalid directory. >&2
echo JAVA_HOME = "%JAVA_HOME%" >&2
echo Please set the JAVA_HOME variable in your environment to match the >&2
-echo location of your Java installation >&2
+echo location of your Java installation. >&2
echo.
goto error
@@ -87,7 +87,7 @@ if not "%M2_HOME%"=="" goto valMHome
echo.
echo Error: M2_HOME not found in your environment. >&2
echo Please set the M2_HOME variable in your environment to match the >&2
-echo location of the Maven installation >&2
+echo location of the Maven installation. >&2
echo.
goto error
@@ -145,6 +145,48 @@ goto Win9xApp
@REM Reaching here means variables are defined and arguments have been captured
:endInit
+
+@REM Find the project base dir, i.e. the directory that contains the folder
".mvn".
+@REM Fallback to current working directory if not found.
+
+set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR%
+IF NOT "%MAVEN_PROJECTBASEDIR%"=
maven-surefire git commit: [SUREFIRE-1137] Fix ConsoleOutputIT on systems with default charset encodings that do not contain German umlauts
Repository: maven-surefire
Updated Branches:
refs/heads/master c26bc4b9e -> cc4dac274
[SUREFIRE-1137] Fix ConsoleOutputIT on systems with default charset encodings
that do not contain German umlauts
Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/cc4dac27
Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/cc4dac27
Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/cc4dac27
Branch: refs/heads/master
Commit: cc4dac274a8d278450c44d72da39cf2a61c4d934
Parents: c26bc4b
Author: Andreas Gudian
Authored: Sat Feb 7 20:08:56 2015 +0100
Committer: Andreas Gudian
Committed: Sat Feb 7 20:08:56 2015 +0100
--
.../maven/surefire/its/ConsoleOutputIT.java | 24
1 file changed, 20 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/cc4dac27/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ConsoleOutputIT.java
--
diff --git
a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ConsoleOutputIT.java
b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ConsoleOutputIT.java
index 830341d..e01d798 100644
---
a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ConsoleOutputIT.java
+++
b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ConsoleOutputIT.java
@@ -65,13 +65,13 @@ public class ConsoleOutputIT
{
TestFile xmlReportFile = outputValidator.getSurefireReportsXmlFile(
"TEST-consoleOutput.Test1.xml" );
xmlReportFile.assertContainsText( "SoutLine" );
-xmlReportFile.assertContainsText( "äöüÃ" );
-xmlReportFile.assertContainsText( "failing with ü" );
+xmlReportFile.assertContainsText( normalizeToDefaultCharset(
"äöüÃ" ) );
+xmlReportFile.assertContainsText( normalizeToDefaultCharset( "failing
with ü" ) );
TestFile outputFile = outputValidator.getSurefireReportsFile(
"consoleOutput.Test1-output.txt" );
outputFile.assertContainsText( "SoutAgain" );
outputFile.assertContainsText( "SoutLine" );
-outputFile.assertContainsText( "äöüÃ" );
+outputFile.assertContainsText( normalizeToDefaultCharset( "äöüÃ" )
);
if ( includeShutdownHook )
{
@@ -79,11 +79,27 @@ public class ConsoleOutputIT
}
}
+/**
+ * @param string the string to normalize
+ * @return the string with all characters not available in the current
charset being replaced, e.g. for US-ASCII,
+ * German umlauts would be replaced to ?
+ */
+private String normalizeToDefaultCharset( String string )
+{
+Charset cs = Charset.defaultCharset();
+if ( cs.canEncode() )
+{
+string = cs.decode( cs.encode( string ) ).toString();
+}
+
+return string;
+}
+
@Test
public void largerSoutThanMemory()
throws Exception
{
-unpack( "consoleoutput-noisy" ).setMavenOpts( "-Xmx64m" ).sysProp(
"thousand", "10" ).executeTest();
+unpack( "consoleoutput-noisy" ).setMavenOpts( "-Xmx64m" ).sysProp(
"thousand", "32000" ).executeTest();
}
maven-surefire git commit: [SUREFIRE-1137] Ensure that all communication with the forked process is encoded with a fixed 8-bit charset, to fix sysout/syserr encoding in case the fork ends up with a di
Repository: maven-surefire
Updated Branches:
refs/heads/master 2b4629c71 -> c26bc4b9e
[SUREFIRE-1137] Ensure that all communication with the forked process is
encoded with a fixed 8-bit charset, to fix sysout/syserr encoding in case the
fork ends up with a different default charset than the main process
Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/c26bc4b9
Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/c26bc4b9
Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/c26bc4b9
Branch: refs/heads/master
Commit: c26bc4b9e60de515e7e730207ebf0aacb372dd04
Parents: 2b4629c
Author: Andreas Gudian
Authored: Tue Feb 3 22:30:08 2015 +0100
Committer: Andreas Gudian
Committed: Thu Feb 5 20:54:02 2015 +0100
--
.../surefire/booterclient/ForkStarter.java | 5 +-
.../TestProvidingInputStream.java | 4 +-
.../booterclient/output/ForkClient.java | 33 +--
.../surefire/report/DirectConsoleOutput.java| 16 -
.../booterclient/ForkingRunListenerTest.java| 6 +-
pom.xml | 2 +-
.../surefire/booter/ForkingRunListener.java | 62
.../surefire/report/ConsoleOutputCapture.java | 8 +--
.../surefire/util/internal/StringUtils.java | 57 ++
.../surefire/util/internal/StringUtilsTest.java | 9 +--
.../maven/surefire/booter/ForkedBooter.java | 18 --
.../maven/surefire/booter/LazyTestsToRun.java | 17 +-
.../maven/surefire/its/ConsoleOutputIT.java | 47 +--
.../maven/surefire/its/fixture/TestFile.java| 2 +-
.../src/test/resources/consoleOutput/pom.xml| 17 ++
.../src/test/java/consoleOutput/Test1.java | 17 +++---
16 files changed, 220 insertions(+), 100 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/c26bc4b9/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 12b224a..b1755ba 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
@@ -22,6 +22,7 @@ package org.apache.maven.plugin.surefire.booterclient;
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
+import java.nio.charset.Charset;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Iterator;
@@ -68,6 +69,7 @@ import org.apache.maven.surefire.report.StackTraceWriter;
import org.apache.maven.surefire.suite.RunResult;
import org.apache.maven.surefire.testset.TestRequest;
import org.apache.maven.surefire.util.DefaultScanResult;
+import org.apache.maven.surefire.util.internal.StringUtils;
import static org.apache.maven.surefire.booter.Classpath.join;
@@ -468,7 +470,8 @@ public class ForkStarter
final int timeout = forkedProcessTimeoutInSeconds > 0 ?
forkedProcessTimeoutInSeconds : 0;
final int result =
CommandLineUtils.executeCommandLine( cli,
testProvidingInputStream, threadedStreamConsumer,
- threadedStreamConsumer,
timeout, inputStreamCloser );
+ threadedStreamConsumer,
timeout, inputStreamCloser,
+ Charset.forName(
StringUtils.FORK_STREAM_CHARSET_NAME ) );
if ( result != RunResult.SUCCESS )
{
throw new SurefireBooterForkException( "Error occurred in
starting fork, check output in log" );
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/c26bc4b9/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/lazytestprovider/TestProvidingInputStream.java
--
diff --git
a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/lazytestprovider/TestProvidingInputStream.java
b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/lazytestprovider/TestProvidingInputStream.java
index a33ce62..e7a5032 100644
---
a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/lazytestprovider/TestProvidingInputStream.java
+++
b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/lazytestprovider/TestProvidingInputStre
svn commit: r1656924 - in /maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli: CommandLineUtils.java StreamPumper.java
Author: agudian
Date: Tue Feb 3 21:17:36 2015
New Revision: 1656924
URL: http://svn.apache.org/r1656924
Log:
[SUREFIRE-1137] Allow passing a Charset to be used by the StreamPumper to read
from the input streams (i.e. the output streams of the forked process)
Modified:
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli/CommandLineUtils.java
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli/StreamPumper.java
Modified:
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli/CommandLineUtils.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli/CommandLineUtils.java?rev=1656924&r1=1656923&r2=1656924&view=diff
==
---
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli/CommandLineUtils.java
(original)
+++
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli/CommandLineUtils.java
Tue Feb 3 21:17:36 2015
@@ -20,6 +20,7 @@ package org.apache.maven.shared.utils.cl
*/
import java.io.InputStream;
+import java.nio.charset.Charset;
import java.util.ArrayList;
import java.util.List;
import java.util.Locale;
@@ -27,12 +28,12 @@ import java.util.Map;
import java.util.Properties;
import java.util.StringTokenizer;
-import org.apache.maven.shared.utils.Os;
-import org.apache.maven.shared.utils.StringUtils;
-
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
+import org.apache.maven.shared.utils.Os;
+import org.apache.maven.shared.utils.StringUtils;
+
/**
* @author mailto:tryg...@inamo.no";>Trygve Laugstøl
* @version $Id$
@@ -135,9 +136,32 @@ public abstract class CommandLineUtils
@Nullable Runnable
runAfterProcessTermination )
throws CommandLineException
{
+return executeCommandLine( cl, systemIn, systemOut, systemErr,
timeoutInSeconds, runAfterProcessTermination,
+ null );
+}
+
+/**
+ * @param cl The command line to execute
+ * @param systemIn The input to read from, must be thread safe
+ * @param systemOutA consumer that receives output, must be thread
safe
+ * @param systemErrA consumer that receives system error stream
output, must be thread safe
+ * @param timeoutInSeconds Positive integer to specify timeout, zero and
negative integers for no timeout.
+ * @param runAfterProcessTermination Optional callback to run after the
process terminated or the the timeout was
+ * exceeded, but before waiting on the stream feeder and pumpers to
finish.
+ * @param streamCharsetCharset to use for reading streams
+ * @return A return value, see {@link Process#exitValue()}
+ * @throws CommandLineException or CommandLineTimeOutException if time out
occurs
+ * @noinspection ThrowableResultOfMethodCallIgnored
+ */
+public static int executeCommandLine( @Nonnull Commandline cl, InputStream
systemIn, StreamConsumer systemOut,
+ StreamConsumer systemErr, int
timeoutInSeconds,
+ @Nullable Runnable
runAfterProcessTermination,
+ @Nullable final Charset
streamCharset )
+throws CommandLineException
+{
final CommandLineCallable future =
executeCommandLineAsCallable( cl, systemIn, systemOut, systemErr,
timeoutInSeconds,
- runAfterProcessTermination );
+ runAfterProcessTermination,
streamCharset );
return future.call();
}
@@ -164,6 +188,35 @@ public abstract class CommandLineUtils
@Nullable
final Runnable runAfterProcessTermination )
throws CommandLineException
{
+return executeCommandLineAsCallable( cl, systemIn, systemOut,
systemErr, timeoutInSeconds,
+ runAfterProcessTermination, null
);
+}
+
+/**
+ * Immediately forks a process, returns a callable that will block until
process is complete.
+ *
+ * @param cl The command line to execute
+ * @param systemIn The input to read from, must be thread safe
+ * @param systemOutA consumer that receives output, must be thread
safe
+ * @param systemErrA consumer that receives system error stream
output, must be thread safe
+ * @param timeoutInSeconds Positive integer to specify timeout, zero and
negative integers for no timeout.
+ * @param runAfterProcessTermination Optional callback to run after the
process terminated or the the timeou
[2/2] maven-surefire git commit: SUREFIRE-1136 Remove usage of fest-assertions from IT (not JDK 1.5 compatible)
SUREFIRE-1136 Remove usage of fest-assertions from IT (not JDK 1.5 compatible)
Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/60111e78
Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/60111e78
Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/60111e78
Branch: refs/heads/master
Commit: 60111e78fa1d10eae0a0b8f2ab653e828f26ad21
Parents: 15da349
Author: Andreas Gudian
Authored: Thu Jan 22 21:18:31 2015 +0100
Committer: Andreas Gudian
Committed: Thu Jan 22 21:18:31 2015 +0100
--
.../surefire-1136-cwd-propagation-in-forked-mode/pom.xml | 6 --
.../cwd/CurrentWorkingDirectoryInForkedModeTest.java | 11 ++-
2 files changed, 6 insertions(+), 11 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/60111e78/surefire-integration-tests/src/test/resources/surefire-1136-cwd-propagation-in-forked-mode/pom.xml
--
diff --git
a/surefire-integration-tests/src/test/resources/surefire-1136-cwd-propagation-in-forked-mode/pom.xml
b/surefire-integration-tests/src/test/resources/surefire-1136-cwd-propagation-in-forked-mode/pom.xml
index c85a9ab..943fac7 100644
---
a/surefire-integration-tests/src/test/resources/surefire-1136-cwd-propagation-in-forked-mode/pom.xml
+++
b/surefire-integration-tests/src/test/resources/surefire-1136-cwd-propagation-in-forked-mode/pom.xml
@@ -46,12 +46,6 @@
4.11
test
-
- org.easytesting
- fest-assert-core
- 2.0M10
- test
-
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/60111e78/surefire-integration-tests/src/test/resources/surefire-1136-cwd-propagation-in-forked-mode/src/test/java/cwd/CurrentWorkingDirectoryInForkedModeTest.java
--
diff --git
a/surefire-integration-tests/src/test/resources/surefire-1136-cwd-propagation-in-forked-mode/src/test/java/cwd/CurrentWorkingDirectoryInForkedModeTest.java
b/surefire-integration-tests/src/test/resources/surefire-1136-cwd-propagation-in-forked-mode/src/test/java/cwd/CurrentWorkingDirectoryInForkedModeTest.java
index 1660bfb..9dc0ffe 100644
---
a/surefire-integration-tests/src/test/resources/surefire-1136-cwd-propagation-in-forked-mode/src/test/java/cwd/CurrentWorkingDirectoryInForkedModeTest.java
+++
b/surefire-integration-tests/src/test/resources/surefire-1136-cwd-propagation-in-forked-mode/src/test/java/cwd/CurrentWorkingDirectoryInForkedModeTest.java
@@ -23,7 +23,8 @@ import org.junit.Test;
import java.io.File;
-import static org.fest.assertions.api.Assertions.assertThat;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
public class CurrentWorkingDirectoryInForkedModeTest
{
@@ -38,12 +39,12 @@ public class CurrentWorkingDirectoryInForkedModeTest
forkDirectory.deleteOnExit();
// user.dir and current working directory must be aligned, base
directory is not affected
-assertThat( System.getProperty( "basedir" ) ).isEqualTo(
projectDirectory.getCanonicalPath() );
-assertThat( System.getProperty( "user.dir" ) ).isEqualTo(
forkDirectory.getCanonicalPath() );
-assertThat( new File( "." ).getCanonicalPath() ).isEqualTo(
forkDirectory.getCanonicalPath() );
+assertEquals( System.getProperty( "basedir" ),
projectDirectory.getCanonicalPath() );
+assertEquals( System.getProperty( "user.dir" ),
forkDirectory.getCanonicalPath() );
+assertEquals( new File( "." ).getCanonicalPath(),
forkDirectory.getCanonicalPath() );
// original working directory (before variable expansion) should not
be created
-assertThat( new File( "cwd_${surefire.forkNumber}" ) ).doesNotExist();
+assertFalse( new File( "cwd_${surefire.forkNumber}" ).exists() );
}
[1/2] maven-surefire git commit: SUREFIRE-1136 Current working directory propagation in forked mode - remove JDK 1.7 API usage in tests, integration test extended to justify deferred directory creatio
Repository: maven-surefire
Updated Branches:
refs/heads/master cebce291f -> 60111e78f
SUREFIRE-1136 Current working directory propagation in forked mode - remove JDK
1.7 API usage in tests, integration test extended to justify deferred directory
creation in AbstractSurefireMojo.ensureWorkingDirectoryExists
Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/15da3495
Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/15da3495
Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/15da3495
Branch: refs/heads/master
Commit: 15da3495d5c7be46cf247e4edc0d0c519f1848b6
Parents: cebce29
Author: Norbert Wnuk
Authored: Thu Jan 22 00:53:02 2015 +0100
Committer: Norbert Wnuk
Committed: Thu Jan 22 00:53:02 2015 +0100
--
.../booterclient/ForkConfigurationTest.java | 16 +++-
pom.xml | 1 +
.../CurrentWorkingDirectoryInForkedModeTest.java| 4
3 files changed, 16 insertions(+), 5 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/15da3495/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/booterclient/ForkConfigurationTest.java
--
diff --git
a/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/booterclient/ForkConfigurationTest.java
b/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/booterclient/ForkConfigurationTest.java
index 32eaa61..b3d2151 100644
---
a/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/booterclient/ForkConfigurationTest.java
+++
b/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/booterclient/ForkConfigurationTest.java
@@ -21,11 +21,11 @@ package org.apache.maven.plugin.surefire.booterclient;
import java.io.File;
import java.io.IOException;
-import java.nio.file.Files;
import java.util.Collections;
import java.util.Properties;
import org.apache.commons.io.FileUtils;
+import org.apache.commons.lang3.RandomStringUtils;
import org.apache.maven.shared.utils.StringUtils;
import org.apache.maven.shared.utils.cli.Commandline;
import org.apache.maven.surefire.booter.Classpath;
@@ -67,7 +67,9 @@ public class ForkConfigurationTest
throws IOException, SurefireBooterForkException
{
// SUREFIRE-1136
-File baseDir = Files.createTempDirectory( "SUREFIRE-1136-" ).toFile();
+File baseDir =
+new File( FileUtils.getTempDirectory(), "SUREFIRE-1136-" +
RandomStringUtils.randomAlphabetic( 3 ) );
+baseDir.mkdirs();
baseDir.deleteOnExit();
File cwd = new File( baseDir, "fork_${surefire.forkNumber}" );
@@ -85,7 +87,9 @@ public class ForkConfigurationTest
throws IOException, SurefireBooterForkException
{
// SUREFIRE-1136
-File baseDir = Files.createTempDirectory( "SUREFIRE-1136-" ).toFile();
+File baseDir =
+new File( FileUtils.getTempDirectory(), "SUREFIRE-1136-" +
RandomStringUtils.randomAlphabetic( 3 ) );
+baseDir.mkdirs();
baseDir.deleteOnExit();
File cwd = new File( baseDir, "cwd.txt" );
@@ -113,10 +117,12 @@ public class ForkConfigurationTest
throws IOException, SurefireBooterForkException
{
// SUREFIRE-1136
-File baseDir = Files.createTempDirectory( "SUREFIRE-1136-" ).toFile();
+File baseDir =
+new File( FileUtils.getTempDirectory(), "SUREFIRE-1136-" +
RandomStringUtils.randomAlphabetic( 3 ) );
+baseDir.mkdirs();
baseDir.deleteOnExit();
-File cwd = new File( baseDir, "\0?InvalidDirectoryName" );
+File cwd = new File( baseDir, "?\0InvalidDirectoryName" );
ForkConfiguration config = getForkConfiguration( null, "java",
cwd.getAbsoluteFile() );
try
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/15da3495/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 81d00bd..1d6087c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -248,6 +248,7 @@
org.apache.maven.plugins
maven-compiler-plugin
+
org.codehaus.mojo
animal-sniffer-maven-plugin
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/15da3495/surefire-integration-tests/src/test/resources/surefire-1136-cwd-propagation-in-forked-mode/src/test/java/cwd/CurrentWorkingDirectoryInForkedModeTest.java
--
diff --git
a/surefire-integration-tests/src/test/resources/surefire-1136-cwd-propagation-in-forked-mode/src/test/java/cwd/CurrentWorkingDirectoryInForkedModeTest.java
b/surefire-inte
maven-surefire git commit: SUREFIRE-1136 Current working directory propagation in forked mode
Repository: maven-surefire
Updated Branches:
refs/heads/master 9b7ca5a2b -> cebce291f
SUREFIRE-1136 Current working directory propagation in forked mode
Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/cebce291
Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/cebce291
Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/cebce291
Branch: refs/heads/master
Commit: cebce291f454fd5df528a8da37b4e81e407b1082
Parents: 9b7ca5a
Author: Norbert Wnuk
Authored: Tue Jan 20 00:59:22 2015 +0100
Committer: Norbert Wnuk
Committed: Tue Jan 20 01:08:21 2015 +0100
--
.../plugin/surefire/AbstractSurefireMojo.java | 7 ++
.../booterclient/ForkConfiguration.java | 18 -
.../booterclient/ForkConfigurationTest.java | 81 ++-
...urefire1136CwdPropagationInForkedModeIT.java | 40 ++
.../pom.xml | 83
...CurrentWorkingDirectoryInForkedModeTest.java | 46 +++
6 files changed, 272 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/cebce291/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 2999a8e..5205b95 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
@@ -2199,6 +2199,13 @@ public abstract class AbstractSurefireMojo
throw new MojoFailureException( "workingDirectory cannot be null"
);
}
+if ( isForking() )
+{
+// Postpone directory creation till forked JVM creation
+// see ForkConfiguration.createCommandLine
+return;
+}
+
if ( !getWorkingDirectory().exists() )
{
if ( !getWorkingDirectory().mkdirs() )
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/cebce291/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 5843428..e5c8a42 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
@@ -201,11 +201,27 @@ public class ForkConfiguration
cli.createArg().setValue( shadefire ? new Relocator().relocate(
forkedBooter ) : forkedBooter );
}
-cli.setWorkingDirectory( workingDirectory.getAbsolutePath() );
+cli.setWorkingDirectory( getWorkingDirectory( threadNumber
).getAbsolutePath() );
return cli;
}
+private File getWorkingDirectory( int threadNumber )
+throws SurefireBooterForkException
+{
+File cwd = new File( replaceThreadNumberPlaceholder(
workingDirectory.getAbsolutePath(), threadNumber ) );
+if ( !cwd.exists() && !cwd.mkdirs() )
+{
+throw new SurefireBooterForkException( "Cannot create
workingDirectory " + cwd.getAbsolutePath() );
+}
+if ( !cwd.isDirectory() )
+{
+throw new SurefireBooterForkException(
+"WorkingDirectory " + cwd.getAbsolutePath() + " exists and is
not a directory" );
+}
+return cwd;
+}
+
private String replaceThreadNumberPlaceholder( String argLine, int
threadNumber )
{
return argLine.replace( AbstractSurefireMojo.THREAD_NUMBER_PLACEHOLDER,
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/cebce291/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/booterclient/ForkConfigurationTest.java
--
diff --git
a/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/booterclient/ForkConfigurationTest.java
b/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/booterclient/ForkConfigurationTest.java
index 5944ec8..32eaa61 100644
---
a/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/booterclient/ForkConfigurationTest.java
+++
b/maven-surefire-commo
maven-surefire git commit: update to maven-parent:26, fix configuration for rat-plugin, update release-plugin to 2.5.1 and add workaround for MRELEASE-799
Repository: maven-surefire
Updated Branches:
refs/heads/master 5693c8117 -> 33e6819ab
update to maven-parent:26, fix configuration for rat-plugin, update
release-plugin to 2.5.1 and add workaround for MRELEASE-799
Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/33e6819a
Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/33e6819a
Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/33e6819a
Branch: refs/heads/master
Commit: 33e6819abce2b64b994612869bc73180f8502fd2
Parents: 5693c81
Author: Andreas Gudian
Authored: Mon Dec 22 14:10:53 2014 +0100
Committer: Andreas Gudian
Committed: Mon Dec 22 15:00:50 2014 +0100
--
maven-failsafe-plugin/pom.xml| 2 +-
maven-surefire-common/pom.xml| 2 +-
maven-surefire-plugin/pom.xml| 2 +-
pom.xml | 70 +--
surefire-api/pom.xml | 2 +-
surefire-booter/pom.xml | 2 +-
surefire-grouper/pom.xml | 2 +-
surefire-integration-tests/pom.xml | 6 +--
surefire-providers/pom.xml | 4 +-
surefire-report-parser/pom.xml | 2 +-
surefire-setup-integration-tests/pom.xml | 2 +-
surefire-shadefire/pom.xml | 8 +--
12 files changed, 52 insertions(+), 52 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/33e6819a/maven-failsafe-plugin/pom.xml
--
diff --git a/maven-failsafe-plugin/pom.xml b/maven-failsafe-plugin/pom.xml
index 894d910..4e7dee1 100644
--- a/maven-failsafe-plugin/pom.xml
+++ b/maven-failsafe-plugin/pom.xml
@@ -105,7 +105,7 @@
org.apache.maven.surefire
surefire-shadefire
-${shadedVersion}
+2.12.4
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/33e6819a/maven-surefire-common/pom.xml
--
diff --git a/maven-surefire-common/pom.xml b/maven-surefire-common/pom.xml
index 0c675b1..0904048 100644
--- a/maven-surefire-common/pom.xml
+++ b/maven-surefire-common/pom.xml
@@ -124,7 +124,7 @@
org.apache.maven.surefire
surefire-shadefire
-${shadedVersion}
+2.12.4
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/33e6819a/maven-surefire-plugin/pom.xml
--
diff --git a/maven-surefire-plugin/pom.xml b/maven-surefire-plugin/pom.xml
index 6c46660..07ea80f 100644
--- a/maven-surefire-plugin/pom.xml
+++ b/maven-surefire-plugin/pom.xml
@@ -97,7 +97,7 @@
org.apache.maven.surefire
surefire-shadefire
-${shadedVersion}
+2.12.4
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/33e6819a/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 34c4a19..093fe51 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
maven-parent
org.apache.maven
-25
+26
../pom/maven/pom.xml
@@ -85,7 +85,7 @@
2.2.1
-2.12.4
+
3.3
scm:git:https://git-wip-us.apache.org/repos/asf/maven-surefire.git
surefire-archives/surefire-LATEST
@@ -271,7 +271,7 @@
maven-surefire-plugin
- ${shadedVersion}
+ 2.12.4
false
@@ -279,7 +279,7 @@
maven-release-plugin
- 2.2.1
+ 2.5.1
true
clean install
@@ -296,36 +296,6 @@
true
-
- org.apache.maven.plugins
- maven-site-plugin
-
-
scm:svn:https://svn.apache.org/repos/infra/websites/production/maven/content/${maven.site.path}
-
-
-
- org.apache.rat
- apache-rat-plugin
-
-
- .git/**/*
- **/.idea
- **/.svn/**/*
- src/test/resources/**/*
- **/*.jj
- src/test/resources/**/*.css
- **/*.iml
- **/*.ipr
- **/*.iws
- **/*.versionsBackup
- **/dependency-reduced-pom.xml
- .gitignore
- DEPENDENCIES
-
src/main/resources/META-INF/services/org.apache.maven.surefire.providerapi.SurefireProvider
-
-
-
-
@@ -333,6 +303,36 @@
org.codehaus.mojo
Git Push Summary
Repository: maven-surefire Updated Tags: refs/tags/surefire-2.18.1_vote-1 [deleted] 5dbe086f2
Git Push Summary
Repository: maven-surefire Updated Tags: refs/tags/surefire-2.18.1-vote-1 [deleted] 18e46805d
[1/2] maven-surefire git commit: [SUREFIRE-1122] fix XML report for the combination of JUnit parallel and rerunFailingTests, by making the StatelessXmlReporter stateless again
file mode 100644
index 000..e8fab4e
--- /dev/null
+++
b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1122ParallelAndFlakyTestsIT.java
@@ -0,0 +1,50 @@
+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.it.VerificationException;
+import org.apache.maven.surefire.its.fixture.SurefireJUnit4IntegrationTestCase;
+import org.apache.maven.surefire.its.fixture.SurefireLauncher;
+import org.junit.Test;
+
+/**
+ * @author agudian
+ * @see {@linkplain https://jira.codehaus.org/browse/SUREFIRE-1122}
+ */
+public class Surefire1122ParallelAndFlakyTestsIT
+extends SurefireJUnit4IntegrationTestCase
+{
+@Test
+public void nonParallelCreatesCorrectReport()
+{
+unpack( "surefire-1122-parallel-and-flakyTests" )
+.executeTest()
+.assertTestSuiteResults( 2, 0, 0, 0, 1 );
+}
+
+@Test
+public void parallelCreatesCorrectReport()
+{
+unpack( "surefire-1122-parallel-and-flakyTests" )
+.activateProfile( "parallel" )
+.executeTest()
+.assertTestSuiteResults( 2, 0, 0, 0, 1 );
+}
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/a0c3283b/surefire-integration-tests/src/test/resources/surefire-1122-parallel-and-flakyTests/pom.xml
--
diff --git
a/surefire-integration-tests/src/test/resources/surefire-1122-parallel-and-flakyTests/pom.xml
b/surefire-integration-tests/src/test/resources/surefire-1122-parallel-and-flakyTests/pom.xml
new file mode 100644
index 000..5fa0110
--- /dev/null
+++
b/surefire-integration-tests/src/test/resources/surefire-1122-parallel-and-flakyTests/pom.xml
@@ -0,0 +1,82 @@
+
+
+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";>
+ 4.0.0
+
+org.apache.maven.surefire
+it-parent
+1.0
+../pom.xml
+
+ org.apache.maven.plugins.surefire
+ jiras-surefire-1122
+ 1.0
+
+
+ junit
+ junit
+ 4.11
+ test
+
+
+
+
+
+maven-compiler-plugin
+
+ 1.5
+ 1.5
+
+
+
+maven-surefire-plugin
+
+
+org.apache.maven.surefire
+surefire-junit47
+${surefire.version}
+
+
+
+ 2
+
+
+
+
+
+
+ parallel
+
+
+
+org.apache.maven.plugins
+maven-surefire-plugin
+
+ true
+ 0
+ classes
+
+
+
+
+
+
+
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/a0c3283b/surefire-integration-tests/src/test/resources/surefire-1122-parallel-and-flakyTests/src/test/java/test/FlakyTest.java
--
diff --git
a/surefire-integration-tests/src/test/resources/surefire-1122-parallel-and-flakyTests/src/test/java/test/FlakyTest.java
b/surefire-integration-tests/src/test/resources/surefire-1122-parallel-and-flakyTests/src/test/java/test/FlakyTest.java
new file mode 100644
index 000..fc7b443
--- /dev/null
+++
b/surefire-integration-tests/src/test/resources/surefire-1122-parallel-and-flakyTests/src/test/java/test/FlakyTest.java
@@ -0,0 +1,41 @@
+package test;
+
+/*
+ * 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 unde
[2/2] maven-surefire git commit: ignore test that failes after fixing the XML test reporter, now uncovering a bug - see SUREFIRE-1123
ignore test that failes after fixing the XML test reporter, now uncovering a
bug - see SUREFIRE-1123
Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/7bfebd06
Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/7bfebd06
Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/7bfebd06
Branch: refs/heads/master
Commit: 7bfebd06f4883a4f9a3aa6d591e2c105eb0bfd5d
Parents: a0c3283
Author: Andreas Gudian
Authored: Thu Dec 11 21:30:30 2014 +0100
Committer: Andreas Gudian
Committed: Thu Dec 11 21:30:30 2014 +0100
--
.../java/org/apache/maven/surefire/its/CheckTestNgSuiteXmlIT.java | 2 ++
1 file changed, 2 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/7bfebd06/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgSuiteXmlIT.java
--
diff --git
a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgSuiteXmlIT.java
b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgSuiteXmlIT.java
index 7e0653d..e8cef5f 100644
---
a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgSuiteXmlIT.java
+++
b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgSuiteXmlIT.java
@@ -21,6 +21,7 @@ package org.apache.maven.surefire.its;
import org.apache.maven.surefire.its.fixture.SurefireJUnit4IntegrationTestCase;
import org.apache.maven.surefire.its.fixture.SurefireLauncher;
+import org.junit.Ignore;
import org.junit.Test;
/**
@@ -38,6 +39,7 @@ public class CheckTestNgSuiteXmlIT
}
@Test
+@Ignore( "Fails - see SUREFIRE-1123" )
public void suiteXmlForkModeAlways()
{
unpack().forkAlways().executeTest().verifyErrorFree( 2 );
Git Push Summary
Repository: maven-surefire Updated Tags: refs/tags/surefire-2.18 [created] ab58411b2
svn commit: r1636729 - /maven/site/trunk/content/apt/plugins/index.apt
Author: agudian
Date: Tue Nov 4 20:45:59 2014
New Revision: 1636729
URL: http://svn.apache.org/r1636729
Log:
Surefire 2.18 release
Modified:
maven/site/trunk/content/apt/plugins/index.apt
Modified: maven/site/trunk/content/apt/plugins/index.apt
URL:
http://svn.apache.org/viewvc/maven/site/trunk/content/apt/plugins/index.apt?rev=1636729&r1=1636728&r2=1636729&view=diff
==
--- maven/site/trunk/content/apt/plugins/index.apt (original)
+++ maven/site/trunk/content/apt/plugins/index.apt Tue Nov 4 20:45:59 2014
@@ -8,7 +8,7 @@
Benson Margulies
Karl-Heinz Marbaise
-
- 2014-09-28
+ 2014-11-04
-
~~ Licensed to the Apache Software Foundation (ASF) under one
@@ -73,7 +73,7 @@ Available Plugins
*--++--++--+++
| {{{/plugins/maven-deploy-plugin/} <<>>}} | B |
2.8.2| 2014-08-27 | Deploy the built artifact to the remote repository.
|
{{{http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-deploy-plugin}SVN}}
| {{{http://jira.codehaus.org/browse/MDEPLOY}JIRA}}
*--++--++--+++
-| {{{/surefire/maven-failsafe-plugin/} <<>>}}| B |
2.17 | 2014-03-16 | Run the JUnit integration tests in an isolated
classloader. |
{{{https://git-wip-us.apache.org/repos/asf/maven-surefire.git}GIT}} |
{{{http://jira.codehaus.org/browse/SUREFIRE}JIRA}}
+| {{{/surefire/maven-failsafe-plugin/} <<>>}}| B |
2.18 | 2014-11-04 | Run the JUnit integration tests in an isolated
classloader. |
{{{https://git-wip-us.apache.org/repos/asf/maven-surefire.git}GIT}} |
{{{http://jira.codehaus.org/browse/SUREFIRE}JIRA}}
*--++--++--+++
| {{{/plugins/maven-install-plugin/} <<>>}} | B |
2.5.2| 2014-08-27 | Install the built artifact into the local
repository. |
{{{http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-install-plugin}SVN}}
| {{{http://jira.codehaus.org/browse/MINSTALL}JIRA}}
*--++--++--+++
@@ -81,7 +81,7 @@ Available Plugins
*--++--++--+++
| {{{/plugins/maven-site-plugin/} <<>>}} | B |
3.4 | 2014-07-07 | Generate a site for the current project. |
{{{http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-site-plugin/}SVN}}
| {{{http://jira.codehaus.org/browse/MSITE}JIRA}}
*--++--++--+++
-| {{{/surefire/maven-surefire-plugin/} <<>>}}| B |
2.17 | 2014-03-16 | Run the JUnit unit tests in an isolated
classloader. |
{{{https://git-wip-us.apache.org/repos/asf/maven-surefire.git}GIT}} |
{{{http://jira.codehaus.org/browse/SUREFIRE}JIRA}}
+| {{{/surefire/maven-surefire-plugin/} <<>>}}| B |
2.18 | 2014-11-04 | Run the JUnit unit tests in an isolated
classloader. |
{{{https://git-wip-us.apache.org/repos/asf/maven-surefire.git}GIT}} |
{{{http://jira.codehaus.org/browse/SUREFIRE}JIRA}}
*--++--++--+++
| {{{/plugins/maven-verifier-plugin/} <<>>}} | B |
1.0 | 2010-01-30 | Useful for integration tests - verifies the
existence of certain conditions. |
{{{http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-verifier-plugin}SVN}}
| {{{http://jira.codehaus.org/browse/MVERIFIER}JIRA}}
*--++--++--+++
@@ -125,7 +125,7 @@ Available Plugins
*--++--++--+++
| {{{/plugins/maven-project-info-reports-plugin/} <<>>}}
| R | 2.7 | 2013-05-16 | Generate standard project reports. |
{{{http://svn.apache.o
Git Push Summary
Repository: maven-surefire Updated Tags: refs/tags/surefire-2.18_vote-2 [created] 78d4103c8
[1/2] git commit: [maven-release-plugin] prepare release surefire-2.18_vote-2
Repository: maven-surefire Updated Branches: refs/heads/master a3de89de2 -> 546078d5b [maven-release-plugin] prepare release surefire-2.18_vote-2 Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/854b914f Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/854b914f Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/854b914f Branch: refs/heads/master Commit: 854b914f2f6e460111269206c06ff0573269f930 Parents: a3de89d Author: Andreas Gudian Authored: Sat Nov 1 20:01:57 2014 +0100 Committer: Andreas Gudian Committed: Sat Nov 1 20:01:57 2014 +0100 -- maven-failsafe-plugin/pom.xml| 2 +- maven-surefire-common/pom.xml| 2 +- maven-surefire-plugin/pom.xml| 2 +- maven-surefire-report-plugin/pom.xml | 2 +- pom.xml | 2 +- surefire-api/pom.xml | 2 +- surefire-booter/pom.xml | 2 +- surefire-grouper/pom.xml | 2 +- surefire-integration-tests/pom.xml | 2 +- surefire-providers/common-java5/pom.xml | 2 +- surefire-providers/common-junit3/pom.xml | 2 +- surefire-providers/common-junit4/pom.xml | 2 +- surefire-providers/common-junit48/pom.xml| 2 +- surefire-providers/pom.xml | 2 +- surefire-providers/surefire-junit3/pom.xml | 2 +- surefire-providers/surefire-junit4/pom.xml | 2 +- surefire-providers/surefire-junit47/pom.xml | 2 +- surefire-providers/surefire-testng-utils/pom.xml | 2 +- surefire-providers/surefire-testng/pom.xml | 2 +- surefire-report-parser/pom.xml | 2 +- surefire-setup-integration-tests/pom.xml | 2 +- surefire-shadefire/pom.xml | 2 +- 22 files changed, 22 insertions(+), 22 deletions(-) -- http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/854b914f/maven-failsafe-plugin/pom.xml -- diff --git a/maven-failsafe-plugin/pom.xml b/maven-failsafe-plugin/pom.xml index c6abbf0..3e6ac2e 100644 --- a/maven-failsafe-plugin/pom.xml +++ b/maven-failsafe-plugin/pom.xml @@ -24,7 +24,7 @@ org.apache.maven.surefire surefire -2.19-SNAPSHOT +2.18 ../pom.xml http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/854b914f/maven-surefire-common/pom.xml -- diff --git a/maven-surefire-common/pom.xml b/maven-surefire-common/pom.xml index 3f8bf18..552f917 100644 --- a/maven-surefire-common/pom.xml +++ b/maven-surefire-common/pom.xml @@ -24,7 +24,7 @@ org.apache.maven.surefire surefire -2.19-SNAPSHOT +2.18 ../pom.xml http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/854b914f/maven-surefire-plugin/pom.xml -- diff --git a/maven-surefire-plugin/pom.xml b/maven-surefire-plugin/pom.xml index 5d87251..d198f21 100644 --- a/maven-surefire-plugin/pom.xml +++ b/maven-surefire-plugin/pom.xml @@ -24,7 +24,7 @@ org.apache.maven.surefire surefire -2.19-SNAPSHOT +2.18 ../pom.xml http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/854b914f/maven-surefire-report-plugin/pom.xml -- diff --git a/maven-surefire-report-plugin/pom.xml b/maven-surefire-report-plugin/pom.xml index 96b3cbf..2e0d1fa 100644 --- a/maven-surefire-report-plugin/pom.xml +++ b/maven-surefire-report-plugin/pom.xml @@ -24,7 +24,7 @@ org.apache.maven.surefire surefire -2.19-SNAPSHOT +2.18 ../pom.xml http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/854b914f/pom.xml -- diff --git a/pom.xml b/pom.xml index 9a0d154..e61c696 100644 --- a/pom.xml +++ b/pom.xml @@ -29,7 +29,7 @@ org.apache.maven.surefire surefire - 2.19-SNAPSHOT + 2.18 pom Apache Maven Surefire http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/854b914f/surefire-api/pom.xml -- diff --git a/surefire-api/pom.xml b/surefire-api/pom.xml index 5cdfe61..d73347d 100644 --- a/surefire-api/pom.xml +++ b/surefire-api/pom.xml @@ -23,7 +23,7 @@ org.apache.maven.surefire surefire -2.19-SNAPSHOT +2.18 ../pom.xml http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/854b914f/surefire-booter/pom.xml -- diff --git a/surefire-booter/pom.xml b/s
[2/2] git commit: [maven-release-plugin] prepare for next development iteration
[maven-release-plugin] prepare for next development iteration Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/546078d5 Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/546078d5 Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/546078d5 Branch: refs/heads/master Commit: 546078d5b0c1e10e91ba3a5fd458ded6997abe4d Parents: 854b914 Author: Andreas Gudian Authored: Sat Nov 1 20:03:28 2014 +0100 Committer: Andreas Gudian Committed: Sat Nov 1 20:03:28 2014 +0100 -- maven-failsafe-plugin/pom.xml| 2 +- maven-surefire-common/pom.xml| 2 +- maven-surefire-plugin/pom.xml| 2 +- maven-surefire-report-plugin/pom.xml | 2 +- pom.xml | 2 +- surefire-api/pom.xml | 2 +- surefire-booter/pom.xml | 2 +- surefire-grouper/pom.xml | 2 +- surefire-integration-tests/pom.xml | 2 +- surefire-providers/common-java5/pom.xml | 2 +- surefire-providers/common-junit3/pom.xml | 2 +- surefire-providers/common-junit4/pom.xml | 2 +- surefire-providers/common-junit48/pom.xml| 2 +- surefire-providers/pom.xml | 2 +- surefire-providers/surefire-junit3/pom.xml | 2 +- surefire-providers/surefire-junit4/pom.xml | 2 +- surefire-providers/surefire-junit47/pom.xml | 2 +- surefire-providers/surefire-testng-utils/pom.xml | 2 +- surefire-providers/surefire-testng/pom.xml | 2 +- surefire-report-parser/pom.xml | 2 +- surefire-setup-integration-tests/pom.xml | 2 +- surefire-shadefire/pom.xml | 2 +- 22 files changed, 22 insertions(+), 22 deletions(-) -- http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/546078d5/maven-failsafe-plugin/pom.xml -- diff --git a/maven-failsafe-plugin/pom.xml b/maven-failsafe-plugin/pom.xml index 3e6ac2e..c6abbf0 100644 --- a/maven-failsafe-plugin/pom.xml +++ b/maven-failsafe-plugin/pom.xml @@ -24,7 +24,7 @@ org.apache.maven.surefire surefire -2.18 +2.19-SNAPSHOT ../pom.xml http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/546078d5/maven-surefire-common/pom.xml -- diff --git a/maven-surefire-common/pom.xml b/maven-surefire-common/pom.xml index 552f917..3f8bf18 100644 --- a/maven-surefire-common/pom.xml +++ b/maven-surefire-common/pom.xml @@ -24,7 +24,7 @@ org.apache.maven.surefire surefire -2.18 +2.19-SNAPSHOT ../pom.xml http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/546078d5/maven-surefire-plugin/pom.xml -- diff --git a/maven-surefire-plugin/pom.xml b/maven-surefire-plugin/pom.xml index d198f21..5d87251 100644 --- a/maven-surefire-plugin/pom.xml +++ b/maven-surefire-plugin/pom.xml @@ -24,7 +24,7 @@ org.apache.maven.surefire surefire -2.18 +2.19-SNAPSHOT ../pom.xml http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/546078d5/maven-surefire-report-plugin/pom.xml -- diff --git a/maven-surefire-report-plugin/pom.xml b/maven-surefire-report-plugin/pom.xml index 2e0d1fa..96b3cbf 100644 --- a/maven-surefire-report-plugin/pom.xml +++ b/maven-surefire-report-plugin/pom.xml @@ -24,7 +24,7 @@ org.apache.maven.surefire surefire -2.18 +2.19-SNAPSHOT ../pom.xml http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/546078d5/pom.xml -- diff --git a/pom.xml b/pom.xml index e61c696..9a0d154 100644 --- a/pom.xml +++ b/pom.xml @@ -29,7 +29,7 @@ org.apache.maven.surefire surefire - 2.18 + 2.19-SNAPSHOT pom Apache Maven Surefire http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/546078d5/surefire-api/pom.xml -- diff --git a/surefire-api/pom.xml b/surefire-api/pom.xml index d73347d..5cdfe61 100644 --- a/surefire-api/pom.xml +++ b/surefire-api/pom.xml @@ -23,7 +23,7 @@ org.apache.maven.surefire surefire -2.18 +2.19-SNAPSHOT ../pom.xml http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/546078d5/surefire-booter/pom.xml -- diff --git a/surefire-booter/pom.xml b/surefire-booter/pom.xml index 2e7f7c7..28a9406 100644 --- a/surefire-booter/pom.xml +++ b
git commit: o Ignore DEPENDENCIES in rat check o Set default location of the deployed site to "surefire-LATEST" again
Repository: maven-surefire
Updated Branches:
refs/heads/master 190c96706 -> a3de89de2
o Ignore DEPENDENCIES in rat check
o Set default location of the deployed site to "surefire-LATEST" again
Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/a3de89de
Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/a3de89de
Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/a3de89de
Branch: refs/heads/master
Commit: a3de89de2b3a99bf69a52318ef2c9cf7ec3eb332
Parents: 190c967
Author: Andreas Gudian
Authored: Sat Nov 1 19:42:29 2014 +0100
Committer: Andreas Gudian
Committed: Sat Nov 1 19:42:29 2014 +0100
--
pom.xml | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/a3de89de/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 1b56683..9a0d154 100644
--- a/pom.xml
+++ b/pom.xml
@@ -88,7 +88,7 @@
2.12.4
3.3
scm:git:https://git-wip-us.apache.org/repos/asf/maven-surefire.git
-
surefire-archives/surefire-${project.version}
+surefire-archives/surefire-LATEST
@@ -320,6 +320,7 @@
**/*.versionsBackup
**/dependency-reduced-pom.xml
.gitignore
+ DEPENDENCIES
src/main/resources/META-INF/services/org.apache.maven.surefire.providerapi.SurefireProvider
[1/2] git commit: o Remove Assignee and Fix-Version columns from Jira report (we're using onlyCurrentVersion=true anyway), use surefire-${project.version} as path name in surefire-archives
Repository: maven-surefire
Updated Branches:
refs/heads/master c1267f521 -> 190c96706
o Remove Assignee and Fix-Version columns from Jira report (we're using
onlyCurrentVersion=true anyway), use surefire-${project.version} as path name
in surefire-archives
Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/bb9d1ea0
Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/bb9d1ea0
Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/bb9d1ea0
Branch: refs/heads/master
Commit: bb9d1ea0704be18b6c80dcf74073f98565bde926
Parents: c1267f5
Author: Andreas Gudian
Authored: Fri Oct 31 17:02:20 2014 +0100
Committer: Andreas Gudian
Committed: Fri Oct 31 17:02:20 2014 +0100
--
pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/bb9d1ea0/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 8d5ebaa..1b56683 100644
--- a/pom.xml
+++ b/pom.xml
@@ -88,7 +88,7 @@
2.12.4
3.3
scm:git:https://git-wip-us.apache.org/repos/asf/maven-surefire.git
-surefire-archives/surefire-LATEST
+
surefire-archives/surefire-${project.version}
@@ -416,7 +416,7 @@
2.11
- Type,Priority,Key,Summary,Assignee,Resolution,Fix
Version
+ Type,Priority,Key,Summary,Resolution
true
Fixed
type DESC,Priority DESC,Key
[2/2] git commit: o Fix section formatting for "Test Execution and Single Thread Execution"
o Fix section formatting for "Test Execution and Single Thread Execution" Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/190c9670 Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/190c9670 Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/190c9670 Branch: refs/heads/master Commit: 190c96706327d222a82665a63834ed7b881611ef Parents: bb9d1ea Author: Andreas Gudian Authored: Fri Oct 31 17:02:51 2014 +0100 Committer: Andreas Gudian Committed: Fri Oct 31 17:02:51 2014 +0100 -- .../site/apt/examples/fork-options-and-parallel-execution.apt.vm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/190c9670/maven-surefire-plugin/src/site/apt/examples/fork-options-and-parallel-execution.apt.vm -- diff --git a/maven-surefire-plugin/src/site/apt/examples/fork-options-and-parallel-execution.apt.vm b/maven-surefire-plugin/src/site/apt/examples/fork-options-and-parallel-execution.apt.vm index 81d32f5..aca06ca 100644 --- a/maven-surefire-plugin/src/site/apt/examples/fork-options-and-parallel-execution.apt.vm +++ b/maven-surefire-plugin/src/site/apt/examples/fork-options-and-parallel-execution.apt.vm @@ -110,7 +110,7 @@ Fork Options and Parallel Test Execution <<>> to a value higher than 1. The next section covers the details about this and the related <<>> property. - * Parallel Test Execution and Single Thread Execution +* Parallel Test Execution and Single Thread Execution As mentioned above the <<>> test execution is used with specific thread count. Since of Surefire 2.18, you can apply the JCIP annotation
Git Push Summary
Repository: maven-surefire Updated Tags: refs/tags/surefire-2.18_vote-1 [created] 38ef6d231
[1/2] git commit: [maven-release-plugin] prepare release surefire-2.18_vote-1
Repository: maven-surefire Updated Branches: refs/heads/master b3a6777ea -> c1267f521 [maven-release-plugin] prepare release surefire-2.18_vote-1 Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/584ae1df Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/584ae1df Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/584ae1df Branch: refs/heads/master Commit: 584ae1df92fcf5d1f7d90cfa48575f54fda14ee6 Parents: b3a6777 Author: Andreas Gudian Authored: Thu Oct 30 20:19:32 2014 +0100 Committer: Andreas Gudian Committed: Thu Oct 30 20:19:32 2014 +0100 -- maven-failsafe-plugin/pom.xml| 2 +- maven-surefire-common/pom.xml| 2 +- maven-surefire-plugin/pom.xml| 2 +- maven-surefire-report-plugin/pom.xml | 2 +- pom.xml | 2 +- surefire-api/pom.xml | 2 +- surefire-booter/pom.xml | 2 +- surefire-grouper/pom.xml | 2 +- surefire-integration-tests/pom.xml | 2 +- surefire-providers/common-java5/pom.xml | 2 +- surefire-providers/common-junit3/pom.xml | 2 +- surefire-providers/common-junit4/pom.xml | 2 +- surefire-providers/common-junit48/pom.xml| 2 +- surefire-providers/pom.xml | 2 +- surefire-providers/surefire-junit3/pom.xml | 2 +- surefire-providers/surefire-junit4/pom.xml | 2 +- surefire-providers/surefire-junit47/pom.xml | 2 +- surefire-providers/surefire-testng-utils/pom.xml | 2 +- surefire-providers/surefire-testng/pom.xml | 2 +- surefire-report-parser/pom.xml | 2 +- surefire-setup-integration-tests/pom.xml | 2 +- surefire-shadefire/pom.xml | 2 +- 22 files changed, 22 insertions(+), 22 deletions(-) -- http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/584ae1df/maven-failsafe-plugin/pom.xml -- diff --git a/maven-failsafe-plugin/pom.xml b/maven-failsafe-plugin/pom.xml index 15cb00e..3e6ac2e 100644 --- a/maven-failsafe-plugin/pom.xml +++ b/maven-failsafe-plugin/pom.xml @@ -24,7 +24,7 @@ org.apache.maven.surefire surefire -2.18-SNAPSHOT +2.18 ../pom.xml http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/584ae1df/maven-surefire-common/pom.xml -- diff --git a/maven-surefire-common/pom.xml b/maven-surefire-common/pom.xml index 4a3b515..552f917 100644 --- a/maven-surefire-common/pom.xml +++ b/maven-surefire-common/pom.xml @@ -24,7 +24,7 @@ org.apache.maven.surefire surefire -2.18-SNAPSHOT +2.18 ../pom.xml http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/584ae1df/maven-surefire-plugin/pom.xml -- diff --git a/maven-surefire-plugin/pom.xml b/maven-surefire-plugin/pom.xml index f983111..d198f21 100644 --- a/maven-surefire-plugin/pom.xml +++ b/maven-surefire-plugin/pom.xml @@ -24,7 +24,7 @@ org.apache.maven.surefire surefire -2.18-SNAPSHOT +2.18 ../pom.xml http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/584ae1df/maven-surefire-report-plugin/pom.xml -- diff --git a/maven-surefire-report-plugin/pom.xml b/maven-surefire-report-plugin/pom.xml index e71556d..2e0d1fa 100644 --- a/maven-surefire-report-plugin/pom.xml +++ b/maven-surefire-report-plugin/pom.xml @@ -24,7 +24,7 @@ org.apache.maven.surefire surefire -2.18-SNAPSHOT +2.18 ../pom.xml http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/584ae1df/pom.xml -- diff --git a/pom.xml b/pom.xml index 634a94e..8b6b9ba 100644 --- a/pom.xml +++ b/pom.xml @@ -29,7 +29,7 @@ org.apache.maven.surefire surefire - 2.18-SNAPSHOT + 2.18 pom Apache Maven Surefire http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/584ae1df/surefire-api/pom.xml -- diff --git a/surefire-api/pom.xml b/surefire-api/pom.xml index 7f3e9b6..d73347d 100644 --- a/surefire-api/pom.xml +++ b/surefire-api/pom.xml @@ -23,7 +23,7 @@ org.apache.maven.surefire surefire -2.18-SNAPSHOT +2.18 ../pom.xml http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/584ae1df/surefire-booter/pom.xml -- diff --git a/surefire-booter/pom.xml b
[2/2] git commit: [maven-release-plugin] prepare for next development iteration
[maven-release-plugin] prepare for next development iteration Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/c1267f52 Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/c1267f52 Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/c1267f52 Branch: refs/heads/master Commit: c1267f5210f7cf80ed48814120a738d742d0b452 Parents: 584ae1d Author: Andreas Gudian Authored: Thu Oct 30 20:19:43 2014 +0100 Committer: Andreas Gudian Committed: Thu Oct 30 20:19:43 2014 +0100 -- maven-failsafe-plugin/pom.xml| 2 +- maven-surefire-common/pom.xml| 2 +- maven-surefire-plugin/pom.xml| 2 +- maven-surefire-report-plugin/pom.xml | 2 +- pom.xml | 2 +- surefire-api/pom.xml | 2 +- surefire-booter/pom.xml | 2 +- surefire-grouper/pom.xml | 2 +- surefire-integration-tests/pom.xml | 2 +- surefire-providers/common-java5/pom.xml | 2 +- surefire-providers/common-junit3/pom.xml | 2 +- surefire-providers/common-junit4/pom.xml | 2 +- surefire-providers/common-junit48/pom.xml| 2 +- surefire-providers/pom.xml | 2 +- surefire-providers/surefire-junit3/pom.xml | 2 +- surefire-providers/surefire-junit4/pom.xml | 2 +- surefire-providers/surefire-junit47/pom.xml | 2 +- surefire-providers/surefire-testng-utils/pom.xml | 2 +- surefire-providers/surefire-testng/pom.xml | 2 +- surefire-report-parser/pom.xml | 2 +- surefire-setup-integration-tests/pom.xml | 2 +- surefire-shadefire/pom.xml | 2 +- 22 files changed, 22 insertions(+), 22 deletions(-) -- http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/c1267f52/maven-failsafe-plugin/pom.xml -- diff --git a/maven-failsafe-plugin/pom.xml b/maven-failsafe-plugin/pom.xml index 3e6ac2e..c6abbf0 100644 --- a/maven-failsafe-plugin/pom.xml +++ b/maven-failsafe-plugin/pom.xml @@ -24,7 +24,7 @@ org.apache.maven.surefire surefire -2.18 +2.19-SNAPSHOT ../pom.xml http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/c1267f52/maven-surefire-common/pom.xml -- diff --git a/maven-surefire-common/pom.xml b/maven-surefire-common/pom.xml index 552f917..3f8bf18 100644 --- a/maven-surefire-common/pom.xml +++ b/maven-surefire-common/pom.xml @@ -24,7 +24,7 @@ org.apache.maven.surefire surefire -2.18 +2.19-SNAPSHOT ../pom.xml http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/c1267f52/maven-surefire-plugin/pom.xml -- diff --git a/maven-surefire-plugin/pom.xml b/maven-surefire-plugin/pom.xml index d198f21..5d87251 100644 --- a/maven-surefire-plugin/pom.xml +++ b/maven-surefire-plugin/pom.xml @@ -24,7 +24,7 @@ org.apache.maven.surefire surefire -2.18 +2.19-SNAPSHOT ../pom.xml http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/c1267f52/maven-surefire-report-plugin/pom.xml -- diff --git a/maven-surefire-report-plugin/pom.xml b/maven-surefire-report-plugin/pom.xml index 2e0d1fa..96b3cbf 100644 --- a/maven-surefire-report-plugin/pom.xml +++ b/maven-surefire-report-plugin/pom.xml @@ -24,7 +24,7 @@ org.apache.maven.surefire surefire -2.18 +2.19-SNAPSHOT ../pom.xml http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/c1267f52/pom.xml -- diff --git a/pom.xml b/pom.xml index 8b6b9ba..8d5ebaa 100644 --- a/pom.xml +++ b/pom.xml @@ -29,7 +29,7 @@ org.apache.maven.surefire surefire - 2.18 + 2.19-SNAPSHOT pom Apache Maven Surefire http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/c1267f52/surefire-api/pom.xml -- diff --git a/surefire-api/pom.xml b/surefire-api/pom.xml index d73347d..5cdfe61 100644 --- a/surefire-api/pom.xml +++ b/surefire-api/pom.xml @@ -23,7 +23,7 @@ org.apache.maven.surefire surefire -2.18 +2.19-SNAPSHOT ../pom.xml http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/c1267f52/surefire-booter/pom.xml -- diff --git a/surefire-booter/pom.xml b/surefire-booter/pom.xml index 2e7f7c7..28a9406 100644 --- a/surefire-booter/pom.xml +++
git commit: [SUREFIRE-1053] small adjustment to suppress the new "defined twice" warning for properties that can not be set via system properties (or user properties) and thus need to be part of argLi
Repository: maven-surefire
Updated Branches:
refs/heads/master 7b8b2ede6 -> e156ab812
[SUREFIRE-1053] small adjustment to suppress the new "defined twice" warning
for properties that can not be set via system properties (or user properties)
and thus need to be part of argLine (as well).
Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/e156ab81
Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/e156ab81
Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/e156ab81
Branch: refs/heads/master
Commit: e156ab812f7df257bcc99f3034ac4dda8bdc6116
Parents: 7b8b2ed
Author: Andreas Gudian
Authored: Wed Oct 29 20:28:45 2014 +0100
Committer: Andreas Gudian
Committed: Wed Oct 29 20:28:45 2014 +0100
--
.../plugin/surefire/AbstractSurefireMojo.java | 3 +++
.../its/jiras/Surefire1053SystemPropertiesIT.java | 17 +++--
2 files changed, 18 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e156ab81/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 5820a62..341b301 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
@@ -967,6 +967,9 @@ public abstract class AbstractSurefireMojo
intersection.add( systemProperty );
}
}
+
+Set ignored =
result.propertiesThatCannotBeSetASystemProperties();
+intersection.removeAll( ignored );
}
return intersection;
}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e156ab81/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1053SystemPropertiesIT.java
--
diff --git
a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1053SystemPropertiesIT.java
b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1053SystemPropertiesIT.java
index 09c1d6c..c33f6c9 100644
---
a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1053SystemPropertiesIT.java
+++
b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1053SystemPropertiesIT.java
@@ -19,10 +19,13 @@ package org.apache.maven.surefire.its.jiras;
* under the License.
*/
+import org.apache.maven.surefire.its.fixture.OutputValidator;
import org.apache.maven.surefire.its.fixture.SurefireJUnit4IntegrationTestCase;
import org.apache.maven.surefire.its.fixture.SurefireLauncher;
import org.junit.Test;
+import static org.junit.Assert.assertFalse;
+
/**
* @author mailto:tibordig...@apache.org";>Tibor Digana (tibor17)
* @see {@linkplain https://jira.codehaus.org/browse/SUREFIRE-1053}
@@ -41,15 +44,25 @@ public class Surefire1053SystemPropertiesIT
+ "file.encoding=... instead" );
}
@Test
-public void checkWarningsSysPropTwice()
+public void checkWarningsSysPropTwice() throws Exception
{
-unpack().argLine( "-DmyArg=myVal2" )
+OutputValidator validator = unpack()
+.argLine( "-DmyArg=myVal2 -Dfile.encoding=ISO-8859-1" )
+.sysProp( "file.encoding", "ISO-8859-1" )
.executeTest()
.verifyErrorFree( 1 )
.verifyTextInLog( "The system property myArg is configured twice! "
+ "The property appears in and
any of , "
+ " or user property." );
+for ( String line : validator.loadLogLines() )
+{
+assertFalse( "no warning for file.encoding not in argLine",
+ line.contains( "file.encoding cannot be set as system
property, use " ) );
+assertFalse( "no warning for double definition of file.encoding",
+ line.contains( "The system property file.encoding is
configured twice!" ) );
+}
+
}
private SurefireLauncher unpack()
[1/2] git commit: [SUREFIRE-654] Support for TestNG successPercentage
Repository: maven-surefire
Updated Branches:
refs/heads/master 391bab043 -> 7bd22e0ad
[SUREFIRE-654] Support for TestNG successPercentage
TestNG has the concept of "successPercentage" where a probabilistic test can be
run some number of invocations and then if the successPercentage is met, the
test is considered passing.
Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/2340c019
Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/2340c019
Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/2340c019
Branch: refs/heads/master
Commit: 2340c019d6e4c217415ed52b0d3a0031c944744b
Parents: 391bab0
Author: Jon Todd
Authored: Tue Sep 2 17:29:08 2014 -0700
Committer: Andreas Gudian
Committed: Sun Oct 26 22:27:43 2014 +0100
--
.../surefire/its/TestNgSuccessPercentageIT.java | 27 ++
.../testng-succes-percentage-fail/pom.xml | 90
.../java/testng/TestNGSuccessPercentTest.java | 44 ++
.../testng-succes-percentage-pass/pom.xml | 90
.../java/testng/TestNGSuccessPercentTest.java | 44 ++
.../maven/surefire/testng/TestNGReporter.java | 2 +-
6 files changed, 296 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/2340c019/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgSuccessPercentageIT.java
--
diff --git
a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgSuccessPercentageIT.java
b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgSuccessPercentageIT.java
new file mode 100644
index 000..0df5cb6
--- /dev/null
+++
b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgSuccessPercentageIT.java
@@ -0,0 +1,27 @@
+package org.apache.maven.surefire.its;
+
+import org.apache.maven.surefire.its.fixture.OutputValidator;
+import org.apache.maven.surefire.its.fixture.SurefireJUnit4IntegrationTestCase;
+import org.junit.Test;
+
+/**
+ * Test that TestNG's @Test(successPercentage = n, invocationCount=n) passes
so long as successPercentage tests
+ * have passed.
+ *
+ * @author Jon Todd
+ */
+public class TestNgSuccessPercentageIT extends
SurefireJUnit4IntegrationTestCase {
+@Test
+public void testPassesWhenFailuresLessThanSuccessPercentage()
+{
+OutputValidator validator =
unpack("/testng-succes-percentage-pass").executeTest();
+validator.assertTestSuiteResults(4, 0, 0, 0);
+}
+
+@Test
+public void testFailsWhenFailuresMoreThanSuccessPercentage()
+{
+OutputValidator validator =
unpack("/testng-succes-percentage-fail").executeTest();
+validator.assertTestSuiteResults(4, 0, 1, 0);
+}
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/2340c019/surefire-integration-tests/src/test/resources/testng-succes-percentage-fail/pom.xml
--
diff --git
a/surefire-integration-tests/src/test/resources/testng-succes-percentage-fail/pom.xml
b/surefire-integration-tests/src/test/resources/testng-succes-percentage-fail/pom.xml
new file mode 100644
index 000..42933f2
--- /dev/null
+++
b/surefire-integration-tests/src/test/resources/testng-succes-percentage-fail/pom.xml
@@ -0,0 +1,90 @@
+
+
+
+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";>
+ 4.0.0
+
+ org.apache.maven.plugins.surefire
+ junit4
+ 1.0-SNAPSHOT
+ Test for Testng
+
+
+
+5.7
+jdk15
+
+
+
+
+ testng-old
+
+testNgClassifier
+
+
+
+ org.testng
+ testng
+ ${testNgVersion}
+ ${testNgClassifier}
+
+
+
+
+ testng-new
+
+!testNgClassifier
+
+
+
+ org.testng
+ testng
+ ${testNgVersion}
+
+
+
+
+
+
+
+
+
+org.apache.maven.plugins
+maven-compiler-plugin
+2.3.2
+
+ 1.5
+ 1.5
+
+
+
+org.apache.maven.plugins
+maven-surefire-plugin
+${surefire.version}
+
+ TestNGSuccessPercentTest
+
+
+
+
+
+
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/2340c019/surefire-integration-tests/src/test/resources/testng-succes-percentage-fail/src/test/java/testng/TestNGSuccessPercentTest.java
--
diff --git
[2/2] git commit: [SUREFIRE-654] fix TestNG successPercentage support by ensuring that "flaky" test detection is disabled when rerunFailingTests=0
[SUREFIRE-654] fix TestNG successPercentage support by ensuring that "flaky"
test detection is disabled when rerunFailingTests=0
Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/7bd22e0a
Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/7bd22e0a
Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/7bd22e0a
Branch: refs/heads/master
Commit: 7bd22e0ad1539412c729582b590e86e910a6c340
Parents: 2340c01
Author: Andreas Gudian
Authored: Sun Oct 26 19:45:01 2014 +0100
Committer: Andreas Gudian
Committed: Sun Oct 26 22:27:44 2014 +0100
--
.../surefire/report/DefaultReporterFactory.java | 53 ++--
.../surefire/report/StatelessXmlReporter.java | 6 +-
.../report/DefaultReporterFactoryTest.java | 53 +++-
.../surefire/its/TestNgSuccessPercentageIT.java | 30 +--
.../testng-succes-percentage-fail/pom.xml | 90
.../java/testng/TestNGSuccessPercentTest.java | 44 --
.../testng-succes-percentage-pass/pom.xml | 90
.../java/testng/TestNGSuccessPercentTest.java | 44 --
.../resources/testng-succes-percentage/pom.xml | 70 +++
.../testng/TestNGSuccessPercentFailingTest.java | 44 ++
.../testng/TestNGSuccessPercentPassingTest.java | 43 ++
surefire-providers/surefire-testng/pom.xml | 5 ++
12 files changed, 248 insertions(+), 324 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/7bd22e0a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/DefaultReporterFactory.java
--
diff --git
a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/DefaultReporterFactory.java
b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/DefaultReporterFactory.java
index 62619a3..dfbec97 100644
---
a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/DefaultReporterFactory.java
+++
b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/DefaultReporterFactory.java
@@ -162,56 +162,60 @@ public class DefaultReporterFactory
* if it only has errors or failures, then count its result based on its
first run
*
* @param reportEntryList the list of test run report type for a given test
+ * @param rerunFailingTestsCount configured rerun count for failing tests
* @return the type of test result
*/
// Use default visibility for testing
-static TestResultType getTestResultType( List
reportEntryList )
+static TestResultType getTestResultType( List
reportEntryList, int rerunFailingTestsCount )
{
if ( reportEntryList == null || reportEntryList.size() == 0 )
{
return TestResultType.unknown;
}
-boolean seenSuccess = false, seenFailure = false;
+boolean seenSuccess = false, seenFailure = false, seenError = false;
for ( ReportEntryType resultType : reportEntryList )
{
if ( resultType == ReportEntryType.SUCCESS )
{
seenSuccess = true;
}
-else if ( resultType == ReportEntryType.FAILURE
-|| resultType == ReportEntryType.ERROR )
+else if ( resultType == ReportEntryType.FAILURE )
{
seenFailure = true;
}
+else if ( resultType == ReportEntryType.ERROR )
+{
+seenError = true;
+}
}
-if ( seenSuccess && !seenFailure )
-{
-return TestResultType.success;
-}
-
-if ( seenSuccess && seenFailure )
-{
-return TestResultType.flake;
-}
-
-if ( !seenSuccess && seenFailure )
+if ( seenFailure || seenError )
{
-if ( reportEntryList.get( 0 ) == ReportEntryType.FAILURE )
-{
-return TestResultType.failure;
-}
-else if ( reportEntryList.get( 0 ) == ReportEntryType.ERROR )
+if ( seenSuccess && rerunFailingTestsCount > 0 )
{
-return TestResultType.error;
+return TestResultType.flake;
}
else
{
-// Reach here if the first one is skipped but later ones have
failure, should be impossible
-return TestResultType.skipped;
+if ( seenError )
+{
+return TestResultType.error;
+}
+else if ( seenFailure )
+{
+return TestResultType.failure;
+}
+els
git commit: [SUREFIRE-1090] Fixed NullPointerException on SmartStackTraceParser init occurring when Thread.contextClassLoader is null
Repository: maven-surefire
Updated Branches:
refs/heads/master 604147c54 -> 391bab043
[SUREFIRE-1090] Fixed NullPointerException on SmartStackTraceParser init
occurring when Thread.contextClassLoader is null
Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/391bab04
Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/391bab04
Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/391bab04
Branch: refs/heads/master
Commit: 391bab043eb5d807fe586455137554c4b89c988a
Parents: 604147c
Author: Jacobus2k
Authored: Mon Aug 18 12:30:26 2014 +0200
Committer: Andreas Gudian
Committed: Sun Oct 26 13:16:08 2014 +0100
--
.../org/apache/maven/surefire/report/SmartStackTraceParser.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/391bab04/surefire-providers/common-java5/src/main/java/org/apache/maven/surefire/report/SmartStackTraceParser.java
--
diff --git
a/surefire-providers/common-java5/src/main/java/org/apache/maven/surefire/report/SmartStackTraceParser.java
b/surefire-providers/common-java5/src/main/java/org/apache/maven/surefire/report/SmartStackTraceParser.java
index c97246c..c0f1128 100644
---
a/surefire-providers/common-java5/src/main/java/org/apache/maven/surefire/report/SmartStackTraceParser.java
+++
b/surefire-providers/common-java5/src/main/java/org/apache/maven/surefire/report/SmartStackTraceParser.java
@@ -66,7 +66,8 @@ public class SmartStackTraceParser
{
try
{
-return Thread.currentThread().getContextClassLoader().loadClass(
name );
+ClassLoader classLoader =
Thread.currentThread().getContextClassLoader();
+return classLoader != null ? classLoader.loadClass( name ) : null;
}
catch ( ClassNotFoundException e )
{
[5/5] git commit: o Add Release Notes link and Jira report to the plugin sites
o Add Release Notes link and Jira report to the plugin sites Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/5d61287a Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/5d61287a Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/5d61287a Branch: refs/heads/master Commit: 5d61287af0a3c5a03761b31d4a65264bcedeba42 Parents: e4ff032 Author: Andreas Gudian Authored: Sun Oct 26 00:58:35 2014 +0200 Committer: Andreas Gudian Committed: Sun Oct 26 00:58:35 2014 +0200 -- maven-failsafe-plugin/pom.xml | 21 + maven-surefire-plugin/pom.xml | 21 + maven-surefire-plugin/src/site/site.xml| 1 + maven-surefire-report-plugin/pom.xml | 14 ++ maven-surefire-report-plugin/src/site/site.xml | 1 + pom.xml| 19 +++ 6 files changed, 77 insertions(+) -- http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/5d61287a/maven-failsafe-plugin/pom.xml -- diff --git a/maven-failsafe-plugin/pom.xml b/maven-failsafe-plugin/pom.xml index b1ff0c0..15cb00e 100644 --- a/maven-failsafe-plugin/pom.xml +++ b/maven-failsafe-plugin/pom.xml @@ -293,5 +293,26 @@ + + reporting + + + +org.apache.maven.plugins +maven-changes-plugin + + false + + + + + jira-report + + + + + + + http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/5d61287a/maven-surefire-plugin/pom.xml -- diff --git a/maven-surefire-plugin/pom.xml b/maven-surefire-plugin/pom.xml index 6d716f1..f983111 100644 --- a/maven-surefire-plugin/pom.xml +++ b/maven-surefire-plugin/pom.xml @@ -163,5 +163,26 @@ + + reporting + + + +org.apache.maven.plugins +maven-changes-plugin + + false + + + + + jira-report + + + + + + + http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/5d61287a/maven-surefire-plugin/src/site/site.xml -- diff --git a/maven-surefire-plugin/src/site/site.xml b/maven-surefire-plugin/src/site/site.xml index d98d763..e67ecb6 100644 --- a/maven-surefire-plugin/src/site/site.xml +++ b/maven-surefire-plugin/src/site/site.xml @@ -32,6 +32,7 @@ + http://www.apache.org/licenses/"/> http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/5d61287a/maven-surefire-report-plugin/pom.xml -- diff --git a/maven-surefire-report-plugin/pom.xml b/maven-surefire-report-plugin/pom.xml index b5d6fcd..0cef841 100644 --- a/maven-surefire-report-plugin/pom.xml +++ b/maven-surefire-report-plugin/pom.xml @@ -233,6 +233,20 @@ + +org.apache.maven.plugins +maven-changes-plugin + + false + + + + + jira-report + + + + http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/5d61287a/maven-surefire-report-plugin/src/site/site.xml -- diff --git a/maven-surefire-report-plugin/src/site/site.xml b/maven-surefire-report-plugin/src/site/site.xml index d638885..8aa02a7 100644 --- a/maven-surefire-report-plugin/src/site/site.xml +++ b/maven-surefire-report-plugin/src/site/site.xml @@ -27,6 +27,7 @@ + http://www.apache.org/licenses/"/> http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/5d61287a/pom.xml -- diff --git a/pom.xml b/pom.xml index 12ee4b3..6788ec6 100644 --- a/pom.xml +++ b/pom.xml @@ -318,6 +318,7 @@ **/*.ipr **/*.iws **/*.versionsBackup + **/dependency-reduced-pom.xml .gitignore src/main/resources/META-INF/services/org.apache.maven.surefire.providerapi.SurefireProvider @@ -407,6 +408,24 @@
[2/5] o Update to maven-parent 25, fix tons of rat and checkstyle errors
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e4ff0329/surefire-api/src/main/java/org/apache/maven/surefire/util/DefaultScanResult.java
--
diff --git
a/surefire-api/src/main/java/org/apache/maven/surefire/util/DefaultScanResult.java
b/surefire-api/src/main/java/org/apache/maven/surefire/util/DefaultScanResult.java
index 8957e5a..ad94948 100644
---
a/surefire-api/src/main/java/org/apache/maven/surefire/util/DefaultScanResult.java
+++
b/surefire-api/src/main/java/org/apache/maven/surefire/util/DefaultScanResult.java
@@ -32,7 +32,7 @@ public class DefaultScanResult
{
private final List files;
-private static final String scanResultNo = "tc.";
+private static final String SCAN_RESULT_NUMBER = "tc.";
public DefaultScanResult( List files )
{
@@ -54,7 +54,7 @@ public class DefaultScanResult
int size = files.size();
for ( int i = 0; i < size; i++ )
{
-properties.setProperty( scanResultNo + i, files.get( i ) );
+properties.setProperty( SCAN_RESULT_NUMBER + i, files.get( i ) );
}
}
@@ -64,7 +64,7 @@ public class DefaultScanResult
int i = 0;
while ( true )
{
-String item = properties.getProperty( scanResultNo + ( i++ ) );
+String item = properties.getProperty( SCAN_RESULT_NUMBER + ( i++ )
);
if ( item == null )
{
return new DefaultScanResult( result );
@@ -137,7 +137,8 @@ public class DefaultScanResult
return testClass;
}
-public DefaultScanResult append(DefaultScanResult other){
+public DefaultScanResult append( DefaultScanResult other )
+{
if ( other != null )
{
List src = new ArrayList( files );
@@ -150,5 +151,4 @@ public class DefaultScanResult
}
}
-
}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e4ff0329/surefire-api/src/main/java/org/apache/maven/surefire/util/ReflectionUtils.java
--
diff --git
a/surefire-api/src/main/java/org/apache/maven/surefire/util/ReflectionUtils.java
b/surefire-api/src/main/java/org/apache/maven/surefire/util/ReflectionUtils.java
index 19c1c3f..a30ae73 100644
---
a/surefire-api/src/main/java/org/apache/maven/surefire/util/ReflectionUtils.java
+++
b/surefire-api/src/main/java/org/apache/maven/surefire/util/ReflectionUtils.java
@@ -221,6 +221,7 @@ public class ReflectionUtils
return newInstance( constructor, params );
}
+@SuppressWarnings( "checkstyle:emptyblock" )
public static Class tryLoadClass( ClassLoader classLoader, String
className )
{
try
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e4ff0329/surefire-api/src/main/java/org/apache/maven/surefire/util/RunOrderCalculator.java
--
diff --git
a/surefire-api/src/main/java/org/apache/maven/surefire/util/RunOrderCalculator.java
b/surefire-api/src/main/java/org/apache/maven/surefire/util/RunOrderCalculator.java
index a87712f..bdbc48b 100644
---
a/surefire-api/src/main/java/org/apache/maven/surefire/util/RunOrderCalculator.java
+++
b/surefire-api/src/main/java/org/apache/maven/surefire/util/RunOrderCalculator.java
@@ -1,23 +1,23 @@
package org.apache.maven.surefire.util;
/*
-* 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.
-*/
+ * 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 fo
[1/5] o Update to maven-parent 25, fix tons of rat and checkstyle errors
Repository: maven-surefire
Updated Branches:
refs/heads/master 2e62ff472 -> 5d61287af
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e4ff0329/surefire-providers/surefire-testng-utils/src/main/java/org/apache/maven/surefire/testng/utils/GroupMatcherMethodSelector.java
--
diff --git
a/surefire-providers/surefire-testng-utils/src/main/java/org/apache/maven/surefire/testng/utils/GroupMatcherMethodSelector.java
b/surefire-providers/surefire-testng-utils/src/main/java/org/apache/maven/surefire/testng/utils/GroupMatcherMethodSelector.java
index 80baa97..7f5d347 100644
---
a/surefire-providers/surefire-testng-utils/src/main/java/org/apache/maven/surefire/testng/utils/GroupMatcherMethodSelector.java
+++
b/surefire-providers/surefire-testng-utils/src/main/java/org/apache/maven/surefire/testng/utils/GroupMatcherMethodSelector.java
@@ -1,4 +1,5 @@
package org.apache.maven.surefire.testng.utils;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -31,6 +32,10 @@ import org.testng.IMethodSelector;
import org.testng.IMethodSelectorContext;
import org.testng.ITestNGMethod;
+/**
+ * Method selector delegating to {@link GroupMatcher} to decide if a method is
included or not.
+ *
+ */
public class GroupMatcherMethodSelector
implements IMethodSelector
{
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e4ff0329/surefire-providers/surefire-testng-utils/src/main/java/org/apache/maven/surefire/testng/utils/MethodSelector.java
--
diff --git
a/surefire-providers/surefire-testng-utils/src/main/java/org/apache/maven/surefire/testng/utils/MethodSelector.java
b/surefire-providers/surefire-testng-utils/src/main/java/org/apache/maven/surefire/testng/utils/MethodSelector.java
index 3c06bca..bf42daa 100644
---
a/surefire-providers/surefire-testng-utils/src/main/java/org/apache/maven/surefire/testng/utils/MethodSelector.java
+++
b/surefire-providers/surefire-testng-utils/src/main/java/org/apache/maven/surefire/testng/utils/MethodSelector.java
@@ -37,11 +37,11 @@ public class MethodSelector
implements IMethodSelector
{
-private static String METHOD_NAME = null;
+private static String methodName = null;
public void setTestMethods( List arg0 )
{
-// noop
+// noop
}
public boolean includeMethod( IMethodSelectorContext context,
ITestNGMethod testngMethod, boolean isTestMethod )
@@ -59,11 +59,11 @@ public class MethodSelector
return true;
}
-return SelectorUtils.match( METHOD_NAME, testngMethod.getMethodName()
);
+return SelectorUtils.match( methodName, testngMethod.getMethodName() );
}
public static void setMethodName( String methodName )
{
-METHOD_NAME = methodName;
+MethodSelector.methodName = methodName;
}
}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e4ff0329/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGDirectoryTestSuite.java
--
diff --git
a/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGDirectoryTestSuite.java
b/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGDirectoryTestSuite.java
index 62286eb..d30ad3c 100644
---
a/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGDirectoryTestSuite.java
+++
b/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGDirectoryTestSuite.java
@@ -76,8 +76,9 @@ public class TestNGDirectoryTestSuite
private Class junitTestAnnotation;
-public TestNGDirectoryTestSuite( String testSourceDirectory, Properties
confOptions, File reportsDirectory, String testMethodPattern,
- RunOrderCalculator runOrderCalculator,
ScanResult scanResult )
+public TestNGDirectoryTestSuite( String testSourceDirectory, Properties
confOptions, File reportsDirectory,
+ String testMethodPattern,
RunOrderCalculator runOrderCalculator,
+ ScanResult scanResult )
{
this.runOrderCalculator = runOrderCalculator;
@@ -95,7 +96,7 @@ public class TestNGDirectoryTestSuite
}
public void execute( TestsToRun testsToRun, ReporterFactory
reporterManagerFactory )
-throws ReporterException, TestSetFailedException
+throws TestSetFailedException
{
if ( !testsToRun.allowEagerReading() )
@@ -132,7 +133,7 @@ public class TestNGDirectoryTestSuite
}
public void executeLazy( TestsToRun testsToRun, ReporterFactory
reporterFactory )
-throws ReporterException, Test
[4/5] git commit: o Update to maven-parent 25, fix tons of rat and checkstyle errors
o Update to maven-parent 25, fix tons of rat and checkstyle 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/e4ff0329 Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/e4ff0329 Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/e4ff0329 Branch: refs/heads/master Commit: e4ff03293e74a2e049fdd9fe4a8e03753568e8a9 Parents: 2e62ff4 Author: Andreas Gudian Authored: Sun Oct 26 00:57:48 2014 +0200 Committer: Andreas Gudian Committed: Sun Oct 26 00:57:48 2014 +0200 -- CONTRIBUTING.md | 19 ++ .../plugin/failsafe/IntegrationTestMojo.java| 21 +- .../maven/plugin/failsafe/VerifyMojo.java | 4 +- .../plugin/surefire/AbstractSurefireMojo.java | 247 + .../maven/plugin/surefire/ClasspathCache.java | 7 +- .../maven/plugin/surefire/ProviderList.java | 2 + .../surefire/StartupReportConfiguration.java| 4 +- .../plugin/surefire/SurefireProperties.java | 20 +- .../surefire/booterclient/BooterSerializer.java | 5 +- .../booterclient/ChecksumCalculator.java| 3 +- .../booterclient/ForkConfiguration.java | 30 ++- .../surefire/booterclient/ForkNumberBucket.java | 29 +- .../surefire/booterclient/ForkStarter.java | 13 +- .../OutputStreamFlushableCommandline.java | 3 - .../TestProvidingInputStream.java | 6 +- .../output/ThreadedStreamConsumer.java | 11 +- .../report/ConsoleOutputFileReporter.java | 4 +- .../plugin/surefire/report/ConsoleReporter.java | 3 - .../surefire/report/DefaultReporterFactory.java | 22 +- .../plugin/surefire/report/FileReporter.java| 5 +- .../surefire/report/FileReporterUtils.java | 4 +- .../surefire/report/PrettyPrintXMLWriter.java | 4 + .../plugin/surefire/report/ReportEntryType.java | 12 +- .../surefire/report/StatelessXmlReporter.java | 15 +- .../surefire/report/TestSetRunListener.java | 13 +- .../plugin/surefire/report/TestSetStats.java| 7 +- .../Utf8RecodingDeferredFileOutputStream.java | 1 + .../surefire/report/WrappedReportEntry.java | 9 +- .../plugin/surefire/util/DependencyScanner.java | 15 +- .../plugin/surefire/util/DirectoryScanner.java | 5 +- .../maven/plugin/surefire/util/Relocator.java | 7 +- .../maven/plugin/surefire/util/ScannerUtil.java | 16 +- .../surefire/util/SpecificFileFilter.java | 4 + .../surefire/report/SurefireReportParser.java | 3 +- .../surefire/report/TestSuiteXmlParser.java | 4 +- .../maven/surefire/report/RunStatistics.java| 7 - .../report/DefaultReporterFactoryTest.java | 65 +++-- .../report/StatelessXmlReporterTest.java| 16 +- .../maven/surefire/report/FileReporterTest.java | 4 +- .../maven/plugin/surefire/SurefirePlugin.java | 25 +- .../src/site/markdown/newerrorsummary.md| 19 ++ .../report/AbstractSurefireReportMojo.java | 17 +- .../surefire/report/FailsafeReportMojo.java | 9 +- .../report/SurefireReportGenerator.java | 269 ++- .../surefire/report/SurefireReportMojo.java | 10 +- .../surefire/report/SurefireReportOnlyMojo.java | 4 +- pom.xml | 2 +- .../surefire/runorder/RunEntryStatistics.java | 1 + .../runorder/ThreadedExecutionScheduler.java| 1 + .../maven/surefire/SpecificTestClassFilter.java | 5 + .../surefire/booter/BaseProviderFactory.java| 4 +- .../surefire/booter/ForkingRunListener.java | 14 +- .../surefire/booter/ProviderParameterNames.java | 1 + .../surefire/booter/SurefireReflector.java | 7 +- .../surefire/providerapi/SurefireProvider.java | 2 +- .../maven/surefire/report/ConsoleLogger.java| 2 +- .../surefire/report/ConsoleOutputCapture.java | 4 +- .../ConsoleOutputReceiverForCurrentThread.java | 9 +- .../report/DefaultDirectConsoleReporter.java| 1 + .../report/LegacyPojoStackTraceWriter.java | 6 +- .../maven/surefire/report/ReportEntry.java | 18 +- .../maven/surefire/report/SafeThrowable.java| 1 + .../surefire/testset/RunOrderParameters.java| 2 +- .../util/DefaultRunOrderCalculator.java | 4 +- .../maven/surefire/util/DefaultScanResult.java | 10 +- .../maven/surefire/util/ReflectionUtils.java| 1 + .../maven/surefire/util/RunOrderCalculator.java | 34 +-- .../surefire/util/internal/ByteBuffer.java | 8 +- .../surefire/util/internal/StringUtils.java | 5 +- .../report/LegacyPojoStackTraceWriterTest.java | 19 ++ .../surefire/util/RunOrderCalculatorTest.java | 2 +- .../maven/surefire/booter/BooterConstants.java | 48 ++-- .../surefire/booter/BooterDeserializer.java | 4 +- .../apache/maven/surefire/booter/Classpath.java | 18 +- .../surefire/booter
[3/5] o Update to maven-parent 25, fix tons of rat and checkstyle errors
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e4ff0329/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/TestSetRunListener.java
--
diff --git
a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/TestSetRunListener.java
b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/TestSetRunListener.java
index 7ec390e..b7bcadb 100644
---
a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/TestSetRunListener.java
+++
b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/TestSetRunListener.java
@@ -63,6 +63,7 @@ public class TestSetRunListener
private final StatisticsReporter statisticsReporter;
+@SuppressWarnings( "checkstyle:parameternumber" )
public TestSetRunListener( ConsoleReporter consoleReporter, FileReporter
fileReporter,
StatelessXmlReporter simpleXMLReporter,
TestcycleConsoleOutputReceiver
consoleOutputReceiver,
@@ -169,7 +170,7 @@ public class TestSetRunListener
public void testSucceeded( ReportEntry reportEntry )
{
-WrappedReportEntry wrapped = wrap( reportEntry,
ReportEntryType.success );
+WrappedReportEntry wrapped = wrap( reportEntry,
ReportEntryType.SUCCESS );
detailsForThis.testSucceeded( wrapped );
if ( statisticsReporter != null )
{
@@ -180,7 +181,7 @@ public class TestSetRunListener
public void testError( ReportEntry reportEntry )
{
-WrappedReportEntry wrapped = wrap( reportEntry, ReportEntryType.error
);
+WrappedReportEntry wrapped = wrap( reportEntry, ReportEntryType.ERROR
);
detailsForThis.testError( wrapped );
if ( statisticsReporter != null )
{
@@ -191,7 +192,7 @@ public class TestSetRunListener
public void testFailed( ReportEntry reportEntry )
{
-WrappedReportEntry wrapped = wrap( reportEntry,
ReportEntryType.failure );
+WrappedReportEntry wrapped = wrap( reportEntry,
ReportEntryType.FAILURE );
detailsForThis.testFailure( wrapped );
if ( statisticsReporter != null )
{
@@ -206,7 +207,7 @@ public class TestSetRunListener
public void testSkipped( ReportEntry reportEntry )
{
-WrappedReportEntry wrapped = wrap( reportEntry,
ReportEntryType.skipped );
+WrappedReportEntry wrapped = wrap( reportEntry,
ReportEntryType.SKIPPED );
detailsForThis.testSkipped( wrapped );
if ( statisticsReporter != null )
@@ -224,7 +225,7 @@ public class TestSetRunListener
private WrappedReportEntry wrap( ReportEntry other, ReportEntryType
reportEntryType )
{
final int estimatedElapsed;
-if ( reportEntryType != ReportEntryType.skipped )
+if ( reportEntryType != ReportEntryType.SKIPPED )
{
if ( other.getElapsed() != null )
{
@@ -260,7 +261,7 @@ public class TestSetRunListener
public void addTestMethodStats()
{
-for (WrappedReportEntry reportEntry :
detailsForThis.getReportEntries())
+for ( WrappedReportEntry reportEntry :
detailsForThis.getReportEntries() )
{
TestMethodStats methodStats =
new TestMethodStats( reportEntry.getClassMethodName(),
reportEntry.getReportEntryType(),
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e4ff0329/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/TestSetStats.java
--
diff --git
a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/TestSetStats.java
b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/TestSetStats.java
index 8391ff9..2ff40ba 100644
---
a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/TestSetStats.java
+++
b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/TestSetStats.java
@@ -1,4 +1,5 @@
package org.apache.maven.plugin.surefire.report;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -82,12 +83,14 @@ public class TestSetStats
public void testSetStart()
{
-lastStartAt = testSetStartAt = System.currentTimeMillis();
+testSetStartAt = System.currentTimeMillis();
+lastStartAt = testSetStartAt;
}
public void testStart()
{
-lastStartAt = testStartAt = System.currentTimeMillis();
+testStartAt = System.currentTimeMillis();
+lastStartAt = testStartAt;
}
private long finishTest( WrappedReportEntry reportEntry )
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e4ff0329/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/re
git commit: [SUREFIRE-1088] another alternative fix for handling of @Ignored test cases: seems like the problem was in the NonConcurrentRunListener that did not finish previous test sets in case of te
Repository: maven-surefire
Updated Branches:
refs/heads/master 5291f3ae6 -> 898475f88
[SUREFIRE-1088] another alternative fix for handling of @Ignored test cases:
seems like the problem was in the NonConcurrentRunListener that did not finish
previous test sets in case of test 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/898475f8
Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/898475f8
Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/898475f8
Branch: refs/heads/master
Commit: 898475f88253dcf751651c2d76d3f693ccc093a1
Parents: 5291f3a
Author: Andreas Gudian
Authored: Sun Oct 19 22:00:41 2014 +0200
Committer: Andreas Gudian
Committed: Sun Oct 19 22:00:41 2014 +0200
--
.../surefire/report/TestSetRunListener.java | 33
.../junitcore/NonConcurrentRunListener.java | 4 ++-
2 files changed, 3 insertions(+), 34 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/898475f8/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/TestSetRunListener.java
--
diff --git
a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/TestSetRunListener.java
b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/TestSetRunListener.java
index 701069f..7ec390e 100644
---
a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/TestSetRunListener.java
+++
b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/TestSetRunListener.java
@@ -24,7 +24,6 @@ import java.util.ArrayList;
import java.util.List;
import org.apache.maven.plugin.surefire.runorder.StatisticsReporter;
-import org.apache.maven.shared.utils.StringUtils;
import org.apache.maven.surefire.report.ConsoleLogger;
import org.apache.maven.surefire.report.ConsoleOutputReceiver;
import org.apache.maven.surefire.report.ReportEntry;
@@ -41,8 +40,6 @@ public class TestSetRunListener
{
private final TestSetStats detailsForThis;
-private ReportEntry lastMarkedAsCompleteAfterSkipped;
-
private List testMethodStats;
private Utf8RecodingDeferredFileOutputStream testStdOut = initDeferred(
"stdout" );
@@ -128,12 +125,6 @@ public class TestSetRunListener
public void testSetCompleted( ReportEntry report )
{
-if ( wasMarkedAsCompleteAfterSkipped( report ) )
-{
-lastMarkedAsCompleteAfterSkipped = null;
-return;
-}
-
WrappedReportEntry wrap = wrapTestSet( report );
List testResults = briefOrPlainFormat ?
detailsForThis.getTestResults() : null;
if ( fileReporter != null )
@@ -166,13 +157,6 @@ public class TestSetRunListener
}
-private boolean wasMarkedAsCompleteAfterSkipped( ReportEntry report )
-{
-return null != lastMarkedAsCompleteAfterSkipped
-&& StringUtils.equals( lastMarkedAsCompleteAfterSkipped.getName(),
report.getName() )
-&& StringUtils.equals(
lastMarkedAsCompleteAfterSkipped.getSourceName(), report.getSourceName() );
-}
-
// --
// Test
// --
@@ -230,23 +214,6 @@ public class TestSetRunListener
statisticsReporter.testSkipped( reportEntry );
}
clearCapture();
-
-if ( looksLikeIgnoredTestSet( reportEntry ) )
-{
-// if a class is marked as @Ignored, the testSetCompleted method
is not always called by the test provider,
-// so we do that here.
-testSetCompleted( reportEntry );
-lastMarkedAsCompleteAfterSkipped = reportEntry;
-}
-}
-
-/**
- * @param reportEntry the report entry to check
- * @return {@code true}, if the report entry looks like it belongs to an
ignored test class
- */
-private boolean looksLikeIgnoredTestSet( ReportEntry reportEntry )
-{
-return StringUtils.equals( reportEntry.getName(),
reportEntry.getSourceName() );
}
public void testAssumptionFailure( ReportEntry report )
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/898475f8/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/NonConcurrentRunListener.java
--
diff --git
a/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/NonConcurrentRunListener.java
b/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/NonConcurrentRunListener.java
index 458b484..9d4e9c1 1
git commit: [SUREFIRE-1088] alternative fix for handling of @Ignored test cases (the better-safe-than-sorry way)
Repository: maven-surefire
Updated Branches:
refs/heads/master 40b4b48a3 -> 5291f3ae6
[SUREFIRE-1088] alternative fix for handling of @Ignored test cases (the
better-safe-than-sorry way)
Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/5291f3ae
Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/5291f3ae
Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/5291f3ae
Branch: refs/heads/master
Commit: 5291f3ae6855bf335598f0147b67c4806c88e6fc
Parents: 40b4b48
Author: Andreas Gudian
Authored: Sun Oct 19 19:43:22 2014 +0200
Committer: Andreas Gudian
Committed: Sun Oct 19 19:43:22 2014 +0200
--
.../surefire/report/TestSetRunListener.java | 44 +++-
1 file changed, 24 insertions(+), 20 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/5291f3ae/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/TestSetRunListener.java
--
diff --git
a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/TestSetRunListener.java
b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/TestSetRunListener.java
index 35b923c..701069f 100644
---
a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/TestSetRunListener.java
+++
b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/TestSetRunListener.java
@@ -41,7 +41,7 @@ public class TestSetRunListener
{
private final TestSetStats detailsForThis;
-private ReportEntry lastSkipped;
+private ReportEntry lastMarkedAsCompleteAfterSkipped;
private List testMethodStats;
@@ -112,8 +112,6 @@ public class TestSetRunListener
public void testSetStarting( ReportEntry report )
{
-checkForUnfinishedTestSetDueToSkip( report );
-
detailsForThis.testSetStart();
if ( consoleReporter != null )
{
@@ -130,7 +128,11 @@ public class TestSetRunListener
public void testSetCompleted( ReportEntry report )
{
-clearLastSkipMarker();
+if ( wasMarkedAsCompleteAfterSkipped( report ) )
+{
+lastMarkedAsCompleteAfterSkipped = null;
+return;
+}
WrappedReportEntry wrap = wrapTestSet( report );
List testResults = briefOrPlainFormat ?
detailsForThis.getTestResults() : null;
@@ -164,6 +166,13 @@ public class TestSetRunListener
}
+private boolean wasMarkedAsCompleteAfterSkipped( ReportEntry report )
+{
+return null != lastMarkedAsCompleteAfterSkipped
+&& StringUtils.equals( lastMarkedAsCompleteAfterSkipped.getName(),
report.getName() )
+&& StringUtils.equals(
lastMarkedAsCompleteAfterSkipped.getSourceName(), report.getSourceName() );
+}
+
// --
// Test
// --
@@ -187,8 +196,6 @@ public class TestSetRunListener
public void testError( ReportEntry reportEntry )
{
-checkForUnfinishedTestSetDueToSkip( reportEntry );
-
WrappedReportEntry wrapped = wrap( reportEntry, ReportEntryType.error
);
detailsForThis.testError( wrapped );
if ( statisticsReporter != null )
@@ -200,8 +207,6 @@ public class TestSetRunListener
public void testFailed( ReportEntry reportEntry )
{
-checkForUnfinishedTestSetDueToSkip( reportEntry );
-
WrappedReportEntry wrapped = wrap( reportEntry,
ReportEntryType.failure );
detailsForThis.testFailure( wrapped );
if ( statisticsReporter != null )
@@ -217,10 +222,6 @@ public class TestSetRunListener
public void testSkipped( ReportEntry reportEntry )
{
-checkForUnfinishedTestSetDueToSkip( reportEntry );
-
-lastSkipped = reportEntry;
-
WrappedReportEntry wrapped = wrap( reportEntry,
ReportEntryType.skipped );
detailsForThis.testSkipped( wrapped );
@@ -229,20 +230,23 @@ public class TestSetRunListener
statisticsReporter.testSkipped( reportEntry );
}
clearCapture();
-}
-private void checkForUnfinishedTestSetDueToSkip( ReportEntry reportEntry )
-{
-if ( lastSkipped != null && !StringUtils.equals(
lastSkipped.getSourceName(), reportEntry.getSourceName() ) )
+if ( looksLikeIgnoredTestSet( reportEntry ) )
{
-// a new test class was started to be processed, but a skipped
test class was not yet marked as completed
-testSetCompleted( lastSkipped );
+// if a class is marked as @Ignored, the testSetCompleted method
is not always called by t
git commit: Add debug output to Surefire943ReportContentIT for analysis of the failing test in Jenkins
Repository: maven-surefire
Updated Branches:
refs/heads/master 3ab27f473 -> 254e7390a
Add debug output to Surefire943ReportContentIT for analysis of the failing test
in Jenkins
Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/254e7390
Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/254e7390
Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/254e7390
Branch: refs/heads/master
Commit: 254e7390a833222d006314c54cbb2be0a929d18d
Parents: 3ab27f4
Author: Andreas Gudian
Authored: Mon Oct 13 19:44:04 2014 +0200
Committer: Andreas Gudian
Committed: Mon Oct 13 19:44:04 2014 +0200
--
.../surefire/its/jiras/Surefire943ReportContentIT.java | 13 +++--
1 file changed, 11 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/254e7390/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire943ReportContentIT.java
--
diff --git
a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire943ReportContentIT.java
b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire943ReportContentIT.java
index f702999..249ed9b 100644
---
a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire943ReportContentIT.java
+++
b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire943ReportContentIT.java
@@ -50,8 +50,17 @@ public class Surefire943ReportContentIT
throws Exception
{
OutputValidator validator =
-unpack( "surefire-943-report-content" ).maven().sysProp(
"parallel", parallelMode ).sysProp( "threadCount",
-
4 ).withFailure().executeTest();
+unpack( "surefire-943-report-content" ).maven()
+.sysProp( "parallel", parallelMode )
+.sysProp( "threadCount", 4 )
+.withFailure().executeTest();
+
+System.out.println("= START EXECUTION LOG =");
+for ( String line : validator.loadLogLines() )
+{
+System.out.println( line );
+}
+System.out.println("= END EXECUTION LOG =");
validator.assertTestSuiteResults( 10, 1, 3, 3 );
git commit: [SUREFIRE-1088] fix handling of @Ignored test cases
Repository: maven-surefire
Updated Branches:
refs/heads/master 5c793434a -> 3ab27f473
[SUREFIRE-1088] fix handling of @Ignored test cases
Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/3ab27f47
Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/3ab27f47
Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/3ab27f47
Branch: refs/heads/master
Commit: 3ab27f473c88e9b1ad9fc975dc89c7d5af297616
Parents: 5c79343
Author: Andreas Gudian
Authored: Sun Oct 12 19:46:48 2014 +0200
Committer: Andreas Gudian
Committed: Sun Oct 12 19:46:48 2014 +0200
--
.../maven/plugin/surefire/report/TestSetRunListener.java | 11 +--
1 file changed, 9 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/3ab27f47/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/TestSetRunListener.java
--
diff --git
a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/TestSetRunListener.java
b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/TestSetRunListener.java
index d4c0263..35b923c 100644
---
a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/TestSetRunListener.java
+++
b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/TestSetRunListener.java
@@ -130,6 +130,8 @@ public class TestSetRunListener
public void testSetCompleted( ReportEntry report )
{
+clearLastSkipMarker();
+
WrappedReportEntry wrap = wrapTestSet( report );
List testResults = briefOrPlainFormat ?
detailsForThis.getTestResults() : null;
if ( fileReporter != null )
@@ -231,13 +233,18 @@ public class TestSetRunListener
private void checkForUnfinishedTestSetDueToSkip( ReportEntry reportEntry )
{
-if ( lastSkipped != null && !StringUtils.equals(
lastSkipped.getSourceName(), reportEntry.getSourceName() ) ) {
+if ( lastSkipped != null && !StringUtils.equals(
lastSkipped.getSourceName(), reportEntry.getSourceName() ) )
+{
// a new test class was started to be processed, but a skipped
test class was not yet marked as completed
testSetCompleted( lastSkipped );
-lastSkipped = null;
}
}
+private void clearLastSkipMarker()
+{
+lastSkipped = null;
+}
+
public void testAssumptionFailure( ReportEntry report )
{
testSkipped( report );
git commit: [SUREFIRE-1088] fix reported execution time if a test breaks in @BeforeClass, or if a complete test class is marked as @Ignored
Repository: maven-surefire
Updated Branches:
refs/heads/master 6d50bf678 -> 080aa5f61
[SUREFIRE-1088] fix reported execution time if a test breaks in @BeforeClass,
or if a complete test class is marked as @Ignored
Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/080aa5f6
Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/080aa5f6
Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/080aa5f6
Branch: refs/heads/master
Commit: 080aa5f612382cd1bf6e47c4322bd855ad3b4fed
Parents: 6d50bf6
Author: Andreas Gudian
Authored: Sat Oct 11 23:05:03 2014 +0200
Committer: Andreas Gudian
Committed: Sat Oct 11 23:05:03 2014 +0200
--
.../surefire/report/TestSetRunListener.java | 31 ++--
.../plugin/surefire/report/TestSetStats.java| 18 -
.../its/jiras/Surefire943ReportContentIT.java | 37 +++
.../test/java/org/sample/module/My1Test.java| 3 --
.../test/java/org/sample/module/My2Test.java| 3 --
.../test/java/org/sample/module/My3Test.java| 3 --
.../test/java/org/sample/module/My4Test.java| 5 ---
.../test/java/org/sample/module/My5Test.java| 39
8 files changed, 111 insertions(+), 28 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/080aa5f6/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/TestSetRunListener.java
--
diff --git
a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/TestSetRunListener.java
b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/TestSetRunListener.java
index ca2403d..d4c0263 100644
---
a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/TestSetRunListener.java
+++
b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/TestSetRunListener.java
@@ -19,16 +19,17 @@ package org.apache.maven.plugin.surefire.report;
* under the License.
*/
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+
import org.apache.maven.plugin.surefire.runorder.StatisticsReporter;
+import org.apache.maven.shared.utils.StringUtils;
import org.apache.maven.surefire.report.ConsoleLogger;
import org.apache.maven.surefire.report.ConsoleOutputReceiver;
import org.apache.maven.surefire.report.ReportEntry;
import org.apache.maven.surefire.report.RunListener;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-
/**
* Reports data for a single test set.
*
@@ -40,6 +41,8 @@ public class TestSetRunListener
{
private final TestSetStats detailsForThis;
+private ReportEntry lastSkipped;
+
private List testMethodStats;
private Utf8RecodingDeferredFileOutputStream testStdOut = initDeferred(
"stdout" );
@@ -109,6 +112,8 @@ public class TestSetRunListener
public void testSetStarting( ReportEntry report )
{
+checkForUnfinishedTestSetDueToSkip( report );
+
detailsForThis.testSetStart();
if ( consoleReporter != null )
{
@@ -180,6 +185,8 @@ public class TestSetRunListener
public void testError( ReportEntry reportEntry )
{
+checkForUnfinishedTestSetDueToSkip( reportEntry );
+
WrappedReportEntry wrapped = wrap( reportEntry, ReportEntryType.error
);
detailsForThis.testError( wrapped );
if ( statisticsReporter != null )
@@ -191,6 +198,8 @@ public class TestSetRunListener
public void testFailed( ReportEntry reportEntry )
{
+checkForUnfinishedTestSetDueToSkip( reportEntry );
+
WrappedReportEntry wrapped = wrap( reportEntry,
ReportEntryType.failure );
detailsForThis.testFailure( wrapped );
if ( statisticsReporter != null )
@@ -206,7 +215,12 @@ public class TestSetRunListener
public void testSkipped( ReportEntry reportEntry )
{
+checkForUnfinishedTestSetDueToSkip( reportEntry );
+
+lastSkipped = reportEntry;
+
WrappedReportEntry wrapped = wrap( reportEntry,
ReportEntryType.skipped );
+
detailsForThis.testSkipped( wrapped );
if ( statisticsReporter != null )
{
@@ -215,6 +229,15 @@ public class TestSetRunListener
clearCapture();
}
+private void checkForUnfinishedTestSetDueToSkip( ReportEntry reportEntry )
+{
+if ( lastSkipped != null && !StringUtils.equals(
lastSkipped.getSourceName(), reportEntry.getSourceName() ) ) {
+// a new test class was started to be processed, but a skipped
test class was not yet marked as completed
+testSetCompleted( lastSkipped );
+lastSkipped = null;
+}
+}
+
public void t
git commit: [SUREFIRE-1104] fix IT that fails with Maven 3.2.x
Repository: maven-surefire
Updated Branches:
refs/heads/master ece5f58d5 -> 6d50bf678
[SUREFIRE-1104] fix IT that fails with Maven 3.2.x
Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/6d50bf67
Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/6d50bf67
Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/6d50bf67
Branch: refs/heads/master
Commit: 6d50bf678d6560e84f4f0e44aca9f2e978d847c5
Parents: ece5f58
Author: Andreas Gudian
Authored: Sat Oct 11 20:21:40 2014 +0200
Committer: Andreas Gudian
Committed: Sat Oct 11 20:21:40 2014 +0200
--
.../java/org/apache/maven/surefire/its/ForkModeMultiModuleIT.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/6d50bf67/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ForkModeMultiModuleIT.java
--
diff --git
a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ForkModeMultiModuleIT.java
b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ForkModeMultiModuleIT.java
index f4c5dd5..41b93a4 100644
---
a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ForkModeMultiModuleIT.java
+++
b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ForkModeMultiModuleIT.java
@@ -130,7 +130,7 @@ public class ForkModeMultiModuleIT
private List doTest( SurefireLauncher forkMode )
{
-forkMode.addGoal( "-T 2" );
+forkMode.addGoal( "-T2" );
forkMode.sysProp( "testProperty",
"testValue_${surefire.threadNumber}_${surefire.forkNumber}" );
final OutputValidator outputValidator =
forkMode.setForkJvm().executeTest();
List pids = new ArrayList( 6 );
git commit: SUREFIRE-1096 Fix ClassCastException when configuring forkCount>1 and reuseForks=true together with suiteXmlFiles. For now, surefire falls back to using 1 fork only in that case.
Repository: maven-surefire
Updated Branches:
refs/heads/master f305e2ab2 -> 4287465b6
SUREFIRE-1096 Fix ClassCastException when configuring forkCount>1 and
reuseForks=true together with suiteXmlFiles. For now, surefire falls back to
using 1 fork only in that case.
Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/4287465b
Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/4287465b
Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/4287465b
Branch: refs/heads/master
Commit: 4287465b663091b27364c81141a1152238a4c0b5
Parents: f305e2a
Author: Andreas Gudian
Authored: Sun Sep 28 01:54:51 2014 +0200
Committer: Andreas Gudian
Committed: Sun Sep 28 01:54:51 2014 +0200
--
.../surefire/booterclient/ForkStarter.java | 10 ++-
.../surefire/its/CheckTestNgSuiteXmlIT.java | 12 +---
.../src/test/resources/testng-suite-xml/pom.xml | 3 +-
.../testng-suite-xml/src/test-data/testng.xml | 30
.../testng-suite-xml/src/test-data/testng1.xml | 30
.../testng-suite-xml/src/test-data/testng2.xml | 30
6 files changed, 79 insertions(+), 36 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4287465b/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 315c19d..df4325b 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
@@ -64,6 +64,7 @@ import org.apache.maven.surefire.booter.SystemPropertyManager;
import org.apache.maven.surefire.providerapi.SurefireProvider;
import org.apache.maven.surefire.report.StackTraceWriter;
import org.apache.maven.surefire.suite.RunResult;
+import org.apache.maven.surefire.testset.TestRequest;
import org.apache.maven.surefire.util.DefaultScanResult;
import static org.apache.maven.surefire.booter.Classpath.join;
@@ -185,7 +186,14 @@ public class ForkStarter
private boolean isForkOnce()
{
-return forkConfiguration.isReuseForks() && 1 ==
forkConfiguration.getForkCount();
+return forkConfiguration.isReuseForks() && ( 1 ==
forkConfiguration.getForkCount() || hasSuiteXmlFiles() );
+}
+
+private boolean hasSuiteXmlFiles()
+{
+TestRequest testSuiteDefinition =
providerConfiguration.getTestSuiteDefinition();
+return testSuiteDefinition != null &&
testSuiteDefinition.getSuiteXmlFiles() != null
+&& !testSuiteDefinition.getSuiteXmlFiles().isEmpty();
}
private RunResult runSuitesForkOnceMultiple( final SurefireProperties
effectiveSystemProperties, int forkCount )
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4287465b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgSuiteXmlIT.java
--
diff --git
a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgSuiteXmlIT.java
b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgSuiteXmlIT.java
index d0d30bc..7e0653d 100644
---
a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgSuiteXmlIT.java
+++
b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgSuiteXmlIT.java
@@ -34,19 +34,23 @@ public class CheckTestNgSuiteXmlIT
@Test
public void suiteXml()
{
-unpack().executeTest().verifyErrorFree( 1 );
+unpack().executeTest().verifyErrorFree( 2 );
}
@Test
public void suiteXmlForkModeAlways()
{
-unpack().forkAlways().executeTest().verifyErrorFree( 1 );
+unpack().forkAlways().executeTest().verifyErrorFree( 2 );
+}
+
+@Test
+public void suiteXmlForkCountTwoReuse()
+{
+unpack().forkCount( 2 ).reuseForks( true
).executeTest().verifyErrorFree( 2 );
}
private SurefireLauncher unpack()
{
return unpack( "testng-suite-xml" );
}
-
-
}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4287465b/surefire-integration-tests/src/test/resources/testng-suite-xml/pom.xml
--
diff --git
a/surefire-integration-tests/src/test/resources/testng-suite-xml/pom.xml
b/surefire-integration-tests/src/test/resources/testng-su
[3/3] git commit: SUREFIRE-1072 fix example for running multiple test methods within one test class via -Dit.test
SUREFIRE-1072 fix example for running multiple test methods within one test
class via -Dit.test
Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/f305e2ab
Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/f305e2ab
Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/f305e2ab
Branch: refs/heads/master
Commit: f305e2ab27625c156c253f1f7ca1e3f0349bfdd0
Parents: 52b79e6
Author: Andreas Gudian
Authored: Sat Sep 27 23:12:43 2014 +0200
Committer: Andreas Gudian
Committed: Sat Sep 27 23:12:43 2014 +0200
--
maven-surefire-plugin/src/site/apt/examples/single-test.apt.vm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/f305e2ab/maven-surefire-plugin/src/site/apt/examples/single-test.apt.vm
--
diff --git a/maven-surefire-plugin/src/site/apt/examples/single-test.apt.vm
b/maven-surefire-plugin/src/site/apt/examples/single-test.apt.vm
index 12e50b3..d069ab7 100644
--- a/maven-surefire-plugin/src/site/apt/examples/single-test.apt.vm
+++ b/maven-surefire-plugin/src/site/apt/examples/single-test.apt.vm
@@ -111,6 +111,6 @@ mvn -Dtest=TestCircle#testOne+testTwo test
+---+
#{else}
+---+
-mvn -Dit.test=ITCircle#test* verify
+mvn -Dit.test=ITCircle#testOne+testTwo verify
+---+
#{end}
[1/3] git commit: SUREFIRE-1077 avoid NPE in stacktrace parsing if a test fails without a Throwable as cause
Repository: maven-surefire
Updated Branches:
refs/heads/master 86d78ad1b -> f305e2ab2
SUREFIRE-1077 avoid NPE in stacktrace parsing if a test fails without a
Throwable as cause
Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/d78376b8
Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/d78376b8
Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/d78376b8
Branch: refs/heads/master
Commit: d78376b82a18cec354cab32182e7c18af363f6f7
Parents: 86d78ad
Author: Andreas Gudian
Authored: Sat Sep 27 22:18:11 2014 +0200
Committer: Andreas Gudian
Committed: Sat Sep 27 22:18:11 2014 +0200
--
.../surefire/its/CheckTestNgListenersIT.java| 37 +
.../src/test/resources/testng-listeners/pom.xml | 43 ++
.../java/listeners/MarkAsFailureListener.java | 83
.../src/test/java/listeners/SimpleTest.java | 35 +
.../surefire/report/PojoStackTraceWriter.java | 14
5 files changed, 212 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/d78376b8/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgListenersIT.java
--
diff --git
a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgListenersIT.java
b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgListenersIT.java
new file mode 100644
index 000..cc1bb74
--- /dev/null
+++
b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgListenersIT.java
@@ -0,0 +1,37 @@
+package org.apache.maven.surefire.its;
+
+/*
+ * 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;
+
+/**
+ * Test annotation-based TestNG listener
+ */
+public class CheckTestNgListenersIT
+extends SurefireJUnit4IntegrationTestCase
+{
+@Test
+public void TestNgListenerReporter()
+{
+unpack( "testng-listeners" ).mavenTestFailureIgnore( true
).executeTest().assertTestSuiteResults( 1, 0, 1, 0 );
+}
+
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/d78376b8/surefire-integration-tests/src/test/resources/testng-listeners/pom.xml
--
diff --git
a/surefire-integration-tests/src/test/resources/testng-listeners/pom.xml
b/surefire-integration-tests/src/test/resources/testng-listeners/pom.xml
new file mode 100644
index 000..e2482a2
--- /dev/null
+++ b/surefire-integration-tests/src/test/resources/testng-listeners/pom.xml
@@ -0,0 +1,43 @@
+
+
+
+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
+
+
+ org.apache.maven.surefire
+ it-parent
+ 1.0
+ ../pom.xml
+
+
+testng-listeners
+ 1.0-SNAPSHOT
+
+
+
+ org.testng
+ testng
+ 6.8.8
+
+
+
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/d78376b8/surefire-integration-tests/src/test/resources/testng-listeners/src/test/java/listeners/MarkAsFailureListener.java
--
diff --git
a/surefire-integration-tests/src/test/resources/testng-listeners/src/test/java/listeners/MarkAsFailureListener.java
b/surefire-integration-tests/src/test/resources/testng-listeners/src/test/java/listeners/MarkAsFailureListener.java
new file mode 100644
index 000..a104604
--- /dev/null
+++
b/surefire-integration-tests/src/test/resources/testng-listeners/src/test/java/listeners/MarkAsFailureListener.java
@@ -0,0 +1,83 @@
+package listeners;
+
+/*
+ * Licensed to the Apache Software Fou
[2/3] git commit: Fix test that broke with fix for SUREFIRE-1099
Fix test that broke with fix for SUREFIRE-1099
Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/52b79e61
Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/52b79e61
Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/52b79e61
Branch: refs/heads/master
Commit: 52b79e6191d5822ed947512ac6abf50946db8017
Parents: d78376b
Author: Andreas Gudian
Authored: Sat Sep 27 22:58:00 2014 +0200
Committer: Andreas Gudian
Committed: Sat Sep 27 22:58:00 2014 +0200
--
.../surefire/its/jiras/Surefire260TestWithIdenticalNamesIT.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/52b79e61/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire260TestWithIdenticalNamesIT.java
--
diff --git
a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire260TestWithIdenticalNamesIT.java
b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire260TestWithIdenticalNamesIT.java
index 85d7dfc..5f59eac 100644
---
a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire260TestWithIdenticalNamesIT.java
+++
b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire260TestWithIdenticalNamesIT.java
@@ -59,8 +59,8 @@ public class Surefire260TestWithIdenticalNamesIT
final HtmlPage page = webClient.getPage( uri.toURL() );
final HtmlAnchor a =
-(HtmlAnchor) page.getByXPath( "//a[contains(@href,
'surefire260_TestB_testDup')]" ).get( 0 );
-final HtmlDivision content = (HtmlDivision) page.getElementById(
"surefire260_TestB_testDuperror" );
+(HtmlAnchor) page.getByXPath( "//a[@href =
\"javascript:toggleDisplay('surefire260.TestB.testDup');\"]" ).get( 0 );
+final HtmlDivision content = (HtmlDivision) page.getElementById(
"surefire260.TestB.testDuperror" );
assertTrue( content.getAttribute( "style" ).contains( "none" ) );
a.click();
assertFalse( content.getAttribute( "style" ).contains( "none" ) );
[1/2] git commit: Make build work with JDK 1.5 again
Repository: maven-surefire
Updated Branches:
refs/heads/master bad7cb910 -> 86d78ad1b
Make build work with JDK 1.5 again
Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/86d78ad1
Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/86d78ad1
Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/86d78ad1
Branch: refs/heads/master
Commit: 86d78ad1ba72ed030ef582f6b22693f799ed1097
Parents: a790a61
Author: Andreas Gudian
Authored: Sat Sep 27 19:59:08 2014 +0200
Committer: Andreas Gudian
Committed: Sat Sep 27 20:02:58 2014 +0200
--
.../maven/plugin/surefire/report/DefaultReporterFactoryTest.java | 4
surefire-providers/surefire-junit47/pom.xml | 2 --
2 files changed, 6 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/86d78ad1/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/report/DefaultReporterFactoryTest.java
--
diff --git
a/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/report/DefaultReporterFactoryTest.java
b/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/report/DefaultReporterFactoryTest.java
index 0dc7865..5bb1b61 100644
---
a/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/report/DefaultReporterFactoryTest.java
+++
b/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/report/DefaultReporterFactoryTest.java
@@ -179,25 +179,21 @@ public class DefaultReporterFactoryTest
this.stackTrace = stackTrace;
}
-@Override
public String writeTraceToString()
{
return "";
}
-@Override
public String writeTrimmedTraceToString()
{
return "";
}
-@Override
public String smartTrimmedStackTrace()
{
return stackTrace;
}
-@Override
public SafeThrowable getThrowable()
{
return null;
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/86d78ad1/surefire-providers/surefire-junit47/pom.xml
--
diff --git a/surefire-providers/surefire-junit47/pom.xml
b/surefire-providers/surefire-junit47/pom.xml
index 6dcbad7..b51e1f3 100644
--- a/surefire-providers/surefire-junit47/pom.xml
+++ b/surefire-providers/surefire-junit47/pom.xml
@@ -77,9 +77,7 @@
maven-surefire-plugin
- ${java.home}/bin/java
true
- -server -Xmx128m -XX:+UseParallelGC -XX:+UseNUMA
-XX:MaxGCPauseMillis=50
[2/2] git commit: SUREFIRE-1099 avoid invalid link ids
SUREFIRE-1099 avoid invalid link ids
Call toHtmlId() everytime before using testCase.getFullName() as anchor
id or link target.
Use DoxiaUtils.encodeId() in toHtmlId(), to avoid problems with any
illegal char.
This closes #36
Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/a790a61a
Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/a790a61a
Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/a790a61a
Branch: refs/heads/master
Commit: a790a61acccb2da1524b64142ed180e30051841e
Parents: bad7cb9
Author: kermit-the-frog
Authored: Thu Mar 13 09:42:17 2014 +0100
Committer: Andreas Gudian
Committed: Sat Sep 27 20:02:58 2014 +0200
--
.../surefire/report/SurefireReportGenerator.java| 16
1 file changed, 12 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/a790a61a/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/SurefireReportGenerator.java
--
diff --git
a/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/SurefireReportGenerator.java
b/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/SurefireReportGenerator.java
index 944832a..68a83b2 100644
---
a/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/SurefireReportGenerator.java
+++
b/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/SurefireReportGenerator.java
@@ -31,6 +31,7 @@ import org.apache.maven.doxia.markup.HtmlMarkup;
import org.apache.maven.doxia.sink.Sink;
import org.apache.maven.doxia.sink.SinkEventAttributeSet;
import org.apache.maven.doxia.sink.SinkEventAttributes;
+import org.apache.maven.doxia.util.DoxiaUtils;
import org.apache.maven.reporting.MavenReportException;
/**
@@ -425,7 +426,7 @@ public class SurefireReportGenerator
if ( failure != null )
{
-sink.link( "#" + testCase.getFullName() );
+sink.link( "#" + toHtmlId(
testCase.getFullName() ) );
sinkIcon( (String) failure.get( "type" ), sink
);
@@ -442,7 +443,7 @@ public class SurefireReportGenerator
{
sink.tableCell();
-sinkLink( sink, testCase.getName(), "#" +
testCase.getFullName() );
+sinkLink( sink, testCase.getName(), "#" +
toHtmlId( testCase.getFullName() ) );
SinkEventAttributeSet atts = new
SinkEventAttributeSet();
atts.addAttribute( SinkEventAttributes.CLASS,
"detailToggle" );
@@ -540,7 +541,14 @@ public class SurefireReportGenerator
private String toHtmlId( String id )
{
-return id.replace( ".", "_" );
+if ( DoxiaUtils.isValidId(id) )
+{
+return id;
+}
+else
+{
+return DoxiaUtils.encodeId( id, true );
+}
}
private void constructFailureDetails( Sink sink, ResourceBundle bundle,
List failureList )
@@ -579,7 +587,7 @@ public class SurefireReportGenerator
sink.tableCell_();
-sinkCellAnchor( sink, tCase.getName(), tCase.getFullName() );
+sinkCellAnchor( sink, tCase.getName(), toHtmlId(
tCase.getFullName() ) );
sink.tableRow_();
git commit: SUREFIRE-1023 fix potential StringIndexOutOfBoundsException in SurefireReportGenerator when coming across unusual failure stacktraces
Repository: maven-surefire
Updated Branches:
refs/heads/master 7f2c1fb11 -> bad7cb910
SUREFIRE-1023 fix potential StringIndexOutOfBoundsException in
SurefireReportGenerator when coming across unusual failure stacktraces
Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/bad7cb91
Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/bad7cb91
Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/bad7cb91
Branch: refs/heads/master
Commit: bad7cb910c0164dc9ffb4700dabbd8e8f4b61023
Parents: 7f2c1fb
Author: Andreas Gudian
Authored: Thu Sep 25 21:03:57 2014 +0200
Committer: Andreas Gudian
Committed: Thu Sep 25 21:03:57 2014 +0200
--
.../surefire/report/SurefireReportGenerator.java | 15 ++-
1 file changed, 10 insertions(+), 5 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/bad7cb91/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/SurefireReportGenerator.java
--
diff --git
a/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/SurefireReportGenerator.java
b/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/SurefireReportGenerator.java
index 5e8b842..944832a 100644
---
a/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/SurefireReportGenerator.java
+++
b/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/SurefireReportGenerator.java
@@ -666,19 +666,24 @@ public class SurefireReportGenerator
{
StringTokenizer tokenizer = new StringTokenizer( source );
-String lineNo = "";
-
while ( tokenizer.hasMoreTokens() )
{
String token = tokenizer.nextToken();
if ( token.startsWith( className ) )
{
int idx = token.indexOf( ":" );
-lineNo = token.substring( idx + 1, token.indexOf( ")" ) );
-break;
+if ( idx >= 0 )
+{
+int closeIdx = token.lastIndexOf( ")" );
+
+if ( closeIdx > idx + 1 )
+{
+return token.substring( idx + 1, closeIdx );
+}
+}
}
}
-return lineNo;
+return "";
}
private void constructHotLinks( Sink sink, ResourceBundle bundle )
git commit: [SUREFIRE-1091] Prevent IOExceptions in case a thread tries to write to an already closed Utf8RecodingDeferredFileOutputStream
Repository: maven-surefire
Updated Branches:
refs/heads/master 11c151ced -> ad278f82d
[SUREFIRE-1091] Prevent IOExceptions in case a thread tries to write to an
already closed Utf8RecodingDeferredFileOutputStream
Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/ad278f82
Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/ad278f82
Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/ad278f82
Branch: refs/heads/master
Commit: ad278f82da8b31e057b88b6ffe6655bc8fa1830e
Parents: 11c151c
Author: Andreas Gudian
Authored: Tue Aug 26 21:55:26 2014 +0200
Committer: Andreas Gudian
Committed: Tue Aug 26 22:30:02 2014 +0200
--
.../Utf8RecodingDeferredFileOutputStream.java | 22 ++--
.../test/java/consoleoutput_noisy/Test1.java| 55 +++-
2 files changed, 59 insertions(+), 18 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/ad278f82/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/Utf8RecodingDeferredFileOutputStream.java
--
diff --git
a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/Utf8RecodingDeferredFileOutputStream.java
b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/Utf8RecodingDeferredFileOutputStream.java
index 5c7b8a3..af1682f 100644
---
a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/Utf8RecodingDeferredFileOutputStream.java
+++
b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/Utf8RecodingDeferredFileOutputStream.java
@@ -37,6 +37,8 @@ class Utf8RecodingDeferredFileOutputStream
{
private DeferredFileOutputStream deferredFileOutputStream;
+private boolean closed = false;
+
private static final Charset UTF8 = Charset.forName( "UTF-8" );
public Utf8RecodingDeferredFileOutputStream( String channel )
@@ -44,9 +46,14 @@ class Utf8RecodingDeferredFileOutputStream
this.deferredFileOutputStream = new DeferredFileOutputStream( 100,
channel, "deferred", null );
}
-public void write( byte[] buf, int off, int len )
+public synchronized void write( byte[] buf, int off, int len )
throws IOException
{
+if ( closed )
+{
+return;
+}
+
if ( !Charset.defaultCharset().equals( UTF8 ) )
{
CharBuffer decodedFromDefaultCharset =
Charset.defaultCharset().decode( ByteBuffer.wrap( buf, off, len ) );
@@ -77,24 +84,29 @@ class Utf8RecodingDeferredFileOutputStream
return deferredFileOutputStream.getByteCount();
}
-public void close()
+public synchronized void close()
throws IOException
{
+closed = true;
deferredFileOutputStream.close();
}
-public void writeTo( OutputStream out )
+public synchronized void writeTo( OutputStream out )
throws IOException
{
-deferredFileOutputStream.writeTo( out );
+if ( closed )
+{
+deferredFileOutputStream.writeTo( out );
+}
}
-public void free()
+public synchronized void free()
{
if ( null != deferredFileOutputStream && null !=
deferredFileOutputStream.getFile() )
{
try
{
+closed = true;
deferredFileOutputStream.close();
if ( !deferredFileOutputStream.getFile().delete() )
{
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/ad278f82/surefire-integration-tests/src/test/resources/consoleoutput-noisy/src/test/java/consoleoutput_noisy/Test1.java
--
diff --git
a/surefire-integration-tests/src/test/resources/consoleoutput-noisy/src/test/java/consoleoutput_noisy/Test1.java
b/surefire-integration-tests/src/test/resources/consoleoutput-noisy/src/test/java/consoleoutput_noisy/Test1.java
index 4b5a21f..888cd22 100644
---
a/surefire-integration-tests/src/test/resources/consoleoutput-noisy/src/test/java/consoleoutput_noisy/Test1.java
+++
b/surefire-integration-tests/src/test/resources/consoleoutput-noisy/src/test/java/consoleoutput_noisy/Test1.java
@@ -19,38 +19,67 @@ package consoleoutput_noisy;
* under the License.
*/
-import junit.framework.TestCase;
+import org.junit.Test;
+import org.junit.After;
+import org.junit.AfterClass;
+import org.junit.Before;
+import org.junit.BeforeClass;
public class Test1
-extends TestCase
{
public static final int thousand = Integer.parseInt( System.getProperty(
"thousand", "1000" ) );
+@Test
public void test1MillionBytes()
{
for ( int i = 0; i < ( 10 *
git commit: Remove unused import
Repository: maven-surefire Updated Branches: refs/heads/master 2bdeeaf1a -> aba9d94db Remove unused import Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/aba9d94d Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/aba9d94d Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/aba9d94d Branch: refs/heads/master Commit: aba9d94dbabf61830b7af40d17a3ffdf46e6fb6a Parents: 2bdeeaf Author: Andreas Gudian Authored: Sun Aug 3 20:44:24 2014 +0200 Committer: Andreas Gudian Committed: Sun Aug 3 20:44:24 2014 +0200 -- .../org/apache/maven/surefire/common/junit48/FilterFactory.java | 1 - 1 file changed, 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/aba9d94d/surefire-providers/common-junit48/src/main/java/org/apache/maven/surefire/common/junit48/FilterFactory.java -- diff --git a/surefire-providers/common-junit48/src/main/java/org/apache/maven/surefire/common/junit48/FilterFactory.java b/surefire-providers/common-junit48/src/main/java/org/apache/maven/surefire/common/junit48/FilterFactory.java index 3c2fa86..9171336 100644 --- a/surefire-providers/common-junit48/src/main/java/org/apache/maven/surefire/common/junit48/FilterFactory.java +++ b/surefire-providers/common-junit48/src/main/java/org/apache/maven/surefire/common/junit48/FilterFactory.java @@ -39,7 +39,6 @@ import org.apache.maven.surefire.group.parse.ParseException; import org.junit.experimental.categories.Category; import org.junit.runner.Description; import org.junit.runner.manipulation.Filter; -import sun.security.krb5.internal.crypto.Des; /** * @author Todd Lipcon
[4/4] git commit: Adjust example page for rerun failing tests to be valid for surefire and failsafe plugin
Adjust example page for rerun failing tests to be valid for surefire and
failsafe plugin
Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/2bdeeaf1
Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/2bdeeaf1
Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/2bdeeaf1
Branch: refs/heads/master
Commit: 2bdeeaf1ae6ff71b876fd881f807d1492399917b
Parents: fefaae7
Author: Andreas Gudian
Authored: Thu Jul 31 12:46:42 2014 +0200
Committer: Andreas Gudian
Committed: Thu Jul 31 12:46:42 2014 +0200
--
.../src/site/apt/examples/rerun-failing-tests.apt.vm | 7 ++-
1 file changed, 2 insertions(+), 5 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/2bdeeaf1/maven-surefire-plugin/src/site/apt/examples/rerun-failing-tests.apt.vm
--
diff --git
a/maven-surefire-plugin/src/site/apt/examples/rerun-failing-tests.apt.vm
b/maven-surefire-plugin/src/site/apt/examples/rerun-failing-tests.apt.vm
index 42cc98c..607f875 100644
--- a/maven-surefire-plugin/src/site/apt/examples/rerun-failing-tests.apt.vm
+++ b/maven-surefire-plugin/src/site/apt/examples/rerun-failing-tests.apt.vm
@@ -28,7 +28,6 @@
Rerun Failing Tests
-#{if}(${project.artifactId}=="maven-surefire-plugin")
During development, you may re-run failing tests because they are flaky.
To use this feature through Maven surefire, set the
<<>> property to be a value larger than 0.
Tests will be run until they pass or the number of reruns has been exhausted.
@@ -37,7 +36,7 @@ Rerun Failing Tests
+---+
-mvn -DrerunFailingTestsCount=2 test
+mvn -D${thisPlugin.toLowerCase()}.rerunFailingTestsCount=2 test
+---+
If <<>> is set to a value smaller than or euqal to
0, then it will be ignored.
@@ -115,7 +114,7 @@ mvn -DrerunFailingTestsCount=2 test
2) The test fails in all of the re-runs:
<<>> and <<>> elements will still be used in the generated
xml report to include information
- for the first failing run, the same as without using
<<>>. <<>> and <<>>
+ for the first failing run, the same as without using
<<>>. <<>> and <<>>
elements will be used in the generated xml report to include information of
each <> failing re-runs.
<<>> and <<>> will also be used inside each
<<>> or <<>> to include
information of System.out and System.err output. The original
<<>> and <<>> elements will be
@@ -135,5 +134,3 @@ mvn -DrerunFailingTestsCount=2 test
In the xml report, the running time of a failing test with re-runs will be
the running time of the
<>.
-
-#{end}
[2/4] Add rerunFailingTestsCount option for maven surefire to rerun failing tests immediately after they fail.
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/fefaae7f/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/report/StatelessXMLReporterTest.java
--
diff --git
a/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/report/StatelessXMLReporterTest.java
b/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/report/StatelessXMLReporterTest.java
deleted file mode 100644
index 5a74c45..000
---
a/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/report/StatelessXMLReporterTest.java
+++ /dev/null
@@ -1,172 +0,0 @@
-package org.apache.maven.plugin.surefire.report;
-
-/*
- * 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 java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStreamReader;
-
-import junit.framework.AssertionFailedError;
-import junit.framework.TestCase;
-
-import
org.apache.maven.plugin.surefire.booterclient.output.DeserializedStacktraceWriter;
-import org.apache.maven.shared.utils.StringUtils;
-import org.apache.maven.shared.utils.xml.Xpp3Dom;
-import org.apache.maven.shared.utils.xml.Xpp3DomBuilder;
-import org.apache.maven.surefire.report.LegacyPojoStackTraceWriter;
-import org.apache.maven.surefire.report.ReportEntry;
-import org.apache.maven.surefire.report.SimpleReportEntry;
-import org.apache.maven.surefire.report.StackTraceWriter;
-
-@SuppressWarnings( "ResultOfMethodCallIgnored" )
-public class StatelessXMLReporterTest
-extends TestCase
-{
-
-private StatelessXmlReporter reporter = new StatelessXmlReporter( new
File( "." ), null, false );
-
-private ReportEntry reportEntry;
-
-private TestSetStats stats;
-
-private File expectedReportFile;
-
-protected void setUp()
-throws Exception
-{
-super.setUp();
-reportEntry = new SimpleReportEntry( this.getClass().getName(),
"StatelessXMLReporterTest",
- new LegacyPojoStackTraceWriter(
"", "", new AssertionFailedError() ), 17 );
-stats = new TestSetStats( false, true );
-}
-
-@Override protected void tearDown()
-throws Exception
-{
-super.tearDown();
-
-if ( expectedReportFile != null )
-{
-expectedReportFile.delete();
-}
-}
-
-public void testFileNameWithoutSuffix()
-{
-File reportDir = new File( "." );
-String testName =
"org.apache.maven.plugin.surefire.report.StatelessXMLReporterTest";
-reportEntry = new SimpleReportEntry( this.getClass().getName(),
testName, 12 );
-WrappedReportEntry testSetReportEntry =
-new WrappedReportEntry( reportEntry, ReportEntryType.success, 12,
null, null );
-stats.testSucceeded( testSetReportEntry );
-reporter.testSetCompleted( testSetReportEntry, stats );
-
-expectedReportFile = new File( reportDir, "TEST-" + testName + ".xml"
);
-assertTrue( "Report file (" + expectedReportFile.getAbsolutePath() +
") doesn't exist",
-expectedReportFile.exists() );
-}
-
-
-public void testAllFieldsSerialized()
-throws IOException
-{
-File reportDir = new File( "." );
-String testName = "aTestMethod";
-String testName2 = "bTestMethod";
-reportEntry = new SimpleReportEntry( this.getClass().getName(),
testName, 12 );
-WrappedReportEntry testSetReportEntry =
-new WrappedReportEntry( reportEntry, ReportEntryType.success, 12,
null, null );
-expectedReportFile = new File( reportDir, "TEST-" + testName + ".xml"
);
-
-stats.testSucceeded( testSetReportEntry );
-StackTraceWriter stackTraceWriter = new DeserializedStacktraceWriter(
"A fud msg", "trimmed", "fail at foo" );
-Utf8RecodingDeferredFileOutputStream stdOut = new
Utf8RecodingDeferredFileOutputStream( "fds" );
-String stdOutPrefix;
-String stdErrPrefix;
-if ( defaultCharsetSupportsSpecialChar() )
-{
-stdErrPrefix = "std-\u0115rr";
-stdOutPrefix = "st]]>d-o\u00DCt";
-}
-
[3/4] git commit: Add rerunFailingTestsCount option for maven surefire to rerun failing tests immediately after they fail.
Add rerunFailingTestsCount option for maven surefire to rerun failing tests immediately after they fail. When rerunFailingTestsCount is set to a value larger k than 0, a failing test will get re-run up to k times until it passes. If a test passes in any of its reruns, the build will be marked as successful and the test will count as a flake (or flaky test). If it fails all those k times then it will still be marked as a failed test. In the console output all the flaky tests will be count as "Flakes: N". The generated test report XML file is augmented with additional information, while still being compatible with existing consumers (such as Jenkins). A flaky test will have or/and under its element, to store all the flaky runs' information (such as output, stackTrace). So existing consumers will still consider it as a passing test, while potential future consumers can parse those flaky runs information. A failing test will still have or under , but all the subsequent re-run information will be stored under or . So existing consumers will still be able to see it's a failed test and parse its failure information, and potential future consumers will be able to get all the flaky runs. It is implemented by keeping a map between test full class name and a map between all its test methods and the list of runs. It also takes into account Fork and Parallel and have them covered by integration tests. Currently only supports JUnit4.x Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/fefaae7f Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/fefaae7f Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/fefaae7f Branch: refs/heads/master Commit: fefaae7f0534a59f52c046a64c96987e8561dd48 Parents: 1cdf49d Author: Qingzhou Luo Authored: Tue Jun 24 13:44:44 2014 -0700 Committer: Qingzhou Luo Committed: Wed Jul 30 17:19:13 2014 -0700 -- .../plugin/failsafe/IntegrationTestMojo.java| 12 + maven-surefire-common/pom.xml | 6 + .../plugin/surefire/AbstractSurefireMojo.java | 8 +- .../maven/plugin/surefire/CommonReflector.java | 5 +- .../surefire/StartupReportConfiguration.java| 20 +- .../surefire/booterclient/BooterSerializer.java | 2 + .../surefire/booterclient/ForkStarter.java | 26 +- .../booterclient/output/ForkClient.java | 5 + .../surefire/report/DefaultReporterFactory.java | 287 -- .../plugin/surefire/report/ReportEntryType.java | 36 ++- .../surefire/report/StatelessXmlReporter.java | 280 -- .../plugin/surefire/report/TestMethodStats.java | 60 .../surefire/report/TestSetRunListener.java | 32 +- .../plugin/surefire/report/TestSetStats.java| 10 +- .../surefire/report/WrappedReportEntry.java | 5 + .../maven/surefire/report/RunStatistics.java| 100 +++ ...erDeserializerProviderConfigurationTest.java | 5 +- .../report/DefaultReporterFactoryTest.java | 206 + .../report/StatelessXMLReporterTest.java| 172 --- .../report/StatelessXmlReporterTest.java| 290 +++ .../surefire/report/RunStatisticsTest.java | 87 +- .../maven/plugin/surefire/SurefirePlugin.java | 12 + .../apt/examples/rerun-failing-tests.apt.vm | 139 + maven-surefire-plugin/src/site/site.xml | 1 + .../surefire/booter/SurefireReflector.java | 6 +- .../apache/maven/surefire/suite/RunResult.java | 22 +- .../maven/surefire/testset/TestRequest.java | 19 ++ .../apache/maven/surefire/util/TestsToRun.java | 18 ++ .../maven/surefire/suite/RunResultTest.java | 5 +- .../maven/surefire/util/TestsToRunTest.java | 8 + .../maven/surefire/booter/BooterConstants.java | 1 + .../surefire/booter/BooterDeserializer.java | 5 +- .../surefire/booter/PropertiesWrapper.java | 5 + .../surefire/its/JUnit4RerunFailingTestsIT.java | 278 ++ .../surefire/its/fixture/HelperAssertions.java | 18 +- .../fixture/IntegrationTestSuiteResults.java| 18 +- .../surefire/its/fixture/OutputValidator.java | 6 + .../junit4-rerun-failing-tests/pom.xml | 63 .../test/java/junit4/FlakyFirstTimeTest.java| 62 .../src/test/java/junit4/PassingTest.java | 39 +++ .../common/junit4/JUnit4ProviderUtil.java | 109 +++ .../common/junit4/JUnit4RunListener.java| 2 +- .../common/junit4/JUnitTestFailureListener.java | 35 +++ .../common/junit4/JUnit4ProviderUtilTest.java | 85 ++ .../surefire/common/junit48/FilterFactory.java | 57 .../maven/surefire/junit4/JUnit4Provider.java | 61 +++- .../surefire/junit4/JUnit4ProviderTest.java | 18 +- .../surefire/junitcore/JUnitCoreProvider.java | 38 +++ .../junitcore/ConcurrentRunListenerTest.java| 5
[1/4] Add rerunFailingTestsCount option for maven surefire to rerun failing tests immediately after they fail.
Repository: maven-surefire
Updated Branches:
refs/heads/master 1cdf49dc2 -> 2bdeeaf1a
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/fefaae7f/surefire-providers/common-junit48/src/main/java/org/apache/maven/surefire/common/junit48/FilterFactory.java
--
diff --git
a/surefire-providers/common-junit48/src/main/java/org/apache/maven/surefire/common/junit48/FilterFactory.java
b/surefire-providers/common-junit48/src/main/java/org/apache/maven/surefire/common/junit48/FilterFactory.java
index f3fcc0b..3c2fa86 100644
---
a/surefire-providers/common-junit48/src/main/java/org/apache/maven/surefire/common/junit48/FilterFactory.java
+++
b/surefire-providers/common-junit48/src/main/java/org/apache/maven/surefire/common/junit48/FilterFactory.java
@@ -25,6 +25,7 @@ import java.util.Collection;
import java.util.Collections;
import java.util.HashSet;
import java.util.List;
+import java.util.Map;
import java.util.Properties;
import java.util.Set;
@@ -38,6 +39,7 @@ import org.apache.maven.surefire.group.parse.ParseException;
import org.junit.experimental.categories.Category;
import org.junit.runner.Description;
import org.junit.runner.manipulation.Filter;
+import sun.security.krb5.internal.crypto.Des;
/**
* @author Todd Lipcon
@@ -102,6 +104,11 @@ public class FilterFactory
return new MethodFilter( requestedTestMethod );
}
+public Filter createFailingMethodFilter( Map, Set>
failingClassMethodMap )
+{
+return new FailingMethodFilter( failingClassMethodMap );
+}
+
public Filter and( Filter filter1, Filter filter2 )
{
return new AndFilter( filter1, filter2 );
@@ -144,6 +151,56 @@ public class FilterFactory
}
}
+// Only run test methods in the given input map, indexed by test class
+private static class FailingMethodFilter
+extends Filter
+{
+// Map from Class -> List of method names. Are the method names hashed
to include the signature?
+private final Map, Set> failingClassMethodMap;
+
+public FailingMethodFilter( Map, Set>
failingClassMethodMap )
+{
+this.failingClassMethodMap = failingClassMethodMap;
+}
+
+@Override
+public boolean shouldRun( Description description )
+{
+return isDescriptionMatch( description );
+}
+
+private boolean isDescriptionMatch( Description description )
+{
+if ( description.getTestClass() == null ||
description.getMethodName() == null )
+{
+for ( Description childrenDescription :
description.getChildren() )
+{
+if ( isDescriptionMatch( childrenDescription ) )
+{
+return true;
+}
+}
+return false;
+}
+
+Set testMethods = failingClassMethodMap.get(
description.getTestClass() );
+if ( testMethods == null )
+{
+return false;
+}
+else
+{
+return testMethods.contains( description.getMethodName() );
+}
+}
+
+@Override
+public String describe()
+{
+return "By failing class method";
+}
+}
+
private static class GroupMatcherCategoryFilter
extends Filter
{
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/fefaae7f/surefire-providers/surefire-junit4/src/main/java/org/apache/maven/surefire/junit4/JUnit4Provider.java
--
diff --git
a/surefire-providers/surefire-junit4/src/main/java/org/apache/maven/surefire/junit4/JUnit4Provider.java
b/surefire-providers/surefire-junit4/src/main/java/org/apache/maven/surefire/junit4/JUnit4Provider.java
index a03c7d2..03012bd 100644
---
a/surefire-providers/surefire-junit4/src/main/java/org/apache/maven/surefire/junit4/JUnit4Provider.java
+++
b/surefire-providers/surefire-junit4/src/main/java/org/apache/maven/surefire/junit4/JUnit4Provider.java
@@ -19,14 +19,12 @@ package org.apache.maven.surefire.junit4;
* under the License.
*/
-import java.lang.reflect.Method;
-import java.util.Iterator;
-import java.util.List;
-
import org.apache.maven.shared.utils.io.SelectorUtils;
+import org.apache.maven.surefire.common.junit4.JUnit4ProviderUtil;
import org.apache.maven.surefire.common.junit4.JUnit4RunListener;
import org.apache.maven.surefire.common.junit4.JUnit4RunListenerFactory;
import org.apache.maven.surefire.common.junit4.JUnit4TestChecker;
+import org.apache.maven.surefire.common.junit4.JUnitTestFailureListener;
import org.apache.maven.surefire.providerapi.AbstractProvider;
import org.apache.maven.surefire.providerapi.ProviderParameters;
import org.apache.maven.surefire.report.ConsoleOutputCapture;
@@ -43,12 +41,19 @
[3/3] git commit: Remove reference to SVN
Remove reference to SVN
Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/7a50aee2
Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/7a50aee2
Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/7a50aee2
Branch: refs/heads/master
Commit: 7a50aee24cc4875844955675a4d7070d622ef085
Parents: 22eb736
Author: Andreas Gudian
Authored: Tue Jun 10 21:08:55 2014 +0200
Committer: Andreas Gudian
Committed: Tue Jun 10 21:08:55 2014 +0200
--
.../src/site/apt/developing.apt.vm | 19 +--
1 file changed, 9 insertions(+), 10 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/7a50aee2/maven-surefire-plugin/src/site/apt/developing.apt.vm
--
diff --git a/maven-surefire-plugin/src/site/apt/developing.apt.vm
b/maven-surefire-plugin/src/site/apt/developing.apt.vm
index dbc5f67..ef8103f 100644
--- a/maven-surefire-plugin/src/site/apt/developing.apt.vm
+++ b/maven-surefire-plugin/src/site/apt/developing.apt.vm
@@ -32,25 +32,24 @@ Developer Center
* Multi-module Project
- The plugin is built as part of a multi-module plugin. The generated
- "project information" will suggest that you check out (e.g.)
-
{{http://svn.apache.org/repos/asf/maven/surefire/trunk/${project.artifactId}}}.
- In fact, you need to check out (e.g.)
- {{http://svn.apache.org/repos/asf/maven/surefire/trunk}} and
- build from there.
+ The plugin is built as part of a multi-module plugin. You need to check out
+ the complete module and build from there:
+
++---+
+ git clone https://git-wip-us.apache.org/repos/asf/maven-surefire.git
++---+
* Making Test Cases for Demonstrating Problems
When reporting an issue, it is immensely useful to create a small sample
project
that demonstrates the problem. Surefire already contains a large number of
such
projects, and they can be found at
-
{{https://svn.apache.org/repos/asf/maven/surefire/trunk/surefire-integration-tests/src/test/resources/}}.
+ {{surefire-integration-tests/src/test/resources/}}.
Typically you can check out one of the pre-existing projects and run it like
this:
+---+
-svn co
https://svn.apache.org/repos/asf/maven/surefire/trunk/surefire-integration-tests/src/test/resources/failsafe-buildfail
-cd failsafe-buildfail
-mvn -Dsurefire.version=2.12 verify
+ cd surefire-integration-tests/src/test/resources/failsafe-buildfail
+ mvn -Dsurefire.version=2.12 verify
+---+
* Attaching a Debugger
[1/3] Fix formatting and spelling mistakes in the documentation.
Repository: maven-surefire
Updated Branches:
refs/heads/master c8858944c -> 7a50aee24
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/22eb7362/maven-surefire-report-plugin/src/site/apt/index.apt
--
diff --git a/maven-surefire-report-plugin/src/site/apt/index.apt
b/maven-surefire-report-plugin/src/site/apt/index.apt
index 4630fbe..737c509 100644
--- a/maven-surefire-report-plugin/src/site/apt/index.apt
+++ b/maven-surefire-report-plugin/src/site/apt/index.apt
@@ -26,12 +26,12 @@
Maven Surefire Report Plugin
The Surefire Report Plugin parses the generated <<>> files under
- <<<$\{basedir\}/target/surefire-reports>>> and renders them to DOXIA
+ <<<$\{basedir\}/target/surefire-reports>>> and renders them using DOXIA,
which creates the web interface version of the test results.
* Goals Overview
- Surefire Report Plugin only has one goal (the other is a workaround):
+ The Surefire Report Plugin only has one goal (the other is a workaround):
* {{{./report-mojo.html}surefire-report:report}} Generates the test
results report into HTML format.
@@ -40,15 +40,15 @@ Maven Surefire Report Plugin
not run the tests, it only builds the reports. It is provided as a work
around for {{{http://jira.codehaus.org/browse/SUREFIRE-257}SUREFIRE-257}}
- As of version 2.8 this plugin requires Maven Site Plugin 2.1 or
higher to work properly. Version 2.7.2 and
- older are still compatible with newer surefire versions, so mixing is
possible.
-
[]
+ As of version 2.8 this plugin requires Maven Site Plugin 2.1 or
newer to work properly. Version 2.7.2 and
+ older are still compatible with newer Surefire versions, so mixing is
possible.
+
* Usage
General instructions on how to use the Surefire Report Plugin can be found
on the {{{./usage.html}usage page}}. Some more
- specific use cases are described in the examples given below. Last but not
least, users occasionally contribute
+ specific use cases are described in the examples listed below. Last but not
least, users occasionally contribute
additional examples, tips or errata to the
{{{http://docs.codehaus.org/display/MAVENUSER/Surefire+Report+Plugin}plugin's
wiki page}}.
@@ -57,7 +57,7 @@ Maven Surefire Report Plugin
already contain the answer to your question as part of an older thread.
Hence, it is also worth browsing/searching
the {{{./mail-lists.html}mail archive}}.
- If you feel like the plugin is missing a feature or has a defect, you can
fill a feature request or bug report in our
+ If you feel like the plugin is missing a feature or has a defect, you can
file a feature request or bug report in our
{{{./issue-tracking.html}issue tracker}}. When creating a new issue, please
provide a comprehensive description of your
concern. Especially for fixing bugs it is crucial that the developers can
reproduce your problem. For this reason,
entire debug logs, POMs or most preferably little demo projects attached to
the issue are very much appreciated.
@@ -67,11 +67,11 @@ Maven Surefire Report Plugin
* Examples
- The following examples show how to use the Surefire Report Plugin in more
advanced usecases:
+ The following examples show how to use the Surefire Report Plugin in more
advanced use cases:
- * {{{./examples/show-failures.html}Showing Failure Tests}}
+ * {{{./examples/show-failures.html}Showing Only Failed Tests}}
- * {{{./examples/changing-report-name.html}Changing Report Name}}
+ * {{{./examples/changing-report-name.html}Changing the Report Name}}
* {{{./examples/report-custom-location.html}Configuring the Output Location
of the Report}}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/22eb7362/maven-surefire-report-plugin/src/site/apt/usage.apt.vm
--
diff --git a/maven-surefire-report-plugin/src/site/apt/usage.apt.vm
b/maven-surefire-report-plugin/src/site/apt/usage.apt.vm
index ef71d13..d5af182 100644
--- a/maven-surefire-report-plugin/src/site/apt/usage.apt.vm
+++ b/maven-surefire-report-plugin/src/site/apt/usage.apt.vm
@@ -25,10 +25,10 @@
Usage
-* Generate the report as part of Project Reports
+* Generate the Report as Part of Project Reports
To generate the Surefire report as part of the site generation, add the
following in
- the \ section of your POM:
+ the <<<\>>> section of your POM:
+---+
@@ -46,14 +46,14 @@ Usage
+---+
- When the <<>> is invoked, the report will be automatically
+ When <<>> is invoked, the report will automatically be
included in the Project Reports menu as shown in the figure below.
[images/surefire-sample1.PNG] Sample Surefire Report
-* Generate the report as standalone
+* Generate the Report in a Standalone Fashion
- The Surefire report can also generate the report using its standalone goal:
+ The plugin can also generate the report using
Git Push Summary
Repository: maven-surefire Updated Tags: refs/tags/surefire-2.17 [created] f0b18b847
svn commit: r901741 - in /websites/production/maven/content: ./ ant-tasks-archives/ ant-tasks/ apache-resource-bundles/ archetype-archives/ archetype/ core-its/ enforcer-archives/ enforcer/ jxr-archiv
Author: agudian Date: Sat Mar 15 22:53:43 2014 New Revision: 901741 Log: release surefire 2.17 Added: websites/production/maven/content/ - copied from r901740, websites/staging/maven/trunk/content/ websites/production/maven/content/ant-tasks/ - copied from r901740, websites/production/maven/content/ant-tasks/ websites/production/maven/content/ant-tasks-archives/ - copied from r901740, websites/production/maven/content/ant-tasks-archives/ websites/production/maven/content/apache-resource-bundles/ - copied from r901740, websites/production/maven/content/apache-resource-bundles/ websites/production/maven/content/archetype/ - copied from r901740, websites/production/maven/content/archetype/ websites/production/maven/content/archetype-archives/ - copied from r901740, websites/production/maven/content/archetype-archives/ websites/production/maven/content/core-its/ - copied from r901740, websites/production/maven/content/core-its/ websites/production/maven/content/enforcer/ - copied from r901740, websites/production/maven/content/enforcer/ websites/production/maven/content/enforcer-archives/ - copied from r901740, websites/production/maven/content/enforcer-archives/ websites/production/maven/content/jxr/ - copied from r901740, websites/production/maven/content/jxr/ websites/production/maven/content/jxr-archives/ - copied from r901740, websites/production/maven/content/jxr-archives/ websites/production/maven/content/maven-1.x/ - copied from r901740, websites/production/maven/content/maven-1.x/ websites/production/maven/content/maven-archetype-bundles/ - copied from r901740, websites/production/maven/content/maven-archetype-bundles/ websites/production/maven/content/maven-indexer/ - copied from r901740, websites/production/maven/content/maven-indexer/ websites/production/maven/content/maven-indexer-archives/ - copied from r901740, websites/production/maven/content/maven-indexer-archives/ websites/production/maven/content/maven-release/ - copied from r901740, websites/production/maven/content/maven-release/ websites/production/maven/content/maven-release-archives/ - copied from r901740, websites/production/maven/content/maven-release-archives/ websites/production/maven/content/plugin-testing/ - copied from r901740, websites/production/maven/content/plugin-testing/ websites/production/maven/content/plugin-testing-archives/ - copied from r901740, websites/production/maven/content/plugin-testing-archives/ websites/production/maven/content/plugin-tools/ - copied from r901740, websites/production/maven/content/plugin-tools/ websites/production/maven/content/plugin-tools-archives/ - copied from r901740, websites/production/maven/content/plugin-tools-archives/ websites/production/maven/content/plugins-archives/ - copied from r901740, websites/production/maven/content/plugins-archives/ websites/production/maven/content/plugins/maven-acr-plugin/ - copied from r901740, websites/production/maven/content/plugins/maven-acr-plugin/ websites/production/maven/content/plugins/maven-ant-plugin/ - copied from r901740, websites/production/maven/content/plugins/maven-ant-plugin/ websites/production/maven/content/plugins/maven-antrun-plugin/ - copied from r901740, websites/production/maven/content/plugins/maven-antrun-plugin/ websites/production/maven/content/plugins/maven-archetype-plugin/ - copied from r901740, websites/production/maven/content/plugins/maven-archetype-plugin/ websites/production/maven/content/plugins/maven-assembly-plugin/ - copied from r901740, websites/production/maven/content/plugins/maven-assembly-plugin/ websites/production/maven/content/plugins/maven-changelog-plugin/ - copied from r901740, websites/production/maven/content/plugins/maven-changelog-plugin/ websites/production/maven/content/plugins/maven-changes-plugin/ - copied from r901740, websites/production/maven/content/plugins/maven-changes-plugin/ websites/production/maven/content/plugins/maven-checkstyle-plugin/ - copied from r901740, websites/production/maven/content/plugins/maven-checkstyle-plugin/ websites/production/maven/content/plugins/maven-clean-plugin/ - copied from r901740, websites/production/maven/content/plugins/maven-clean-plugin/ websites/production/maven/content/plugins/maven-compiler-plugin/ - copied from r901740, websites/production/maven/content/plugins/maven-compiler-plugin/ websites/production/maven/content/plugins/maven-dependency-plugin/ - copied from r901740, websites/production/maven/content/plugins/maven-dependency-plugin/ websites/production/maven/content/plugins/maven-deploy-plugin/ - copied from r901740, websites/production/maven/content/plugins/maven-deploy-plugin
svn commit: r1577943 - /maven/site/trunk/content/apt/plugins/index.apt
Author: agudian
Date: Sat Mar 15 22:49:23 2014
New Revision: 1577943
URL: http://svn.apache.org/r1577943
Log:
release surefire 2.17
Modified:
maven/site/trunk/content/apt/plugins/index.apt
Modified: maven/site/trunk/content/apt/plugins/index.apt
URL:
http://svn.apache.org/viewvc/maven/site/trunk/content/apt/plugins/index.apt?rev=1577943&r1=1577942&r2=1577943&view=diff
==
--- maven/site/trunk/content/apt/plugins/index.apt (original)
+++ maven/site/trunk/content/apt/plugins/index.apt Sat Mar 15 22:49:23 2014
@@ -72,7 +72,7 @@ Available Plugins
*--++--++--+++
| {{{/plugins/maven-deploy-plugin/} <<>>}} | B |
2.8.1| 2013-10-18 | Deploy the built artifact to the remote repository.
|
{{{http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-deploy-plugin}SVN}}
| {{{http://jira.codehaus.org/browse/MDEPLOY}JIRA}}
*--++--++--+++
-| {{{/surefire/maven-failsafe-plugin/} <<>>}}| B |
2.16 | 2013-08-16 | Run the JUnit integration tests in an isolated
classloader. |
{{{https://git-wip-us.apache.org/repos/asf/maven-surefire.git}GIT}} |
{{{http://jira.codehaus.org/browse/SUREFIRE}JIRA}}
+| {{{/surefire/maven-failsafe-plugin/} <<>>}}| B |
2.17 | 2014-03-16 | Run the JUnit integration tests in an isolated
classloader. |
{{{https://git-wip-us.apache.org/repos/asf/maven-surefire.git}GIT}} |
{{{http://jira.codehaus.org/browse/SUREFIRE}JIRA}}
*--++--++--+++
| {{{/plugins/maven-install-plugin/} <<>>}} | B |
2.5.1| 2013-10-18 | Install the built artifact into the local
repository. |
{{{http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-install-plugin}SVN}}
| {{{http://jira.codehaus.org/browse/MINSTALL}JIRA}}
*--++--++--+++
@@ -80,7 +80,7 @@ Available Plugins
*--++--++--+++
| {{{/plugins/maven-site-plugin/} <<>>}} | B |
3.3 | 2013-05-13 | Generate a site for the current project. |
{{{http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-site-plugin/}SVN}}
| {{{http://jira.codehaus.org/browse/MSITE}JIRA}}
*--++--++--+++
-| {{{/surefire/maven-surefire-plugin/} <<>>}}| B |
2.16 | 2013-08-16 | Run the JUnit unit tests in an isolated
classloader. |
{{{https://git-wip-us.apache.org/repos/asf/maven-surefire.git}GIT}} |
{{{http://jira.codehaus.org/browse/SUREFIRE}JIRA}}
+| {{{/surefire/maven-surefire-plugin/} <<>>}}| B |
2.17 | 2014-03-16 | Run the JUnit unit tests in an isolated
classloader. |
{{{https://git-wip-us.apache.org/repos/asf/maven-surefire.git}GIT}} |
{{{http://jira.codehaus.org/browse/SUREFIRE}JIRA}}
*--++--++--+++
| {{{/plugins/maven-verifier-plugin/} <<>>}} | B |
1.0 | 2010-01-30 | Useful for integration tests - verifies the
existence of certain conditions. |
{{{http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-verifier-plugin}SVN}}
| {{{http://jira.codehaus.org/browse/MVERIFIER}JIRA}}
*--++--++--+++
@@ -122,7 +122,7 @@ Available Plugins
*--++--++--+++
| {{{/plugins/maven-project-info-reports-plugin/} <<>>}}
| R | 2.7 | 2013-05-16 | Generate standard project reports. |
{{{http://svn.apache.o
svn commit: r901739 - in /websites/production/maven/content: ./ ant-tasks-archives/ ant-tasks/ apache-resource-bundles/ archetype-archives/ archetype/ core-its/ enforcer-archives/ enforcer/ jxr-archiv
Author: agudian Date: Sat Mar 15 22:44:05 2014 New Revision: 901739 Log: release surefire 2.17 Added: websites/production/maven/content/ - copied from r901738, websites/staging/maven/trunk/content/ websites/production/maven/content/ant-tasks/ - copied from r901738, websites/production/maven/content/ant-tasks/ websites/production/maven/content/ant-tasks-archives/ - copied from r901738, websites/production/maven/content/ant-tasks-archives/ websites/production/maven/content/apache-resource-bundles/ - copied from r901738, websites/production/maven/content/apache-resource-bundles/ websites/production/maven/content/archetype/ - copied from r901738, websites/production/maven/content/archetype/ websites/production/maven/content/archetype-archives/ - copied from r901738, websites/production/maven/content/archetype-archives/ websites/production/maven/content/core-its/ - copied from r901738, websites/production/maven/content/core-its/ websites/production/maven/content/enforcer/ - copied from r901738, websites/production/maven/content/enforcer/ websites/production/maven/content/enforcer-archives/ - copied from r901738, websites/production/maven/content/enforcer-archives/ websites/production/maven/content/jxr/ - copied from r901738, websites/production/maven/content/jxr/ websites/production/maven/content/jxr-archives/ - copied from r901738, websites/production/maven/content/jxr-archives/ websites/production/maven/content/maven-1.x/ - copied from r901738, websites/production/maven/content/maven-1.x/ websites/production/maven/content/maven-archetype-bundles/ - copied from r901738, websites/production/maven/content/maven-archetype-bundles/ websites/production/maven/content/maven-indexer/ - copied from r901738, websites/production/maven/content/maven-indexer/ websites/production/maven/content/maven-indexer-archives/ - copied from r901738, websites/production/maven/content/maven-indexer-archives/ websites/production/maven/content/maven-release/ - copied from r901738, websites/production/maven/content/maven-release/ websites/production/maven/content/maven-release-archives/ - copied from r901738, websites/production/maven/content/maven-release-archives/ websites/production/maven/content/plugin-testing/ - copied from r901738, websites/production/maven/content/plugin-testing/ websites/production/maven/content/plugin-testing-archives/ - copied from r901738, websites/production/maven/content/plugin-testing-archives/ websites/production/maven/content/plugin-tools/ - copied from r901738, websites/production/maven/content/plugin-tools/ websites/production/maven/content/plugin-tools-archives/ - copied from r901738, websites/production/maven/content/plugin-tools-archives/ websites/production/maven/content/plugins-archives/ - copied from r901738, websites/production/maven/content/plugins-archives/ websites/production/maven/content/plugins/maven-acr-plugin/ - copied from r901738, websites/production/maven/content/plugins/maven-acr-plugin/ websites/production/maven/content/plugins/maven-ant-plugin/ - copied from r901738, websites/production/maven/content/plugins/maven-ant-plugin/ websites/production/maven/content/plugins/maven-antrun-plugin/ - copied from r901738, websites/production/maven/content/plugins/maven-antrun-plugin/ websites/production/maven/content/plugins/maven-archetype-plugin/ - copied from r901738, websites/production/maven/content/plugins/maven-archetype-plugin/ websites/production/maven/content/plugins/maven-assembly-plugin/ - copied from r901738, websites/production/maven/content/plugins/maven-assembly-plugin/ websites/production/maven/content/plugins/maven-changelog-plugin/ - copied from r901738, websites/production/maven/content/plugins/maven-changelog-plugin/ websites/production/maven/content/plugins/maven-changes-plugin/ - copied from r901738, websites/production/maven/content/plugins/maven-changes-plugin/ websites/production/maven/content/plugins/maven-checkstyle-plugin/ - copied from r901738, websites/production/maven/content/plugins/maven-checkstyle-plugin/ websites/production/maven/content/plugins/maven-clean-plugin/ - copied from r901738, websites/production/maven/content/plugins/maven-clean-plugin/ websites/production/maven/content/plugins/maven-compiler-plugin/ - copied from r901738, websites/production/maven/content/plugins/maven-compiler-plugin/ websites/production/maven/content/plugins/maven-dependency-plugin/ - copied from r901738, websites/production/maven/content/plugins/maven-dependency-plugin/ websites/production/maven/content/plugins/maven-deploy-plugin/ - copied from r901738, websites/production/maven/content/plugins/maven-deploy-plugin
svn commit: r901738 - /websites/production/maven/content/surefire/
Author: agudian Date: Sat Mar 15 22:34:05 2014 New Revision: 901738 Log: release maven-surefire-plugin 2.17 Added: websites/production/maven/content/surefire/ - copied from r901737, websites/production/maven/content/surefire-archives/surefire-2.17/
svn commit: r901737 - /websites/production/maven/content/surefire/
Author: agudian Date: Sat Mar 15 22:33:53 2014 New Revision: 901737 Log: move 2.16 site out of the way Removed: websites/production/maven/content/surefire/
svn commit: r901336 - in /websites/production/maven/content/surefire-archives/surefire-2.17: ./ css/ images/ images/logos/ images/profiles/ img/ js/ maven-failsafe-plugin/ maven-failsafe-plugin/apidoc
Author: agudian Date: Wed Mar 12 21:36:48 2014 New Revision: 901336 Log: Surefire 2.17 release [This commit notification would consist of 585 parts, which exceeds the limit of 50 ones, so it was shortened to the summary.]
svn commit: r901323 - in /websites/production/maven/content/surefire-archives: surefire-2.17/ surefire-LATEST/
Author: agudian Date: Wed Mar 12 21:10:20 2014 New Revision: 901323 Log: (empty) Added: websites/production/maven/content/surefire-archives/surefire-2.17/ - copied from r901322, websites/production/maven/content/surefire-archives/surefire-LATEST/ Removed: websites/production/maven/content/surefire-archives/surefire-LATEST/
svn commit: r901322 - /websites/production/maven/content/surefire-archives/surefire-LATEST/
Author: agudian Date: Wed Mar 12 21:00:09 2014 New Revision: 901322 Log: Automatic svn path creation: https://svn.apache.org/repos/infra/websites/production/maven/content/surefire-archives/surefire-LATEST Added: websites/production/maven/content/surefire-archives/surefire-LATEST/
