svn commit: r1210392 - /maven/site/trunk/src/site/apt/plugins/index.apt
Author: carlos
Date: Mon Dec 5 10:04:29 2011
New Revision: 1210392
URL: http://svn.apache.org/viewvc?rev=1210392view=rev
Log:
Update for Dependency 2.4
Modified:
maven/site/trunk/src/site/apt/plugins/index.apt
Modified: maven/site/trunk/src/site/apt/plugins/index.apt
URL:
http://svn.apache.org/viewvc/maven/site/trunk/src/site/apt/plugins/index.apt?rev=1210392r1=1210391r2=1210392view=diff
==
--- maven/site/trunk/src/site/apt/plugins/index.apt (original)
+++ maven/site/trunk/src/site/apt/plugins/index.apt Mon Dec 5 10:04:29 2011
@@ -134,7 +134,7 @@ Available Plugins
*--++--++--+++
| {{{/plugins/maven-assembly-plugin/} assembly}} | B |
2.2.2| 2011-12-02 | Build an assembly (distribution) of sources and/or
binaries. |
{{{http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-assembly-plugin}SVN}}
| {{{http://jira.codehaus.org/browse/MASSEMBLY}JIRA}}
*--++--++--+++
-| {{{/plugins/maven-dependency-plugin/} dependency}} | B+R|
2.3 | 2011-07-10 | Dependency manipulation (copy, unpack) and
analysis. |
{{{http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-dependency-plugin}SVN}}
| {{{http://jira.codehaus.org/browse/MDEP}JIRA}}
+| {{{/plugins/maven-dependency-plugin/} dependency}} | B+R|
2.4 | 2011-12-05 | Dependency manipulation (copy, unpack) and
analysis. |
{{{http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-dependency-plugin}SVN}}
| {{{http://jira.codehaus.org/browse/MDEP}JIRA}}
*--++--++--+++
| {{{/plugins/maven-enforcer-plugin/} enforcer}} | B |
1.0.1| 2011-06-22 | Environmental constraint checking (Maven Version,
JDK etc), User Custom Rule Execution. |
{{{http://svn.apache.org/repos/asf/maven/enforcer/trunk/maven-enforcer-plugin}SVN}}
| {{{http://jira.codehaus.org/browse/MENFORCER}JIRA}}
*--++--++--+++
svn commit: r1210403 - in /maven/core-integration-testing/trunk: core-it-suite/src/test/java/org/apache/maven/it/ core-it-suite/src/test/resources/it0146/ core-it-suite/src/test/resources/it0146/repo/
Author: olamy
Date: Mon Dec 5 10:36:32 2011
New Revision: 1210403
URL: http://svn.apache.org/viewvc?rev=1210403view=rev
Log:
add core it test for regression found in appassembler with download timestamped
SNAPSHOT
see
http://mail-archives.apache.org/mod_mbox/maven-dev/201112.mbox/%3ccapcjjnhjsqed0tzuztwwtqcspyvn_k0-0xq2b7qxtn5arz-...@mail.gmail.com%3e
Added:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0146InstallerSnapshotNaming.java
(with props)
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0146/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0146/pom.xml
(with props)
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0146/repo/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0146/repo/org/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0146/repo/org/apache/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0146/repo/org/apache/maven/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0146/repo/org/apache/maven/its/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0146/repo/org/apache/maven/its/it0146/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0146/repo/org/apache/maven/its/it0146/dep/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0146/repo/org/apache/maven/its/it0146/dep/0.1-SNAPSHOT/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0146/repo/org/apache/maven/its/it0146/dep/0.1-SNAPSHOT/dep-0.1-20110726.105319-1.jar
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0146/repo/org/apache/maven/its/it0146/dep/0.1-SNAPSHOT/dep-0.1-20110726.105319-1.pom
(with props)
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0146/repo/org/apache/maven/its/it0146/dep/0.1-SNAPSHOT/maven-metadata.xml
(with props)
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0146/settings-template.xml
(with props)
maven/core-integration-testing/trunk/core-it-support/core-it-plugins/maven-it-plugin-artifact/src/main/java/org/apache/maven/plugin/coreit/InstallArtifactsMojo.java
(with props)
Added:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0146InstallerSnapshotNaming.java
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0146InstallerSnapshotNaming.java?rev=1210403view=auto
==
---
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0146InstallerSnapshotNaming.java
(added)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0146InstallerSnapshotNaming.java
Mon Dec 5 10:36:32 2011
@@ -0,0 +1,123 @@
+package org.apache.maven.it;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * License); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * AS IS BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import org.apache.maven.it.util.FileUtils;
+import org.apache.maven.it.util.ResourceExtractor;
+import org.mortbay.jetty.Handler;
+import org.mortbay.jetty.Server;
+import org.mortbay.jetty.handler.DefaultHandler;
+import org.mortbay.jetty.handler.HandlerList;
+import org.mortbay.jetty.handler.ResourceHandler;
+import org.mortbay.resource.FileResource;
+import org.mortbay.resource.Resource;
+
+import java.io.File;
+import java.io.IOException;
+import java.net.InetAddress;
+import java.net.MalformedURLException;
+import java.net.URISyntaxException;
+import java.util.Properties;
+
+public class MavenIT0146InstallerSnapshotNaming
+extends AbstractMavenIntegrationTestCase
+{
+
+private Server server;
+
+private int port;
+
+
+private final File testDir;
+
+public MavenIT0146InstallerSnapshotNaming()
+throws IOException
+{
+super( (2.0.2,) );
+testDir = ResourceExtractor.simpleExtractResources( getClass(),
/it0146 );
+}
+
+public void setUp()
+throws Exception
+{
+
+
svn commit: r1210404 - in /maven/core-integration-testing/trunk/core-it-suite/src/test: java/org/apache/maven/it/ resources/it0146/ resources/it0146/project/ resources/it0146/project/src/ resources/it
Author: olamy
Date: Mon Dec 5 10:37:48 2011
New Revision: 1210404
URL: http://svn.apache.org/viewvc?rev=1210404view=rev
Log:
enhance it to add a use where a SNAPSHOT has been installed locally and ensure
now it's a -SNAPSHOT rather than a timestamped one.
Added:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0146/project/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0146/project/pom.xml
(with props)
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0146/project/src/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0146/project/src/main/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0146/project/src/main/resources/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0146/project/src/main/resources/empty.txt
(with props)
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0146InstallerSnapshotNaming.java
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0146/pom.xml
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0146InstallerSnapshotNaming.java
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0146InstallerSnapshotNaming.java?rev=1210404r1=1210403r2=1210404view=diff
==
---
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0146InstallerSnapshotNaming.java
(original)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0146InstallerSnapshotNaming.java
Mon Dec 5 10:37:48 2011
@@ -19,21 +19,16 @@ package org.apache.maven.it;
* under the License.
*/
-import org.apache.maven.it.util.FileUtils;
import org.apache.maven.it.util.ResourceExtractor;
import org.mortbay.jetty.Handler;
import org.mortbay.jetty.Server;
import org.mortbay.jetty.handler.DefaultHandler;
import org.mortbay.jetty.handler.HandlerList;
import org.mortbay.jetty.handler.ResourceHandler;
-import org.mortbay.resource.FileResource;
-import org.mortbay.resource.Resource;
import java.io.File;
import java.io.IOException;
import java.net.InetAddress;
-import java.net.MalformedURLException;
-import java.net.URISyntaxException;
import java.util.Properties;
public class MavenIT0146InstallerSnapshotNaming
@@ -60,7 +55,6 @@ public class MavenIT0146InstallerSnapsho
ResourceHandler resourceHandler = new ResourceHandler();
resourceHandler.setResourceBase( new File( testDir, repo
).getAbsolutePath() );
- // org/apache/maven/its/it0146/dep/0.1-SNAPSHOT/maven-metadata.xml
HandlerList handlers = new HandlerList();
handlers.setHandlers( new Handler[]{ resourceHandler, new
DefaultHandler() } );
@@ -73,7 +67,6 @@ public class MavenIT0146InstallerSnapsho
}
-
protected void tearDown()
throws Exception
{
@@ -102,7 +95,6 @@ public class MavenIT0146InstallerSnapsho
verifier.filterFile( settings-template.xml, settings.xml, UTF-8,
properties );
-
verifier.getCliOptions().add( --settings );
verifier.getCliOptions().add( settings.xml );
@@ -120,4 +112,44 @@ public class MavenIT0146InstallerSnapsho
}
+
+public void testitNonTimestampedNameWithInstalledSNAPSHOT()
+throws Exception
+{
+
+Verifier verifier = newVerifier( testDir.getAbsolutePath() );
+verifier.deleteArtifacts( org.apache.maven.its.it0146 );
+verifier.getCliOptions().add( -f );
+verifier.getCliOptions().add( project/pom.xml );
+verifier.deleteDirectory( project/target );
+verifier.setLogFileName( log2.txt );
+
+verifier.executeGoal( install );
+verifier.verifyErrorFreeLog();
+verifier.resetStreams();
+
+verifier = newVerifier( testDir.getAbsolutePath() );
+
+Properties properties = verifier.newDefaultFilterProperties();
+properties.setProperty( @host@,
InetAddress.getLocalHost().getCanonicalHostName() );
+properties.setProperty( @port@, Integer.toString( port ) );
+
+verifier.filterFile( settings-template.xml, settings.xml, UTF-8,
properties );
+
+verifier.getCliOptions().add( --settings );
+verifier.getCliOptions().add( settings.xml );
+verifier.setLogFileName( log3.txt );
+
+
+verifier.getCliOptions().add( -X );
+
+verifier.deleteDirectory( target );
+
+verifier.executeGoal( validate );
+verifier.verifyErrorFreeLog();
+verifier.resetStreams();
+
+verifier.assertFilePresent(
target/appassembler/repo/dep-0.1-SNAPSHOT.jar );
+
+}
}
Modified:
svn commit: r1210415 - /maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0146/repo/org/apache/maven/its/it0146/dep/0.1-SNAPSHOT/maven-metadata.xml
Author: olamy Date: Mon Dec 5 11:34:31 2011 New Revision: 1210415 URL: http://svn.apache.org/viewvc?rev=1210415view=rev Log: remove extended snapshot metadata as not supported by old m2 versions Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0146/repo/org/apache/maven/its/it0146/dep/0.1-SNAPSHOT/maven-metadata.xml Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0146/repo/org/apache/maven/its/it0146/dep/0.1-SNAPSHOT/maven-metadata.xml URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0146/repo/org/apache/maven/its/it0146/dep/0.1-SNAPSHOT/maven-metadata.xml?rev=1210415r1=1210414r2=1210415view=diff == --- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0146/repo/org/apache/maven/its/it0146/dep/0.1-SNAPSHOT/maven-metadata.xml (original) +++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0146/repo/org/apache/maven/its/it0146/dep/0.1-SNAPSHOT/maven-metadata.xml Mon Dec 5 11:34:31 2011 @@ -9,17 +9,5 @@ buildNumber1/buildNumber /snapshot lastUpdated20110726105319/lastUpdated -snapshotVersions - snapshotVersion -extensionjar/extension -value0.1-20110726.105319-1/value -updated20110726105319/updated - /snapshotVersion - snapshotVersion -extensionpom/extension -value0.1-20110726.105319-1/value -updated20110726105319/updated - /snapshotVersion -/snapshotVersions /versioning /metadata \ No newline at end of file
svn commit: r1210423 - in /maven/surefire/trunk: ./ maven-failsafe-plugin/ maven-surefire-common/ maven-surefire-plugin/ maven-surefire-report-plugin/ surefire-api/ surefire-integration-tests/ surefir
Author: krosenvold Date: Mon Dec 5 12:14:30 2011 New Revision: 1210423 URL: http://svn.apache.org/viewvc?rev=1210423view=rev Log: o Upgraded to java 1.5, including parent 21 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-integration-tests/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/surefire-junit4/pom.xml maven/surefire/trunk/surefire-providers/surefire-junit47/pom.xml maven/surefire/trunk/surefire-setup-integration-tests/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=1210423r1=1210422r2=1210423view=diff == --- maven/surefire/trunk/maven-failsafe-plugin/pom.xml (original) +++ maven/surefire/trunk/maven-failsafe-plugin/pom.xml Mon Dec 5 12:14:30 2011 @@ -171,13 +171,6 @@ build plugins plugin -artifactIdmaven-compiler-plugin/artifactId -configuration - source1.4/source - target1.4/target -/configuration - /plugin - plugin groupIdorg.apache.maven.plugins/groupId artifactIdmaven-plugin-plugin/artifactId version2.8/version Modified: maven/surefire/trunk/maven-surefire-common/pom.xml URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-common/pom.xml?rev=1210423r1=1210422r2=1210423view=diff == --- maven/surefire/trunk/maven-surefire-common/pom.xml (original) +++ maven/surefire/trunk/maven-surefire-common/pom.xml Mon Dec 5 12:14:30 2011 @@ -86,13 +86,6 @@ build plugins plugin -artifactIdmaven-compiler-plugin/artifactId -configuration - source1.4/source - target1.4/target -/configuration - /plugin - plugin artifactIdmaven-surefire-plugin/artifactId dependencies dependency Modified: maven/surefire/trunk/maven-surefire-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-plugin/pom.xml?rev=1210423r1=1210422r2=1210423view=diff == --- maven/surefire/trunk/maven-surefire-plugin/pom.xml (original) +++ maven/surefire/trunk/maven-surefire-plugin/pom.xml Mon Dec 5 12:14:30 2011 @@ -169,13 +169,6 @@ build plugins plugin -artifactIdmaven-compiler-plugin/artifactId -configuration - source1.4/source - target1.4/target -/configuration - /plugin - plugin groupIdorg.apache.maven.plugins/groupId artifactIdmaven-plugin-plugin/artifactId version2.8/version @@ -257,23 +250,6 @@ /reporting profiles -!-- Force JDK 1.4 for this one, plugins can never be built on 1.3 -- -profile - idjdk1.3/id - build -pluginManagement - plugins -plugin - artifactIdmaven-compiler-plugin/artifactId - configuration -forkfalse/fork -compilerVersion1.4/compilerVersion - /configuration -/plugin - /plugins -/pluginManagement - /build -/profile profile idci/id activation 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=1210423r1=1210422r2=1210423view=diff == --- maven/surefire/trunk/maven-surefire-report-plugin/pom.xml (original) +++ maven/surefire/trunk/maven-surefire-report-plugin/pom.xml Mon Dec 5 12:14:30 2011 @@ -129,13 +129,6 @@ build plugins plugin -artifactIdmaven-compiler-plugin/artifactId -configuration - source1.4/source - target1.4/target -/configuration - /plugin - plugin groupIdorg.apache.maven.plugins/groupId artifactIdmaven-plugin-plugin/artifactId version2.8/version @@ -181,13 +174,6 @@ pluginManagement plugins plugin - artifactIdmaven-compiler-plugin/artifactId - configuration -forkfalse/fork -compilerVersion1.4/compilerVersion - /configuration -/plugin -plugin artifactIdmaven-surefire-plugin/artifactId
svn commit: r1210461 - /maven/maven-3/tags/maven-3.0.4-RC3/
Author: olamy Date: Mon Dec 5 13:48:22 2011 New Revision: 1210461 URL: http://svn.apache.org/viewvc?rev=1210461view=rev Log: [maven-release-plugin] copy for tag maven-3.0.4-RC3 Added: maven/maven-3/tags/maven-3.0.4-RC3/ (props changed) - copied from r1210460, maven/maven-3/trunk/ Propchange: maven/maven-3/tags/maven-3.0.4-RC3/ -- bugtraq:append = true Propchange: maven/maven-3/tags/maven-3.0.4-RC3/ -- bugtraq:label = Enter issue ID: Propchange: maven/maven-3/tags/maven-3.0.4-RC3/ -- bugtraq:message = Issue id: %BUGID% Propchange: maven/maven-3/tags/maven-3.0.4-RC3/ -- bugtraq:number = false Propchange: maven/maven-3/tags/maven-3.0.4-RC3/ -- bugtraq:url = http://jira.codehaus.org/browse/%BUGID% Propchange: maven/maven-3/tags/maven-3.0.4-RC3/ -- --- svn:ignore (added) +++ svn:ignore Mon Dec 5 13:48:22 2011 @@ -0,0 +1,16 @@ +release.properties +deleteme.version.properties +bootstrap +target +.classpath +.project +.settings +*.iml +*.iws +*.ipr +log.txt +dependencies.xml +.git +.gitignore +.idea +*.iml Propchange: maven/maven-3/tags/maven-3.0.4-RC3/ -- --- svn:mergeinfo (added) +++ svn:mergeinfo Mon Dec 5 13:48:22 2011 @@ -0,0 +1,8 @@ +/maven/components/branches/MNG-3932-1:746145-746157 +/maven/components/branches/maven-2.0.10-RC:680477 +/maven/components/branches/maven-2.0.x:679206,708871,720042,726541,727548,727998,728264,728940,729060,729738,729785,730631 +/maven/components/branches/maven-2.1.x:739385,741841,747468,747683,748815,749612,766523,768817 +/maven/components/branches/sisbell-plugin-manager:738973-739966 +/maven/components/sisbell-plugin-manager:738757-738972 +/maven/components/trunk:751453-767358,767708-768832 +/maven/maven-2/branches/maven-2.2.x:795521 Propchange: maven/maven-3/tags/maven-3.0.4-RC3/ -- svnmerge-integrated = /maven/components/branches/maven-2.0.x:1-496200
svn commit: r1210462 - in /maven/maven-3/trunk: ./ apache-maven/ maven-aether-provider/ maven-artifact/ maven-compat/ maven-core/ maven-embedder/ maven-model-builder/ maven-model/ maven-plugin-api/ ma
Author: olamy Date: Mon Dec 5 13:48:51 2011 New Revision: 1210462 URL: http://svn.apache.org/viewvc?rev=1210462view=rev Log: [maven-release-plugin] prepare for next development iteration Modified: maven/maven-3/trunk/apache-maven/pom.xml maven/maven-3/trunk/maven-aether-provider/pom.xml maven/maven-3/trunk/maven-artifact/pom.xml maven/maven-3/trunk/maven-compat/pom.xml maven/maven-3/trunk/maven-core/pom.xml maven/maven-3/trunk/maven-embedder/pom.xml maven/maven-3/trunk/maven-model-builder/pom.xml maven/maven-3/trunk/maven-model/pom.xml maven/maven-3/trunk/maven-plugin-api/pom.xml maven/maven-3/trunk/maven-repository-metadata/pom.xml maven/maven-3/trunk/maven-settings-builder/pom.xml maven/maven-3/trunk/maven-settings/pom.xml maven/maven-3/trunk/pom.xml Modified: maven/maven-3/trunk/apache-maven/pom.xml URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/apache-maven/pom.xml?rev=1210462r1=1210461r2=1210462view=diff == --- maven/maven-3/trunk/apache-maven/pom.xml (original) +++ maven/maven-3/trunk/apache-maven/pom.xml Mon Dec 5 13:48:51 2011 @@ -21,7 +21,7 @@ parent groupIdorg.apache.maven/groupId artifactIdmaven/artifactId -version3.0.4-RC3/version +version3.0.4-SNAPSHOT/version /parent artifactIdapache-maven/artifactId Modified: maven/maven-3/trunk/maven-aether-provider/pom.xml URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-aether-provider/pom.xml?rev=1210462r1=1210461r2=1210462view=diff == --- maven/maven-3/trunk/maven-aether-provider/pom.xml (original) +++ maven/maven-3/trunk/maven-aether-provider/pom.xml Mon Dec 5 13:48:51 2011 @@ -25,7 +25,7 @@ under the License. parent groupIdorg.apache.maven/groupId artifactIdmaven/artifactId -version3.0.4-RC3/version +version3.0.4-SNAPSHOT/version /parent artifactIdmaven-aether-provider/artifactId Modified: maven/maven-3/trunk/maven-artifact/pom.xml URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-artifact/pom.xml?rev=1210462r1=1210461r2=1210462view=diff == --- maven/maven-3/trunk/maven-artifact/pom.xml (original) +++ maven/maven-3/trunk/maven-artifact/pom.xml Mon Dec 5 13:48:51 2011 @@ -16,7 +16,7 @@ parent groupIdorg.apache.maven/groupId artifactIdmaven/artifactId -version3.0.4-RC3/version +version3.0.4-SNAPSHOT/version /parent artifactIdmaven-artifact/artifactId Modified: maven/maven-3/trunk/maven-compat/pom.xml URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-compat/pom.xml?rev=1210462r1=1210461r2=1210462view=diff == --- maven/maven-3/trunk/maven-compat/pom.xml (original) +++ maven/maven-3/trunk/maven-compat/pom.xml Mon Dec 5 13:48:51 2011 @@ -16,7 +16,7 @@ parent groupIdorg.apache.maven/groupId artifactIdmaven/artifactId -version3.0.4-RC3/version +version3.0.4-SNAPSHOT/version /parent artifactIdmaven-compat/artifactId Modified: maven/maven-3/trunk/maven-core/pom.xml URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/pom.xml?rev=1210462r1=1210461r2=1210462view=diff == --- maven/maven-3/trunk/maven-core/pom.xml (original) +++ maven/maven-3/trunk/maven-core/pom.xml Mon Dec 5 13:48:51 2011 @@ -16,7 +16,7 @@ parent groupIdorg.apache.maven/groupId artifactIdmaven/artifactId -version3.0.4-RC3/version +version3.0.4-SNAPSHOT/version /parent artifactIdmaven-core/artifactId Modified: maven/maven-3/trunk/maven-embedder/pom.xml URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-embedder/pom.xml?rev=1210462r1=1210461r2=1210462view=diff == --- maven/maven-3/trunk/maven-embedder/pom.xml (original) +++ maven/maven-3/trunk/maven-embedder/pom.xml Mon Dec 5 13:48:51 2011 @@ -16,7 +16,7 @@ parent groupIdorg.apache.maven/groupId artifactIdmaven/artifactId -version3.0.4-RC3/version +version3.0.4-SNAPSHOT/version /parent artifactIdmaven-embedder/artifactId Modified: maven/maven-3/trunk/maven-model-builder/pom.xml URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-model-builder/pom.xml?rev=1210462r1=1210461r2=1210462view=diff == --- maven/maven-3/trunk/maven-model-builder/pom.xml (original) +++ maven/maven-3/trunk/maven-model-builder/pom.xml Mon Dec 5 13:48:51 2011 @@ -16,7 +16,7 @@ parent groupIdorg.apache.maven/groupId artifactIdmaven/artifactId -version3.0.4-RC3/version +version3.0.4-SNAPSHOT/version /parent
svn commit: r1210500 - in /maven/indexer/trunk/indexer-artifact/src/main/java/org/apache/maven/index/artifact: DefaultArtifactPackagingMapper.java VersionUtils.java
Author: cstamas
Date: Mon Dec 5 15:36:56 2011
New Revision: 1210500
URL: http://svn.apache.org/viewvc?rev=1210500view=rev
Log:
Performance/locking improvements.
* VersionUtils was syncing on an already thread safe (compiled) Pattern
unnecessary, GAV constructor calls into this, causing problem with when
bursting GAV creations unnecessary.
* DefaultArtifactPackagingMapper getPackaging2extensionMapping() was
synchronized only to be able to construct the Map on 1st invocation. On
frequent getExtensionForPackaging() method calls, this may cause congestion.
Modified:
maven/indexer/trunk/indexer-artifact/src/main/java/org/apache/maven/index/artifact/DefaultArtifactPackagingMapper.java
maven/indexer/trunk/indexer-artifact/src/main/java/org/apache/maven/index/artifact/VersionUtils.java
Modified:
maven/indexer/trunk/indexer-artifact/src/main/java/org/apache/maven/index/artifact/DefaultArtifactPackagingMapper.java
URL:
http://svn.apache.org/viewvc/maven/indexer/trunk/indexer-artifact/src/main/java/org/apache/maven/index/artifact/DefaultArtifactPackagingMapper.java?rev=1210500r1=1210499r2=1210500view=diff
==
---
maven/indexer/trunk/indexer-artifact/src/main/java/org/apache/maven/index/artifact/DefaultArtifactPackagingMapper.java
(original)
+++
maven/indexer/trunk/indexer-artifact/src/main/java/org/apache/maven/index/artifact/DefaultArtifactPackagingMapper.java
Mon Dec 5 15:36:56 2011
@@ -34,7 +34,7 @@ import org.codehaus.plexus.util.IOUtil;
* A very simple artifact packaging mapper, that has everything for
quick-start wired in this class. Also, it takes into
* account the ${nexus-work}/conf/packaging2extension-mapping.properties
file into account if found. To override the
* defaults in this class, simply add lines to properties file with same
keys.
- *
+ *
* @author cstamas
*/
@Component( role = ArtifactPackagingMapper.class )
@@ -42,11 +42,12 @@ public class DefaultArtifactPackagingMap
extends AbstractLogEnabled
implements ArtifactPackagingMapper
{
+
public static final String MAPPING_PROPERTIES_FILE =
packaging2extension-mapping.properties;
private File propertiesFile;
-private MapString, String packaging2extensionMapping;
+private volatile MapString, String packaging2extensionMapping;
private final static MapString, String defaults;
@@ -75,55 +76,65 @@ public class DefaultArtifactPackagingMap
this.packaging2extensionMapping = null;
}
-public synchronized MapString, String getPackaging2extensionMapping()
+public MapString, String getPackaging2extensionMapping()
{
if ( packaging2extensionMapping == null )
{
-packaging2extensionMapping = new HashMapString, String();
+synchronized ( this )
+{
+if ( packaging2extensionMapping == null )
+{
+packaging2extensionMapping = new HashMapString, String();
-// merge defaults
-packaging2extensionMapping.putAll( defaults );
+// merge defaults
+packaging2extensionMapping.putAll( defaults );
-if ( propertiesFile != null propertiesFile.exists() )
-{
-getLogger().info( Found user artifact packaging mapping file,
applying it... );
+if ( propertiesFile != null propertiesFile.exists() )
+{
+getLogger().info( Found user artifact packaging
mapping file, applying it... );
-Properties userMappings = new Properties();
+Properties userMappings = new Properties();
-FileInputStream fis = null;
+FileInputStream fis = null;
-try
-{
-fis = new FileInputStream( propertiesFile );
+try
+{
+fis = new FileInputStream( propertiesFile );
-userMappings.load( fis );
+userMappings.load( fis );
-if ( userMappings.keySet().size() 0 )
-{
-for ( Object key : userMappings.keySet() )
+if ( userMappings.keySet().size() 0 )
+{
+for ( Object key : userMappings.keySet() )
+{
+packaging2extensionMapping.put(
key.toString(),
+
userMappings.getProperty( key.toString() ) );
+}
+
+getLogger().info(
+propertiesFile.getAbsolutePath()
++ user artifact packaging mapping
file
svn commit: r1210545 - in /maven/surefire/trunk: surefire-booter/src/main/java/org/apache/maven/surefire/booter/ surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/misc/
Author: krosenvold
Date: Mon Dec 5 17:59:17 2011
New Revision: 1210545
URL: http://svn.apache.org/viewvc?rev=1210545view=rev
Log:
[SUREFIRE-804] Testcase fails with forkMode=always and
useSystemClassLoader=false
It turned out existing IT was not being run due to incorrect naming convention.
Doh
Added:
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/misc/Surefire763EnvironmentForkModeIT.java
(contents, props changed)
- copied, changed from r1210423,
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/misc/Surefire763EnvironmentForkMode.java
Removed:
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/misc/Surefire763EnvironmentForkMode.java
Modified:
maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ForkedBooter.java
maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/TypeEncodedValue.java
Modified:
maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ForkedBooter.java
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ForkedBooter.java?rev=1210545r1=1210544r2=1210545view=diff
==
---
maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ForkedBooter.java
(original)
+++
maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ForkedBooter.java
Mon Dec 5 17:59:17 2011
@@ -70,7 +70,7 @@ public class ForkedBooter
startupConfiguration.writeSurefireTestClasspathProperty();
-Object testSet = forkedTestSet != null ?
forkedTestSet.getDecodedValue() : null;
+Object testSet = forkedTestSet != null ?
forkedTestSet.getDecodedValue(testClassLoader) : null;
runSuitesInProcess( testSet, testClassLoader,
startupConfiguration, providerConfiguration );
// noinspection CallToSystemExit
Modified:
maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/TypeEncodedValue.java
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/TypeEncodedValue.java?rev=1210545r1=1210544r2=1210545view=diff
==
---
maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/TypeEncodedValue.java
(original)
+++
maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/TypeEncodedValue.java
Mon Dec 5 17:59:17 2011
@@ -40,11 +40,6 @@ public class TypeEncodedValue
this.value = value;
}
-public String getType()
-{
-return type;
-}
-
public boolean isTypeClass()
{
return Class.class.getName().equals( type );
@@ -52,6 +47,11 @@ public class TypeEncodedValue
public Object getDecodedValue()
{
+return getDecodedValue( Thread.currentThread().getContextClassLoader()
);
+}
+
+public Object getDecodedValue(ClassLoader classLoader)
+{
if ( type.trim().length() == 0 )
{
return null;
@@ -62,7 +62,7 @@ public class TypeEncodedValue
}
else if ( isTypeClass() )
{
-return ReflectionUtils.loadClass(
Thread.currentThread().getContextClassLoader(), value );
+return ReflectionUtils.loadClass( classLoader, value );
}
else if ( type.equals( File.class.getName() ) )
{
Copied:
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/misc/Surefire763EnvironmentForkModeIT.java
(from r1210423,
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/misc/Surefire763EnvironmentForkMode.java)
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/misc/Surefire763EnvironmentForkModeIT.java?p2=maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/misc/Surefire763EnvironmentForkModeIT.javap1=maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/misc/Surefire763EnvironmentForkMode.javar1=1210423r2=1210545rev=1210545view=diff
==
---
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/misc/Surefire763EnvironmentForkMode.java
(original)
+++
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/misc/Surefire763EnvironmentForkModeIT.java
Mon Dec 5 17:59:17 2011
@@ -26,23 +26,23 @@ import org.apache.maven.surefire.its.Sur
*
* @author Kristian Rosenvold
*/
-public class
svn commit: r1210559 - /maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/
Author: krosenvold
Date: Mon Dec 5 18:27:32 2011
New Revision: 1210559
URL: http://svn.apache.org/viewvc?rev=1210559view=rev
Log:
o Enabled a few more IT's that weren't running
Added:
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire376TestNgAfterSuiteFailureIT.java
(contents, props changed)
- copied, changed from r1210545,
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire376TestNgAfterSuiteFailure.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgParallelWithAnnotationsIT.java
(contents, props changed)
- copied, changed from r1210545,
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgParallelWithAnnotations.java
Removed:
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire376TestNgAfterSuiteFailure.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgParallelWithAnnotations.java
Copied:
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire376TestNgAfterSuiteFailureIT.java
(from r1210545,
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire376TestNgAfterSuiteFailure.java)
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire376TestNgAfterSuiteFailureIT.java?p2=maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire376TestNgAfterSuiteFailureIT.javap1=maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire376TestNgAfterSuiteFailure.javar1=1210545r2=1210559rev=1210559view=diff
==
---
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire376TestNgAfterSuiteFailure.java
(original)
+++
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire376TestNgAfterSuiteFailureIT.java
Mon Dec 5 18:27:32 2011
@@ -19,16 +19,18 @@ package org.apache.maven.surefire.its;
*/
+import org.apache.maven.it.VerificationException;
+
/**
* Test Surefire-376 (TestNG @AfterSuite failures are ignored)
*
* @author a href=mailto:dfabul...@apache.org;Dan Fabulich/a
*/
-public class Surefire376TestNgAfterSuiteFailure
+public class Surefire376TestNgAfterSuiteFailureIT
extends SurefireVerifierTestClass
{
-public Surefire376TestNgAfterSuiteFailure()
+public Surefire376TestNgAfterSuiteFailureIT()
{
super( /testng-afterSuiteFailure );
}
@@ -36,7 +38,14 @@ public class Surefire376TestNgAfterSuite
public void testAfterSuiteFailure()
throws Exception
{
-executeTest();
-assertTestSuiteResults( 2, 0, 1, 0 );
+try
+{
+executeTest();
+fail( Should fail );
+}
+catch ( VerificationException e )
+{
+assertTestSuiteResults( 2, 0, 1, 0 );
+}
}
}
Propchange:
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire376TestNgAfterSuiteFailureIT.java
--
svn:eol-style = native
Copied:
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgParallelWithAnnotationsIT.java
(from r1210545,
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgParallelWithAnnotations.java)
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgParallelWithAnnotationsIT.java?p2=maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgParallelWithAnnotationsIT.javap1=maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgParallelWithAnnotations.javar1=1210545r2=1210559rev=1210559view=diff
==
---
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgParallelWithAnnotations.java
(original)
+++
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgParallelWithAnnotationsIT.java
Mon Dec 5 18:27:32 2011
@@ -25,10 +25,10 @@ package org.apache.maven.surefire.its;
* @author a href=mailto:spam.hai...@gmail.com;Haikal Saadh/a
*
*/
-public class TestNgParallelWithAnnotations
+public class TestNgParallelWithAnnotationsIT
extends SurefireVerifierTestClass
{
-public TestNgParallelWithAnnotations()
+
svn commit: r1210583 - in /maven/surefire/trunk: maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/ surefire-api/src/main/java/org/apache/maven/surefire/booter/ surefire-providers/c
Author: krosenvold
Date: Mon Dec 5 19:15:17 2011
New Revision: 1210583
URL: http://svn.apache.org/viewvc?rev=1210583view=rev
Log:
o Extracted ProviderParameterNames to contain names of providers
Added:
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/booter/ProviderParameterNames.java
- copied, changed from r1210559,
maven/surefire/trunk/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/TestNG52Configurator.java
Modified:
maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/booter/BaseProviderFactory.java
maven/surefire/trunk/surefire-providers/common-junit48/src/main/java/org/apache/maven/surefire/common/junit48/FilterFactory.java
maven/surefire/trunk/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/JUnitCoreParameters.java
maven/surefire/trunk/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore/Surefire746Test.java
maven/surefire/trunk/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/AbstractDirectConfigurator.java
maven/surefire/trunk/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/TestNG4751Configurator.java
maven/surefire/trunk/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/TestNG52Configurator.java
maven/surefire/trunk/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/TestNGMapConfigurator.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=1210583r1=1210582r2=1210583view=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
Mon Dec 5 19:15:17 2011
@@ -54,6 +54,7 @@ import org.apache.maven.surefire.booter.
import org.apache.maven.surefire.booter.Classpath;
import org.apache.maven.surefire.booter.ClasspathConfiguration;
import org.apache.maven.surefire.booter.ProviderConfiguration;
+import org.apache.maven.surefire.booter.ProviderParameterNames;
import org.apache.maven.surefire.booter.StartupConfiguration;
import org.apache.maven.surefire.booter.StartupReportConfiguration;
import org.apache.maven.surefire.booter.SurefireBooterForkException;
@@ -253,13 +254,13 @@ public abstract class AbstractSurefireMo
if ( this.getParallel() != null )
{
-getProperties().setProperty( parallel, this.getParallel() );
+getProperties().setProperty( ProviderParameterNames.PARALLEL_PROP,
this.getParallel() );
}
convertGroupParameters();
if ( this.getThreadCount() 0 )
{
-getProperties().setProperty( threadcount, Integer.toString(
this.getThreadCount() ) );
+getProperties().setProperty(
ProviderParameterNames.THREADCOUNT_PROP, Integer.toString(
this.getThreadCount() ) );
}
if ( this.getObjectFactory() != null )
{
@@ -281,11 +282,11 @@ public abstract class AbstractSurefireMo
}
if ( this.getExcludedGroups() != null )
{
-getProperties().setProperty( excludedgroups,
this.getExcludedGroups() );
+getProperties().setProperty(
ProviderParameterNames.TESTNG_EXCLUDEDGROUPS_PROP, this.getExcludedGroups() );
}
if ( this.getGroups() != null )
{
-getProperties().setProperty( groups, this.getGroups() );
+getProperties().setProperty(
ProviderParameterNames.TESTNG_GROUPS_PROP, this.getGroups() );
}
}
@@ -312,11 +313,11 @@ public abstract class AbstractSurefireMo
if ( this.getParallel() != null )
{
-getProperties().setProperty( parallel, this.getParallel() );
+getProperties().setProperty( ProviderParameterNames.PARALLEL_PROP,
this.getParallel() );
}
if ( this.getThreadCount() 0 )
{
-getProperties().setProperty( threadCount, Integer.toString(
this.getThreadCount() ) );
+getProperties().setProperty(
ProviderParameterNames.THREADCOUNT_PROP, Integer.toString(
this.getThreadCount() ) );
}
getProperties().setProperty( perCoreThreadCount, Boolean.toString(
getPerCoreThreadCount() ) );
getProperties().setProperty( useUnlimitedThreads, Boolean.toString(
getUseUnlimitedThreads()
svn commit: r1210590 - in /maven/surefire/trunk/surefire-integration-tests/src/test: java/org/apache/maven/surefire/its/ resources/testng-groups/ resources/testng-groups/src/ resources/testng-groups/s
Author: krosenvold
Date: Mon Dec 5 19:34:37 2011
New Revision: 1210590
URL: http://svn.apache.org/viewvc?rev=1210590view=rev
Log:
[SUREFIRE-805] Regression: surefire 2.11 seems to break excludeGroups config
with TestNG
Fixed in r1210583, this commit adds integration test.
Added:
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgGroupsIT.java
(with props)
maven/surefire/trunk/surefire-integration-tests/src/test/resources/testng-groups/
maven/surefire/trunk/surefire-integration-tests/src/test/resources/testng-groups/pom.xml
(with props)
maven/surefire/trunk/surefire-integration-tests/src/test/resources/testng-groups/src/
maven/surefire/trunk/surefire-integration-tests/src/test/resources/testng-groups/src/test/
maven/surefire/trunk/surefire-integration-tests/src/test/resources/testng-groups/src/test/java/
maven/surefire/trunk/surefire-integration-tests/src/test/resources/testng-groups/src/test/java/testng/
maven/surefire/trunk/surefire-integration-tests/src/test/resources/testng-groups/src/test/java/testng/jdk14/
maven/surefire/trunk/surefire-integration-tests/src/test/resources/testng-groups/src/test/java/testng/jdk14/TestNGJavadocTest.java
(with props)
Modified:
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/SurefireVerifierTestClass.java
Modified:
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/SurefireVerifierTestClass.java
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/SurefireVerifierTestClass.java?rev=1210590r1=1210589r2=1210590view=diff
==
---
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/SurefireVerifierTestClass.java
(original)
+++
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/SurefireVerifierTestClass.java
Mon Dec 5 19:34:37 2011
@@ -424,5 +424,11 @@ public abstract class SurefireVerifierTe
addGoal( -D + variable + = + value);
}
+public void setGroups(String groups){
+addD( groups, groups );
+}
+public void setExcludedGroups(String excludedGroups){
+addD( excludedGroups, excludedGroups );
+}
}
Added:
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgGroupsIT.java
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgGroupsIT.java?rev=1210590view=auto
==
---
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgGroupsIT.java
(added)
+++
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgGroupsIT.java
Mon Dec 5 19:34:37 2011
@@ -0,0 +1,53 @@
+package org.apache.maven.surefire.its;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * License); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * AS IS BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
+/**
+ * Test that TestNG's @Test(threadPoolSize = n, invocationCount=n) causes
tests to be run in parallel.
+ *
+ * @author a href=mailto:spam.hai...@gmail.com;Haikal Saadh/a
+ *
+ */
+public class TestNgGroupsIT
+ extends SurefireVerifierTestClass
+{
+public TestNgGroupsIT()
+{
+super( /testng-groups );
+}
+
+public void testTestNgGroupThreadParallel ()
+throws Exception
+{
+setExcludedGroups( notincluded );
+executeTest();
+verifyErrorFreeLog();
+assertTestSuiteResults( 1, 0, 0, 0 );
+}
+public void testGroups()
+throws Exception
+{
+setGroups( functional );
+executeTest();
+verifyErrorFreeLog();
+assertTestSuiteResults( 2, 0, 0, 0 );
+}
+
+}
Propchange:
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgGroupsIT.java
--
svn:eol-style = native
Added:
svn commit: r1210609 - /maven/skins/trunk/maven-fluido-skin/src/main/resources/META-INF/maven/site.vm
Author: rfscholte Date: Mon Dec 5 20:24:47 2011 New Revision: 1210609 URL: http://svn.apache.org/viewvc?rev=1210609view=rev Log: MSKINS-16: width, height and border not picked up for banner Modified: maven/skins/trunk/maven-fluido-skin/src/main/resources/META-INF/maven/site.vm 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=1210609r1=1210608r2=1210609view=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 Mon Dec 5 20:24:47 2011 @@ -127,7 +127,22 @@ #else #set ( $alt = $banner.name ) #end -img src=$src alt=$alt/ +#if( $banner.border ) + #set ( $imgBorder = ' border=' + $border + '' ) +#else + #set ( $imgBorder = ) +#end +#if( $banner.width ) +#set ( $imgWidth = ' width=' + $banner.width + '' ) +#else +#set ( $imgWidth = ) +#end +#if( $banner.height ) + #set ( $imgHeight = ' height=' + $banner.height + '' ) +#else + #set ( $imgHeight = ) +#end +img src=$src alt=$alt$imgBorder$imgWidth$imgHeight/ #else h2$banner.name/h2 #end
svn commit: r1210641 - in /maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its: SurefireVerifierTestClass.java XmlReporterRunTimeIT.java
Author: krosenvold
Date: Mon Dec 5 21:18:35 2011
New Revision: 1210641
URL: http://svn.apache.org/viewvc?rev=1210641view=rev
Log:
[SUREFIRE-793] JUnit47 provider reports incorrect time in the XML report
Fixed with IT
Added:
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/XmlReporterRunTimeIT.java
(with props)
Modified:
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/SurefireVerifierTestClass.java
Modified:
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/SurefireVerifierTestClass.java
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/SurefireVerifierTestClass.java?rev=1210641r1=1210640r2=1210641view=diff
==
---
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/SurefireVerifierTestClass.java
(original)
+++
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/SurefireVerifierTestClass.java
Mon Dec 5 21:18:35 2011
@@ -419,6 +419,18 @@ public abstract class SurefireVerifierTe
addD( parallel, parallel );
}
+
+protected void parallelClasses()
+{
+parallel( classes );
+}
+
+protected void parallelMethods()
+{
+parallel( methods );
+}
+
+
protected void addD( String variable, String value )
{
addGoal( -D + variable + = + value);
Added:
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/XmlReporterRunTimeIT.java
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/XmlReporterRunTimeIT.java?rev=1210641view=auto
==
---
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/XmlReporterRunTimeIT.java
(added)
+++
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/XmlReporterRunTimeIT.java
Mon Dec 5 21:18:35 2011
@@ -0,0 +1,65 @@
+package org.apache.maven.surefire.its;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * License); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * AS IS BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import java.io.File;
+import java.util.List;
+import org.apache.maven.surefire.its.misc.HelperAssertions;
+import org.apache.maven.surefire.its.misc.ReportTestSuite;
+
+/**
+ * Test reported runtime
+ *
+ * @author Kristian Rosenvold
+ */
+public class XmlReporterRunTimeIT
+extends SurefireVerifierTestClass
+{
+
+public XmlReporterRunTimeIT()
+{
+super( /runorder-parallel );
+}
+
+public void testForkModeAlways()
+throws Exception
+{
+parallelMethods( );
+executeTest();
+
+ListReportTestSuite reports = HelperAssertions.extractReports( ( new
File[]{ getTestDir() } ) );
+for ( ReportTestSuite report : reports )
+{
+if ( runorder.parallel.Test1.equals( report.getFullClassName() )
)
+{
+assertTrue( report.getTimeElapsed() = 1.2f);
+}
+else if ( runorder.parallel.Test2.equals(
report.getFullClassName() ) )
+{
+assertTrue( report.getTimeElapsed() = 0.9f);
+}
+else
+{
+System.out.println( report = + report );
+}
+}
+
+}
+
+}
Propchange:
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/XmlReporterRunTimeIT.java
--
svn:eol-style = native
svn commit: r1210653 - in /maven/surefire/trunk: ./ maven-failsafe-plugin/ maven-surefire-common/ maven-surefire-plugin/ maven-surefire-report-plugin/ surefire-api/ surefire-integration-tests/ surefir
Author: krosenvold Date: Mon Dec 5 21:43:11 2011 New Revision: 1210653 URL: http://svn.apache.org/viewvc?rev=1210653view=rev Log: Revert o Upgraded to java 1.5, including parent 21 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-integration-tests/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/surefire-junit4/pom.xml maven/surefire/trunk/surefire-providers/surefire-junit47/pom.xml maven/surefire/trunk/surefire-setup-integration-tests/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=1210653r1=1210652r2=1210653view=diff == --- maven/surefire/trunk/maven-failsafe-plugin/pom.xml (original) +++ maven/surefire/trunk/maven-failsafe-plugin/pom.xml Mon Dec 5 21:43:11 2011 @@ -171,6 +171,13 @@ build plugins plugin +artifactIdmaven-compiler-plugin/artifactId +configuration + source1.4/source + target1.4/target +/configuration + /plugin + plugin groupIdorg.apache.maven.plugins/groupId artifactIdmaven-plugin-plugin/artifactId version2.8/version Modified: maven/surefire/trunk/maven-surefire-common/pom.xml URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-common/pom.xml?rev=1210653r1=1210652r2=1210653view=diff == --- maven/surefire/trunk/maven-surefire-common/pom.xml (original) +++ maven/surefire/trunk/maven-surefire-common/pom.xml Mon Dec 5 21:43:11 2011 @@ -86,6 +86,13 @@ build plugins plugin +artifactIdmaven-compiler-plugin/artifactId +configuration + source1.4/source + target1.4/target +/configuration + /plugin + plugin artifactIdmaven-surefire-plugin/artifactId dependencies dependency Modified: maven/surefire/trunk/maven-surefire-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-plugin/pom.xml?rev=1210653r1=1210652r2=1210653view=diff == --- maven/surefire/trunk/maven-surefire-plugin/pom.xml (original) +++ maven/surefire/trunk/maven-surefire-plugin/pom.xml Mon Dec 5 21:43:11 2011 @@ -169,6 +169,13 @@ build plugins plugin +artifactIdmaven-compiler-plugin/artifactId +configuration + source1.4/source + target1.4/target +/configuration + /plugin + plugin groupIdorg.apache.maven.plugins/groupId artifactIdmaven-plugin-plugin/artifactId version2.8/version @@ -250,6 +257,23 @@ /reporting profiles +!-- Force JDK 1.4 for this one, plugins can never be built on 1.3 -- +profile + idjdk1.3/id + build +pluginManagement + plugins +plugin + artifactIdmaven-compiler-plugin/artifactId + configuration +forkfalse/fork +compilerVersion1.4/compilerVersion + /configuration +/plugin + /plugins +/pluginManagement + /build +/profile profile idci/id activation 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=1210653r1=1210652r2=1210653view=diff == --- maven/surefire/trunk/maven-surefire-report-plugin/pom.xml (original) +++ maven/surefire/trunk/maven-surefire-report-plugin/pom.xml Mon Dec 5 21:43:11 2011 @@ -129,6 +129,13 @@ build plugins plugin +artifactIdmaven-compiler-plugin/artifactId +configuration + source1.4/source + target1.4/target +/configuration + /plugin + plugin groupIdorg.apache.maven.plugins/groupId artifactIdmaven-plugin-plugin/artifactId version2.8/version @@ -174,6 +181,13 @@ pluginManagement plugins plugin + artifactIdmaven-compiler-plugin/artifactId + configuration +forkfalse/fork +compilerVersion1.4/compilerVersion + /configuration +/plugin +plugin artifactIdmaven-surefire-plugin/artifactId
svn commit: r1210654 - in /maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/misc: HelperAssertions.java ReportTestCase.java ReportTestSuite.java SurefireRepo
Author: krosenvold
Date: Mon Dec 5 21:44:00 2011
New Revision: 1210654
URL: http://svn.apache.org/viewvc?rev=1210654view=rev
Log:
o Added some generics
Modified:
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/misc/HelperAssertions.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/misc/ReportTestCase.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/misc/ReportTestSuite.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/misc/SurefireReportParser.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/misc/TestSuiteXmlParser.java
Modified:
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/misc/HelperAssertions.java
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/misc/HelperAssertions.java?rev=1210654r1=1210653r2=1210654view=diff
==
---
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/misc/HelperAssertions.java
(original)
+++
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/misc/HelperAssertions.java
Mon Dec 5 21:44:00 2011
@@ -18,12 +18,10 @@ package org.apache.maven.surefire.its.mi
* under the License.
*/
-import org.apache.maven.surefire.its.IntegrationTestSuiteResults;
-
import java.io.File;
import java.util.ArrayList;
import java.util.List;
-import java.util.Locale;
+import org.apache.maven.surefire.its.IntegrationTestSuiteResults;
import junit.framework.Assert;
@@ -66,13 +64,12 @@ public class HelperAssertions
{
Assert.assertTrue( No reports!, reports.size() 0 );
int total = 0, errors = 0, failures = 0, skipped = 0;
-for ( int i = 0; i reports.size(); i++ )
+for ( ReportTestSuite report : reports )
{
-ReportTestSuite suite = (ReportTestSuite) reports.get( i );
-total += suite.getNumberOfTests();
-errors += suite.getNumberOfErrors();
-failures += suite.getNumberOfFailures();
-skipped += suite.getNumberOfSkipped();
+total += report.getNumberOfTests();
+errors += report.getNumberOfErrors();
+failures += report.getNumberOfFailures();
+skipped += report.getNumberOfSkipped();
}
return new IntegrationTestSuiteResults( total, errors, failures,
skipped );
}
@@ -80,14 +77,13 @@ public class HelperAssertions
public static ListReportTestSuite extractReports( File[] testDirs )
{
ListFile reportsDirs = new ArrayListFile();
-for ( int i = 0; i testDirs.length; i++ )
+for ( File testDir : testDirs )
{
-File testDir = testDirs[i];
File reportsDir = new File( testDir, target/surefire-reports );
Assert.assertTrue( Reports directory is missing: +
reportsDir.getAbsolutePath(), reportsDir.exists() );
reportsDirs.add( reportsDir );
}
-SurefireReportParser parser = new SurefireReportParser( reportsDirs,
Locale.getDefault() );
+SurefireReportParser parser = new SurefireReportParser( reportsDirs );
ListReportTestSuite reports;
try
{
Modified:
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/misc/ReportTestCase.java
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/misc/ReportTestCase.java?rev=1210654r1=1210653r2=1210654view=diff
==
---
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/misc/ReportTestCase.java
(original)
+++
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/misc/ReportTestCase.java
Mon Dec 5 21:44:00 2011
@@ -37,7 +37,7 @@ public class ReportTestCase
private float time;
-private Map failure;
+private MapString, Object failure;
public String getName()
{
@@ -79,7 +79,7 @@ public class ReportTestCase
this.time = time;
}
-public Map getFailure()
+public MapString, Object getFailure()
{
return failure;
}
@@ -96,7 +96,7 @@ public class ReportTestCase
public void addFailure( String message, String type )
{
-failure = new HashMap();
+failure = new HashMapString, Object();
failure.put( message, message );
failure.put( type, type );
}
Modified:
svn commit: r1210655 - in /maven/surefire/trunk: maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/ maven-surefire-common/src/main/java/org/apache/maven/surefire/report/ maven-suref
Author: krosenvold
Date: Mon Dec 5 21:44:56 2011
New Revision: 1210655
URL: http://svn.apache.org/viewvc?rev=1210655view=rev
Log:
o Removed unused code
Removed:
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/TestConsoleOutputRunListener.java
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/ThreadLocalRunListener.java
maven/surefire/trunk/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/SynchronizedReporterManager.java
Modified:
maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java
maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/surefire/report/BriefFileReporter.java
maven/surefire/trunk/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/booterclient/TestSetMockReporterFactory.java
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/booter/SurefireReflector.java
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/CategorizedReportEntry.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/SurefireVerifierTestClass.java
maven/surefire/trunk/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore/ConcurrentReporterManagerTest.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=1210655r1=1210654r2=1210655view=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
Mon Dec 5 21:44:56 2011
@@ -414,11 +414,6 @@ public abstract class AbstractSurefireMo
null );
}
-public File getStatisticsFile( String configurationHash )
-{
-return new File( getStatisticsFileName( configurationHash ) );
-}
-
public String getStatisticsFileName( String configurationHash )
{
return getReportsDirectory().getParentFile().getParentFile() +
File.separator + .surefire-
Modified:
maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/surefire/report/BriefFileReporter.java
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/surefire/report/BriefFileReporter.java?rev=1210655r1=1210654r2=1210655view=diff
==
---
maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/surefire/report/BriefFileReporter.java
(original)
+++
maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/surefire/report/BriefFileReporter.java
Mon Dec 5 21:44:56 2011
@@ -31,11 +31,6 @@ public class BriefFileReporter
extends AbstractFileReporter
{
-public BriefFileReporter( boolean trimStackTrace, File reportsDirectory )
-{
-super( trimStackTrace, BRIEF, reportsDirectory );
-}
-
public BriefFileReporter( boolean trimStackTrace, File reportsDirectory,
String reportNameSuffix )
{
super( trimStackTrace, BRIEF, reportsDirectory, reportNameSuffix );
Modified:
maven/surefire/trunk/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/booterclient/TestSetMockReporterFactory.java
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/booterclient/TestSetMockReporterFactory.java?rev=1210655r1=1210654r2=1210655view=diff
==
---
maven/surefire/trunk/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/booterclient/TestSetMockReporterFactory.java
(original)
+++
maven/surefire/trunk/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/booterclient/TestSetMockReporterFactory.java
Mon Dec 5 21:44:56 2011
@@ -21,8 +21,6 @@ package org.apache.maven.plugin.surefire
import org.apache.maven.plugin.surefire.report.FileReporterFactory;
import org.apache.maven.surefire.booter.StartupReportConfiguration;
-import org.apache.maven.surefire.report.ConsoleLogger;
-import org.apache.maven.surefire.report.DefaultConsoleReporter;
import org.apache.maven.surefire.report.RunListener;
/**
@@ -36,11 +34,6 @@ public class TestSetMockReporterFactory
super( StartupReportConfiguration.defaultValue() );
}
-public ConsoleLogger createConsoleLogger()
-{
-return new
