git commit: improved javadoc
Updated Branches:
refs/heads/master 39e11cf2e - aa0b71ca6
improved javadoc
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/aa0b71ca
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/aa0b71ca
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/aa0b71ca
Branch: refs/heads/master
Commit: aa0b71ca62eb095dd1476088b4071eaf269e7b08
Parents: 39e11cf
Author: Hervé Boutemy hbout...@apache.org
Authored: Sun Dec 16 09:44:26 2012 +0100
Committer: Hervé Boutemy hbout...@apache.org
Committed: Sun Dec 16 09:44:26 2012 +0100
--
.../org/apache/maven/cli/logging/Slf4jLogger.java |4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven/blob/aa0b71ca/maven-embedder/src/main/java/org/apache/maven/cli/logging/Slf4jLogger.java
--
diff --git
a/maven-embedder/src/main/java/org/apache/maven/cli/logging/Slf4jLogger.java
b/maven-embedder/src/main/java/org/apache/maven/cli/logging/Slf4jLogger.java
index a2b9bca..fa59a12 100644
--- a/maven-embedder/src/main/java/org/apache/maven/cli/logging/Slf4jLogger.java
+++ b/maven-embedder/src/main/java/org/apache/maven/cli/logging/Slf4jLogger.java
@@ -114,7 +114,7 @@ public class Slf4jLogger
}
/**
- * bWarning/b: ignored (always return code0/code).
+ * bWarning/b: ignored (always return code0 ==
Logger.LEVEL_DEBUG/code).
*/
public int getThreshold()
{
@@ -129,7 +129,7 @@ public class Slf4jLogger
}
/**
- * bWarning/b: ignored (always return code0/code).
+ * bWarning/b: ignored (always return codenull/code).
*/
public Logger getChildLogger( String name )
{
git commit: fixed indentation
Updated Branches:
refs/heads/master aa0b71ca6 - 25bae5acd
fixed indentation
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/25bae5ac
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/25bae5ac
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/25bae5ac
Branch: refs/heads/master
Commit: 25bae5acd7b1c9008182d45ddc54d8ba0ae9be7a
Parents: aa0b71c
Author: Hervé Boutemy hbout...@apache.org
Authored: Sun Dec 16 09:49:17 2012 +0100
Committer: Hervé Boutemy hbout...@apache.org
Committed: Sun Dec 16 09:49:17 2012 +0100
--
.../main/java/org/apache/maven/cli/MavenCli.java | 36 +++
1 files changed, 17 insertions(+), 19 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven/blob/25bae5ac/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
--
diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
b/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
index e3c62f8..99ea11b 100644
--- a/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
+++ b/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
@@ -387,29 +387,27 @@ public class MavenCli
DefaultPlexusContainer container = null;
-ContainerConfiguration cc = new DefaultContainerConfiguration()
-.setClassWorld( cliRequest.classWorld )
-.setRealm( setupContainerRealm( cliRequest ) )
-.setClassPathScanning( PlexusConstants.SCANNING_INDEX )
-.setAutoWiring( true )
-.setName( maven );
-
-container = new DefaultPlexusContainer( cc, new AbstractModule()
-{
-
-protected void configure()
-{
-bind( ILoggerFactory.class ).toInstance(
slf4jLoggerFactory );
-}
+ContainerConfiguration cc = new DefaultContainerConfiguration()
+.setClassWorld( cliRequest.classWorld )
+.setRealm( setupContainerRealm( cliRequest ) )
+.setClassPathScanning( PlexusConstants.SCANNING_INDEX )
+.setAutoWiring( true )
+.setName( maven );
-} );
+container = new DefaultPlexusContainer( cc, new AbstractModule()
+{
+protected void configure()
+{
+bind( ILoggerFactory.class ).toInstance( slf4jLoggerFactory );
+}
+} );
-// NOTE: To avoid inconsistencies, we'll use the TCCL exclusively
for lookups
-container.setLookupRealm( null );
+// NOTE: To avoid inconsistencies, we'll use the TCCL exclusively for
lookups
+container.setLookupRealm( null );
-container.setLoggerManager( plexusLoggerManager );
+container.setLoggerManager( plexusLoggerManager );
-customizeContainer( container );
+customizeContainer( container );
container.getLoggerManager().setThresholds(
cliRequest.request.getLoggingLevel() );
git commit: added javadoc for logging levels int values accepted
Updated Branches:
refs/heads/master 25bae5acd - eb9257e70
added javadoc for logging levels int values accepted
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/eb9257e7
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/eb9257e7
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/eb9257e7
Branch: refs/heads/master
Commit: eb9257e70c4988fff66759ecdef806a6b82f2c9e
Parents: 25bae5a
Author: Hervé Boutemy hbout...@apache.org
Authored: Sun Dec 16 11:21:30 2012 +0100
Committer: Hervé Boutemy hbout...@apache.org
Committed: Sun Dec 16 11:21:30 2012 +0100
--
.../maven/cli/logging/Slf4jConfiguration.java | 10 ++
1 files changed, 10 insertions(+), 0 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven/blob/eb9257e7/maven-embedder/src/main/java/org/apache/maven/cli/logging/Slf4jConfiguration.java
--
diff --git
a/maven-embedder/src/main/java/org/apache/maven/cli/logging/Slf4jConfiguration.java
b/maven-embedder/src/main/java/org/apache/maven/cli/logging/Slf4jConfiguration.java
index c988bd8..8aff15a 100644
---
a/maven-embedder/src/main/java/org/apache/maven/cli/logging/Slf4jConfiguration.java
+++
b/maven-embedder/src/main/java/org/apache/maven/cli/logging/Slf4jConfiguration.java
@@ -20,6 +20,8 @@ package org.apache.maven.cli.logging;
*/
import java.io.File;
+import org.apache.maven.execution.MavenExecutionRequest;
+import org.codehaus.plexus.logging.Logger;
/**
* Interface for configuration operations on loggers, which are not available
in slf4j, then require per-slf4f-binding
@@ -29,6 +31,14 @@ import java.io.File;
*/
public interface Slf4jConfiguration
{
+/**
+ * Set root logging level.
+ *
+ * @param level the level as defined in Plexus Logger codeLEVEL_*/code
and equivalent
+ * codeMavenExecutionRequest.LOGGING_LEVEL_*/code constants.
+ * @see Logger
+ * @see MavenExecutionRequest
+ */
void setRootLoggerLevel( int level );
void setLoggerFile( File output );
svn commit: r1422564 - in /maven/plugins/trunk/maven-deploy-plugin/src/test: java/org/apache/maven/plugin/deploy/stubs/ resources/unit/basic-deploy-pom/ resources/unit/basic-deploy-test/ resources/uni
Author: rfscholte
Date: Sun Dec 16 12:12:31 2012
New Revision: 1422564
URL: http://svn.apache.org/viewvc?rev=1422564view=rev
Log:
Now tests also succeed under Eclipse
Modified:
maven/plugins/trunk/maven-deploy-plugin/src/test/java/org/apache/maven/plugin/deploy/stubs/ArtifactRepositoryStub.java
maven/plugins/trunk/maven-deploy-plugin/src/test/resources/unit/basic-deploy-pom/plugin-config.xml
maven/plugins/trunk/maven-deploy-plugin/src/test/resources/unit/basic-deploy-test/plugin-config.xml
maven/plugins/trunk/maven-deploy-plugin/src/test/resources/unit/basic-deploy-with-attached-artifacts/plugin-config.xml
Modified:
maven/plugins/trunk/maven-deploy-plugin/src/test/java/org/apache/maven/plugin/deploy/stubs/ArtifactRepositoryStub.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-deploy-plugin/src/test/java/org/apache/maven/plugin/deploy/stubs/ArtifactRepositoryStub.java?rev=1422564r1=1422563r2=1422564view=diff
==
---
maven/plugins/trunk/maven-deploy-plugin/src/test/java/org/apache/maven/plugin/deploy/stubs/ArtifactRepositoryStub.java
(original)
+++
maven/plugins/trunk/maven-deploy-plugin/src/test/java/org/apache/maven/plugin/deploy/stubs/ArtifactRepositoryStub.java
Sun Dec 16 12:12:31 2012
@@ -35,6 +35,8 @@ public class ArtifactRepositoryStub
private String url;
+private String basedir = System.getProperty( basedir );
+
public String pathOf( Artifact artifact )
{
return getLayout().pathOf( artifact );
@@ -57,12 +59,12 @@ public class ArtifactRepositoryStub
public void setAppendToUrl( String dir )
{
-this.url = file:// + System.getProperty( basedir ) +
/target/remote-repo/ + dir;
+this.url = file:// + basedir + /target/remote-repo/ + dir;
}
public String getBasedir()
{
-return System.getProperty( basedir );
+return basedir;
}
public String getProtocol()
Modified:
maven/plugins/trunk/maven-deploy-plugin/src/test/resources/unit/basic-deploy-pom/plugin-config.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-deploy-plugin/src/test/resources/unit/basic-deploy-pom/plugin-config.xml?rev=1422564r1=1422563r2=1422564view=diff
==
---
maven/plugins/trunk/maven-deploy-plugin/src/test/resources/unit/basic-deploy-pom/plugin-config.xml
(original)
+++
maven/plugins/trunk/maven-deploy-plugin/src/test/resources/unit/basic-deploy-pom/plugin-config.xml
Sun Dec 16 12:12:31 2012
@@ -35,7 +35,9 @@ under the License.
packagingpom/packaging
artifact
implementation=org.apache.maven.plugin.deploy.stubs.DeployArtifactStub /
attachedArtifacts /
-deploymentRepository
implementation=org.apache.maven.plugin.deploy.stubs.ArtifactRepositoryStub /
+deploymentRepository
implementation=org.apache.maven.plugin.deploy.stubs.ArtifactRepositoryStub
+ basedir${basedir}/basedir
+/deploymentRepository
/project
updateReleaseInfotrue/updateReleaseInfo
/configuration
Modified:
maven/plugins/trunk/maven-deploy-plugin/src/test/resources/unit/basic-deploy-test/plugin-config.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-deploy-plugin/src/test/resources/unit/basic-deploy-test/plugin-config.xml?rev=1422564r1=1422563r2=1422564view=diff
==
Binary files - no diff available.
Modified:
maven/plugins/trunk/maven-deploy-plugin/src/test/resources/unit/basic-deploy-with-attached-artifacts/plugin-config.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-deploy-plugin/src/test/resources/unit/basic-deploy-with-attached-artifacts/plugin-config.xml?rev=1422564r1=1422563r2=1422564view=diff
==
---
maven/plugins/trunk/maven-deploy-plugin/src/test/resources/unit/basic-deploy-with-attached-artifacts/plugin-config.xml
(original)
+++
maven/plugins/trunk/maven-deploy-plugin/src/test/resources/unit/basic-deploy-with-attached-artifacts/plugin-config.xml
Sun Dec 16 12:12:31 2012
@@ -39,7 +39,9 @@ under the License.
attachedArtifacts
attachedArtifact
implementation=org.apache.maven.plugin.deploy.stubs.AttachedArtifactStub /
/attachedArtifacts
-deploymentRepository
implementation=org.apache.maven.plugin.deploy.stubs.ArtifactRepositoryStub /
+deploymentRepository
implementation=org.apache.maven.plugin.deploy.stubs.ArtifactRepositoryStub
+ basedir${basedir}/basedir
+/deploymentRepository
/project
updateReleaseInfotrue/updateReleaseInfo
/configuration
git commit: o Stabilized IT by adding runOrder alphabetical to get deterministic runOrder
Updated Branches:
refs/heads/master 2ac80139e - 3b34e06ca
o Stabilized IT by adding runOrder alphabetical to get deterministic runOrder
Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/3b34e06c
Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/3b34e06c
Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/3b34e06c
Branch: refs/heads/master
Commit: 3b34e06ca282361c13b5ef8c6f404c9d70b2f033
Parents: 2ac8013
Author: Kristian Rosenvold krosenv...@apache.org
Authored: Sun Dec 16 16:17:37 2012 +0100
Committer: Kristian Rosenvold krosenv...@apache.org
Committed: Sun Dec 16 16:17:37 2012 +0100
--
.../test/resources/junit47-redirect-output/pom.xml |1 +
1 files changed, 1 insertions(+), 0 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/3b34e06c/surefire-integration-tests/src/test/resources/junit47-redirect-output/pom.xml
--
diff --git
a/surefire-integration-tests/src/test/resources/junit47-redirect-output/pom.xml
b/surefire-integration-tests/src/test/resources/junit47-redirect-output/pom.xml
index 289b2dc..7cdb0a1 100644
---
a/surefire-integration-tests/src/test/resources/junit47-redirect-output/pom.xml
+++
b/surefire-integration-tests/src/test/resources/junit47-redirect-output/pom.xml
@@ -43,6 +43,7 @@
redirectTestOutputToFile${redirect.to.file}/redirectTestOutputToFile
threadCount2/threadCount
parallel${parallel}/parallel
+ runOrderalphabetical/runOrder
includes
include**/Test*.java/include
/includes
git commit: o Removed printStackTrace in unit test
Updated Branches:
refs/heads/master 3b34e06ca - b80783fa9
o Removed printStackTrace in unit 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/b80783fa
Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/b80783fa
Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/b80783fa
Branch: refs/heads/master
Commit: b80783fa9e2b0edd49a57a4cef5fdc5570f22825
Parents: 3b34e06
Author: Kristian Rosenvold krosenv...@apache.org
Authored: Sun Dec 16 16:23:25 2012 +0100
Committer: Kristian Rosenvold krosenv...@apache.org
Committed: Sun Dec 16 16:23:25 2012 +0100
--
.../surefire/report/SmartStackTraceParserTest.java |1 -
1 files changed, 0 insertions(+), 1 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b80783fa/surefire-providers/common-java5/src/test/java/org/apache/maven/surefire/report/SmartStackTraceParserTest.java
--
diff --git
a/surefire-providers/common-java5/src/test/java/org/apache/maven/surefire/report/SmartStackTraceParserTest.java
b/surefire-providers/common-java5/src/test/java/org/apache/maven/surefire/report/SmartStackTraceParserTest.java
index 5a87484..a3fd02c 100644
---
a/surefire-providers/common-java5/src/test/java/org/apache/maven/surefire/report/SmartStackTraceParserTest.java
+++
b/surefire-providers/common-java5/src/test/java/org/apache/maven/surefire/report/SmartStackTraceParserTest.java
@@ -184,7 +184,6 @@ public class SmartStackTraceParserTest
{
Throwable aThrownException = getAThrownException();
-aThrownException.printStackTrace();
ListStackTraceElement innerMost =
SmartStackTraceParser.focusInsideClass(
aThrownException.getCause().getStackTrace(),
TestClass1.InnerBTestClass.class.getName() );
svn commit: r1422614 - /maven/shared/trunk/maven-shared-utils/src/site/apt/index.apt
Author: krosenvold Date: Sun Dec 16 16:18:27 2012 New Revision: 1422614 URL: http://svn.apache.org/viewvc?rev=1422614view=rev Log: o Removed bits about unclean code Modified: maven/shared/trunk/maven-shared-utils/src/site/apt/index.apt Modified: maven/shared/trunk/maven-shared-utils/src/site/apt/index.apt URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-utils/src/site/apt/index.apt?rev=1422614r1=1422613r2=1422614view=diff == --- maven/shared/trunk/maven-shared-utils/src/site/apt/index.apt (original) +++ maven/shared/trunk/maven-shared-utils/src/site/apt/index.apt Sun Dec 16 16:18:27 2012 @@ -37,9 +37,8 @@ Apache Maven Shared Utils Why ? - plexus-utils consisted mostly of code that was forked from various apache projects. From a licensing - perspective this code became unclean when it was forked to codehaus. maven-shared-utils is - based on the original from the apache sources. + plexus-utils consisted mostly of code that was forked from various apache projects. + maven-shared-utils is based on the original from the apache sources. Why not commons ? We would prefer code to use commons-* code where appropriate, but the plexus-utils became
git commit: [SUREFIRE-937] Intermittent incorrect testcount in parallel junit provider
Updated Branches:
refs/heads/master b80783fa9 - 5b56fe700
[SUREFIRE-937] Intermittent incorrect testcount in parallel junit provider
Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/5b56fe70
Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/5b56fe70
Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/5b56fe70
Branch: refs/heads/master
Commit: 5b56fe7002eb0671ef2035cd39adfb7a89bba5a5
Parents: b80783f
Author: Kristian Rosenvold krosenv...@apache.org
Authored: Sun Dec 16 16:52:39 2012 +0100
Committer: Kristian Rosenvold krosenv...@apache.org
Committed: Sun Dec 16 17:08:52 2012 +0100
--
.../junitcore/ConcurrentReporterManager.java |5 +
1 files changed, 5 insertions(+), 0 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/5b56fe70/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/ConcurrentReporterManager.java
--
diff --git
a/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/ConcurrentReporterManager.java
b/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/ConcurrentReporterManager.java
index 9429310..777f50b 100644
---
a/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/ConcurrentReporterManager.java
+++
b/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/ConcurrentReporterManager.java
@@ -71,6 +71,7 @@ public abstract class ConcurrentReporterManager
{
testSet.replay( reporterManager );
}
+detachTestMethodFromThread();
reporterManagerThreadLocal.remove();
}
@@ -81,6 +82,7 @@ public abstract class ConcurrentReporterManager
{
testMethod.testFailure( failure );
}
+detachTestMethodFromThread();
}
public void testError( ReportEntry failure )
@@ -90,6 +92,7 @@ public abstract class ConcurrentReporterManager
{
testMethod.testError( failure );
}
+detachTestMethodFromThread();
}
public void testSkipped( ReportEntry description )
@@ -98,6 +101,7 @@ public abstract class ConcurrentReporterManager
TestMethod testMethod = getTestSet( description ).createTestMethod(
description );
testMethod.testIgnored( description );
testSet.incrementFinishedTests( getRunListener(), reportImmediately );
+detachTestMethodFromThread();
}
public void testAssumptionFailure( ReportEntry failure )
@@ -107,6 +111,7 @@ public abstract class ConcurrentReporterManager
{
testMethod.testIgnored( failure );
}
+detachTestMethodFromThread();
}
public void testStarting( ReportEntry description )
git commit: o Removed unused code
Updated Branches:
refs/heads/master 5b56fe700 - 38f1c75f9
o Removed unused code
Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/38f1c75f
Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/38f1c75f
Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/38f1c75f
Branch: refs/heads/master
Commit: 38f1c75f9af70d49cc97ccc88db4e5341cf3cfdc
Parents: 5b56fe7
Author: Kristian Rosenvold krosenv...@apache.org
Authored: Sun Dec 16 17:35:18 2012 +0100
Committer: Kristian Rosenvold krosenv...@apache.org
Committed: Sun Dec 16 17:35:18 2012 +0100
--
.../util/internal/FunkyTwoThreadBlockingQueue.java | 102
.../util/internal/TwoThreadBlockingQueue.java | 104
.../util/internal/TwoThreadBlockingQueueTest.java | 182 ---
3 files changed, 0 insertions(+), 388 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/38f1c75f/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/util/internal/FunkyTwoThreadBlockingQueue.java
--
diff --git
a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/util/internal/FunkyTwoThreadBlockingQueue.java
b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/util/internal/FunkyTwoThreadBlockingQueue.java
deleted file mode 100644
index 2d619f6..000
---
a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/util/internal/FunkyTwoThreadBlockingQueue.java
+++ /dev/null
@@ -1,102 +0,0 @@
-package org.apache.maven.plugin.surefire.util.internal;
-
-/*
- * 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.
- */
-
-/**
- * A producer/consumer queue that is optimized for *one* producer thread
- * and *one* consumer thread, and solely optimized for efficient inserts
- * by the producer, minimizing producer locking for hand-off to
- * a second consumer.
- * p/
- * TwoThreadBlockingQueue insert 500 elements in = 52
- * FunkyTwoThreadBlockingQueue insert 500 elements in = 42
- * TwoThreadBlockingQueue produced and taken 500 elements in = 104
- * LinkedBlockingQueue insert 500 elements in = 1815
- * LinkedBlockingDeque insert 500 elements in = 113
- * ArrayList insert 500 elements in = 18
- * LinkedList insert 500 elements in = 334
- * p/
- * Todo: Determine if this design actually works ;)
- *
- * @author Kristian Rosenvold
- */
-public class FunkyTwoThreadBlockingQueue
-implements BlockingQueue
-{
-final int chunkSize = 100;
-
-private Chunk takeChunk = new Chunk();
-
-private int takePos = 0;
-
-private Chunk insertChunk = takeChunk;
-
-private int insertPos = 0;
-
-private volatile boolean memoryModelGuard;
-
-
-public void put( String object )
-{
-insertChunk.elements[insertPos] = object;
-if ( ++insertPos == chunkSize )
-{
-Chunk newChunk = new Chunk();
-insertChunk.next = newChunk;
-insertChunk = newChunk;
-insertPos = 0;
-}
-memoryModelGuard = true;
-}
-
-public void add( String object )
-{
-put( object );
-}
-
-
-public String take()
-throws InterruptedException
-{
-if ( takePos = chunkSize )
-{
-takeChunk = takeChunk.next;
-takePos = 0;
-}
-
-boolean fud = memoryModelGuard;
-String next = takeChunk.elements[takePos];
-while ( next == null )
-{
-Thread.sleep( 1 );
-fud = memoryModelGuard;
-next = takeChunk.elements[takePos];
-}
-takePos++;
-return next;
-}
-
-final class Chunk
-{
-final String[] elements = new String[chunkSize];
-
-volatile Chunk next;
-}
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/38f1c75f/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/util/internal/TwoThreadBlockingQueue.java
git commit: [SUREFIRE-933] repair parallel=classes
Updated Branches:
refs/heads/master 38f1c75f9 - 435ef473b
[SUREFIRE-933] repair parallel=classes
Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/435ef473
Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/435ef473
Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/435ef473
Branch: refs/heads/master
Commit: 435ef473be35f69dbb0c3187ecf7b54e3f87f49a
Parents: 38f1c75
Author: agudian andreas.gud...@gmail.com
Authored: Sat Dec 15 21:42:09 2012 +0100
Committer: Kristian Rosenvold krosenv...@apache.org
Committed: Sun Dec 16 17:55:00 2012 +0100
--
.../apache/maven/surefire/util/LazyTestsToRun.java |7 ++
.../org/apache/maven/surefire/util/TestsToRun.java |9 ++
.../maven/surefire/junitcore/JUnitCoreWrapper.java | 79 +--
.../surefire/testng/TestNGDirectoryTestSuite.java |2 +-
4 files changed, 67 insertions(+), 30 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/435ef473/surefire-api/src/main/java/org/apache/maven/surefire/util/LazyTestsToRun.java
--
diff --git
a/surefire-api/src/main/java/org/apache/maven/surefire/util/LazyTestsToRun.java
b/surefire-api/src/main/java/org/apache/maven/surefire/util/LazyTestsToRun.java
index 3a6dba7..996797c 100644
---
a/surefire-api/src/main/java/org/apache/maven/surefire/util/LazyTestsToRun.java
+++
b/surefire-api/src/main/java/org/apache/maven/surefire/util/LazyTestsToRun.java
@@ -173,4 +173,11 @@ public class LazyTestsToRun
return sb.toString();
}
+/* (non-Javadoc)
+ * @see org.apache.maven.surefire.util.TestsToRun#allowEagerReading()
+ */
+public boolean allowEagerReading() {
+return false;
+}
+
}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/435ef473/surefire-api/src/main/java/org/apache/maven/surefire/util/TestsToRun.java
--
diff --git
a/surefire-api/src/main/java/org/apache/maven/surefire/util/TestsToRun.java
b/surefire-api/src/main/java/org/apache/maven/surefire/util/TestsToRun.java
index 86e43d9..02224ab 100644
--- a/surefire-api/src/main/java/org/apache/maven/surefire/util/TestsToRun.java
+++ b/surefire-api/src/main/java/org/apache/maven/surefire/util/TestsToRun.java
@@ -116,4 +116,13 @@ public class TestsToRun
return containsAtLeast( it, items ) !it.hasNext();
}
+/**
+ * @return {@code true}, if the classes may be read eagerly. {@code false},
+ * if the classes must only be read lazy.
+ */
+public boolean allowEagerReading()
+{
+return true;
+}
+
}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/435ef473/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/JUnitCoreWrapper.java
--
diff --git
a/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/JUnitCoreWrapper.java
b/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/JUnitCoreWrapper.java
index 0608ab4..c834e6f 100644
---
a/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/JUnitCoreWrapper.java
+++
b/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/JUnitCoreWrapper.java
@@ -19,6 +19,7 @@ package org.apache.maven.surefire.junitcore;
* under the License.
*/
+import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import java.util.concurrent.ExecutionException;
@@ -26,7 +27,6 @@ import java.util.concurrent.ExecutionException;
import org.apache.maven.surefire.common.junit4.JUnit4RunListener;
import org.apache.maven.surefire.testset.TestSetFailedException;
import org.apache.maven.surefire.util.TestsToRun;
-
import org.junit.runner.Computer;
import org.junit.runner.JUnitCore;
import org.junit.runner.Request;
@@ -77,39 +77,18 @@ class JUnitCoreWrapper
Computer computer = getComputer( jUnitCoreParameters );
JUnitCore junitCore = createJUnitCore( listeners );
-/*
-Request req = Request.classes( computer,
testsToRun.getLocatedClasses() );
-if ( filter != null )
-{
-req = req.filterWith( filter );
-}
-
-try
-{
-final Result run = junitCore.run( req );
-JUnit4RunListener.rethrowAnyTestMechanismFailures( run );
-}
- */
try
{
-// in order to support LazyTestsToRun, the iterator must be used
-Iterator classIter = testsToRun.iterator();
-while ( classIter.hasNext() )
+if (
svn commit: r1422650 - in /maven/plugins/trunk/maven-deploy-plugin/src/main/java/org/apache/maven/plugin/deploy: DeployFileMojo.java DeployMojo.java
Author: rfscholte
Date: Sun Dec 16 18:16:12 2012
New Revision: 1422650
URL: http://svn.apache.org/viewvc?rev=1422650view=rev
Log:
Apply generics and foreach loops
Modified:
maven/plugins/trunk/maven-deploy-plugin/src/main/java/org/apache/maven/plugin/deploy/DeployFileMojo.java
maven/plugins/trunk/maven-deploy-plugin/src/main/java/org/apache/maven/plugin/deploy/DeployMojo.java
Modified:
maven/plugins/trunk/maven-deploy-plugin/src/main/java/org/apache/maven/plugin/deploy/DeployFileMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-deploy-plugin/src/main/java/org/apache/maven/plugin/deploy/DeployFileMojo.java?rev=1422650r1=1422649r2=1422650view=diff
==
---
maven/plugins/trunk/maven-deploy-plugin/src/main/java/org/apache/maven/plugin/deploy/DeployFileMojo.java
(original)
+++
maven/plugins/trunk/maven-deploy-plugin/src/main/java/org/apache/maven/plugin/deploy/DeployFileMojo.java
Sun Dec 16 18:16:12 2012
@@ -19,6 +19,13 @@ package org.apache.maven.plugin.deploy;
* under the License.
*/
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.Reader;
+import java.io.Writer;
+import java.util.List;
+
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.deployer.ArtifactDeploymentException;
import org.apache.maven.artifact.metadata.ArtifactMetadata;
@@ -45,14 +52,6 @@ import org.codehaus.plexus.util.StringUt
import org.codehaus.plexus.util.WriterFactory;
import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.Reader;
-import java.io.Writer;
-import java.util.Iterator;
-import java.util.List;
-
/**
* Installs the artifact in the remote repository.
*
@@ -377,12 +376,11 @@ public class DeployFileMojo
}
}
-List attachedArtifacts = project.getAttachedArtifacts();
+@SuppressWarnings( unchecked )
+ListArtifact attachedArtifacts = project.getAttachedArtifacts();
-for ( Iterator i = attachedArtifacts.iterator(); i.hasNext(); )
+for ( Artifact attached : attachedArtifacts)
{
-Artifact attached = ( Artifact ) i.next();
-
try
{
deploy( attached.getFile(), attached, deploymentRepository,
getLocalRepository() );
Modified:
maven/plugins/trunk/maven-deploy-plugin/src/main/java/org/apache/maven/plugin/deploy/DeployMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-deploy-plugin/src/main/java/org/apache/maven/plugin/deploy/DeployMojo.java?rev=1422650r1=1422649r2=1422650view=diff
==
---
maven/plugins/trunk/maven-deploy-plugin/src/main/java/org/apache/maven/plugin/deploy/DeployMojo.java
(original)
+++
maven/plugins/trunk/maven-deploy-plugin/src/main/java/org/apache/maven/plugin/deploy/DeployMojo.java
Sun Dec 16 18:16:12 2012
@@ -34,7 +34,6 @@ import org.apache.maven.project.MavenPro
import org.apache.maven.project.artifact.ProjectArtifactMetadata;
import java.io.File;
-import java.util.Iterator;
import java.util.List;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@@ -150,7 +149,9 @@ public class DeployMojo
Artifact artifact = project.getArtifact();
String packaging = project.getPackaging();
File pomFile = project.getFile();
-List attachedArtifacts = project.getAttachedArtifacts();
+
+@SuppressWarnings( unchecked )
+ListArtifact attachedArtifacts = project.getAttachedArtifacts();
ArtifactRepository repo = getDeploymentRepository( project );
@@ -219,10 +220,8 @@ public class DeployMojo
}
}
-for ( Iterator i = attachedArtifacts.iterator(); i.hasNext(); )
+for ( Artifact attached : attachedArtifacts )
{
-Artifact attached = ( Artifact ) i.next();
-
deploy( attached.getFile(), attached, repo,
getLocalRepository() );
}
}
git commit: updated content
Updated Branches: refs/heads/master eb9257e70 - 3e95b5f1c updated content Project: http://git-wip-us.apache.org/repos/asf/maven/repo Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/3e95b5f1 Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/3e95b5f1 Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/3e95b5f1 Branch: refs/heads/master Commit: 3e95b5f1c775c26f84271d96bda0e726ee9d5169 Parents: eb9257e Author: Hervé Boutemy hbout...@apache.org Authored: Sun Dec 16 21:13:57 2012 +0100 Committer: Hervé Boutemy hbout...@apache.org Committed: Sun Dec 16 21:13:57 2012 +0100 -- apache-maven/NOTICE.txt |2 +- apache-maven/README.txt | 14 +++--- 2 files changed, 8 insertions(+), 8 deletions(-) -- http://git-wip-us.apache.org/repos/asf/maven/blob/3e95b5f1/apache-maven/NOTICE.txt -- diff --git a/apache-maven/NOTICE.txt b/apache-maven/NOTICE.txt index 62abffb..e744352 100644 --- a/apache-maven/NOTICE.txt +++ b/apache-maven/NOTICE.txt @@ -5,7 +5,7 @@ = Apache Maven -Copyright 2001-2011 The Apache Software Foundation +Copyright 2001-2012 The Apache Software Foundation This product includes software developed by The Apache Software Foundation (http://www.apache.org/). http://git-wip-us.apache.org/repos/asf/maven/blob/3e95b5f1/apache-maven/README.txt -- diff --git a/apache-maven/README.txt b/apache-maven/README.txt index c337ce8..dc55c01 100644 --- a/apache-maven/README.txt +++ b/apache-maven/README.txt @@ -40,18 +40,18 @@ 1) Unpack the archive where you would like to store the binaries, eg: Unix-based Operating Systems (Linux, Solaris and Mac OS X) - tar zxvf apache-maven-3.0.x.tar.gz + tar zxvf apache-maven-3.x.y.tar.gz Windows 2000/XP - unzip apache-maven-3.0.x.zip + unzip apache-maven-3.x.y.zip - 2) A directory called apache-maven-3.0.x will be created. + 2) A directory called apache-maven-3.x.y will be created. 3) Add the bin directory to your PATH, eg: Unix-based Operating Systems (Linux, Solaris and Mac OS X) - export PATH=/usr/local/apache-maven-3.0.x/bin:$PATH + export PATH=/usr/local/apache-maven-3.x.y/bin:$PATH Windows 2000/XP - set PATH=c:\program files\apache-maven-3.0.x\bin;%PATH% + set PATH=c:\program files\apache-maven-3.x.y\bin;%PATH% 4) Make sure JAVA_HOME is set to the location of your JDK @@ -71,7 +71,7 @@ Downloads: http://maven.apache.org/download.html Release Notes: http://maven.apache.org/release-notes.html Mailing Lists: http://maven.apache.org/mail-lists.html - Source Code:http://svn.apache.org/repos/asf/maven/ + Source Code: https://git-wip-us.apache.org/repos/asf/maven.git/apache-maven Issue Tracking: http://jira.codehaus.org/browse/MNG - Wiki: http://docs.codehaus.org/display/MAVENUSER/ + Wiki: https://cwiki.apache.org/confluence/display/MAVEN/ Available Plugins: http://maven.apache.org/plugins/index.html
git commit: improved javadoc
Updated Branches: refs/heads/master 3e95b5f1c - 7f21c4a31 improved javadoc Project: http://git-wip-us.apache.org/repos/asf/maven/repo Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/7f21c4a3 Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/7f21c4a3 Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/7f21c4a3 Branch: refs/heads/master Commit: 7f21c4a31af5d499bc6242e4b1524db3348d7d39 Parents: 3e95b5f Author: Hervé Boutemy hbout...@apache.org Authored: Sun Dec 16 21:15:26 2012 +0100 Committer: Hervé Boutemy hbout...@apache.org Committed: Sun Dec 16 21:15:26 2012 +0100 -- .../maven/cli/logging/Slf4jConfiguration.java |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) -- http://git-wip-us.apache.org/repos/asf/maven/blob/7f21c4a3/maven-embedder/src/main/java/org/apache/maven/cli/logging/Slf4jConfiguration.java -- diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/logging/Slf4jConfiguration.java b/maven-embedder/src/main/java/org/apache/maven/cli/logging/Slf4jConfiguration.java index 8aff15a..e153c96 100644 --- a/maven-embedder/src/main/java/org/apache/maven/cli/logging/Slf4jConfiguration.java +++ b/maven-embedder/src/main/java/org/apache/maven/cli/logging/Slf4jConfiguration.java @@ -34,7 +34,7 @@ public interface Slf4jConfiguration /** * Set root logging level. * - * @param level the level as defined in Plexus Logger codeLEVEL_*/code and equivalent + * @param level the level as defined in Plexus codeLogger.LEVEL_*/code and equivalent * codeMavenExecutionRequest.LOGGING_LEVEL_*/code constants. * @see Logger * @see MavenExecutionRequest
git commit: avoid timestamp in javadoc
Updated Branches: refs/heads/master 7f21c4a31 - 2acec0557 avoid timestamp in javadoc Project: http://git-wip-us.apache.org/repos/asf/maven/repo Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/2acec055 Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/2acec055 Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/2acec055 Branch: refs/heads/master Commit: 2acec0557af502a0224ade17431dc2a23027acf9 Parents: 7f21c4a Author: Hervé Boutemy hbout...@apache.org Authored: Sun Dec 16 21:21:58 2012 +0100 Committer: Hervé Boutemy hbout...@apache.org Committed: Sun Dec 16 21:21:58 2012 +0100 -- pom.xml |1 + 1 files changed, 1 insertions(+), 0 deletions(-) -- http://git-wip-us.apache.org/repos/asf/maven/blob/2acec055/pom.xml -- diff --git a/pom.xml b/pom.xml index 7ed3df4..f53359f 100644 --- a/pom.xml +++ b/pom.xml @@ -489,6 +489,7 @@ artifactIdmaven-javadoc-plugin/artifactId configuration linksourcetrue/linksource + notimestamptrue/notimestamp links combine.children=append linkhttp://sonatype.github.com/sonatype-aether/apidocs//link linkhttp://plexus.codehaus.org/plexus-containers/plexus-container-default/apidocs//link
git commit: fixed errors reported by Checkstyle
Updated Branches:
refs/heads/master 2acec0557 - 3849bbd46
fixed errors reported by Checkstyle
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/3849bbd4
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/3849bbd4
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/3849bbd4
Branch: refs/heads/master
Commit: 3849bbd46a77c24aa72ec6949b5c96ad5e52847f
Parents: 2acec05
Author: Hervé Boutemy hbout...@apache.org
Authored: Sun Dec 16 21:49:18 2012 +0100
Committer: Hervé Boutemy hbout...@apache.org
Committed: Sun Dec 16 21:49:18 2012 +0100
--
.../artifact/versioning/ComparableVersion.java |2 +-
.../artifact/resolver/DefaultArtifactResolver.java |8 ++--
.../resolver/transform/ArtifactTransformation.java | 11 ++--
.../transform/ArtifactTransformationManager.java |1 -
.../execution/DefaultMavenExecutionResult.java |3 +-
.../maven/execution/MavenExecutionRequest.java | 28 +-
.../lifecycle/internal/CurrentPhaseForThread.java |7 +--
.../DefaultLifecycleExecutionPlanCalculator.java | 40 ---
.../internal/DefaultLifecyclePluginAnalyzer.java |4 +-
.../lifecycle/internal/ExecutionPlanItem.java |4 +-
.../lifecycle/internal/LifecycleWeaveBuilder.java |3 +-
11 files changed, 56 insertions(+), 55 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven/blob/3849bbd4/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/ComparableVersion.java
--
diff --git
a/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/ComparableVersion.java
b/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/ComparableVersion.java
index 481e845..6f06614 100644
---
a/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/ComparableVersion.java
+++
b/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/ComparableVersion.java
@@ -86,7 +86,7 @@ public class ComparableVersion
private static class IntegerItem
implements Item
{
- private static final BigInteger BIG_INTEGER_ZERO = new BigInteger( 0
);
+private static final BigInteger BIG_INTEGER_ZERO = new BigInteger( 0
);
private final BigInteger value;
http://git-wip-us.apache.org/repos/asf/maven/blob/3849bbd4/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java
--
diff --git
a/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java
b/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java
index 18deeb2..5833d06 100644
---
a/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java
+++
b/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java
@@ -557,18 +557,18 @@ public class DefaultArtifactResolver
/**
* ThreadCreator for creating daemon threads with fixed ThreadGroup-name.
*/
-final static class DaemonThreadCreator
+static final class DaemonThreadCreator
implements ThreadFactory
{
static final String THREADGROUP_NAME =
org.apache.maven.artifact.resolver.DefaultArtifactResolver;
-final static ThreadGroup group = new ThreadGroup( THREADGROUP_NAME );
+static final ThreadGroup GROUP = new ThreadGroup( THREADGROUP_NAME );
-final static AtomicInteger threadNumber = new AtomicInteger( 1 );
+static final AtomicInteger THREAD_NUMBER = new AtomicInteger( 1 );
public Thread newThread( Runnable r )
{
-Thread newThread = new Thread( group, r, resolver- +
threadNumber.getAndIncrement() );
+Thread newThread = new Thread( GROUP, r, resolver- +
THREAD_NUMBER.getAndIncrement() );
newThread.setDaemon( true );
return newThread;
}
http://git-wip-us.apache.org/repos/asf/maven/blob/3849bbd4/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/transform/ArtifactTransformation.java
--
diff --git
a/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/transform/ArtifactTransformation.java
b/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/transform/ArtifactTransformation.java
index 1a5606f..42604d7 100644
---
a/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/transform/ArtifactTransformation.java
+++
b/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/transform/ArtifactTransformation.java
@@ -38,18 +38,17 @@ public interface ArtifactTransformation
svn commit: r1422691 - in /maven/plugins/trunk/maven-site-plugin/src: it/interpolation/invoker.properties main/java/org/apache/maven/plugins/site/EffectiveSiteMojo.java
Author: hboutemy Date: Sun Dec 16 21:18:52 2012 New Revision: 1422691 URL: http://svn.apache.org/viewvc?rev=1422691view=rev Log: [MSITE-670] fixed XML content generated by site:effective-site: removed duplicate ?xml instruction Modified: maven/plugins/trunk/maven-site-plugin/src/it/interpolation/invoker.properties maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/EffectiveSiteMojo.java Modified: maven/plugins/trunk/maven-site-plugin/src/it/interpolation/invoker.properties URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/interpolation/invoker.properties?rev=1422691r1=1422690r2=1422691view=diff == --- maven/plugins/trunk/maven-site-plugin/src/it/interpolation/invoker.properties (original) +++ maven/plugins/trunk/maven-site-plugin/src/it/interpolation/invoker.properties Sun Dec 16 21:18:52 2012 @@ -1,2 +1,3 @@ invoker.goals.1 = clean invoker.goals.2 = site-deploy +invoker.goals.3 = site:effective-site Modified: maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/EffectiveSiteMojo.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/EffectiveSiteMojo.java?rev=1422691r1=1422690r2=1422691view=diff == --- maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/EffectiveSiteMojo.java (original) +++ maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/EffectiveSiteMojo.java Sun Dec 16 21:18:52 2012 @@ -184,6 +184,7 @@ public class EffectiveSiteMojo } effectiveSite = sWriter.toString(); +effectiveSite = effectiveSite.substring( effectiveSite.indexOf( project ) ); // remove ?xml header writeComment( writer, Effective site descriptor for project \' + project.getId() + \' );
svn commit: r842722 - in /websites/production/maven/content/ref/3.1-SNAPSHOT: ./ apache-maven/ apache-maven/css/ apache-maven/images/ apache-maven/images/logos/ apache-maven/images/profiles/ apache-ma
Author: hboutemy Date: Sun Dec 16 22:55:18 2012 New Revision: 842722 Log: imported documentation for Maven 3.1-SNAPSHOT [This commit notification would consist of 1813 parts, which exceeds the limit of 50 ones, so it was shortened to the summary.]
git commit: o Added reuseForks parameters instead of forkmode = onceperthread
Updated Branches:
refs/heads/master 435ef473b - 318f8a9a4
o Added reuseForks parameters instead of forkmode = onceperthread
Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/318f8a9a
Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/318f8a9a
Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/318f8a9a
Branch: refs/heads/master
Commit: 318f8a9a465319c63aef20e5c89a64073579a631
Parents: 435ef47
Author: Kristian Rosenvold krosenv...@apache.org
Authored: Fri Dec 14 20:00:08 2012 +0100
Committer: Kristian Rosenvold krosenv...@apache.org
Committed: Mon Dec 17 03:30:58 2012 +0100
--
.../plugin/surefire/AbstractSurefireMojo.java | 38 --
.../surefire/booterclient/ForkConfiguration.java | 16 --
.../plugin/surefire/booterclient/ForkStarter.java | 13 +++--
.../booterclient/ForkConfigurationTest.java|6 +--
.../org/apache/maven/surefire/util/TestsToRun.java | 18 ++-
.../apache/maven/surefire/util/TestsToRunTest.java | 25 +++---
surefire-integration-tests/pom.xml |2 +-
.../surefire/its/fixture/SurefireLauncher.java |4 +-
.../Surefire907PerThreadWithoutThreadCountIT.java |2 +-
.../surefire/junitcore/JUnitCoreParameters.java|9
.../surefire/junitcore/JUnitCoreProvider.java |2 +-
.../maven/surefire/junitcore/JUnitCoreWrapper.java | 38 +--
12 files changed, 105 insertions(+), 68 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/318f8a9a/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 9636017..fd00d5f 100644
---
a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java
+++
b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java
@@ -329,9 +329,8 @@ public abstract class AbstractSurefireMojo
protected Boolean failIfNoTests;
/**
- * Option to specify the forking mode. Can be never, once, always,
perthread or onceperthread. none and pertest are also accepted
- * for backwards compatibility. always forks for each test-class.
perthread will create threadCount parallel forks, each executing one
test-class.
- * onceperthread will fork threadCount processes that each execute a
1/threadCount of all test-classes.br/
+ * Option to specify the forking mode. Can be never, once, always,
perthread. none and pertest are also accepted
+ * for backwards compatibility. always forks for each test-class.
perthread will create threadCount parallel forks, each executing one
test-class, see also parameter reuseForks.br/
* The system properties and the argLine of the forked processes may
contain the place holder string code${surefire.threadNumber}/code,
* which is replaced with a fixed number for each thread, ranging from 1
to threadCount.
*
@@ -434,15 +433,25 @@ public abstract class AbstractSurefireMojo
protected String testNGArtifactName;
/**
- * (forkMode=perthread, forkmode=onceperthread or TestNG/JUnit 4.7
provider) The attribute thread-count allows you to specify how many threads
should be
- * allocated for this execution. Only makes sense to use in conjunction
with the codeparallel/code parameter or with forkMode=perthread
- * or forkmode=onceperthread.
+ * (forkMode=perthread or TestNG/JUnit 4.7 provider) The attribute
thread-count allows you to specify how many threads should be
+ * allocated for this execution. Only makes sense to use in conjunction
with the codeparallel/code parameter or with forkMode=perthread.
*
* @since 2.2
*/
@Parameter( property = threadCount )
protected int threadCount;
+
+/**
+ * Indicates if forks can be reused. Currently only meaningful
+ * when forking N parallel forks
+ *
+ * @since 2.13
+ */
+
+@Parameter( property = reuseForks, defaultValue = false )
+private boolean reuseForks;
+
/**
* (JUnit 4.7 provider) Indicates that threadCount is per cpu core.
*
@@ -783,8 +792,7 @@ public abstract class AbstractSurefireMojo
try
{
ForkStarter forkStarter =
-createForkStarter( provider, forkConfiguration,
classLoaderConfiguration, runOrderParameters,
- effectiveProperties );
+createForkStarter( provider,
svn commit: r1422760 - /maven/shared/trunk/maven-verifier/pom.xml
Author: krosenvold Date: Mon Dec 17 06:24:16 2012 New Revision: 1422760 URL: http://svn.apache.org/viewvc?rev=1422760view=rev Log: o m-s-u 0.2 Modified: maven/shared/trunk/maven-verifier/pom.xml Modified: maven/shared/trunk/maven-verifier/pom.xml URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-verifier/pom.xml?rev=1422760r1=1422759r2=1422760view=diff == --- maven/shared/trunk/maven-verifier/pom.xml (original) +++ maven/shared/trunk/maven-verifier/pom.xml Mon Dec 17 06:24:16 2012 @@ -47,7 +47,7 @@ dependency groupIdorg.apache.maven.shared/groupId artifactIdmaven-shared-utils/artifactId - version0.1/version + version0.2/version /dependency dependency
svn commit: r1422761 - /maven/shared/tags/maven-verifier-1.4/
Author: krosenvold Date: Mon Dec 17 06:27:41 2012 New Revision: 1422761 URL: http://svn.apache.org/viewvc?rev=1422761view=rev Log: o Rollback release Removed: maven/shared/tags/maven-verifier-1.4/
svn commit: r1422763 - /maven/shared/tags/maven-verifier-1.4/
Author: krosenvold Date: Mon Dec 17 06:30:34 2012 New Revision: 1422763 URL: http://svn.apache.org/viewvc?rev=1422763view=rev Log: [maven-release-plugin] copy for tag maven-verifier-1.4 Added: maven/shared/tags/maven-verifier-1.4/ - copied from r1422762, maven/shared/trunk/maven-verifier/
svn commit: r1422764 - /maven/shared/trunk/maven-verifier/pom.xml
Author: krosenvold Date: Mon Dec 17 06:30:52 2012 New Revision: 1422764 URL: http://svn.apache.org/viewvc?rev=1422764view=rev Log: [maven-release-plugin] prepare for next development iteration Modified: maven/shared/trunk/maven-verifier/pom.xml Modified: maven/shared/trunk/maven-verifier/pom.xml URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-verifier/pom.xml?rev=1422764r1=1422763r2=1422764view=diff == --- maven/shared/trunk/maven-verifier/pom.xml (original) +++ maven/shared/trunk/maven-verifier/pom.xml Mon Dec 17 06:30:52 2012 @@ -28,15 +28,15 @@ /parent artifactIdmaven-verifier/artifactId - version1.4/version + version1.5-SNAPSHOT/version nameMaven Verifier Component/name descriptionProvides a test harness for Maven integration tests./description scm - connectionscm:svn:http://svn.apache.org/repos/asf/maven/shared/tags/maven-verifier-1.4/connection - developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/shared/tags/maven-verifier-1.4/developerConnection - urlhttp://svn.apache.org/viewvc/maven/shared/tags/maven-verifier-1.4/url + connectionscm:svn:http://svn.apache.org/repos/asf/maven/shared/trunk/maven-verifier/connection + developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/shared/trunk/maven-verifier/developerConnection +urlhttp://svn.apache.org/viewvc/maven/shared/trunk/maven-verifier/url /scm issueManagement systemjira/system
