svn commit: r1627926 - in /maven/shared/trunk/maven-shared-utils: ./ src/main/java/org/apache/maven/shared/utils/ src/main/java/org/apache/maven/shared/utils/cli/ src/main/java/org/apache/maven/shared
Author: hboutemy
Date: Sat Sep 27 07:01:33 2014
New Revision: 1627926
URL: http://svn.apache.org/r1627926
Log:
fixed errors reported by Checkstyle
Modified:
maven/shared/trunk/maven-shared-utils/pom.xml
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/PathTool.java
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/ReaderFactory.java
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/StringUtils.java
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/WriterFactory.java
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli/StreamConsumer.java
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/io/FileUtils.java
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/io/IOUtil.java
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/xml/Xpp3Dom.java
maven/shared/trunk/maven-shared-utils/src/test/java/org/apache/maven/shared/utils/io/DirectoryScannerTest.java
Modified: maven/shared/trunk/maven-shared-utils/pom.xml
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-utils/pom.xml?rev=1627926r1=1627925r2=1627926view=diff
==
--- maven/shared/trunk/maven-shared-utils/pom.xml (original)
+++ maven/shared/trunk/maven-shared-utils/pom.xml Sat Sep 27 07:01:33 2014
@@ -156,4 +156,19 @@
/plugin
/plugins
/build
+
+ profiles
+profile
+ idreporting/id
+ reporting
+plugins
+ plugin
+groupIdorg.apache.maven.plugins/groupId
+artifactIdmaven-checkstyle-plugin/artifactId
+version2.13/version
+ /plugin
+/plugins
+ /reporting
+/profile
+ /profiles
/project
Modified:
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/PathTool.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/PathTool.java?rev=1627926r1=1627925r2=1627926view=diff
==
---
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/PathTool.java
(original)
+++
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/PathTool.java
Sat Sep 27 07:01:33 2014
@@ -194,7 +194,7 @@ public class PathTool
* terminated with a forward slash. A zero-length string is
* returned if: the filename is zero-length.
*/
-private @Nonnull static String determineRelativePath( @Nonnull String
filename, @Nonnull String separator )
+@Nonnull private static String determineRelativePath( @Nonnull String
filename, @Nonnull String separator )
{
if ( filename.length() == 0 )
{
@@ -267,7 +267,8 @@ public class PathTool
return path;
}
-private @Nonnull static String buildRelativePath( @Nonnull String toPath,
@Nonnull String fromPath, final char separatorChar )
+@Nonnull private static String buildRelativePath( @Nonnull String toPath,
@Nonnull String fromPath,
+ final char separatorChar
)
{
// use tokeniser to traverse paths and for lazy checking
StringTokenizer toTokeniser = new StringTokenizer( toPath,
String.valueOf( separatorChar ) );
Modified:
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/ReaderFactory.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/ReaderFactory.java?rev=1627926r1=1627925r2=1627926view=diff
==
---
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/ReaderFactory.java
(original)
+++
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/ReaderFactory.java
Sat Sep 27 07:01:33 2014
@@ -29,7 +29,6 @@ import java.io.InputStreamReader;
import java.io.Reader;
import java.io.UnsupportedEncodingException;
import java.net.URL;
-import java.nio.charset.Charset;
import org.apache.commons.io.input.XmlStreamReader;
import javax.annotation.Nonnull;
@@ -40,9 +39,8 @@ import javax.annotation.Nonnull;
* XML, or specified.
*
* @author a href=mailto:hbout...@apache.org;Hervé Boutemy/a
- * @see Charset
+ * @see java.nio.charset.Charset
* @see a
href=http://docs.oracle.com/javase/1.5.0/docs/guide/intl/encoding.doc.html;Supported
encodings/a
- *
*/
public class ReaderFactory
{
@@ -50,7 +48,7 @@ public class ReaderFactory
* ISO Latin Alphabet #1, also known as ISO-LATIN-1.
* Every implementation of the Java platform is required to support
svn commit: r1627932 - /maven/shared/trunk/maven-shared-utils/src/test/java/org/apache/maven/shared/utils/io/DirectoryScannerTest.java
Author: krosenvold
Date: Sat Sep 27 08:30:26 2014
New Revision: 1627932
URL: http://svn.apache.org/r1627932
Log:
[MSHARED-350] Testcase that proves the current implementation is good enough
Modified:
maven/shared/trunk/maven-shared-utils/src/test/java/org/apache/maven/shared/utils/io/DirectoryScannerTest.java
Modified:
maven/shared/trunk/maven-shared-utils/src/test/java/org/apache/maven/shared/utils/io/DirectoryScannerTest.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-utils/src/test/java/org/apache/maven/shared/utils/io/DirectoryScannerTest.java?rev=1627932r1=1627931r2=1627932view=diff
==
---
maven/shared/trunk/maven-shared-utils/src/test/java/org/apache/maven/shared/utils/io/DirectoryScannerTest.java
(original)
+++
maven/shared/trunk/maven-shared-utils/src/test/java/org/apache/maven/shared/utils/io/DirectoryScannerTest.java
Sat Sep 27 08:30:26 2014
@@ -20,10 +20,10 @@ package org.apache.maven.shared.utils.io
*/
import org.apache.maven.shared.utils.testhelpers.FileTestHelper;
+import org.junit.Assert;
import org.junit.Ignore;
import org.junit.Rule;
import org.junit.Test;
-import org.junit.Assert;
import org.junit.rules.TemporaryFolder;
import java.io.File;
@@ -32,6 +32,9 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
public class DirectoryScannerTest
{
private static final String[] NONE = new String[0];
@@ -67,7 +70,8 @@ public class DirectoryScannerTest
fitScanTest( true, true, true,
/* includes */null,
/* excludes */null,
-/* expInclFiles */new String[]{ file1.txt, file2.txt,
file3.dat, folder1/file4.txt, folder1/file5.dat },
+/* expInclFiles */
+new String[]{ file1.txt, file2.txt, file3.dat,
folder1/file4.txt, folder1/file5.dat },
/* expInclDirs */ new String[]{ , folder1 },
/* expNotInclFiles */ NONE,
/* expNotInclDirs */ NONE,
@@ -78,7 +82,8 @@ public class DirectoryScannerTest
fitScanTest( true, false, true,
/* includes */null,
/* excludes */null,
-/* expInclFiles */new String[]{ file1.txt, file2.txt,
file3.dat, folder1/file4.txt, folder1/file5.dat },
+/* expInclFiles */
+new String[]{ file1.txt, file2.txt, file3.dat,
folder1/file4.txt, folder1/file5.dat },
/* expInclDirs */ new String[]{ , folder1 },
/* expNotInclFiles */ NONE,
/* expNotInclDirs */ NONE,
@@ -115,18 +120,57 @@ public class DirectoryScannerTest
}
@Test
-public void followSymlinks()
+public void followSymlinksFalse()
{
DirectoryScanner ds = new DirectoryScanner();
ds.setBasedir( new File( src/test/resources/symlinks/src/ ) );
ds.setFollowSymlinks( false );
ds.scan();
ListString included = Arrays.asList( ds.getIncludedFiles() );
-System.out.println( includedFiles(nosymlinks) = + included );
+assertAlwaysIncluded( included );
+assertEquals( 9, included.size() );
+ListString includedDirs = Arrays.asList( ds.getIncludedDirectories()
);
+assertTrue( includedDirs.contains( ) ); // w00t !
+assertTrue( includedDirs.contains( aRegularDir ) );
+assertTrue( includedDirs.contains( symDir ) );
+assertTrue( includedDirs.contains( symLinkToDirOnTheOutside ) );
+assertTrue( includedDirs.contains( targetDir ) );
+assertEquals( 5, includedDirs.size() );
+}
+
+private void assertAlwaysIncluded( ListString included )
+{
+assertTrue( included.contains( aRegularDir/aRegularFile.txt ) );
+assertTrue( included.contains( targetDir/targetFile.txt ) );
+assertTrue( included.contains( fileR.txt ) );
+assertTrue( included.contains( fileW.txt ) );
+assertTrue( included.contains( fileX.txt ) );
+assertTrue( included.contains( symR ) );
+assertTrue( included.contains( symW ) );
+assertTrue( included.contains( symX ) );
+assertTrue( included.contains( symLinkToFileOnTheOutside ) );
+}
+
+@Test
+public void followSymlinks()
+{
+DirectoryScanner ds = new DirectoryScanner();
+ds.setBasedir( new File( src/test/resources/symlinks/src/ ) );
ds.setFollowSymlinks( true );
ds.scan();
-included = Arrays.asList( ds.getIncludedFiles() );
-System.out.println( includedFiles(symlinks) = + included );
+ListString included = Arrays.asList( ds.getIncludedFiles() );
+assertAlwaysIncluded( included );
+assertTrue( included.contains( symDir/targetFile.txt ) );
+
svn commit: r1627934 - /maven/shared/trunk/maven-shared-utils/src/test/java/org/apache/maven/shared/utils/io/DirectoryScannerTest.java
Author: krosenvold
Date: Sat Sep 27 08:47:25 2014
New Revision: 1627934
URL: http://svn.apache.org/r1627934
Log:
Ok, so semantics are still muddy on java6. DGF
Modified:
maven/shared/trunk/maven-shared-utils/src/test/java/org/apache/maven/shared/utils/io/DirectoryScannerTest.java
Modified:
maven/shared/trunk/maven-shared-utils/src/test/java/org/apache/maven/shared/utils/io/DirectoryScannerTest.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-utils/src/test/java/org/apache/maven/shared/utils/io/DirectoryScannerTest.java?rev=1627934r1=1627933r2=1627934view=diff
==
---
maven/shared/trunk/maven-shared-utils/src/test/java/org/apache/maven/shared/utils/io/DirectoryScannerTest.java
(original)
+++
maven/shared/trunk/maven-shared-utils/src/test/java/org/apache/maven/shared/utils/io/DirectoryScannerTest.java
Sat Sep 27 08:47:25 2014
@@ -122,6 +122,7 @@ public class DirectoryScannerTest
@Test
public void followSymlinksFalse()
{
+if (!Java7Support.isJava7()) return;
DirectoryScanner ds = new DirectoryScanner();
ds.setBasedir( new File( src/test/resources/symlinks/src/ ) );
ds.setFollowSymlinks( false );
@@ -154,6 +155,7 @@ public class DirectoryScannerTest
@Test
public void followSymlinks()
{
+if (!Java7Support.isJava7()) return;
DirectoryScanner ds = new DirectoryScanner();
ds.setBasedir( new File( src/test/resources/symlinks/src/ ) );
ds.setFollowSymlinks( true );
svn commit: r1627960 - /maven/plugins/trunk/maven-javadoc-plugin/pom.xml
Author: michaelo Date: Sat Sep 27 12:49:47 2014 New Revision: 1627960 URL: http://svn.apache.org/r1627960 Log: [maven-release-plugin] prepare release maven-javadoc-plugin-2.10.1 Modified: maven/plugins/trunk/maven-javadoc-plugin/pom.xml Modified: maven/plugins/trunk/maven-javadoc-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/pom.xml?rev=1627960r1=1627959r2=1627960view=diff == --- maven/plugins/trunk/maven-javadoc-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-javadoc-plugin/pom.xml Sat Sep 27 12:49:47 2014 @@ -30,7 +30,7 @@ under the License. /parent artifactIdmaven-javadoc-plugin/artifactId - version2.11-SNAPSHOT/version + version2.10.1/version packagingmaven-plugin/packaging nameApache Maven Javadoc Plugin/name @@ -45,9 +45,9 @@ under the License. /prerequisites scm - connectionscm:svn:http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-javadoc-plugin//connection - developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-javadoc-plugin//developerConnection - urlhttp://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin//url + connectionscm:svn:http://svn.apache.org/repos/asf/maven/plugins/tags/maven-javadoc-plugin-2.10.1/connection + developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/plugins/tags/maven-javadoc-plugin-2.10.1/developerConnection + urlhttp://svn.apache.org/viewvc/maven/plugins/tags/maven-javadoc-plugin-2.10.1/url /scm issueManagement systemjira/system
svn commit: r1627964 - /maven/plugins/trunk/maven-javadoc-plugin/pom.xml
Author: michaelo Date: Sat Sep 27 13:01:25 2014 New Revision: 1627964 URL: http://svn.apache.org/r1627964 Log: [maven-release-plugin] prepare for next development iteration Modified: maven/plugins/trunk/maven-javadoc-plugin/pom.xml Modified: maven/plugins/trunk/maven-javadoc-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/pom.xml?rev=1627964r1=1627963r2=1627964view=diff == --- maven/plugins/trunk/maven-javadoc-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-javadoc-plugin/pom.xml Sat Sep 27 13:01:25 2014 @@ -30,7 +30,7 @@ under the License. /parent artifactIdmaven-javadoc-plugin/artifactId - version2.10.1/version + version2.10.2-SNAPSHOT/version packagingmaven-plugin/packaging nameApache Maven Javadoc Plugin/name @@ -45,9 +45,9 @@ under the License. /prerequisites scm - connectionscm:svn:http://svn.apache.org/repos/asf/maven/plugins/tags/maven-javadoc-plugin-2.10.1/connection - developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/plugins/tags/maven-javadoc-plugin-2.10.1/developerConnection - urlhttp://svn.apache.org/viewvc/maven/plugins/tags/maven-javadoc-plugin-2.10.1/url + connectionscm:svn:http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-javadoc-plugin//connection + developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-javadoc-plugin//developerConnection + urlhttp://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin//url /scm issueManagement systemjira/system
svn commit: r1627963 - /maven/plugins/tags/maven-javadoc-plugin-2.10.1/
Author: michaelo Date: Sat Sep 27 13:01:17 2014 New Revision: 1627963 URL: http://svn.apache.org/r1627963 Log: [maven-release-plugin] copy for tag maven-javadoc-plugin-2.10.1 Added: maven/plugins/tags/maven-javadoc-plugin-2.10.1/ - copied from r1627962, maven/plugins/trunk/maven-javadoc-plugin/
svn commit: r1627971 - /maven/plugins/trunk/maven-ear-plugin/pom.xml
Author: khmarbaise Date: Sat Sep 27 14:27:46 2014 New Revision: 1627971 URL: http://svn.apache.org/r1627971 Log: [MEAR-195] - Removed plexus-container-default:1.0-alpha-9-stable-1 dependency Modified: maven/plugins/trunk/maven-ear-plugin/pom.xml Modified: maven/plugins/trunk/maven-ear-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/pom.xml?rev=1627971r1=1627970r2=1627971view=diff == --- maven/plugins/trunk/maven-ear-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-ear-plugin/pom.xml Sat Sep 27 14:27:46 2014 @@ -120,11 +120,6 @@ under the License. /dependency dependency groupIdorg.codehaus.plexus/groupId - artifactIdplexus-container-default/artifactId - version1.0-alpha-9-stable-1/version -/dependency -dependency - groupIdorg.codehaus.plexus/groupId artifactIdplexus-utils/artifactId version3.0.15/version /dependency
[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 git...@martin.egge.info
Authored: Thu Mar 13 09:42:17 2014 +0100
Committer: Andreas Gudian agud...@apache.org
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,
ListReportTestCase 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_();
[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 agud...@apache.org
Authored: Sat Sep 27 19:59:08 2014 +0200
Committer: Andreas Gudian agud...@apache.org
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 @@
plugin
artifactIdmaven-surefire-plugin/artifactId
configuration
- jvm${java.home}/bin/java/jvm
redirectTestOutputToFiletrue/redirectTestOutputToFile
- argLine-server -Xmx128m -XX:+UseParallelGC -XX:+UseNUMA
-XX:MaxGCPauseMillis=50/argLine
/configuration
/plugin
plugin
svn commit: r1627986 - /maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/EarMojo.java
Author: khmarbaise
Date: Sat Sep 27 18:07:52 2014
New Revision: 1627986
URL: http://svn.apache.org/r1627986
Log:
- Removed unused code.
Modified:
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/EarMojo.java
Modified:
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/EarMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/EarMojo.java?rev=1627986r1=1627985r2=1627986view=diff
==
---
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/EarMojo.java
(original)
+++
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/EarMojo.java
Sat Sep 27 18:07:52 2014
@@ -70,8 +70,6 @@ import java.util.zip.ZipException;
public class EarMojo
extends AbstractEarMojo
{
-private static final String[] EMPTY_STRING_ARRAY = {};
-
/**
* Single directory for extra files to include in the EAR.
*/
svn commit: r1627992 - /maven/shared/trunk/maven-filtering/pom.xml
Author: khmarbaise Date: Sat Sep 27 19:48:30 2014 New Revision: 1627992 URL: http://svn.apache.org/r1627992 Log: [MSHARED-351] - Upgrade plexus-interpolation to 1.19 Modified: maven/shared/trunk/maven-filtering/pom.xml Modified: maven/shared/trunk/maven-filtering/pom.xml URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-filtering/pom.xml?rev=1627992r1=1627991r2=1627992view=diff == --- maven/shared/trunk/maven-filtering/pom.xml (original) +++ maven/shared/trunk/maven-filtering/pom.xml Sat Sep 27 19:48:30 2014 @@ -115,7 +115,7 @@ dependency groupIdorg.codehaus.plexus/groupId artifactIdplexus-interpolation/artifactId - version1.12/version + version1.19/version /dependency dependency groupIdorg.sonatype.plexus/groupId
svn commit: r1627993 - /maven/shared/trunk/maven-filtering/pom.xml
Author: khmarbaise Date: Sat Sep 27 19:51:46 2014 New Revision: 1627993 URL: http://svn.apache.org/r1627993 Log: [MSHARED-352] - Upgrade plexus-utils to 3.0.15 Modified: maven/shared/trunk/maven-filtering/pom.xml Modified: maven/shared/trunk/maven-filtering/pom.xml URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-filtering/pom.xml?rev=1627993r1=1627992r2=1627993view=diff == --- maven/shared/trunk/maven-filtering/pom.xml (original) +++ maven/shared/trunk/maven-filtering/pom.xml Sat Sep 27 19:51:46 2014 @@ -110,7 +110,7 @@ dependency groupIdorg.codehaus.plexus/groupId artifactIdplexus-utils/artifactId - version1.5.15/version + version3.0.15/version /dependency dependency groupIdorg.codehaus.plexus/groupId
svn commit: r1627994 - /maven/shared/trunk/maven-filtering/pom.xml
Author: khmarbaise Date: Sat Sep 27 19:57:35 2014 New Revision: 1627994 URL: http://svn.apache.org/r1627994 Log: [MSHARED-353] - Upgrade maven-shared-utils to 0.6 Modified: maven/shared/trunk/maven-filtering/pom.xml Modified: maven/shared/trunk/maven-filtering/pom.xml URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-filtering/pom.xml?rev=1627994r1=1627993r2=1627994view=diff == --- maven/shared/trunk/maven-filtering/pom.xml (original) +++ maven/shared/trunk/maven-filtering/pom.xml Sat Sep 27 19:57:35 2014 @@ -99,7 +99,7 @@ dependency groupIdorg.apache.maven.shared/groupId artifactIdmaven-shared-utils/artifactId - version0.3/version + version0.6/version /dependency dependency
svn commit: r1627995 - /maven/shared/trunk/maven-filtering/pom.xml
Author: khmarbaise Date: Sat Sep 27 20:01:03 2014 New Revision: 1627995 URL: http://svn.apache.org/r1627995 Log: [MSHARED-354] - Remvoved plexus-container-default:1.0-alpha-9-stable-1 Modified: maven/shared/trunk/maven-filtering/pom.xml Modified: maven/shared/trunk/maven-filtering/pom.xml URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-filtering/pom.xml?rev=1627995r1=1627994r2=1627995view=diff == --- maven/shared/trunk/maven-filtering/pom.xml (original) +++ maven/shared/trunk/maven-filtering/pom.xml Sat Sep 27 20:01:03 2014 @@ -104,11 +104,6 @@ dependency groupIdorg.codehaus.plexus/groupId - artifactIdplexus-container-default/artifactId - version1.0-alpha-9-stable-1/version -/dependency -dependency - groupIdorg.codehaus.plexus/groupId artifactIdplexus-utils/artifactId version3.0.15/version /dependency
svn commit: r1627996 - /maven/shared/trunk/maven-filtering/pom.xml
Author: khmarbaise
Date: Sat Sep 27 20:06:13 2014
New Revision: 1627996
URL: http://svn.apache.org/r1627996
Log:
[MSHARED-355]
- Upgraded to minimum build version 2.2.1 and compatibility as well.
Modified:
maven/shared/trunk/maven-filtering/pom.xml
Modified: maven/shared/trunk/maven-filtering/pom.xml
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-filtering/pom.xml?rev=1627996r1=1627995r2=1627996view=diff
==
--- maven/shared/trunk/maven-filtering/pom.xml (original)
+++ maven/shared/trunk/maven-filtering/pom.xml Sat Sep 27 20:06:13 2014
@@ -35,7 +35,7 @@
descriptionA component to assist in filtering of resource files with
properties from a Maven project./description
prerequisites
-maven2.0.6/maven
+maven${mavenVersion}/maven
/prerequisites
scm
@@ -55,7 +55,7 @@
/distributionManagement
properties
-mavenVersion2.0.6/mavenVersion
+mavenVersion2.2.1/mavenVersion
/properties
contributors
svn commit: r1627998 - /maven/shared/trunk/maven-mapping/pom.xml
Author: khmarbaise Date: Sat Sep 27 20:15:05 2014 New Revision: 1627998 URL: http://svn.apache.org/r1627998 Log: [MSHARED-356] - Upgrade build minimum to 2.2.1 and compatibility. Modified: maven/shared/trunk/maven-mapping/pom.xml Modified: maven/shared/trunk/maven-mapping/pom.xml URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-mapping/pom.xml?rev=1627998r1=1627997r2=1627998view=diff == --- maven/shared/trunk/maven-mapping/pom.xml (original) +++ maven/shared/trunk/maven-mapping/pom.xml Sat Sep 27 20:15:05 2014 @@ -56,7 +56,7 @@ /distributionManagement properties -mavenVersion2.0.6/mavenVersion +mavenVersion2.2.1/mavenVersion /properties dependencies
svn commit: r1627999 - /maven/shared/trunk/maven-mapping/pom.xml
Author: khmarbaise Date: Sat Sep 27 20:17:07 2014 New Revision: 1627999 URL: http://svn.apache.org/r1627999 Log: [MSHARED-357] - Upgrade plexus-interpolation to 1.19 Modified: maven/shared/trunk/maven-mapping/pom.xml Modified: maven/shared/trunk/maven-mapping/pom.xml URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-mapping/pom.xml?rev=1627999r1=1627998r2=1627999view=diff == --- maven/shared/trunk/maven-mapping/pom.xml (original) +++ maven/shared/trunk/maven-mapping/pom.xml Sat Sep 27 20:17:07 2014 @@ -68,7 +68,7 @@ dependency groupIdorg.codehaus.plexus/groupId artifactIdplexus-interpolation/artifactId - version1.15/version + version1.19/version /dependency dependency
svn commit: r1628001 - /maven/shared/trunk/maven-invoker/pom.xml
Author: khmarbaise Date: Sat Sep 27 20:22:30 2014 New Revision: 1628001 URL: http://svn.apache.org/r1628001 Log: [MSHARED-358] - Upgrade of plexus-utils to 3.0.15 Modified: maven/shared/trunk/maven-invoker/pom.xml Modified: maven/shared/trunk/maven-invoker/pom.xml URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-invoker/pom.xml?rev=1628001r1=1628000r2=1628001view=diff == --- maven/shared/trunk/maven-invoker/pom.xml (original) +++ maven/shared/trunk/maven-invoker/pom.xml Sat Sep 27 20:22:30 2014 @@ -61,7 +61,7 @@ under the License. dependency groupIdorg.codehaus.plexus/groupId artifactIdplexus-utils/artifactId - version3.0.8/version + version3.0.15/version /dependency !-- dependency
svn commit: r1628002 - /maven/shared/trunk/maven-invoker/pom.xml
Author: khmarbaise Date: Sat Sep 27 20:26:59 2014 New Revision: 1628002 URL: http://svn.apache.org/r1628002 Log: - Removed comment in pom.xml Modified: maven/shared/trunk/maven-invoker/pom.xml Modified: maven/shared/trunk/maven-invoker/pom.xml URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-invoker/pom.xml?rev=1628002r1=1628001r2=1628002view=diff == --- maven/shared/trunk/maven-invoker/pom.xml (original) +++ maven/shared/trunk/maven-invoker/pom.xml Sat Sep 27 20:26:59 2014 @@ -63,13 +63,6 @@ under the License. artifactIdplexus-utils/artifactId version3.0.15/version /dependency -!-- -dependency - groupIdorg.apache.maven.shared/groupId - artifactIdmaven-shared-utils/artifactId - version0.1-SNAPSHOT/version -/dependency - -- dependency groupIdorg.codehaus.plexus/groupId artifactIdplexus-component-annotations/artifactId
svn commit: r1628003 - /maven/shared/trunk/maven-shared-utils/pom.xml
Author: khmarbaise Date: Sat Sep 27 20:30:03 2014 New Revision: 1628003 URL: http://svn.apache.org/r1628003 Log: [MSHARED-359] - Upgrade to Maven 2.2.1 build and compatibility. Modified: maven/shared/trunk/maven-shared-utils/pom.xml Modified: maven/shared/trunk/maven-shared-utils/pom.xml URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-utils/pom.xml?rev=1628003r1=1628002r2=1628003view=diff == --- maven/shared/trunk/maven-shared-utils/pom.xml (original) +++ maven/shared/trunk/maven-shared-utils/pom.xml Sat Sep 27 20:30:03 2014 @@ -55,7 +55,7 @@ /distributionManagement properties -mavenVersion2.1.0/mavenVersion +mavenVersion2.2.1/mavenVersion /properties dependencies
[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 agud...@apache.org
Authored: Sat Sep 27 22:18:11 2014 +0200
Committer: Andreas Gudian agud...@apache.org
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 @@
+?xml version=1.0 encoding=UTF-8?
+!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one
+ ~ or more contributor license agreements. See the NOTICE file
+ ~ distributed with this work for additional information
+ ~ regarding copyright ownership. The ASF licenses this file
+ ~ to you under the Apache License, Version 2.0 (the
+ ~ License); you may not use this file except in compliance
+ ~ with the License. You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing,
+ ~ software distributed under the License is distributed on an
+ ~ AS IS BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ ~ KIND, either express or implied. See the License for the
+ ~ specific language governing permissions and limitations
+ ~ under the License.
+ --
+
+project xmlns=http://maven.apache.org/POM/4.0.0;
+ xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance;
+ xsi:schemaLocation=http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd;
+ modelVersion4.0.0/modelVersion
+
+parent
+ groupIdorg.apache.maven.surefire/groupId
+ artifactIdit-parent/artifactId
+ version1.0/version
+
[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 agud...@apache.org
Authored: Sat Sep 27 22:58:00 2014 +0200
Committer: Andreas Gudian agud...@apache.org
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 ) );
[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 agud...@apache.org
Authored: Sat Sep 27 23:12:43 2014 +0200
Committer: Andreas Gudian agud...@apache.org
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}
git commit: SUREFIRE-1096 Fix ClassCastException when configuring forkCount1 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 forkCount1 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 agud...@apache.org
Authored: Sun Sep 28 01:54:51 2014 +0200
Committer: Andreas Gudian agud...@apache.org
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
svn commit: r923821 - /websites/production/maven/content/plugins-archives/maven-javadoc-plugin-2.10/maven-javadoc-plugin-LATEST/
Author: michaelo Date: Sat Sep 27 14:11:59 2014 New Revision: 923821 Log: Archive versioned site. Added: websites/production/maven/content/plugins-archives/maven-javadoc-plugin-2.10/maven-javadoc-plugin-LATEST/ - copied from r923820, websites/production/maven/content/plugins-archives/maven-javadoc-plugin-LATEST/
svn commit: r923822 - in /websites/production/maven/content/plugins-archives/maven-javadoc-plugin-LATEST: ./ apidocs/ apidocs/org/apache/maven/plugin/javadoc/ apidocs/org/apache/maven/plugin/javadoc/c
Author: michaelo Date: Sat Sep 27 14:19:01 2014 New Revision: 923822 Log: Site checkin for project Apache Maven Javadoc Plugin [This commit notification would consist of 102 parts, which exceeds the limit of 50 ones, so it was shortened to the summary.]
