svn commit: r1430738 - in /maven/plugins/trunk/maven-doap-plugin/src: it/MDOAP-38/verify.groovy main/java/org/apache/maven/plugin/doap/DoapMojo.java
Author: olamy Date: Wed Jan 9 09:02:21 2013 New Revision: 1430738 URL: http://svn.apache.org/viewvc?rev=1430738view=rev Log: say the first what :-) Modified: maven/plugins/trunk/maven-doap-plugin/src/it/MDOAP-38/verify.groovy maven/plugins/trunk/maven-doap-plugin/src/main/java/org/apache/maven/plugin/doap/DoapMojo.java Modified: maven/plugins/trunk/maven-doap-plugin/src/it/MDOAP-38/verify.groovy URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-doap-plugin/src/it/MDOAP-38/verify.groovy?rev=1430738r1=1430737r2=1430738view=diff == --- maven/plugins/trunk/maven-doap-plugin/src/it/MDOAP-38/verify.groovy (original) +++ maven/plugins/trunk/maven-doap-plugin/src/it/MDOAP-38/verify.groovy Wed Jan 9 09:02:21 2013 @@ -21,4 +21,4 @@ def logFile = new File( basedir, 'build. assert logFile.exists() content = logFile.text -assert content.contains( 'The doapOptionsshortdesc//doapOptions first is too long maximum words number is 10.' ) +assert content.contains( 'The doapOptionsshortdesc//doapOptions first sentence is too long maximum words number is 10.' ) Modified: maven/plugins/trunk/maven-doap-plugin/src/main/java/org/apache/maven/plugin/doap/DoapMojo.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-doap-plugin/src/main/java/org/apache/maven/plugin/doap/DoapMojo.java?rev=1430738r1=1430737r2=1430738view=diff == --- maven/plugins/trunk/maven-doap-plugin/src/main/java/org/apache/maven/plugin/doap/DoapMojo.java (original) +++ maven/plugins/trunk/maven-doap-plugin/src/main/java/org/apache/maven/plugin/doap/DoapMojo.java Wed Jan 9 09:02:21 2013 @@ -2641,7 +2641,7 @@ public class DoapMojo break; case SHORT_DESC_TOO_LONG: errorMessages.add( -The + toConfiguration( tags, value ) + first is too long maximum words number is 10. ); +The + toConfiguration( tags, value ) + first sentence is too long maximum words number is 10. ); break; default: throw new IllegalArgumentException( Unknown errorId= + errorId );
svn commit: r1430962 - in /maven/shared/trunk/maven-archiver/src/site/apt/examples: classpath.apt manifest.apt manifestEntries.apt manifestSections.apt
Author: olamy
Date: Wed Jan 9 17:16:08 2013
New Revision: 1430962
URL: http://svn.apache.org/viewvc?rev=1430962view=rev
Log:
[MSHARED-273] Update documentation for the Created-By manifest entry
Modified:
maven/shared/trunk/maven-archiver/src/site/apt/examples/classpath.apt
maven/shared/trunk/maven-archiver/src/site/apt/examples/manifest.apt
maven/shared/trunk/maven-archiver/src/site/apt/examples/manifestEntries.apt
maven/shared/trunk/maven-archiver/src/site/apt/examples/manifestSections.apt
Modified: maven/shared/trunk/maven-archiver/src/site/apt/examples/classpath.apt
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-archiver/src/site/apt/examples/classpath.apt?rev=1430962r1=1430961r2=1430962view=diff
==
--- maven/shared/trunk/maven-archiver/src/site/apt/examples/classpath.apt
(original)
+++ maven/shared/trunk/maven-archiver/src/site/apt/examples/classpath.apt Wed
Jan 9 17:16:08 2013
@@ -90,7 +90,7 @@ Set Up The Classpath
+-+
Manifest-Version: 1.0
Archiver-Version: Plexus Archiver
-Created-By: Apache Maven
+Created-By: Apache Maven ${maven.version}
Built-By: ${user.name}
Build-Jdk: ${java.version}
Class-Path: plexus-utils-1.1.jar commons-lang-2.1.jar
@@ -150,7 +150,7 @@ Class-Path: plexus-utils-1.1.jar commons
+-+
Manifest-Version: 1.0
Archiver-Version: Plexus Archiver
-Created-By: Apache Maven
+Created-By: Apache Maven ${maven.version}
Built-By: ${user.name}
Build-Jdk: ${java.version}
Main-Class: fully.qualified.MainClass
Modified: maven/shared/trunk/maven-archiver/src/site/apt/examples/manifest.apt
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-archiver/src/site/apt/examples/manifest.apt?rev=1430962r1=1430961r2=1430962view=diff
==
--- maven/shared/trunk/maven-archiver/src/site/apt/examples/manifest.apt
(original)
+++ maven/shared/trunk/maven-archiver/src/site/apt/examples/manifest.apt Wed
Jan 9 17:16:08 2013
@@ -33,7 +33,7 @@ Manifest
+-+
Manifest-Version: 1.0
Archiver-Version: Plexus Archiver
-Created-By: Apache Maven
+Created-By: Apache Maven ${maven.version}
Built-By: ${user.name}
Build-Jdk: ${java.version}
+-+
@@ -80,7 +80,7 @@ Build-Jdk: ${java.version}
+-+
Manifest-Version: 1.0
Archiver-Version: Plexus Archiver
-Created-By: Apache Maven
+Created-By: Apache Maven ${maven.version}
Built-By: ${user.name}
Build-Jdk: ${java.version}
Specification-Title: ${project.name}
Modified:
maven/shared/trunk/maven-archiver/src/site/apt/examples/manifestEntries.apt
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-archiver/src/site/apt/examples/manifestEntries.apt?rev=1430962r1=1430961r2=1430962view=diff
==
--- maven/shared/trunk/maven-archiver/src/site/apt/examples/manifestEntries.apt
(original)
+++ maven/shared/trunk/maven-archiver/src/site/apt/examples/manifestEntries.apt
Wed Jan 9 17:16:08 2013
@@ -69,7 +69,7 @@ Manifest Entries
+-+
Manifest-Version: 1.0
Archiver-Version: Plexus Archiver
-Created-By: Apache Maven
+Created-By: Apache Maven ${maven.version}
Built-By: ${user.name}
Build-Jdk: ${java.version}
mode: development
Modified:
maven/shared/trunk/maven-archiver/src/site/apt/examples/manifestSections.apt
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-archiver/src/site/apt/examples/manifestSections.apt?rev=1430962r1=1430961r2=1430962view=diff
==
---
maven/shared/trunk/maven-archiver/src/site/apt/examples/manifestSections.apt
(original)
+++
maven/shared/trunk/maven-archiver/src/site/apt/examples/manifestSections.apt
Wed Jan 9 17:16:08 2013
@@ -75,7 +75,7 @@ Manifest Sections
+-+
Manifest-Version: 1.0
Archiver-Version: Plexus Archiver
-Created-By: Apache Maven
+Created-By: Apache Maven ${maven.version}
Built-By: ${user.name}
Build-Jdk: ${java.version}
git commit: o Made sleep timeout configurable in forkModeIt for testing SUREFIRE-946
Updated Branches:
refs/heads/master 4dfdb08cc - 350dd6fd7
o Made sleep timeout configurable in forkModeIt for testing SUREFIRE-946
Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/350dd6fd
Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/350dd6fd
Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/350dd6fd
Branch: refs/heads/master
Commit: 350dd6fd745f82dcdf071ff910665d8b388dfe7b
Parents: 4dfdb08
Author: Kristian Rosenvold krosenv...@apache.org
Authored: Wed Jan 9 18:20:50 2013 +0100
Committer: Kristian Rosenvold krosenv...@apache.org
Committed: Wed Jan 9 18:21:09 2013 +0100
--
.../fork-mode/src/test/java/forkMode/Test1.java|4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/350dd6fd/surefire-integration-tests/src/test/resources/fork-mode/src/test/java/forkMode/Test1.java
--
diff --git
a/surefire-integration-tests/src/test/resources/fork-mode/src/test/java/forkMode/Test1.java
b/surefire-integration-tests/src/test/resources/fork-mode/src/test/java/forkMode/Test1.java
index ca5af55..8dd3307 100644
---
a/surefire-integration-tests/src/test/resources/fork-mode/src/test/java/forkMode/Test1.java
+++
b/surefire-integration-tests/src/test/resources/fork-mode/src/test/java/forkMode/Test1.java
@@ -17,9 +17,9 @@ public class Test1
public void test1()
throws IOException, InterruptedException
{
-Thread.sleep( 750 );
+int sleepLength = Integer.valueOf( System.getProperty( sleepLength,
750 ));
+Thread.sleep(sleepLength);
dumpPidFile( this );
-
}
public static void dumpPidFile( TestCase test )
git commit: [SUREFIRE-946] prevent hanging main process if forked process was killed (softly)
Updated Branches:
refs/heads/master 350dd6fd7 - e54dbd810
[SUREFIRE-946] prevent hanging main process if forked process was killed
(softly)
Fixed with extended IT
Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/e54dbd81
Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/e54dbd81
Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/e54dbd81
Branch: refs/heads/master
Commit: e54dbd810f62fe723800f11279b881bff244b707
Parents: 350dd6f
Author: agudian andreas.gud...@gmail.com
Authored: Sat Jan 5 21:13:12 2013 +0100
Committer: Kristian Rosenvold krosenv...@apache.org
Committed: Wed Jan 9 18:24:38 2013 +0100
--
.../plugin/surefire/booterclient/ForkStarter.java | 140 +++
.../lazytestprovider/TestProvidingInputStream.java | 29 ++-
.../surefire/booterclient/output/ForkClient.java | 22 ++-
.../maven/surefire/booter/ForkingRunListener.java |3 +
.../apache/maven/surefire/booter/ForkedBooter.java | 74 ++--
.../maven/surefire/its/CrashDetectionIT.java |7 +-
6 files changed, 215 insertions(+), 60 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e54dbd81/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 620dfd4..892c6a9 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
@@ -21,6 +21,8 @@ package org.apache.maven.plugin.surefire.booterclient;
import java.io.File;
import java.io.IOException;
+import java.io.InputStream;
+import java.security.AccessControlException;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
@@ -36,6 +38,7 @@ import java.util.concurrent.LinkedBlockingQueue;
import java.util.concurrent.ThreadPoolExecutor;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicInteger;
+
import org.apache.maven.plugin.surefire.AbstractSurefireMojo;
import org.apache.maven.plugin.surefire.CommonReflector;
import org.apache.maven.plugin.surefire.StartupReportConfiguration;
@@ -63,14 +66,13 @@ import org.apache.maven.surefire.report.StackTraceWriter;
import org.apache.maven.surefire.suite.RunResult;
import org.apache.maven.surefire.util.DefaultScanResult;
-
/**
* Starts the fork or runs in-process.
* p/
* Lives only on the plugin-side (not present in remote vms)
* p/
* Knows how to fork new vms and also how to delegate non-forking invocation
to SurefireStarter directly
- *
+ *
* @author Jason van Zyl
* @author Emmanuel Venisse
* @author Brett Porter
@@ -80,6 +82,36 @@ import org.apache.maven.surefire.util.DefaultScanResult;
*/
public class ForkStarter
{
+/**
+ * Closes an InputStream
+ */
+private final class InputStreamCloser
+extends Thread
+{
+private InputStream testProvidingInputStream;
+
+public InputStreamCloser( InputStream testProvidingInputStream )
+{
+this.testProvidingInputStream = testProvidingInputStream;
+}
+
+@Override
+public void run()
+{
+if ( testProvidingInputStream != null )
+{
+try
+{
+testProvidingInputStream.close();
+}
+catch ( IOException e )
+{
+// ignore
+}
+}
+}
+}
+
private final int forkedProcessTimeoutInSeconds;
private final ProviderConfiguration providerConfiguration;
@@ -105,7 +137,6 @@ public class ForkStarter
}
};
-
public ForkStarter( ProviderConfiguration providerConfiguration,
StartupConfiguration startupConfiguration,
ForkConfiguration forkConfiguration, int
forkedProcessTimeoutInSeconds,
StartupReportConfiguration startupReportConfiguration )
@@ -167,8 +198,9 @@ public class ForkStarter
{
ArrayListFutureRunResult results = new
ArrayListFutureRunResult( forkCount );
-ExecutorService executorService = new ThreadPoolExecutor( forkCount,
forkCount, 60, TimeUnit.SECONDS,
- new
ArrayBlockingQueueRunnable( forkCount ) );
+ExecutorService executorService =
+new ThreadPoolExecutor( forkCount,
git commit: o Removed warning
Updated Branches:
refs/heads/master e54dbd810 - 230c46a26
o Removed warning
Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/230c46a2
Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/230c46a2
Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/230c46a2
Branch: refs/heads/master
Commit: 230c46a26eaffcb0da57fd317e6a7611ba2c8e96
Parents: e54dbd8
Author: Kristian Rosenvold krosenv...@apache.org
Authored: Wed Jan 9 19:03:30 2013 +0100
Committer: Kristian Rosenvold krosenv...@apache.org
Committed: Wed Jan 9 19:03:30 2013 +0100
--
.../apache/maven/surefire/booter/ForkedBooter.java |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/230c46a2/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ForkedBooter.java
--
diff --git
a/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ForkedBooter.java
b/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ForkedBooter.java
index 4b04a99..5f711f4 100644
---
a/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ForkedBooter.java
+++
b/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ForkedBooter.java
@@ -72,7 +72,7 @@ public class ForkedBooter
{
originalIn.close();
}
-catch ( IOException e )
+catch ( IOException ignore )
{
}
