svn commit: r1377219 - in /maven/plugins/trunk/maven-ear-plugin: ./ src/main/java/org/apache/maven/plugin/ear/ src/site/ src/site/apt/ src/site/apt/examples/ src/test/java/org/apache/maven/plugin/ear/
Author: snicoll
Date: Sat Aug 25 05:42:36 2012
New Revision: 1377219
URL: http://svn.apache.org/viewvc?rev=1377219&view=rev
Log:
MEAR-141: support of env-entries in generated application.xml, based on a patch
from Jim Brownfield. Applied again with a fix for the IT with Maven 2
Added:
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/EnvEntry.java
(with props)
maven/plugins/trunk/maven-ear-plugin/src/site/apt/examples/specifying-env-entries-for-the-generated-application-xml.apt.vm
maven/plugins/trunk/maven-ear-plugin/src/test/java/org/apache/maven/plugin/ear/EnvEntryTest.java
(with props)
maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-074/expected-META-INF/application.xml
(with props)
maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-074/pom.xml
(with props)
maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-075/expected-META-INF/application.xml
(with props)
maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-075/pom.xml
(with props)
maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-076/expected-META-INF/application.xml
(with props)
maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-076/pom.xml
(with props)
maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-077/expected-META-INF/application.xml
(with props)
maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-077/pom.xml
(with props)
Modified:
maven/plugins/trunk/maven-ear-plugin/pom.xml
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/ApplicationXmlWriter.java
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/ApplicationXmlWriterContext.java
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/GenerateApplicationXmlMojo.java
maven/plugins/trunk/maven-ear-plugin/src/site/apt/index.apt
maven/plugins/trunk/maven-ear-plugin/src/site/apt/tests.apt
maven/plugins/trunk/maven-ear-plugin/src/site/site.xml
maven/plugins/trunk/maven-ear-plugin/src/test/java/org/apache/maven/plugin/ear/it/EarMojoIT.java
Modified: maven/plugins/trunk/maven-ear-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/pom.xml?rev=1377219&r1=1377218&r2=1377219&view=diff
==
--- maven/plugins/trunk/maven-ear-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-ear-plugin/pom.xml Sat Aug 25 05:42:36 2012
@@ -126,7 +126,7 @@ under the License.
junit
junit
- 3.8.1
+ 4.8.1
test
Modified:
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/ApplicationXmlWriter.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/ApplicationXmlWriter.java?rev=1377219&r1=1377218&r2=1377219&view=diff
==
---
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/ApplicationXmlWriter.java
(original)
+++
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/ApplicationXmlWriter.java
Sat Aug 25 05:42:36 2012
@@ -111,6 +111,14 @@ final class ApplicationXmlWriter
securityRole.appendSecurityRole( writer );
}
+if ( version.ge( JavaEEVersion.Six ) )
+{
+for ( EnvEntry envEntry : context.getEnvEntries() )
+{
+envEntry.appendEnvEntry( writer );
+}
+}
+
if ( version.ge( JavaEEVersion.Five ) )
{
writeLibraryDirectory( context.getLibraryDirectory(), writer );
Modified:
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/ApplicationXmlWriterContext.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/ApplicationXmlWriterContext.java?rev=1377219&r1=1377218&r2=1377219&view=diff
==
---
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/ApplicationXmlWriterContext.java
(original)
+++
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/ApplicationXmlWriterContext.java
Sat Aug 25 05:42:36 2012
@@ -36,6 +36,8 @@ class ApplicationXmlWriterContext
private final List earModules;
private final List securityRoles;
+
+private final List envEntries;
private final String displayName;
@@ -47,13 +49,15 @@ class ApplicationXmlWriterContext
private final Boolean initializeInOrder;
-public ApplicationXmlWriterContext( File destinationFile, List
earModules, List
svn commit: r1377129 - in /maven/surefire/trunk: ./ maven-failsafe-plugin/ maven-surefire-common/ maven-surefire-plugin/ maven-surefire-report-plugin/ surefire-api/ surefire-booter/ surefire-grouper/
Author: krosenvold Date: Fri Aug 24 21:50:54 2012 New Revision: 1377129 URL: http://svn.apache.org/viewvc?rev=1377129&view=rev Log: [maven-release-plugin] prepare for next development iteration Modified: maven/surefire/trunk/maven-failsafe-plugin/pom.xml maven/surefire/trunk/maven-surefire-common/pom.xml maven/surefire/trunk/maven-surefire-plugin/pom.xml maven/surefire/trunk/maven-surefire-report-plugin/pom.xml maven/surefire/trunk/pom.xml maven/surefire/trunk/surefire-api/pom.xml maven/surefire/trunk/surefire-booter/pom.xml maven/surefire/trunk/surefire-grouper/pom.xml maven/surefire/trunk/surefire-integration-tests/pom.xml maven/surefire/trunk/surefire-providers/common-junit3/pom.xml maven/surefire/trunk/surefire-providers/common-junit4/pom.xml maven/surefire/trunk/surefire-providers/common-junit48/pom.xml maven/surefire/trunk/surefire-providers/pom.xml maven/surefire/trunk/surefire-providers/surefire-junit3/pom.xml maven/surefire/trunk/surefire-providers/surefire-junit4/pom.xml maven/surefire/trunk/surefire-providers/surefire-junit47/pom.xml maven/surefire/trunk/surefire-providers/surefire-testng-utils/pom.xml maven/surefire/trunk/surefire-providers/surefire-testng/pom.xml maven/surefire/trunk/surefire-setup-integration-tests/pom.xml maven/surefire/trunk/surefire-shadefire/pom.xml Modified: maven/surefire/trunk/maven-failsafe-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-failsafe-plugin/pom.xml?rev=1377129&r1=1377128&r2=1377129&view=diff == --- maven/surefire/trunk/maven-failsafe-plugin/pom.xml (original) +++ maven/surefire/trunk/maven-failsafe-plugin/pom.xml Fri Aug 24 21:50:54 2012 @@ -24,7 +24,7 @@ org.apache.maven.surefire surefire -2.12.3 +2.13-SNAPSHOT ../pom.xml Modified: maven/surefire/trunk/maven-surefire-common/pom.xml URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-common/pom.xml?rev=1377129&r1=1377128&r2=1377129&view=diff == --- maven/surefire/trunk/maven-surefire-common/pom.xml (original) +++ maven/surefire/trunk/maven-surefire-common/pom.xml Fri Aug 24 21:50:54 2012 @@ -24,7 +24,7 @@ org.apache.maven.surefire surefire -2.12.3 +2.13-SNAPSHOT ../pom.xml Modified: maven/surefire/trunk/maven-surefire-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-plugin/pom.xml?rev=1377129&r1=1377128&r2=1377129&view=diff == --- maven/surefire/trunk/maven-surefire-plugin/pom.xml (original) +++ maven/surefire/trunk/maven-surefire-plugin/pom.xml Fri Aug 24 21:50:54 2012 @@ -24,7 +24,7 @@ org.apache.maven.surefire surefire -2.12.3 +2.13-SNAPSHOT ../pom.xml Modified: maven/surefire/trunk/maven-surefire-report-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-report-plugin/pom.xml?rev=1377129&r1=1377128&r2=1377129&view=diff == --- maven/surefire/trunk/maven-surefire-report-plugin/pom.xml (original) +++ maven/surefire/trunk/maven-surefire-report-plugin/pom.xml Fri Aug 24 21:50:54 2012 @@ -24,7 +24,7 @@ org.apache.maven.surefire surefire -2.12.3 +2.13-SNAPSHOT ../pom.xml Modified: maven/surefire/trunk/pom.xml URL: http://svn.apache.org/viewvc/maven/surefire/trunk/pom.xml?rev=1377129&r1=1377128&r2=1377129&view=diff == --- maven/surefire/trunk/pom.xml (original) +++ maven/surefire/trunk/pom.xml Fri Aug 24 21:50:54 2012 @@ -29,7 +29,7 @@ org.apache.maven.surefire surefire - 2.12.3 + 2.13-SNAPSHOT pom SureFire @@ -97,9 +97,9 @@ - scm:svn:http://svn.apache.org/repos/asf/maven/surefire/tags/surefire-2.12.3 - scm:svn:https://svn.apache.org/repos/asf/maven/surefire/tags/surefire-2.12.3 - http://svn.apache.org/viewcvs.cgi/maven/surefire/tags/surefire-2.12.3 + scm:svn:http://svn.apache.org/repos/asf/maven/surefire/trunk/ + scm:svn:https://svn.apache.org/repos/asf/maven/surefire/trunk/ +http://svn.apache.org/viewcvs.cgi/maven/surefire/trunk jira Modified: maven/surefire/trunk/surefire-api/pom.xml URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-api/pom.xml?rev=1377129&r1=1377128&r2=1377129&view=diff == --- maven/surefire/trunk/surefire-api/pom.xml (original) +++ maven/surefire/trunk/surefire-api/pom.xml Fri Aug 24 21:50:54 2012 @@ -23,7 +23,7 @@ org.apache.maven.surefire surefire -2.12.3 +2.13-SNAPSHOT ../pom.xml Modified: m
svn commit: r1377128 - /maven/surefire/tags/surefire-2.12.3/
Author: krosenvold Date: Fri Aug 24 21:50:42 2012 New Revision: 1377128 URL: http://svn.apache.org/viewvc?rev=1377128&view=rev Log: [maven-release-plugin] copy for tag surefire-2.12.3 Added: maven/surefire/tags/surefire-2.12.3/ - copied from r1377127, maven/surefire/trunk/
svn commit: r1377127 - in /maven/surefire/trunk: ./ maven-failsafe-plugin/ maven-surefire-common/ maven-surefire-plugin/ maven-surefire-report-plugin/ surefire-api/ surefire-booter/ surefire-grouper/
Author: krosenvold Date: Fri Aug 24 21:50:32 2012 New Revision: 1377127 URL: http://svn.apache.org/viewvc?rev=1377127&view=rev Log: [maven-release-plugin] prepare release surefire-2.12.3 Modified: maven/surefire/trunk/maven-failsafe-plugin/pom.xml maven/surefire/trunk/maven-surefire-common/pom.xml maven/surefire/trunk/maven-surefire-plugin/pom.xml maven/surefire/trunk/maven-surefire-report-plugin/pom.xml maven/surefire/trunk/pom.xml maven/surefire/trunk/surefire-api/pom.xml maven/surefire/trunk/surefire-booter/pom.xml maven/surefire/trunk/surefire-grouper/pom.xml maven/surefire/trunk/surefire-integration-tests/pom.xml maven/surefire/trunk/surefire-providers/common-junit3/pom.xml maven/surefire/trunk/surefire-providers/common-junit4/pom.xml maven/surefire/trunk/surefire-providers/common-junit48/pom.xml maven/surefire/trunk/surefire-providers/pom.xml maven/surefire/trunk/surefire-providers/surefire-junit3/pom.xml maven/surefire/trunk/surefire-providers/surefire-junit4/pom.xml maven/surefire/trunk/surefire-providers/surefire-junit47/pom.xml maven/surefire/trunk/surefire-providers/surefire-testng-utils/pom.xml maven/surefire/trunk/surefire-providers/surefire-testng/pom.xml maven/surefire/trunk/surefire-setup-integration-tests/pom.xml maven/surefire/trunk/surefire-shadefire/pom.xml Modified: maven/surefire/trunk/maven-failsafe-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-failsafe-plugin/pom.xml?rev=1377127&r1=1377126&r2=1377127&view=diff == --- maven/surefire/trunk/maven-failsafe-plugin/pom.xml (original) +++ maven/surefire/trunk/maven-failsafe-plugin/pom.xml Fri Aug 24 21:50:32 2012 @@ -24,7 +24,7 @@ org.apache.maven.surefire surefire -2.13-SNAPSHOT +2.12.3 ../pom.xml Modified: maven/surefire/trunk/maven-surefire-common/pom.xml URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-common/pom.xml?rev=1377127&r1=1377126&r2=1377127&view=diff == --- maven/surefire/trunk/maven-surefire-common/pom.xml (original) +++ maven/surefire/trunk/maven-surefire-common/pom.xml Fri Aug 24 21:50:32 2012 @@ -24,7 +24,7 @@ org.apache.maven.surefire surefire -2.13-SNAPSHOT +2.12.3 ../pom.xml Modified: maven/surefire/trunk/maven-surefire-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-plugin/pom.xml?rev=1377127&r1=1377126&r2=1377127&view=diff == --- maven/surefire/trunk/maven-surefire-plugin/pom.xml (original) +++ maven/surefire/trunk/maven-surefire-plugin/pom.xml Fri Aug 24 21:50:32 2012 @@ -24,7 +24,7 @@ org.apache.maven.surefire surefire -2.13-SNAPSHOT +2.12.3 ../pom.xml Modified: maven/surefire/trunk/maven-surefire-report-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-report-plugin/pom.xml?rev=1377127&r1=1377126&r2=1377127&view=diff == --- maven/surefire/trunk/maven-surefire-report-plugin/pom.xml (original) +++ maven/surefire/trunk/maven-surefire-report-plugin/pom.xml Fri Aug 24 21:50:32 2012 @@ -24,7 +24,7 @@ org.apache.maven.surefire surefire -2.13-SNAPSHOT +2.12.3 ../pom.xml Modified: maven/surefire/trunk/pom.xml URL: http://svn.apache.org/viewvc/maven/surefire/trunk/pom.xml?rev=1377127&r1=1377126&r2=1377127&view=diff == --- maven/surefire/trunk/pom.xml (original) +++ maven/surefire/trunk/pom.xml Fri Aug 24 21:50:32 2012 @@ -29,7 +29,7 @@ org.apache.maven.surefire surefire - 2.13-SNAPSHOT + 2.12.3 pom SureFire @@ -97,9 +97,9 @@ - scm:svn:http://svn.apache.org/repos/asf/maven/surefire/trunk/ - scm:svn:https://svn.apache.org/repos/asf/maven/surefire/trunk/ -http://svn.apache.org/viewcvs.cgi/maven/surefire/trunk + scm:svn:http://svn.apache.org/repos/asf/maven/surefire/tags/surefire-2.12.3 + scm:svn:https://svn.apache.org/repos/asf/maven/surefire/tags/surefire-2.12.3 + http://svn.apache.org/viewcvs.cgi/maven/surefire/tags/surefire-2.12.3 jira Modified: maven/surefire/trunk/surefire-api/pom.xml URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-api/pom.xml?rev=1377127&r1=1377126&r2=1377127&view=diff == --- maven/surefire/trunk/surefire-api/pom.xml (original) +++ maven/surefire/trunk/surefire-api/pom.xml Fri Aug 24 21:50:32 2012 @@ -23,7 +23,7 @@ org.apache.maven.surefire surefire -2.13-SNAPSHOT +2.12.3 ../pom.xml Modified: maven/su
svn commit: r1377118 - /maven/surefire/trunk/pom.xml
Author: krosenvold Date: Fri Aug 24 21:15:57 2012 New Revision: 1377118 URL: http://svn.apache.org/viewvc?rev=1377118&view=rev Log: p-u 3.0.5 Modified: maven/surefire/trunk/pom.xml Modified: maven/surefire/trunk/pom.xml URL: http://svn.apache.org/viewvc/maven/surefire/trunk/pom.xml?rev=1377118&r1=1377117&r2=1377118&view=diff == --- maven/surefire/trunk/pom.xml (original) +++ maven/surefire/trunk/pom.xml Fri Aug 24 21:15:57 2012 @@ -216,7 +216,7 @@ org.codehaus.plexus plexus-utils -3.0.4 +3.0.5 jmock
svn commit: r1377115 [2/2] - in /maven/surefire/trunk: ./ maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/report/ maven-surefire-plugin/src/assembly/ maven-surefire-plugin/src/sit
Modified: maven/surefire/trunk/surefire-providers/surefire-testng-utils/pom.xml URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-providers/surefire-testng-utils/pom.xml?rev=1377115&r1=1377114&r2=1377115&view=diff == --- maven/surefire/trunk/surefire-providers/surefire-testng-utils/pom.xml (original) +++ maven/surefire/trunk/surefire-providers/surefire-testng-utils/pom.xml Fri Aug 24 21:06:03 2012 @@ -1,4 +1,22 @@ + http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> 4.0.0 Modified: maven/surefire/trunk/surefire-providers/surefire-testng-utils/src/main/java/org/apache/maven/surefire/testng/utils/GroupMatcherMethodSelector.java URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-providers/surefire-testng-utils/src/main/java/org/apache/maven/surefire/testng/utils/GroupMatcherMethodSelector.java?rev=1377115&r1=1377114&r2=1377115&view=diff == --- maven/surefire/trunk/surefire-providers/surefire-testng-utils/src/main/java/org/apache/maven/surefire/testng/utils/GroupMatcherMethodSelector.java (original) +++ maven/surefire/trunk/surefire-providers/surefire-testng-utils/src/main/java/org/apache/maven/surefire/testng/utils/GroupMatcherMethodSelector.java Fri Aug 24 21:06:03 2012 @@ -1,5 +1,22 @@ package org.apache.maven.surefire.testng.utils; - +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ import java.util.HashMap; import java.util.List; import java.util.Map;
svn commit: r1377091 - /maven/sandbox/trunk/plugins/maven-scm-publish-plugin/src/main/java/org/apache/maven/plugins/scmpublish/AbstractScmPublishMojo.java
Author: olamy Date: Fri Aug 24 20:36:40 2012 New Revision: 1377091 URL: http://svn.apache.org/viewvc?rev=1377091&view=rev Log: add TODO Modified: maven/sandbox/trunk/plugins/maven-scm-publish-plugin/src/main/java/org/apache/maven/plugins/scmpublish/AbstractScmPublishMojo.java Modified: maven/sandbox/trunk/plugins/maven-scm-publish-plugin/src/main/java/org/apache/maven/plugins/scmpublish/AbstractScmPublishMojo.java URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/plugins/maven-scm-publish-plugin/src/main/java/org/apache/maven/plugins/scmpublish/AbstractScmPublishMojo.java?rev=1377091&r1=1377090&r2=1377091&view=diff == --- maven/sandbox/trunk/plugins/maven-scm-publish-plugin/src/main/java/org/apache/maven/plugins/scmpublish/AbstractScmPublishMojo.java (original) +++ maven/sandbox/trunk/plugins/maven-scm-publish-plugin/src/main/java/org/apache/maven/plugins/scmpublish/AbstractScmPublishMojo.java Fri Aug 24 20:36:40 2012 @@ -216,6 +216,8 @@ public abstract class AbstractScmPublish ReleaseDescriptor releaseDescriptor = new ReleaseDescriptor(); releaseDescriptor.setInteractive( settings.isInteractiveMode() ); +//TODO use from settings with decrypt stuff + releaseDescriptor.setScmPassword( password ); releaseDescriptor.setScmUsername( username );
svn commit: r1377032 - in /maven/surefire/trunk: maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/ surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/ s
Author: krosenvold
Date: Fri Aug 24 18:43:31 2012
New Revision: 1377032
URL: http://svn.apache.org/viewvc?rev=1377032&view=rev
Log:
[SUREFIRE-907] threadcount parameter required for forkmode=perthread
Fixed with IT
Added:
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire907PerThreadWithoutThreadCountIT.java
(with props)
Modified:
maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/SurefireLauncher.java
Modified:
maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java?rev=1377032&r1=1377031&r2=1377032&view=diff
==
---
maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java
(original)
+++
maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java
Fri Aug 24 18:43:31 2012
@@ -632,6 +632,7 @@ public abstract class AbstractSurefireMo
{
ensureWorkingDirectoryExists();
ensureParallelRunningCompatibility();
+ensureThreadCountWithPerThread();
warnIfUselessUseSystemClassLoaderParameter();
warnIfDefunctGroupsCombinations();
}
@@ -1641,6 +1642,15 @@ public abstract class AbstractSurefireMo
}
}
+void ensureThreadCountWithPerThread()
+throws MojoFailureException
+{
+if ( ForkConfiguration.FORK_PERTHREAD.equals( getEffectiveForkMode() )
&& getThreadCount() < 1 )
+{
+throw new MojoFailureException( "Fork mode perthread requires a
thread count" );
+}
+}
+
void warnIfUselessUseSystemClassLoaderParameter()
{
if ( isUseSystemClassLoader() && isForkModeNever() )
Modified:
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/SurefireLauncher.java
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/SurefireLauncher.java?rev=1377032&r1=1377031&r2=1377032&view=diff
==
---
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/SurefireLauncher.java
(original)
+++
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/SurefireLauncher.java
Fri Aug 24 18:43:31 2012
@@ -379,6 +379,10 @@ public class SurefireLauncher
{
return forkMode( "pertest" );
}
+public SurefireLauncher forkPerThread()
+{
+return forkMode( "perthread" );
+}
public SurefireLauncher forkMode( String forkMode )
{
Added:
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire907PerThreadWithoutThreadCountIT.java
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire907PerThreadWithoutThreadCountIT.java?rev=1377032&view=auto
==
---
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire907PerThreadWithoutThreadCountIT.java
(added)
+++
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire907PerThreadWithoutThreadCountIT.java
Fri Aug 24 18:43:31 2012
@@ -0,0 +1,36 @@
+package org.apache.maven.surefire.its.jiras;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+import org.apache.maven.surefire.its.fixture.OutputValidator;
+import org.apache.maven.surefire.its.fixture.SurefireJUnit4IntegrationTestCase;
+import org.apache.maven.surefi
svn commit: r1377020 - /maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/StringSearchModelInterpolator.java
Author: krosenvold
Date: Fri Aug 24 18:25:16 2012
New Revision: 1377020
URL: http://svn.apache.org/viewvc?rev=1377020&view=rev
Log:
o Changed clumsy collection interpolation into List interpolation, since it's
all lists anyway.
Performs twice as fast, but you'll have to be a profiler to appreciate this
subtle
performance increase.
Modified:
maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/StringSearchModelInterpolator.java
Modified:
maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/StringSearchModelInterpolator.java
URL:
http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/StringSearchModelInterpolator.java?rev=1377020&r1=1377019&r2=1377020&view=diff
==
---
maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/StringSearchModelInterpolator.java
(original)
+++
maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/StringSearchModelInterpolator.java
Fri Aug 24 18:25:16 2012
@@ -241,9 +241,13 @@ public class StringSearchModelInterpolat
fields.add( new StringField( currentField ) );
}
}
+else if ( List.class.isAssignableFrom( type ) )
+{
+fields.add( new ListField( currentField ) );
+}
else if ( Collection.class.isAssignableFrom( type ) )
{
-fields.add( new CollectionField( currentField ) );
+throw new RuntimeException("We dont interpolate
into collections, use a list instead");
}
else if ( Map.class.isAssignableFrom( type ) )
{
@@ -348,10 +352,10 @@ public class StringSearchModelInterpolat
}
}
-static final class CollectionField
+static final class ListField
extends CacheField
{
-CollectionField( Field field )
+ListField( Field field )
{
super( field );
}
@@ -360,52 +364,47 @@ public class StringSearchModelInterpolat
void doInterpolate( Object target, InterpolateObjectAction ctx )
throws IllegalAccessException
{
-@SuppressWarnings( "unchecked" ) Collection c =
(Collection) field.get( target );
-if ( c == null || c.isEmpty() )
+@SuppressWarnings( "unchecked" ) List c =
(List) field.get( target );
+if ( c == null )
{
return;
}
-List originalValues = new ArrayList( c );
-try
-{
-c.clear();
-}
-catch ( UnsupportedOperationException e )
+int size = c.size();
+Object value;
+for ( int i = 0; i < size; i++ )
{
-return;
-}
-for ( Object value : originalValues )
-{
-if ( value == null )
-{
-// add the null back in...not sure what else to do...
-c.add( value );
-}
-else if ( String.class == value.getClass() )
-{
-String interpolated = ctx.interpolate( (String) value
);
+value = c.get( i );
-if ( !interpolated.equals( value ) )
-{
-c.add( interpolated );
-}
-else
-{
-c.add( value );
-}
-}
-else
+if ( value != null )
{
-c.add( value );
-if ( value.getClass().isArray() )
+if ( String.class == value.getClass() )
{
-evaluateArray( value, ctx );
+String interpolated = ctx.interpolate( (String)
value );
+
+if ( !interpolated.equals( value ) )
+{
+try
+{
+c.set( i, interpolated );
+}
+catch ( UnsupportedOperationException e )
+{
+retur
svn commit: r1376991 - in /maven/skins/trunk/maven-fluido-skin/src/main/resources: META-INF/maven/site.vm css/maven-base.css css/maven-theme.css
Author: olamy
Date: Fri Aug 24 17:01:48 2012
New Revision: 1376991
URL: http://svn.apache.org/viewvc?rev=1376991&view=rev
Log:
[MSKINS-63] Improve the sidebar layout
Robert patch modified.
Modified:
maven/skins/trunk/maven-fluido-skin/src/main/resources/META-INF/maven/site.vm
maven/skins/trunk/maven-fluido-skin/src/main/resources/css/maven-base.css
maven/skins/trunk/maven-fluido-skin/src/main/resources/css/maven-theme.css
Modified:
maven/skins/trunk/maven-fluido-skin/src/main/resources/META-INF/maven/site.vm
URL:
http://svn.apache.org/viewvc/maven/skins/trunk/maven-fluido-skin/src/main/resources/META-INF/maven/site.vm?rev=1376991&r1=1376990&r2=1376991&view=diff
==
---
maven/skins/trunk/maven-fluido-skin/src/main/resources/META-INF/maven/site.vm
(original)
+++
maven/skins/trunk/maven-fluido-skin/src/main/resources/META-INF/maven/site.vm
Fri Aug 24 17:01:48 2012
@@ -249,31 +249,37 @@
#set ( $collapse = "expanded" )
#end
#end
-
+
+ #if ( $alignedFileName == $currentItemHref )
+
+ #else
+
+ #end
+
#if ( $item.img )
#if ( $item.position == "left" )
#if ( $alignedFileName == $currentItemHref )
-#image($item.img $item.alt $item.border $item.width
$item.height) $item.name
+#image($item.img $item.alt $item.border $item.width
$item.height) $item.name
#else
#link($currentItemHref $item.name $item.target $item.img
$item.position $item.alt $item.border $item.width $item.height)
#end
#else
#if ( $alignedFileName == $currentItemHref )
-$item.name #image($item.img $item.alt $item.border $item.width
$item.height)
+$item.name #image($item.img $item.alt $item.border
$item.width $item.height)
#else
#link($currentItemHref $item.name $item.target $item.img
$item.position $item.alt $item.border $item.width $item.height)
#end
#end
#else
#if ( $alignedFileName == $currentItemHref )
- $item.name
+ $item.name
#else
#link( $currentItemHref $item.name $item.target $item.img $item.position
$item.alt $item.border $item.width $item.height )
#end
#end
#if ( $item && $item.items && $item.items.size() > 0 )
#if ( $collapse == "expanded" )
-
+
#foreach( $subitem in $item.items )
#menuItem( $subitem )
#end
@@ -284,6 +290,7 @@
#end
##
#macro ( mainMenu $menus )
+
#foreach( $menu in $menus )
#if ( $menu.name )
#if ( $menu.img )
@@ -329,22 +336,21 @@
#set ( $img = '" )
##
#if ( $position == "left" )
-$img $menu.name
+$img $menu.name
#else
-$menu.name $img
+$menu.name $img
#end
#else
-$menu.name
+$menu.name
#end
#end
#if ( $menu.items && $menu.items.size() > 0 )
-
#foreach( $item in $menu.items )
#menuItem( $item )
#end
-
#end
#end
+
#end
##
#macro ( copyright )
@@ -978,8 +984,8 @@
#if ( $sideBarEnabled )
-
-
+
+
#publishDate( "navigation-top" $decoration.publishDate
$decoration.version )
#mainMenu( $decoration.body.menus )
#publishDate( "navigation-bottom" $decoration.publishDate
$decoration.version )
@@ -1002,7 +1008,7 @@
#end
-
+
#if ( $title && $title.endsWith( "Project License" ) )
$bodyContent
#else
Modified:
maven/skins/trunk/maven-fluido-skin/src/main/resources/css/maven-base.css
URL:
http://svn.apache.org/viewvc/maven/skins/trunk/maven-fluido-skin/src/main/resources/css/maven-base.css?rev=1376991&r1=1376990&r2=1376991&view=diff
==
--- maven/skins/trunk/maven-fluido-skin/src/main/resources/css/maven-base.css
(original)
+++ maven/skins/trunk/maven-fluido-skin/src/main/resources/css/maven-base.css
Fri Aug 24 17:01:48 2012
@@ -22,5 +22,4 @@
.clear{clear:both;visibility: hidden;}
.clear hr{display: none;}
.section p,.section p,.section dt,.section dt{margin-right: 7px;margin-left:
7px;}
-#leftColumn li.none {text-indent: -1em;margin-left: 1em;}
#ohloh {margin-bottom: 10px;}
Modified:
maven/skins/trunk/maven-fluido-skin/src/main/resources/css/maven-theme.css
URL:
http://svn.apache.org/viewvc/maven/skins/trunk/maven-fluido-skin/src/main/resources/css/maven-theme.css?rev=1376991&r1=1376990&r2=1376991&view=diff
==
--- maven/skins/trunk/maven-fluido-skin/src/main/resources/css/maven-theme.css
(original)
+++ maven/skins/trunk/maven-fluido-skin/src/main/resources/css/maven-theme.css
Fri Aug 24 17:01:48 2012
@@ -39,7 +39,7 @@ a.externalLink[href^=ftp]{background: ur
a.externalLink[href^=mailto]{background: url('../images/contact-new.pn
svn commit: r1376966 - /maven/doxia/doxia-tools/trunk/doxia-integration-tools/
Author: olamy Date: Fri Aug 24 15:31:19 2012 New Revision: 1376966 URL: http://svn.apache.org/viewvc?rev=1376966&view=rev Log: ignore idea files Modified: maven/doxia/doxia-tools/trunk/doxia-integration-tools/ (props changed) Propchange: maven/doxia/doxia-tools/trunk/doxia-integration-tools/ -- --- svn:ignore (original) +++ svn:ignore Fri Aug 24 15:31:19 2012 @@ -6,3 +6,5 @@ maven-doxia-tools.ipr maven-doxia-tools.iws .settings bin +*.iml +.idea
svn commit: r1376965 - /maven/doxia/doxia-sitetools/trunk/pom.xml
Author: olamy Date: Fri Aug 24 15:31:00 2012 New Revision: 1376965 URL: http://svn.apache.org/viewvc?rev=1376965&view=rev Log: use last parent Modified: maven/doxia/doxia-sitetools/trunk/pom.xml Modified: maven/doxia/doxia-sitetools/trunk/pom.xml URL: http://svn.apache.org/viewvc/maven/doxia/doxia-sitetools/trunk/pom.xml?rev=1376965&r1=1376964&r2=1376965&view=diff == --- maven/doxia/doxia-sitetools/trunk/pom.xml (original) +++ maven/doxia/doxia-sitetools/trunk/pom.xml Fri Aug 24 15:31:00 2012 @@ -25,7 +25,7 @@ under the License. org.apache.maven maven-parent -21 +22 ../../pom/maven/pom.xml
svn commit: r1376964 - in /maven/doxia: doxia-tools/trunk/pom.xml doxia/trunk/pom.xml site/pom.xml
Author: olamy Date: Fri Aug 24 15:30:13 2012 New Revision: 1376964 URL: http://svn.apache.org/viewvc?rev=1376964&view=rev Log: use last parent Modified: maven/doxia/doxia-tools/trunk/pom.xml maven/doxia/doxia/trunk/pom.xml maven/doxia/site/pom.xml Modified: maven/doxia/doxia-tools/trunk/pom.xml URL: http://svn.apache.org/viewvc/maven/doxia/doxia-tools/trunk/pom.xml?rev=1376964&r1=1376963&r2=1376964&view=diff == --- maven/doxia/doxia-tools/trunk/pom.xml (original) +++ maven/doxia/doxia-tools/trunk/pom.xml Fri Aug 24 15:30:13 2012 @@ -25,7 +25,7 @@ under the License. org.apache.maven maven-parent -21 +22 ../../pom/maven/pom.xml Modified: maven/doxia/doxia/trunk/pom.xml URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/pom.xml?rev=1376964&r1=1376963&r2=1376964&view=diff == --- maven/doxia/doxia/trunk/pom.xml (original) +++ maven/doxia/doxia/trunk/pom.xml Fri Aug 24 15:30:13 2012 @@ -25,7 +25,7 @@ under the License. org.apache.maven maven-parent -21 +22 ../../pom/maven/pom.xml Modified: maven/doxia/site/pom.xml URL: http://svn.apache.org/viewvc/maven/doxia/site/pom.xml?rev=1376964&r1=1376963&r2=1376964&view=diff == --- maven/doxia/site/pom.xml (original) +++ maven/doxia/site/pom.xml Fri Aug 24 15:30:13 2012 @@ -25,7 +25,7 @@ under the License. org.apache.maven maven-parent -19 +22 ../../pom/maven/pom.xml
svn commit: r1376963 - /maven/doxia/trunks/pom.xml
Author: olamy Date: Fri Aug 24 15:29:48 2012 New Revision: 1376963 URL: http://svn.apache.org/viewvc?rev=1376963&view=rev Log: use last parent Modified: maven/doxia/trunks/pom.xml Modified: maven/doxia/trunks/pom.xml URL: http://svn.apache.org/viewvc/maven/doxia/trunks/pom.xml?rev=1376963&r1=1376962&r2=1376963&view=diff == --- maven/doxia/trunks/pom.xml (original) +++ maven/doxia/trunks/pom.xml Fri Aug 24 15:29:48 2012 @@ -35,6 +35,7 @@ under the License. doxia doxia-sitetools doxia-tools +site
svn commit: r1376861 - /maven/plugins/trunk/maven-dependency-plugin/pom.xml
Author: olamy Date: Fri Aug 24 08:29:22 2012 New Revision: 1376861 URL: http://svn.apache.org/viewvc?rev=1376861&view=rev Log: [maven-release-plugin] prepare for next development iteration Modified: maven/plugins/trunk/maven-dependency-plugin/pom.xml Modified: maven/plugins/trunk/maven-dependency-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/pom.xml?rev=1376861&r1=1376860&r2=1376861&view=diff == --- maven/plugins/trunk/maven-dependency-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-dependency-plugin/pom.xml Fri Aug 24 08:29:22 2012 @@ -30,7 +30,7 @@ under the License. maven-dependency-plugin - 2.5.1 + 2.5.2-SNAPSHOT maven-plugin Maven Dependency Plugin @@ -41,9 +41,9 @@ under the License. - scm:svn:http://svn.apache.org/repos/asf/maven/plugins/tags/maven-dependency-plugin-2.5.1 - scm:svn:https://svn.apache.org/repos/asf/maven/plugins/tags/maven-dependency-plugin-2.5.1 - http://svn.apache.org/viewvc/maven/plugins/tags/maven-dependency-plugin-2.5.1 + scm:svn:http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-dependency-plugin/ + scm:svn:https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-dependency-plugin/ + http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/ JIRA
svn commit: r1376859 - /maven/plugins/trunk/maven-dependency-plugin/pom.xml
Author: olamy Date: Fri Aug 24 08:29:14 2012 New Revision: 1376859 URL: http://svn.apache.org/viewvc?rev=1376859&view=rev Log: [maven-release-plugin] prepare release maven-dependency-plugin-2.5.1 Modified: maven/plugins/trunk/maven-dependency-plugin/pom.xml Modified: maven/plugins/trunk/maven-dependency-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/pom.xml?rev=1376859&r1=1376858&r2=1376859&view=diff == --- maven/plugins/trunk/maven-dependency-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-dependency-plugin/pom.xml Fri Aug 24 08:29:14 2012 @@ -30,7 +30,7 @@ under the License. maven-dependency-plugin - 2.5.1-SNAPSHOT + 2.5.1 maven-plugin Maven Dependency Plugin @@ -41,9 +41,9 @@ under the License. - scm:svn:http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-dependency-plugin/ - scm:svn:https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-dependency-plugin/ - http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/ + scm:svn:http://svn.apache.org/repos/asf/maven/plugins/tags/maven-dependency-plugin-2.5.1 + scm:svn:https://svn.apache.org/repos/asf/maven/plugins/tags/maven-dependency-plugin-2.5.1 + http://svn.apache.org/viewvc/maven/plugins/tags/maven-dependency-plugin-2.5.1 JIRA
svn commit: r1376860 - /maven/plugins/tags/maven-dependency-plugin-2.5.1/
Author: olamy Date: Fri Aug 24 08:29:19 2012 New Revision: 1376860 URL: http://svn.apache.org/viewvc?rev=1376860&view=rev Log: [maven-release-plugin] copy for tag maven-dependency-plugin-2.5.1 Added: maven/plugins/tags/maven-dependency-plugin-2.5.1/ - copied from r1376859, maven/plugins/trunk/maven-dependency-plugin/
