Nabble - Maven - Commits

svn commit: r835644 - in /maven/maven-3/trunk/apache-maven: pom.xml src/main/assembly/bin.xml

2009-11-12T15:42:20Z

Author: brett
Date: Thu Nov 12 23:42:20 2009
New Revision: 835644

URL: http://svn.apache.org/viewvc?rev=835644&view=rev
Log:
[MNG-4439] apache-maven project should not deploy a source JAR or JAR, as it is only a distribution module

Modified:
maven/maven-3/trunk/apache-maven/pom.xml
maven/maven-3/trunk/apache-maven/src/main/assembly/bin.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=835644&r1=835643&r2=835644&view=diff
==============================================================================
--- maven/maven-3/trunk/apache-maven/pom.xml (original)
+++ maven/maven-3/trunk/apache-maven/pom.xml Thu Nov 12 23:42:20 2009
@@ -24,6 +24,7 @@
<version>3.0-SNAPSHOT</version>
</parent>
<artifactId>apache-maven</artifactId>
+ <packaging>pom</packaging>
<name>Maven Distribution</name>
<dependencies>
<dependency>
@@ -60,6 +61,19 @@
<build>
<plugins>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>test-compile</id>
+ <goals>
+ <goal>testCompile</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<systemProperties>
@@ -69,6 +83,14 @@
</property>
</systemProperties>
</configuration>
+ <executions>
+ <execution>
+ <id>test</id>
+ <goals>
+ <goal>test</goal>
+ </goals>
+ </execution>
+ </executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>

Modified: maven/maven-3/trunk/apache-maven/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/apache-maven/src/main/assembly/bin.xml?rev=835644&r1=835643&r2=835644&view=diff
==============================================================================
--- maven/maven-3/trunk/apache-maven/src/main/assembly/bin.xml (original)
+++ maven/maven-3/trunk/apache-maven/src/main/assembly/bin.xml Thu Nov 12 23:42:20 2009
@@ -33,9 +33,8 @@
<dependencySet>
<outputDirectory>lib</outputDirectory>
<excludes>
- <exclude>org.codehaus.plexus:plexus-classworlds</exclude>
+ <exclude>org.codehaus.plexus:plexus-classworlds</exclude>
<exclude>junit:junit</exclude>
- <exclude>org.apache.maven:apache-maven</exclude>
<exclude>log4j:log4j</exclude>
<exclude>commons-logging:commons-logging-api</exclude>

@@ -45,6 +44,7 @@
<exclude>junit:junit</exclude>
<exclude>jmock:jmock</exclude>
<exclude>xml-apis:xml-apis</exclude>
+ <exclude>org.apache.maven:apache-maven</exclude>
<exclude>org.apache.maven:maven-artifact</exclude>
<exclude>org.apache.maven:maven-monitor</exclude>
<exclude>org.apache.maven:maven-plugin-descriptor</exclude>

svn commit: r835611 - /maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4361ForceDependencySnapshotUpdateTest.java

2009-11-12T14:34:19Z

Author: bentmann
Date: Thu Nov 12 22:34:19 2009
New Revision: 835611

URL: http://svn.apache.org/viewvc?rev=835611&view=rev
Log:
o Made test fail properly

Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4361ForceDependencySnapshotUpdateTest.java

Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4361ForceDependencySnapshotUpdateTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4361ForceDependencySnapshotUpdateTest.java?rev=835611&r1=835610&r2=835611&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4361ForceDependencySnapshotUpdateTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4361ForceDependencySnapshotUpdateTest.java Thu Nov 12 22:34:19 2009
@@ -82,7 +82,7 @@

private void assertChecksum( String checksum, String jar, Properties checksums )
{
- assertEquals( checksum, checksums.getProperty( jar ).toLowerCase( java.util.Locale.ENGLISH ) );
+ assertEquals( checksum, checksums.getProperty( jar, "" ).toLowerCase( java.util.Locale.ENGLISH ) );
}

}

svn commit: r835475 - /maven/plugins/trunk/maven-checkstyle-plugin/pom.xml

2009-11-12T09:53:22Z

Author: markh
Date: Thu Nov 12 17:53:22 2009
New Revision: 835475

URL: http://svn.apache.org/viewvc?rev=835475&view=rev
Log:
[maven-release-plugin] prepare for next development iteration

Modified:
maven/plugins/trunk/maven-checkstyle-plugin/pom.xml

Modified: maven/plugins/trunk/maven-checkstyle-plugin/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-checkstyle-plugin/pom.xml?rev=835475&r1=835474&r2=835475&view=diff
==============================================================================
--- maven/plugins/trunk/maven-checkstyle-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-checkstyle-plugin/pom.xml Thu Nov 12 17:53:22 2009
@@ -29,7 +29,7 @@
</parent>

<artifactId>maven-checkstyle-plugin</artifactId>
- <version>2.4</version>
+ <version>2.5-SNAPSHOT</version>
<packaging>maven-plugin</packaging>

<name>Maven Checkstyle Plugin</name>
@@ -48,9 +48,9 @@
</prerequisites>

<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/maven/plugins/tags/maven-checkstyle-plugin-2.4</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/plugins/tags/maven-checkstyle-plugin-2.4</developerConnection>
- <url>http://svn.apache.org/viewvc/maven/plugins/tags/maven-checkstyle-plugin-2.4</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-checkstyle-plugin/</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-checkstyle-plugin/</developerConnection>
+ <url>http://svn.apache.org/viewvc/maven/plugins/trunk/maven-checkstyle-plugin/</url>
</scm>
<issueManagement>
<system>JIRA</system>

svn commit: r835474 - /maven/plugins/tags/maven-checkstyle-plugin-2.4/

2009-11-12T09:53:09Z

Author: markh
Date: Thu Nov 12 17:53:08 2009
New Revision: 835474

URL: http://svn.apache.org/viewvc?rev=835474&view=rev
Log:
[maven-scm] copy for tag maven-checkstyle-plugin-2.4

Added:
maven/plugins/tags/maven-checkstyle-plugin-2.4/
- copied from r835473, maven/plugins/trunk/maven-checkstyle-plugin/

svn commit: r835473 - /maven/plugins/trunk/maven-checkstyle-plugin/pom.xml

2009-11-12T09:52:29Z

Author: markh
Date: Thu Nov 12 17:52:29 2009
New Revision: 835473

URL: http://svn.apache.org/viewvc?rev=835473&view=rev
Log:
[maven-release-plugin] prepare release maven-checkstyle-plugin-2.4

Modified:
maven/plugins/trunk/maven-checkstyle-plugin/pom.xml

Modified: maven/plugins/trunk/maven-checkstyle-plugin/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-checkstyle-plugin/pom.xml?rev=835473&r1=835472&r2=835473&view=diff
==============================================================================
--- maven/plugins/trunk/maven-checkstyle-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-checkstyle-plugin/pom.xml Thu Nov 12 17:52:29 2009
@@ -19,7 +19,7 @@
under the License.
-->

-<project 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' xmlns='http://maven.apache.org/POM/4.0.0'>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<parent>
@@ -29,7 +29,7 @@
</parent>

<artifactId>maven-checkstyle-plugin</artifactId>
- <version>2.4-SNAPSHOT</version>
+ <version>2.4</version>
<packaging>maven-plugin</packaging>

<name>Maven Checkstyle Plugin</name>
@@ -48,9 +48,9 @@
</prerequisites>

<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-checkstyle-plugin/</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-checkstyle-plugin/</developerConnection>
- <url>http://svn.apache.org/viewvc/maven/plugins/trunk/maven-checkstyle-plugin/</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/maven/plugins/tags/maven-checkstyle-plugin-2.4</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/plugins/tags/maven-checkstyle-plugin-2.4</developerConnection>
+ <url>http://svn.apache.org/viewvc/maven/plugins/tags/maven-checkstyle-plugin-2.4</url>
</scm>
<issueManagement>
<system>JIRA</system>

svn commit: r835472 - /maven/plugins/tags/maven-checkstyle-plugin-2.4/

2009-11-12T09:51:17Z

Author: markh
Date: Thu Nov 12 17:51:17 2009
New Revision: 835472

URL: http://svn.apache.org/viewvc?rev=835472&view=rev
Log:
Rolling back failed checkstyle 2.4 release

Removed:
maven/plugins/tags/maven-checkstyle-plugin-2.4/

svn commit: r835471 - /maven/plugins/trunk/maven-checkstyle-plugin/pom.xml

2009-11-12T09:50:26Z

Author: markh
Date: Thu Nov 12 17:50:26 2009
New Revision: 835471

URL: http://svn.apache.org/viewvc?rev=835471&view=rev
Log:
[maven-release-plugin] rollback the release of maven-checkstyle-plugin-2.4

Modified:
maven/plugins/trunk/maven-checkstyle-plugin/pom.xml

Modified: maven/plugins/trunk/maven-checkstyle-plugin/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-checkstyle-plugin/pom.xml?rev=835471&r1=835470&r2=835471&view=diff
==============================================================================
--- maven/plugins/trunk/maven-checkstyle-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-checkstyle-plugin/pom.xml Thu Nov 12 17:50:26 2009
@@ -19,7 +19,7 @@
under the License.
-->

-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project 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' xmlns='http://maven.apache.org/POM/4.0.0'>
<modelVersion>4.0.0</modelVersion>

<parent>
@@ -29,7 +29,7 @@
</parent>

<artifactId>maven-checkstyle-plugin</artifactId>
- <version>2.4</version>
+ <version>2.4-SNAPSHOT</version>
<packaging>maven-plugin</packaging>

<name>Maven Checkstyle Plugin</name>
@@ -48,9 +48,9 @@
</prerequisites>

<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/maven/plugins/tags/maven-checkstyle-plugin-2.4</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/plugins/tags/maven-checkstyle-plugin-2.4</developerConnection>
- <url>http://svn.apache.org/viewvc/maven/plugins/tags/maven-checkstyle-plugin-2.4</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-checkstyle-plugin/</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-checkstyle-plugin/</developerConnection>
+ <url>http://svn.apache.org/viewvc/maven/plugins/trunk/maven-checkstyle-plugin/</url>
</scm>
<issueManagement>
<system>JIRA</system>

svn commit: r835468 - /maven/plugins/tags/maven-checkstyle-plugin-2.4/

2009-11-12T09:47:39Z

Author: markh
Date: Thu Nov 12 17:47:39 2009
New Revision: 835468

URL: http://svn.apache.org/viewvc?rev=835468&view=rev
Log:
[maven-scm] copy for tag maven-checkstyle-plugin-2.4

Added:
maven/plugins/tags/maven-checkstyle-plugin-2.4/
- copied from r835466, maven/plugins/trunk/maven-checkstyle-plugin/

svn commit: r835465 - /maven/plugins/trunk/maven-checkstyle-plugin/pom.xml

2009-11-12T09:43:47Z

Author: markh
Date: Thu Nov 12 17:43:47 2009
New Revision: 835465

URL: http://svn.apache.org/viewvc?rev=835465&view=rev
Log:
[maven-release-plugin] prepare release maven-checkstyle-plugin-2.4

Modified:
maven/plugins/trunk/maven-checkstyle-plugin/pom.xml

Modified: maven/plugins/trunk/maven-checkstyle-plugin/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-checkstyle-plugin/pom.xml?rev=835465&r1=835464&r2=835465&view=diff
==============================================================================
--- maven/plugins/trunk/maven-checkstyle-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-checkstyle-plugin/pom.xml Thu Nov 12 17:43:47 2009
@@ -19,7 +19,7 @@
under the License.
-->

-<project 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' xmlns='http://maven.apache.org/POM/4.0.0'>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<parent>
@@ -29,7 +29,7 @@
</parent>

<artifactId>maven-checkstyle-plugin</artifactId>
- <version>2.4-SNAPSHOT</version>
+ <version>2.4</version>
<packaging>maven-plugin</packaging>

<name>Maven Checkstyle Plugin</name>
@@ -48,9 +48,9 @@
</prerequisites>

<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-checkstyle-plugin/</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-checkstyle-plugin/</developerConnection>
- <url>http://svn.apache.org/viewvc/maven/plugins/trunk/maven-checkstyle-plugin/</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/maven/plugins/tags/maven-checkstyle-plugin-2.4</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/plugins/tags/maven-checkstyle-plugin-2.4</developerConnection>
+ <url>http://svn.apache.org/viewvc/maven/plugins/tags/maven-checkstyle-plugin-2.4</url>
</scm>
<issueManagement>
<system>JIRA</system>

svn commit: r835464 - /maven/plugins/trunk/maven-checkstyle-plugin/pom.xml

2009-11-12T09:41:48Z

Author: markh
Date: Thu Nov 12 17:41:47 2009
New Revision: 835464

URL: http://svn.apache.org/viewvc?rev=835464&view=rev
Log:
Upgraded parent to maven-plugins:16

Modified:
maven/plugins/trunk/maven-checkstyle-plugin/pom.xml

Modified: maven/plugins/trunk/maven-checkstyle-plugin/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-checkstyle-plugin/pom.xml?rev=835464&r1=835463&r2=835464&view=diff
==============================================================================
--- maven/plugins/trunk/maven-checkstyle-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-checkstyle-plugin/pom.xml Thu Nov 12 17:41:47 2009
@@ -25,7 +25,7 @@
<parent>
<artifactId>maven-plugins</artifactId>
<groupId>org.apache.maven.plugins</groupId>
- <version>14</version>
+ <version>16</version>
</parent>

<artifactId>maven-checkstyle-plugin</artifactId>

svn propchange: r835415 - svn:log

2009-11-12T07:43:00Z

Author: markh
Revision: 835415
Modified property: svn:log

Modified: svn:log at Thu Nov 12 15:43:00 2009
------------------------------------------------------------------------------
--- svn:log (original)
+++ svn:log Thu Nov 12 15:43:00 2009
@@ -1 +1,3 @@
+[MCHECKSTYLE-125] Update to maven-reporting-impl-2.0.4.3
+
Upgraded maven-reporting-impl to 2.0.4.3 for MSHARED-120 fix

svn commit: r835415 - /maven/plugins/trunk/maven-checkstyle-plugin/pom.xml

2009-11-12T07:30:43Z

Author: markh
Date: Thu Nov 12 15:30:42 2009
New Revision: 835415

URL: http://svn.apache.org/viewvc?rev=835415&view=rev
Log:
Upgraded maven-reporting-impl to 2.0.4.3 for MSHARED-120 fix

Modified:
maven/plugins/trunk/maven-checkstyle-plugin/pom.xml

Modified: maven/plugins/trunk/maven-checkstyle-plugin/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-checkstyle-plugin/pom.xml?rev=835415&r1=835414&r2=835415&view=diff
==============================================================================
--- maven/plugins/trunk/maven-checkstyle-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-checkstyle-plugin/pom.xml Thu Nov 12 15:30:42 2009
@@ -93,7 +93,7 @@
<dependency>
<groupId>org.apache.maven.reporting</groupId>
<artifactId>maven-reporting-impl</artifactId>
- <version>2.0.4.2</version>
+ <version>2.0.4.3</version>
</dependency>

svn commit: r835389 - /maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/

2009-11-12T06:24:01Z

Author: brett
Date: Thu Nov 12 14:24:00 2009
New Revision: 835389

URL: http://svn.apache.org/viewvc?rev=835389&view=rev
Log:
correct version ranges for versions the regressions were fixed in

Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4361ForceDependencySnapshotUpdateTest.java
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4412OfflineModeInPluginTest.java
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4433ForceParentSnapshotUpdateTest.java

Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4361ForceDependencySnapshotUpdateTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4361ForceDependencySnapshotUpdateTest.java?rev=835389&r1=835388&r2=835389&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4361ForceDependencySnapshotUpdateTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4361ForceDependencySnapshotUpdateTest.java Thu Nov 12 14:24:00 2009
@@ -36,7 +36,7 @@

public MavenITmng4361ForceDependencySnapshotUpdateTest()
{
- super( ALL_MAVEN_VERSIONS );
+ super( "[2.0,3.0-alpha-1),[3.0-alpha-4,)" );
}

/**

Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4412OfflineModeInPluginTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4412OfflineModeInPluginTest.java?rev=835389&r1=835388&r2=835389&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4412OfflineModeInPluginTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4412OfflineModeInPluginTest.java Thu Nov 12 14:24:00 2009
@@ -35,7 +35,7 @@

public MavenITmng4412OfflineModeInPluginTest()
{
- super( ALL_MAVEN_VERSIONS );
+ super( "[2.0,3.0-alpha-1),[3.0-alpha-4,)" );
}

/**

Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4433ForceParentSnapshotUpdateTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4433ForceParentSnapshotUpdateTest.java?rev=835389&r1=835388&r2=835389&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4433ForceParentSnapshotUpdateTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4433ForceParentSnapshotUpdateTest.java Thu Nov 12 14:24:00 2009
@@ -36,7 +36,7 @@

public MavenITmng4433ForceParentSnapshotUpdateTest()
{
- super( ALL_MAVEN_VERSIONS );
+ super( "[2.0,3.0-alpha-1),[3.0-alpha-4,)" );
}

/**

svn commit: r835378 - /maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/

2009-11-12T05:27:54Z

Author: brett
Date: Thu Nov 12 13:27:54 2009
New Revision: 835378

URL: http://svn.apache.org/viewvc?rev=835378&view=rev
Log:
clean up some version specs

Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1073AggregatorForksReactorTest.java
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3924XmlMarkupInterpolationTest.java
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4275RelocationWarningTest.java
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4279WagonProviderFailoverTest.java
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4319PluginExecutionGoalInterpolationTest.java
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4422PluginExecutionPhaseInterpolationTest.java

Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1073AggregatorForksReactorTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1073AggregatorForksReactorTest.java?rev=835378&r1=835377&r2=835378&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1073AggregatorForksReactorTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1073AggregatorForksReactorTest.java Thu Nov 12 13:27:54 2009
@@ -45,7 +45,7 @@
throws Exception
{
// excluded 2.1.x and 2.2.x due to MNG-4325
- requiresMavenVersion( "[2.0,2.0.99),[3.0-alpha-3,)" );
+ requiresMavenVersion( "[2.0,2.1.0),[3.0-alpha-3,)" );

File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-1073" );

Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3924XmlMarkupInterpolationTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3924XmlMarkupInterpolationTest.java?rev=835378&r1=835377&r2=835378&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3924XmlMarkupInterpolationTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3924XmlMarkupInterpolationTest.java Thu Nov 12 13:27:54 2009
@@ -38,7 +38,7 @@

public MavenITmng3924XmlMarkupInterpolationTest()
{
- super( "(2.0.99,)" );
+ super( "[2.1.0-M1,)" );
}

/**

Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4275RelocationWarningTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4275RelocationWarningTest.java?rev=835378&r1=835377&r2=835378&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4275RelocationWarningTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4275RelocationWarningTest.java Thu Nov 12 13:27:54 2009
@@ -36,7 +36,7 @@

public MavenITmng4275RelocationWarningTest()
{
- super( "[2.0,2.0.9)(2.2.0,)" );
+ super( "[2.0,2.0.9),[2.2.1,)" );
}

public void testit()

Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4279WagonProviderFailoverTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4279WagonProviderFailoverTest.java?rev=835378&r1=835377&r2=835378&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4279WagonProviderFailoverTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4279WagonProviderFailoverTest.java Thu Nov 12 13:27:54 2009
@@ -34,7 +34,7 @@

public MavenITmng4279WagonProviderFailoverTest()
{
- super( "(2.2.0,2.99.99]" );
+ super( "[2.2.1,3.0-alpha-1)" );
}

public void testit()

Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4319PluginExecutionGoalInterpolationTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4319PluginExecutionGoalInterpolationTest.java?rev=835378&r1=835377&r2=835378&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4319PluginExecutionGoalInterpolationTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4319PluginExecutionGoalInterpolationTest.java Thu Nov 12 13:27:54 2009
@@ -35,7 +35,7 @@

public MavenITmng4319PluginExecutionGoalInterpolationTest()
{
- super( "[2.0,2.0.99),[2.2.2,)" );
+ super( "[2.0,2.1.0),[2.2.2,)" );
}

/**

Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4422PluginExecutionPhaseInterpolationTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4422PluginExecutionPhaseInterpolationTest.java?rev=835378&r1=835377&r2=835378&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4422PluginExecutionPhaseInterpolationTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4422PluginExecutionPhaseInterpolationTest.java Thu Nov 12 13:27:54 2009
@@ -35,7 +35,7 @@

public MavenITmng4422PluginExecutionPhaseInterpolationTest()
{
- super( "[2.0,2.0.99),[2.2.2,)" );
+ super( "[2.0,2.1.0),[2.2.2,)" );
}

/**

svn commit: r835376 - /maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4293RequiresCompilePlusRuntimeScopeTest.java

2009-11-12T05:21:19Z

Author: brett
Date: Thu Nov 12 13:21:18 2009
New Revision: 835376

URL: http://svn.apache.org/viewvc?rev=835376&view=rev
Log:
fix spec

Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4293RequiresCompilePlusRuntimeScopeTest.java

Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4293RequiresCompilePlusRuntimeScopeTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4293RequiresCompilePlusRuntimeScopeTest.java?rev=835376&r1=835375&r2=835376&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4293RequiresCompilePlusRuntimeScopeTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4293RequiresCompilePlusRuntimeScopeTest.java Thu Nov 12 13:21:18 2009
@@ -41,7 +41,7 @@

public MavenITmng4293RequiresCompilePlusRuntimeScopeTest()
{
- super( "[3.0-alpha3,)" );
+ super( "[3.0-alpha-3,)" );
}

/**

svn commit: r835338 - /maven/archetype/tags/maven-archetype-2.0-alpha-5/

2009-11-12T03:26:39Z

Author: brett
Date: Thu Nov 12 11:26:39 2009
New Revision: 835338

URL: http://svn.apache.org/viewvc?rev=835338&view=rev
Log:
remove older tag, staged release was dropped

Removed:
maven/archetype/tags/maven-archetype-2.0-alpha-5/

svn commit: r835234 - /maven/repository-tools/trunk/src/bin/crontab.txt

2009-11-11T20:42:20Z

Author: brett
Date: Thu Nov 12 04:42:19 2009
New Revision: 835234

URL: http://svn.apache.org/viewvc?rev=835234&view=rev
Log:
update to reflect current crontab - not sure when or why this was disabled

Modified:
maven/repository-tools/trunk/src/bin/crontab.txt

Modified: maven/repository-tools/trunk/src/bin/crontab.txt
URL: http://svn.apache.org/viewvc/maven/repository-tools/trunk/src/bin/crontab.txt?rev=835234&r1=835233&r2=835234&view=diff
==============================================================================
--- maven/repository-tools/trunk/src/bin/crontab.txt (original)
+++ maven/repository-tools/trunk/src/bin/crontab.txt Thu Nov 12 04:42:19 2009
@@ -13,7 +13,7 @@
# sync central to repo.exist.com mirror
#0 23 * * * cd $HOME/bin; ./synchronize-central-to-exist.sh $HOME/bin/synchronize.properties
# sync central to ibiblio
-5 1 * * * cd $HOME/bin; ./synchronize-central-to-ibiblio.sh $HOME/bin/synchronize.properties
+#5 1 * * * cd $HOME/bin; ./synchronize-central-to-ibiblio.sh $HOME/bin/synchronize.properties
# run reports
34 2 * * * cd $HOME/reports; ./run.sh
#run on sat morning after all the syncs

svn commit: r835233 - /maven/repository-tools/trunk/src/bin/crontab.txt

2009-11-11T20:39:06Z

Author: brett
Date: Thu Nov 12 04:39:06 2009
New Revision: 835233

URL: http://svn.apache.org/viewvc?rev=835233&view=rev
Log:
temporarily disable push as we move servers

Modified:
maven/repository-tools/trunk/src/bin/crontab.txt

Modified: maven/repository-tools/trunk/src/bin/crontab.txt
URL: http://svn.apache.org/viewvc/maven/repository-tools/trunk/src/bin/crontab.txt?rev=835233&r1=835232&r2=835233&view=diff
==============================================================================
--- maven/repository-tools/trunk/src/bin/crontab.txt (original)
+++ maven/repository-tools/trunk/src/bin/crontab.txt Thu Nov 12 04:39:06 2009
@@ -11,7 +11,7 @@
# sync central to cica.es mirror
30 21 * * * cd $HOME/bin; ./synchronize-central-to-cica.sh $HOME/bin/synchronize.properties
# sync central to repo.exist.com mirror
-0 23 * * * cd $HOME/bin; ./synchronize-central-to-exist.sh $HOME/bin/synchronize.properties
+#0 23 * * * cd $HOME/bin; ./synchronize-central-to-exist.sh $HOME/bin/synchronize.properties
# sync central to ibiblio
5 1 * * * cd $HOME/bin; ./synchronize-central-to-ibiblio.sh $HOME/bin/synchronize.properties
# run reports

svn commit: r835201 - /maven/pom/trunk/maven/pom.xml

2009-11-11T18:36:41Z

Author: brianf
Date: Thu Nov 12 02:36:37 2009
New Revision: 835201

URL: http://svn.apache.org/viewvc?rev=835201&view=rev
Log: (empty)

Modified:
maven/pom/trunk/maven/pom.xml

Modified: maven/pom/trunk/maven/pom.xml
URL: http://svn.apache.org/viewvc/maven/pom/trunk/maven/pom.xml?rev=835201&r1=835200&r2=835201&view=diff
==============================================================================
--- maven/pom/trunk/maven/pom.xml (original)
+++ maven/pom/trunk/maven/pom.xml Thu Nov 12 02:36:37 2009
@@ -140,16 +140,6 @@
<timezone>+1</timezone>
</developer>
<developer>
- <id>fgiust</id>
- <name>Fabrizio Giustina</name>
- <email>fgiust@...</email>
- <organization>openmind</organization>
- <roles>
- <role>PMC Member</role>
- </roles>
- <timezone>+1</timezone>
- </developer>
- <developer>
<id>hboutemy</id>
<name>HervÃ© Boutemy</name>
<email>hboutemy@...</email>
@@ -179,33 +169,6 @@
<timezone>-6</timezone>
</developer>
<developer>
- <id>joakime</id>
- <name>Joakim Erdfelt</name>
- <email>joakime@...</email>
- <organization>ASF</organization>
- <roles>
- <role>PMC Member</role>
- </roles>
- <timezone>-5</timezone>
- </developer>
- <developer>
- <id>jstrachan</id>
- <name>James Strachan</name>
- <roles>
- <role>PMC Member</role>
- </roles>
- </developer>
- <developer>
- <id>jtolentino</id>
- <name>Ernesto Tolentino Jr.</name>
- <email>jtolentino@...</email>
- <organization>ASF</organization>
- <roles>
- <role>PMC Member</role>
- </roles>
- <timezone>+8</timezone>
- </developer>
- <developer>
<id>jvanzyl</id>
<name>Jason van Zyl</name>
<email>jason@...</email>
@@ -377,6 +340,16 @@
</roles>
<timezone>-8</timezone>
</developer>
+ <developer>
+ <id>fgiust</id>
+ <name>Fabrizio Giustina</name>
+ <email>fgiust@...</email>
+ <organization>openmind</organization>
+ <roles>
+ <role>Committer</role>
+ </roles>
+ <timezone>+1</timezone>
+ </developer>
<developer>
<id>felipeal</id>
<name>Felipe Leme</name>
@@ -493,6 +466,33 @@
</roles>
<timezone>0</timezone>
</developer>
+ <developer>
+ <id>joakime</id>
+ <name>Joakim Erdfelt</name>
+ <email>joakime@...</email>
+ <organization>ASF</organization>
+ <roles>
+ <role>Emeritus</role>
+ </roles>
+ <timezone>-5</timezone>
+ </developer>
+ <developer>
+ <id>jstrachan</id>
+ <name>James Strachan</name>
+ <roles>
+ <role>Emeritus</role>
+ </roles>
+ </developer>
+ <developer>
+ <id>jtolentino</id>
+ <name>Ernesto Tolentino Jr.</name>
+ <email>jtolentino@...</email>
+ <organization>ASF</organization>
+ <roles>
+ <role>Emeritus</role>
+ </roles>
+ <timezone>+8</timezone>
+ </developer>
<developer>
<id>mperham</id>
<name>Mike Perham</name>

svn commit: r835199 - /maven/site/trunk/pom.xml

2009-11-11T18:34:34Z

Author: brianf
Date: Thu Nov 12 02:34:33 2009
New Revision: 835199

URL: http://svn.apache.org/viewvc?rev=835199&view=rev
Log:
use the latest pom

Modified:
maven/site/trunk/pom.xml

Modified: maven/site/trunk/pom.xml
URL: http://svn.apache.org/viewvc/maven/site/trunk/pom.xml?rev=835199&r1=835198&r2=835199&view=diff
==============================================================================
--- maven/site/trunk/pom.xml (original)
+++ maven/site/trunk/pom.xml Thu Nov 12 02:34:33 2009
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven-parent</artifactId>
- <version>12</version>
+ <version>16-SNAPSHOT</version>
<relativePath>../pom/maven/pom.xml</relativePath>
</parent>

svn commit: r835097 - in /maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle: CheckstyleReport.java CheckstyleReportGenerator.java

2009-11-11T14:15:58Z

Author: olamy
Date: Wed Nov 11 22:15:55 2009
New Revision: 835097

URL: http://svn.apache.org/viewvc?rev=835097&view=rev
Log:
remove unused imports.

Modified:
maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleReport.java
maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleReportGenerator.java

Modified: maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleReport.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleReport.java?rev=835097&r1=835096&r2=835097&view=diff
==============================================================================
--- maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleReport.java (original)
+++ maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleReport.java Wed Nov 11 22:15:55 2009
@@ -19,44 +19,6 @@
* under the License.
*/

-import com.puppycrawl.tools.checkstyle.Checker;
-import com.puppycrawl.tools.checkstyle.ConfigurationLoader;
-import com.puppycrawl.tools.checkstyle.DefaultConfiguration;
-import com.puppycrawl.tools.checkstyle.DefaultLogger;
-import com.puppycrawl.tools.checkstyle.PackageNamesLoader;
-import com.puppycrawl.tools.checkstyle.PropertiesExpander;
-import com.puppycrawl.tools.checkstyle.XMLLogger;
-import com.puppycrawl.tools.checkstyle.api.AuditListener;
-import com.puppycrawl.tools.checkstyle.api.CheckstyleException;
-import com.puppycrawl.tools.checkstyle.api.Configuration;
-import com.puppycrawl.tools.checkstyle.api.FilterSet;
-import com.puppycrawl.tools.checkstyle.api.SeverityLevel;
-import com.puppycrawl.tools.checkstyle.filters.SuppressionsLoader;
-import org.apache.maven.artifact.DependencyResolutionRequiredException;
-import org.apache.maven.doxia.siterenderer.Renderer;
-import org.apache.maven.doxia.tools.SiteTool;
-import org.apache.maven.model.ReportPlugin;
-import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.maven.plugin.checkstyle.rss.CheckstyleRssGenerator;
-import org.apache.maven.plugin.checkstyle.rss.CheckstyleRssGeneratorRequest;
-import org.apache.maven.project.MavenProject;
-import org.apache.maven.reporting.AbstractMavenReport;
-import org.apache.maven.reporting.MavenReportException;
-import org.apache.velocity.VelocityContext;
-import org.apache.velocity.context.Context;
-import org.apache.velocity.exception.ResourceNotFoundException;
-import org.apache.velocity.exception.VelocityException;
-import org.codehaus.plexus.component.repository.exception.ComponentLookupException;
-import org.codehaus.plexus.personality.plexus.lifecycle.phase.ServiceLocator;
-import org.codehaus.plexus.personality.plexus.lifecycle.phase.Serviceable;
-import org.codehaus.plexus.resource.ResourceManager;
-import org.codehaus.plexus.resource.loader.FileResourceCreationException;
-import org.codehaus.plexus.resource.loader.FileResourceLoader;
-import org.codehaus.plexus.util.FileUtils;
-import org.codehaus.plexus.util.PathTool;
-import org.codehaus.plexus.util.StringUtils;
-import org.codehaus.plexus.velocity.VelocityComponent;
-
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.File;
@@ -78,7 +40,35 @@
import java.util.Map;
import java.util.Properties;
import java.util.ResourceBundle;
-import java.util.Set;
+
+import org.apache.maven.artifact.DependencyResolutionRequiredException;
+import org.apache.maven.doxia.siterenderer.Renderer;
+import org.apache.maven.doxia.tools.SiteTool;
+import org.apache.maven.model.ReportPlugin;
+import org.apache.maven.plugin.checkstyle.rss.CheckstyleRssGenerator;
+import org.apache.maven.plugin.checkstyle.rss.CheckstyleRssGeneratorRequest;
+import org.apache.maven.project.MavenProject;
+import org.apache.maven.reporting.AbstractMavenReport;
+import org.apache.maven.reporting.MavenReportException;
+import org.codehaus.plexus.resource.ResourceManager;
+import org.codehaus.plexus.resource.loader.FileResourceCreationException;
+import org.codehaus.plexus.resource.loader.FileResourceLoader;
+import org.codehaus.plexus.util.FileUtils;
+import org.codehaus.plexus.util.PathTool;
+import org.codehaus.plexus.util.StringUtils;
+
+import com.puppycrawl.tools.checkstyle.Checker;
+import com.puppycrawl.tools.checkstyle.ConfigurationLoader;
+import com.puppycrawl.tools.checkstyle.DefaultConfiguration;
+import com.puppycrawl.tools.checkstyle.DefaultLogger;
+import com.puppycrawl.tools.checkstyle.PackageNamesLoader;
+import com.puppycrawl.tools.checkstyle.PropertiesExpander;
+import com.puppycrawl.tools.checkstyle.XMLLogger;
+import com.puppycrawl.tools.checkstyle.api.AuditListener;
+import com.puppycrawl.tools.checkstyle.api.CheckstyleException;
+import com.puppycrawl.tools.checkstyle.api.Configuration;
+import com.puppycrawl.tools.checkstyle.api.FilterSet;
+import com.puppycrawl.tools.checkstyle.filters.SuppressionsLoader;

/**
* Perform a Checkstyle analysis, and generate a report on violations.

Modified: maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleReportGenerator.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleReportGenerator.java?rev=835097&r1=835096&r2=835097&view=diff
==============================================================================
--- maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleReportGenerator.java (original)
+++ maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleReportGenerator.java Wed Nov 11 22:15:55 2009
@@ -19,18 +19,6 @@
* under the License.
*/

-import com.puppycrawl.tools.checkstyle.Checker;
-import com.puppycrawl.tools.checkstyle.api.AuditEvent;
-import com.puppycrawl.tools.checkstyle.api.CheckstyleException;
-import com.puppycrawl.tools.checkstyle.api.Configuration;
-import com.puppycrawl.tools.checkstyle.api.SeverityLevel;
-
-import org.apache.maven.doxia.sink.Sink;
-import org.apache.maven.doxia.tools.SiteTool;
-import org.apache.maven.plugin.logging.Log;
-import org.apache.maven.plugin.logging.SystemStreamLog;
-import org.codehaus.plexus.util.StringUtils;
-
import java.io.File;
import java.util.ArrayList;
import java.util.Arrays;
@@ -39,6 +27,17 @@
import java.util.List;
import java.util.ResourceBundle;

+import org.apache.maven.doxia.sink.Sink;
+import org.apache.maven.doxia.tools.SiteTool;
+import org.apache.maven.plugin.logging.Log;
+import org.apache.maven.plugin.logging.SystemStreamLog;
+import org.codehaus.plexus.util.StringUtils;
+
+import com.puppycrawl.tools.checkstyle.api.AuditEvent;
+import com.puppycrawl.tools.checkstyle.api.CheckstyleException;
+import com.puppycrawl.tools.checkstyle.api.Configuration;
+import com.puppycrawl.tools.checkstyle.api.SeverityLevel;
+
/**
* Generate a report based on CheckstyleResults.
*

svn commit: r835071 - /maven/plugin-testing/branches/plugin-testing-mvn-3.x/pom.xml

2009-11-11T13:14:05Z

Author: olamy
Date: Wed Nov 11 21:14:03 2009
New Revision: 835071

URL: http://svn.apache.org/viewvc?rev=835071&view=rev
Log:
upgrade plexus version

Modified:
maven/plugin-testing/branches/plugin-testing-mvn-3.x/pom.xml

Modified: maven/plugin-testing/branches/plugin-testing-mvn-3.x/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugin-testing/branches/plugin-testing-mvn-3.x/pom.xml?rev=835071&r1=835070&r2=835071&view=diff
==============================================================================
--- maven/plugin-testing/branches/plugin-testing-mvn-3.x/pom.xml (original)
+++ maven/plugin-testing/branches/plugin-testing-mvn-3.x/pom.xml Wed Nov 11 21:14:03 2009
@@ -141,7 +141,7 @@

<properties>
<mavenVersion>3.0-SNAPSHOT</mavenVersion>
- <plexusVersion>1.5.0</plexusVersion>
+ <plexusVersion>1.5.1</plexusVersion>
</properties>

<dependencyManagement>

svn commit: r834991 - /maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java

2009-11-11T10:04:28Z

Author: bentmann
Date: Wed Nov 11 18:04:27 2009
New Revision: 834991

URL: http://svn.apache.org/viewvc?rev=834991&view=rev
Log:
[MNG-4436] [regression] Singleton components can get instantianted multiple times

o Enabled IT

Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java

Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java?rev=834991&r1=834990&r2=834991&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java Wed Nov 11 18:04:27 2009
@@ -85,7 +85,7 @@
// suite.addTestSuite( MavenIT0109ReleaseUpdateTest.class );
// suite.addTestSuite( MavenIT0108SnapshotUpdateTest.class ); -- MNG-3137

- // suite.addTestSuite( MavenITmng4436SingletonComponentLookupTest.class );
+ suite.addTestSuite( MavenITmng4436SingletonComponentLookupTest.class );
suite.addTestSuite( MavenITmng4433ForceParentSnapshotUpdateTest.class );
suite.addTestSuite( MavenITmng4430DistributionManagementStatusTest.class );
suite.addTestSuite( MavenITmng4429CompRequirementOnNonDefaultImplTest.class );

svn commit: r834989 - /maven/maven-3/trunk/pom.xml

2009-11-11T10:03:14Z

Author: bentmann
Date: Wed Nov 11 18:03:13 2009
New Revision: 834989

URL: http://svn.apache.org/viewvc?rev=834989&view=rev
Log:
[MNG-4436] [regression] Singleton components can get instantianted multiple times

Modified:
maven/maven-3/trunk/pom.xml

Modified: maven/maven-3/trunk/pom.xml
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/pom.xml?rev=834989&r1=834988&r2=834989&view=diff
==============================================================================
--- maven/maven-3/trunk/pom.xml (original)
+++ maven/maven-3/trunk/pom.xml Wed Nov 11 18:03:13 2009
@@ -41,7 +41,7 @@
<commonsCliVersion>1.2</commonsCliVersion>
<easyMockVersion>1.2_Java1.3</easyMockVersion>
<junitVersion>3.8.2</junitVersion>
- <plexusVersion>1.5.0</plexusVersion>
+ <plexusVersion>1.5.1</plexusVersion>
<plexusInterpolationVersion>1.11</plexusInterpolationVersion>
<plexusPluginManagerVersion>1.0-alpha-1</plexusPluginManagerVersion>
<plexusUtilsVersion>2.0.1</plexusUtilsVersion>

svn commit: r834919 - /maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/DefaultLegacyArtifactCollector.java

2009-11-11T07:46:56Z

Author: bentmann
Date: Wed Nov 11 15:46:56 2009
New Revision: 834919

URL: http://svn.apache.org/viewvc?rev=834919&view=rev
Log:
[MNG-4412] Make legacy entry points to repository system pick offline mode from session

Modified:
maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/DefaultLegacyArtifactCollector.java

Modified: maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/DefaultLegacyArtifactCollector.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/DefaultLegacyArtifactCollector.java?rev=834919&r1=834918&r2=834919&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/DefaultLegacyArtifactCollector.java (original)
+++ maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/DefaultLegacyArtifactCollector.java Wed Nov 11 15:46:56 2009
@@ -45,6 +45,8 @@
import org.apache.maven.artifact.versioning.ManagedVersionMap;
import org.apache.maven.artifact.versioning.OverConstrainedVersionException;
import org.apache.maven.artifact.versioning.VersionRange;
+import org.apache.maven.execution.MavenSession;
+import org.apache.maven.plugin.LegacySupport;
import org.apache.maven.repository.legacy.metadata.ArtifactMetadataRetrievalException;
import org.apache.maven.repository.legacy.metadata.DefaultMetadataResolutionRequest;
import org.apache.maven.repository.legacy.metadata.MetadataResolutionRequest;
@@ -67,6 +69,23 @@
@Requirement
private Logger logger;

+ @Requirement
+ private LegacySupport legacySupport;
+
+ private void injectSession( ArtifactResolutionRequest request )
+ {
+ MavenSession session = legacySupport.getSession();
+
+ if ( session != null )
+ {
+ request.setOffline( session.isOffline() );
+ request.setServers( session.getRequest().getServers() );
+ request.setMirrors( session.getRequest().getMirrors() );
+ request.setProxies( session.getRequest().getProxies() );
+ request.setTransferListener( session.getRequest().getTransferListener() );
+ }
+ }
+
public ArtifactResolutionResult collect( Set<Artifact> artifacts,
Artifact originatingArtifact,
Map managedVersions,
@@ -80,6 +99,7 @@
ArtifactResolutionRequest request = new ArtifactResolutionRequest();
request.setLocalRepository( localRepository );
request.setRemoteRepositories( remoteRepositories );
+ injectSession( request );
return collect( artifacts, originatingArtifact, managedVersions, request, source, filter, listeners,
conflictResolvers );
}

svn commit: r834918 - in /maven/core-integration-testing/trunk: core-it-suite/src/test/java/org/apache/maven/it/ core-it-suite/src/test/resources/mng-4412/ core-it-support/core-it-plugins/maven-it-plugin-artifact/src/main/java/org/apache/maven/plugin/c...

2009-11-11T07:45:06Z

Author: bentmann
Date: Wed Nov 11 15:45:06 2009
New Revision: 834918

URL: http://svn.apache.org/viewvc?rev=834918&view=rev
Log:
[MNG-4412] Make legacy entry points to repository system pick offline mode from session

o Extended IT

Added:
maven/core-integration-testing/trunk/core-it-support/core-it-plugins/maven-it-plugin-artifact/src/main/java/org/apache/maven/plugin/coreit/CollectMojo.java (with props)
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4412OfflineModeInPluginTest.java
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4412/pom.xml

Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4412OfflineModeInPluginTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4412OfflineModeInPluginTest.java?rev=834918&r1=834917&r2=834918&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4412OfflineModeInPluginTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4412OfflineModeInPluginTest.java Wed Nov 11 15:45:06 2009
@@ -42,7 +42,7 @@
* Verify that plugins using the 2.x style artifact resolver directly are subject to the offline mode of the
* current Maven session.
*/
- public void testit()
+ public void testitResolver()
throws Exception
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-4412" );
@@ -52,9 +52,11 @@
verifier.deleteDirectory( "target" );
verifier.deleteArtifacts( "org.apache.maven.its.mng4412" );
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
+ verifier.getCliOptions().add( "-Presolver" );
verifier.getCliOptions().add( "--offline" );
verifier.getCliOptions().add( "-s" );
verifier.getCliOptions().add( "settings.xml" );
+ verifier.setLogFileName( "log-resolver.txt" );
try
{
verifier.executeGoal( "validate" );
@@ -71,4 +73,30 @@
}
}

+ /**
+ * Verify that plugins using the 2.x style artifact collector directly are subject to the offline mode of the
+ * current Maven session.
+ */
+ public void testitCollector()
+ throws Exception
+ {
+ File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-4412" );
+
+ Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ verifier.setAutoclean( false );
+ verifier.deleteDirectory( "target" );
+ verifier.deleteArtifacts( "org.apache.maven.its.mng4412" );
+ verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
+ verifier.getCliOptions().add( "-Pcollector" );
+ verifier.getCliOptions().add( "--offline" );
+ verifier.getCliOptions().add( "-s" );
+ verifier.getCliOptions().add( "settings.xml" );
+ verifier.setLogFileName( "log-collector.txt" );
+ verifier.executeGoal( "validate" );
+ verifier.verifyErrorFreeLog();
+ verifier.resetStreams();
+
+ verifier.assertArtifactNotPresent( "org.apache.maven.its.mng4412", "dep", "0.1", "pom" );
+ }
+
}

Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4412/pom.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4412/pom.xml?rev=834918&r1=834917&r2=834918&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4412/pom.xml (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4412/pom.xml Wed Nov 11 15:45:06 2009
@@ -29,35 +29,70 @@

<name>Maven Integration Test :: MNG-4412</name>
<description>
- Verify that plugins using the 2.x style artifact resolver directly are subject to the offline mode of the
- current Maven session.
+ Verify that plugins using the 2.x style artifact resolver/collector directly are subject to the offline mode of
+ the current Maven session.
</description>

- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.its.plugins</groupId>
- <artifactId>maven-it-plugin-artifact</artifactId>
- <version>2.1-SNAPSHOT</version>
- <executions>
- <execution>
- <id>test</id>
- <phase>validate</phase>
- <goals>
- <goal>resolve</goal>
- </goals>
- <configuration>
- <dependencies>
- <dependency>
- <groupId>org.apache.maven.its.mng4412</groupId>
- <artifactId>dep</artifactId>
- <version>0.1</version>
- </dependency>
- </dependencies>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
+ <profiles>
+ <profile>
+ <id>resolver</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.its.plugins</groupId>
+ <artifactId>maven-it-plugin-artifact</artifactId>
+ <version>2.1-SNAPSHOT</version>
+ <executions>
+ <execution>
+ <id>test</id>
+ <phase>validate</phase>
+ <goals>
+ <goal>resolve</goal>
+ </goals>
+ <configuration>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven.its.mng4412</groupId>
+ <artifactId>dep</artifactId>
+ <version>0.1</version>
+ </dependency>
+ </dependencies>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ <profile>
+ <id>collector</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.its.plugins</groupId>
+ <artifactId>maven-it-plugin-artifact</artifactId>
+ <version>2.1-SNAPSHOT</version>
+ <executions>
+ <execution>
+ <id>test</id>
+ <phase>validate</phase>
+ <goals>
+ <goal>collect</goal>
+ </goals>
+ <configuration>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven.its.mng4412</groupId>
+ <artifactId>dep</artifactId>
+ <version>0.1</version>
+ </dependency>
+ </dependencies>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>

Added: maven/core-integration-testing/trunk/core-it-support/core-it-plugins/maven-it-plugin-artifact/src/main/java/org/apache/maven/plugin/coreit/CollectMojo.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-support/core-it-plugins/maven-it-plugin-artifact/src/main/java/org/apache/maven/plugin/coreit/CollectMojo.java?rev=834918&view=auto
==============================================================================
--- maven/core-integration-testing/trunk/core-it-support/core-it-plugins/maven-it-plugin-artifact/src/main/java/org/apache/maven/plugin/coreit/CollectMojo.java (added)
+++ maven/core-integration-testing/trunk/core-it-support/core-it-plugins/maven-it-plugin-artifact/src/main/java/org/apache/maven/plugin/coreit/CollectMojo.java Wed Nov 11 15:45:06 2009
@@ -0,0 +1,137 @@
+package org.apache.maven.plugin.coreit;
+
+/*
+ * 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.artifact.Artifact;
+import org.apache.maven.artifact.factory.ArtifactFactory;
+import org.apache.maven.artifact.metadata.ArtifactMetadataSource;
+import org.apache.maven.artifact.repository.ArtifactRepository;
+import org.apache.maven.artifact.resolver.ArtifactCollector;
+import org.apache.maven.model.Dependency;
+import org.apache.maven.plugin.AbstractMojo;
+import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.plugin.MojoFailureException;
+
+import java.util.Collections;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Set;
+
+/**
+ * Collects user-specified artifacts. This mimics in part the Maven Assembly Plugin.
+ *
+ * @goal collect
+ *
+ * @author Benjamin Bentmann
+ * @version $Id$
+ */
+public class CollectMojo
+ extends AbstractMojo
+{
+
+ /**
+ * The local repository.
+ *
+ * @parameter default-value="${localRepository}"
+ * @readonly
+ * @required
+ */
+ private ArtifactRepository localRepository;
+
+ /**
+ * The remote repositories of the current Maven project.
+ *
+ * @parameter default-value="${project.remoteArtifactRepositories}"
+ * @readonly
+ * @required
+ */
+ private List remoteRepositories;
+
+ /**
+ * The artifact collector.
+ *
+ * @component
+ */
+ private ArtifactCollector collector;
+
+ /**
+ * The artifact factory.
+ *
+ * @component
+ */
+ private ArtifactFactory factory;
+
+ /**
+ * The metadata source.
+ *
+ * @component
+ */
+ private ArtifactMetadataSource metadataSource;
+
+ /**
+ * The dependencies to resolve.
+ *
+ * @parameter
+ */
+ private Dependency[] dependencies;
+
+ /**
+ * Runs this mojo.
+ *
+ * @throws MojoFailureException If the artifact file has not been set.
+ */
+ public void execute()
+ throws MojoExecutionException, MojoFailureException
+ {
+ getLog().info( "[MAVEN-CORE-IT-LOG] Collecting artifacts" );
+
+ try
+ {
+ Artifact origin = factory.createArtifact( "it", "it", "0.1", null, "pom" );
+
+ Set artifacts = new LinkedHashSet();
+
+ if ( dependencies != null )
+ {
+ for ( int i = 0; i < dependencies.length; i++ )
+ {
+ Dependency dependency = dependencies[i];
+
+ Artifact artifact =
+ factory.createArtifactWithClassifier( dependency.getGroupId(), dependency.getArtifactId(),
+ dependency.getVersion(), dependency.getType(),
+ dependency.getClassifier() );
+
+ artifacts.add( artifact );
+
+ getLog().info( "[MAVEN-CORE-IT-LOG] Collecting " + artifact.getId() );
+ }
+ }
+
+ collector.collect( artifacts, origin, localRepository, remoteRepositories, metadataSource, null,
+ Collections.EMPTY_LIST );
+ }
+ catch ( Exception e )
+ {
+ throw new MojoExecutionException( "Failed to collect artifacts: " + e.getMessage(), e );
+ }
+ }
+
+}

Propchange: maven/core-integration-testing/trunk/core-it-support/core-it-plugins/maven-it-plugin-artifact/src/main/java/org/apache/maven/plugin/coreit/CollectMojo.java
------------------------------------------------------------------------------
svn:eol-style = native

Propchange: maven/core-integration-testing/trunk/core-it-support/core-it-plugins/maven-it-plugin-artifact/src/main/java/org/apache/maven/plugin/coreit/CollectMojo.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision

svn commit: r834917 - /maven/plugin-testing/branches/plugin-testing-mvn-3.x/maven-plugin-testing-harness/src/main/java/org/apache/maven/plugin/testing/stubs/StubArtifactCollector.java

2009-11-11T07:40:37Z

Author: olamy
Date: Wed Nov 11 15:40:37 2009
New Revision: 834917

URL: http://svn.apache.org/viewvc?rev=834917&view=rev
Log:
fix compilation failure due to trunk change.

Modified:
maven/plugin-testing/branches/plugin-testing-mvn-3.x/maven-plugin-testing-harness/src/main/java/org/apache/maven/plugin/testing/stubs/StubArtifactCollector.java

Modified: maven/plugin-testing/branches/plugin-testing-mvn-3.x/maven-plugin-testing-harness/src/main/java/org/apache/maven/plugin/testing/stubs/StubArtifactCollector.java
URL: http://svn.apache.org/viewvc/maven/plugin-testing/branches/plugin-testing-mvn-3.x/maven-plugin-testing-harness/src/main/java/org/apache/maven/plugin/testing/stubs/StubArtifactCollector.java?rev=834917&r1=834916&r2=834917&view=diff
==============================================================================
--- maven/plugin-testing/branches/plugin-testing-mvn-3.x/maven-plugin-testing-harness/src/main/java/org/apache/maven/plugin/testing/stubs/StubArtifactCollector.java (original)
+++ maven/plugin-testing/branches/plugin-testing-mvn-3.x/maven-plugin-testing-harness/src/main/java/org/apache/maven/plugin/testing/stubs/StubArtifactCollector.java Wed Nov 11 15:40:37 2009
@@ -28,6 +28,7 @@
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.repository.RepositoryRequest;
import org.apache.maven.artifact.resolver.ArtifactCollector;
+import org.apache.maven.artifact.resolver.ArtifactResolutionException;
import org.apache.maven.artifact.resolver.ArtifactResolutionRequest;
import org.apache.maven.artifact.resolver.ArtifactResolutionResult;
import org.apache.maven.artifact.resolver.ResolutionListener;
@@ -77,4 +78,14 @@
return new ArtifactResolutionResult();
}

+ public ArtifactResolutionResult collect( Set<Artifact> artifacts, Artifact originatingArtifact,
+ ArtifactRepository localRepository,
+ List<ArtifactRepository> remoteRepositories,
+ ArtifactMetadataSource source, ArtifactFilter filter,
+ List<ResolutionListener> listeners )
+ throws ArtifactResolutionException
+ {
+ return new ArtifactResolutionResult();
+ }
+
}

svn commit: r834908 - in /maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven: artifact/resolver/ArtifactCollector.java repository/legacy/resolver/DefaultLegacyArtifactCollector.java

2009-11-11T07:26:48Z

Author: bentmann
Date: Wed Nov 11 15:26:46 2009
New Revision: 834908

URL: http://svn.apache.org/viewvc?rev=834908&view=rev
Log:
o Restored backward-compat

Modified:
maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ArtifactCollector.java
maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/DefaultLegacyArtifactCollector.java

Modified: maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ArtifactCollector.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ArtifactCollector.java?rev=834908&r1=834907&r2=834908&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ArtifactCollector.java (original)
+++ maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ArtifactCollector.java Wed Nov 11 15:26:46 2009
@@ -19,8 +19,24 @@
* under the License.
*/

+import java.util.List;
+import java.util.Set;
+
+import org.apache.maven.artifact.Artifact;
+import org.apache.maven.artifact.metadata.ArtifactMetadataSource;
+import org.apache.maven.artifact.repository.ArtifactRepository;
+import org.apache.maven.artifact.resolver.filter.ArtifactFilter;
+
@Deprecated
public interface ArtifactCollector
extends org.apache.maven.repository.legacy.resolver.LegacyArtifactCollector
{
+
+ @Deprecated
+ ArtifactResolutionResult collect( Set<Artifact> artifacts, Artifact originatingArtifact,
+ ArtifactRepository localRepository, List<ArtifactRepository> remoteRepositories,
+ ArtifactMetadataSource source, ArtifactFilter filter,
+ List<ResolutionListener> listeners )
+ throws ArtifactResolutionException;
+
}

Modified: maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/DefaultLegacyArtifactCollector.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/DefaultLegacyArtifactCollector.java?rev=834908&r1=834907&r2=834908&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/DefaultLegacyArtifactCollector.java (original)
+++ maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/DefaultLegacyArtifactCollector.java Wed Nov 11 15:26:46 2009
@@ -32,8 +32,6 @@
import org.apache.maven.artifact.metadata.ArtifactMetadataSource;
import org.apache.maven.artifact.metadata.ResolutionGroup;
import org.apache.maven.artifact.repository.ArtifactRepository;
-import org.apache.maven.artifact.repository.DefaultRepositoryRequest;
-import org.apache.maven.artifact.repository.RepositoryRequest;
import org.apache.maven.artifact.resolver.ArtifactResolutionException;
import org.apache.maven.artifact.resolver.ArtifactResolutionRequest;
import org.apache.maven.artifact.resolver.ArtifactResolutionResult;
@@ -773,4 +771,14 @@
filter, listeners, null );
}

+ public ArtifactResolutionResult collect( Set<Artifact> artifacts, Artifact originatingArtifact,
+ ArtifactRepository localRepository,
+ List<ArtifactRepository> remoteRepositories,
+ ArtifactMetadataSource source, ArtifactFilter filter,
+ List<ResolutionListener> listeners )
+ {
+ return collect( artifacts, originatingArtifact, null, localRepository, remoteRepositories, source, filter,
+ listeners );
+ }
+
}

svn commit: r834849 - in /maven/core-integration-testing/trunk: core-it-suite/src/test/java/org/apache/maven/it/ core-it-suite/src/test/resources/bootstrap/ core-it-suite/src/test/resources/mng-4436/ core-it-support/core-it-plugins/ core-it-support/cor...

2009-11-11T04:23:30Z

Author: bentmann
Date: Wed Nov 11 12:23:29 2009
New Revision: 834849

URL: http://svn.apache.org/viewvc?rev=834849&view=rev
Log:
[MNG-4436] [regression] Singleton components can get instantianted multiple times

o Added IT

Added:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4436SingletonComponentLookupTest.java (with props)
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4436/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4436/pom.xml (with props)
maven/core-integration-testing/trunk/core-it-support/core-it-plugins/maven-it-plugin-singleton-component/ (with props)
maven/core-integration-testing/trunk/core-it-support/core-it-plugins/maven-it-plugin-singleton-component/pom.xml (with props)
maven/core-integration-testing/trunk/core-it-support/core-it-plugins/maven-it-plugin-singleton-component/src/
maven/core-integration-testing/trunk/core-it-support/core-it-plugins/maven-it-plugin-singleton-component/src/main/
maven/core-integration-testing/trunk/core-it-support/core-it-plugins/maven-it-plugin-singleton-component/src/main/java/
maven/core-integration-testing/trunk/core-it-support/core-it-plugins/maven-it-plugin-singleton-component/src/main/java/org/
maven/core-integration-testing/trunk/core-it-support/core-it-plugins/maven-it-plugin-singleton-component/src/main/java/org/apache/
maven/core-integration-testing/trunk/core-it-support/core-it-plugins/maven-it-plugin-singleton-component/src/main/java/org/apache/maven/
maven/core-integration-testing/trunk/core-it-support/core-it-plugins/maven-it-plugin-singleton-component/src/main/java/org/apache/maven/plugin/
maven/core-integration-testing/trunk/core-it-support/core-it-plugins/maven-it-plugin-singleton-component/src/main/java/org/apache/maven/plugin/coreit/
maven/core-integration-testing/trunk/core-it-support/core-it-plugins/maven-it-plugin-singleton-component/src/main/java/org/apache/maven/plugin/coreit/Component.java (with props)
maven/core-integration-testing/trunk/core-it-support/core-it-plugins/maven-it-plugin-singleton-component/src/main/java/org/apache/maven/plugin/coreit/DefaultComponent.java (with props)
maven/core-integration-testing/trunk/core-it-support/core-it-plugins/maven-it-plugin-singleton-component/src/main/java/org/apache/maven/plugin/coreit/ItMojo.java (with props)
maven/core-integration-testing/trunk/core-it-support/core-it-plugins/maven-it-plugin-singleton-component/src/main/resources/
maven/core-integration-testing/trunk/core-it-support/core-it-plugins/maven-it-plugin-singleton-component/src/main/resources/META-INF/
maven/core-integration-testing/trunk/core-it-support/core-it-plugins/maven-it-plugin-singleton-component/src/main/resources/META-INF/plexus/
maven/core-integration-testing/trunk/core-it-support/core-it-plugins/maven-it-plugin-singleton-component/src/main/resources/META-INF/plexus/components.xml (with props)
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/bootstrap/pom.xml
maven/core-integration-testing/trunk/core-it-support/core-it-plugins/pom.xml

Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java?rev=834849&r1=834848&r2=834849&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java Wed Nov 11 12:23:29 2009
@@ -85,6 +85,7 @@
// suite.addTestSuite( MavenIT0109ReleaseUpdateTest.class );
// suite.addTestSuite( MavenIT0108SnapshotUpdateTest.class ); -- MNG-3137

+ // suite.addTestSuite( MavenITmng4436SingletonComponentLookupTest.class );
suite.addTestSuite( MavenITmng4433ForceParentSnapshotUpdateTest.class );
suite.addTestSuite( MavenITmng4430DistributionManagementStatusTest.class );
suite.addTestSuite( MavenITmng4429CompRequirementOnNonDefaultImplTest.class );

Added: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4436SingletonComponentLookupTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4436SingletonComponentLookupTest.java?rev=834849&view=auto
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4436SingletonComponentLookupTest.java (added)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4436SingletonComponentLookupTest.java Wed Nov 11 12:23:29 2009
@@ -0,0 +1,66 @@
+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.Verifier;
+import org.apache.maven.it.util.ResourceExtractor;
+
+import java.io.File;
+import java.util.Properties;
+
+/**
+ * This is a test set for <a href="http://jira.codehaus.org/browse/MNG-4436">MNG-4436</a>.
+ *
+ * @author Benjamin Bentmann
+ */
+public class MavenITmng4436SingletonComponentLookupTest
+ extends AbstractMavenIntegrationTestCase
+{
+
+ public MavenITmng4436SingletonComponentLookupTest()
+ {
+ super( "[3.0-alpha-4,)" );
+ }
+
+ /**
+ * Test that lookup of a singleton component works reliably.
+ */
+ public void testit()
+ throws Exception
+ {
+ File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-4436" );
+
+ Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ verifier.setAutoclean( false );
+ verifier.deleteDirectory( "target" );
+ verifier.executeGoal( "validate" );
+ verifier.verifyErrorFreeLog();
+ verifier.resetStreams();
+
+ Properties props = verifier.loadProperties( "target/comp.properties" );
+
+ assertTrue( props.getProperty( "id.0", "" ).length() > 0 );
+
+ assertEquals( props.getProperty( "id.0" ), props.getProperty( "id.1" ) );
+ assertEquals( props.getProperty( "id.1" ), props.getProperty( "id.2" ) );
+ assertEquals( props.getProperty( "id.2" ), props.getProperty( "id.3" ) );
+ }
+
+}

Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4436SingletonComponentLookupTest.java
------------------------------------------------------------------------------
svn:eol-style = native

Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4436SingletonComponentLookupTest.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision

Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/bootstrap/pom.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/bootstrap/pom.xml?rev=834849&r1=834848&r2=834849&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/bootstrap/pom.xml (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/bootstrap/pom.xml Wed Nov 11 12:23:29 2009
@@ -254,6 +254,12 @@
</dependency>
<dependency>
<groupId>org.apache.maven.its.plugins</groupId>
+ <artifactId>maven-it-plugin-singleton-component</artifactId>
+ <version>${itPluginVersion}</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.its.plugins</groupId>
<artifactId>maven-it-plugin-site</artifactId>
<version>${itPluginVersion}</version>
<scope>runtime</scope>

Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4436/pom.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4436/pom.xml?rev=834849&view=auto
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4436/pom.xml (added)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4436/pom.xml Wed Nov 11 12:23:29 2009
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+
+
+<project>
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.apache.maven.its.mng4436</groupId>
+ <artifactId>test</artifactId>
+ <version>0.1</version>
+
+ <name>Maven Integration Test :: MNG-4436</name>
+ <description>
+ Test that lookup of a singleton component works reliably.
+ </description>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.its.plugins</groupId>
+ <artifactId>maven-it-plugin-singleton-component</artifactId>
+ <version>2.1-SNAPSHOT</version>
+ <configuration>
+ <outputFile>target/comp.properties</outputFile>
+ </configuration>
+ <executions>
+ <execution>
+ <id>test</id>
+ <phase>validate</phase>
+ <goals>
+ <goal>it</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>

Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4436/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native

Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4436/pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision

Propchange: maven/core-integration-testing/trunk/core-it-support/core-it-plugins/maven-it-plugin-singleton-component/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Nov 11 12:23:29 2009
@@ -0,0 +1,7 @@
+target
+*.iml
+.classpath
+.project
+.settings
+target-eclipse
+bin

Added: maven/core-integration-testing/trunk/core-it-support/core-it-plugins/maven-it-plugin-singleton-component/pom.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-support/core-it-plugins/maven-it-plugin-singleton-component/pom.xml?rev=834849&view=auto
==============================================================================
--- maven/core-integration-testing/trunk/core-it-support/core-it-plugins/maven-it-plugin-singleton-component/pom.xml (added)
+++ maven/core-integration-testing/trunk/core-it-support/core-it-plugins/maven-it-plugin-singleton-component/pom.xml Wed Nov 11 12:23:29 2009
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <artifactId>maven-it-plugins</artifactId>
+ <groupId>org.apache.maven.its.plugins</groupId>
+ <version>2.1-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>maven-it-plugin-singleton-component</artifactId>
+ <packaging>maven-plugin</packaging>
+
+ <name>Maven Integration Test Plugin :: Singleton Component</name>
+ <description>
+ A test plugin to check that the lookup of a singleton component works reliably.
+ </description>
+ <inceptionYear>2009</inceptionYear>
+
+ <properties>
+ <maven.test.skip>true</maven.test.skip>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-plugin-api</artifactId>
+ <version>2.0</version>
+ </dependency>
+ </dependencies>
+</project>

Propchange: maven/core-integration-testing/trunk/core-it-support/core-it-plugins/maven-it-plugin-singleton-component/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native

Propchange: maven/core-integration-testing/trunk/core-it-support/core-it-plugins/maven-it-plugin-singleton-component/pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision

Added: maven/core-integration-testing/trunk/core-it-support/core-it-plugins/maven-it-plugin-singleton-component/src/main/java/org/apache/maven/plugin/coreit/Component.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-support/core-it-plugins/maven-it-plugin-singleton-component/src/main/java/org/apache/maven/plugin/coreit/Component.java?rev=834849&view=auto
==============================================================================
--- maven/core-integration-testing/trunk/core-it-support/core-it-plugins/maven-it-plugin-singleton-component/src/main/java/org/apache/maven/plugin/coreit/Component.java (added)
+++ maven/core-integration-testing/trunk/core-it-support/core-it-plugins/maven-it-plugin-singleton-component/src/main/java/org/apache/maven/plugin/coreit/Component.java Wed Nov 11 12:23:29 2009
@@ -0,0 +1,32 @@
+package org.apache.maven.plugin.coreit;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+/**
+ * A dummy component.
+ *
+ * @author Benjamin Bentmann
+ */
+public interface Component
+{
+
+ String getId();
+
+}

Propchange: maven/core-integration-testing/trunk/core-it-support/core-it-plugins/maven-it-plugin-singleton-component/src/main/java/org/apache/maven/plugin/coreit/Component.java
------------------------------------------------------------------------------
svn:eol-style = native

Propchange: maven/core-integration-testing/trunk/core-it-support/core-it-plugins/maven-it-plugin-singleton-component/src/main/java/org/apache/maven/plugin/coreit/Component.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision

Added: maven/core-integration-testing/trunk/core-it-support/core-it-plugins/maven-it-plugin-singleton-component/src/main/java/org/apache/maven/plugin/coreit/DefaultComponent.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-support/core-it-plugins/maven-it-plugin-singleton-component/src/main/java/org/apache/maven/plugin/coreit/DefaultComponent.java?rev=834849&view=auto
==============================================================================
--- maven/core-integration-testing/trunk/core-it-support/core-it-plugins/maven-it-plugin-singleton-component/src/main/java/org/apache/maven/plugin/coreit/DefaultComponent.java (added)
+++ maven/core-integration-testing/trunk/core-it-support/core-it-plugins/maven-it-plugin-singleton-component/src/main/java/org/apache/maven/plugin/coreit/DefaultComponent.java Wed Nov 11 12:23:29 2009
@@ -0,0 +1,45 @@
+package org.apache.maven.plugin.coreit;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+/**
+ * A stateful singleton.
+ *
+ * @plexus.component role="org.apache.maven.plugin.coreit.Component" role-hint="default"
+ *
+ * @author Benjamin Bentmann
+ */
+public class DefaultComponent
+ implements Component
+{
+
+ private final String id;
+
+ public DefaultComponent()
+ {
+ id = Integer.toString( System.identityHashCode( this ) );
+ }
+
+ public String getId()
+ {
+ return id;
+ }
+
+}

Propchange: maven/core-integration-testing/trunk/core-it-support/core-it-plugins/maven-it-plugin-singleton-component/src/main/java/org/apache/maven/plugin/coreit/DefaultComponent.java
------------------------------------------------------------------------------
svn:eol-style = native

Propchange: maven/core-integration-testing/trunk/core-it-support/core-it-plugins/maven-it-plugin-singleton-component/src/main/java/org/apache/maven/plugin/coreit/DefaultComponent.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision

Added: maven/core-integration-testing/trunk/core-it-support/core-it-plugins/maven-it-plugin-singleton-component/src/main/java/org/apache/maven/plugin/coreit/ItMojo.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-support/core-it-plugins/maven-it-plugin-singleton-component/src/main/java/org/apache/maven/plugin/coreit/ItMojo.java?rev=834849&view=auto
==============================================================================
--- maven/core-integration-testing/trunk/core-it-support/core-it-plugins/maven-it-plugin-singleton-component/src/main/java/org/apache/maven/plugin/coreit/ItMojo.java (added)
+++ maven/core-integration-testing/trunk/core-it-support/core-it-plugins/maven-it-plugin-singleton-component/src/main/java/org/apache/maven/plugin/coreit/ItMojo.java Wed Nov 11 12:23:29 2009
@@ -0,0 +1,125 @@
+package org.apache.maven.plugin.coreit;
+
+/*
+ * 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.io.FileOutputStream;
+import java.io.IOException;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+
+import org.apache.maven.plugin.AbstractMojo;
+import org.apache.maven.plugin.MojoExecutionException;
+
+/**
+ * Requires a singleton component in various ways and dumps the ids to a properties file.
+ *
+ * @goal it
+ * @phase initialize
+ *
+ * @author Benjamin Bentmann
+ * @version $Id$
+ */
+public class ItMojo
+ extends AbstractMojo
+{
+
+ /**
+ * The path to the output file.
+ *
+ * @parameter expression="${touch.outputFile}" default-value="target/comp.properties"
+ */
+ private File outputFile;
+
+ /**
+ * Component lookup without role hint.
+ *
+ * @component
+ */
+ private Component componentWithoutRoleHint;
+
+ /**
+ * Component lookup with explicit role hint.
+ *
+ * @component roleHint="default"
+ */
+ private Component componentWithRoleHint;
+
+ /**
+ * Component lookup via active map.
+ *
+ * @component role="org.apache.maven.plugin.coreit.Component"
+ */
+ private Map componentMap;
+
+ /**
+ * Component lookup via active list.
+ *
+ * @component role="org.apache.maven.plugin.coreit.Component"
+ */
+ private List componentList;
+
+ /**
+ * Runs this mojo.
+ *
+ * @throws MojoExecutionException If the output file could not be created.
+ */
+ public void execute()
+ throws MojoExecutionException
+ {
+ Component componentFromMap = (Component) componentMap.values().iterator().next();
+ Component componentFromList = (Component) componentList.iterator().next();
+
+ getLog().info( "[MAVEN-CORE-IT-LOG] Using component: " + componentWithoutRoleHint );
+ getLog().info( "[MAVEN-CORE-IT-LOG] Using component: " + componentWithRoleHint );
+ getLog().info( "[MAVEN-CORE-IT-LOG] Using component: " + componentFromMap );
+ getLog().info( "[MAVEN-CORE-IT-LOG] Using component: " + componentFromList );
+
+ Properties props = new Properties();
+ props.setProperty( "id.0", componentWithoutRoleHint.getId() );
+ props.setProperty( "id.1", componentWithRoleHint.getId() );
+ props.setProperty( "id.2", componentFromMap.getId() );
+ props.setProperty( "id.3", componentFromList.getId() );
+
+ getLog().info( "[MAVEN-CORE-IT-LOG] Creating output file: " + outputFile );
+
+ try
+ {
+ outputFile.getParentFile().mkdirs();
+ FileOutputStream os = new FileOutputStream( outputFile );
+ try
+ {
+ props.store( os, "MAVEN-CORE-IT-LOG" );
+ }
+ finally
+ {
+ os.close();
+ }
+ }
+ catch ( IOException e )
+ {
+ throw new MojoExecutionException( "Output file could not be created: " + outputFile, e );
+ }
+
+ getLog().info( "[MAVEN-CORE-IT-LOG] Created output file: " + outputFile );
+ }
+
+}

Propchange: maven/core-integration-testing/trunk/core-it-support/core-it-plugins/maven-it-plugin-singleton-component/src/main/java/org/apache/maven/plugin/coreit/ItMojo.java
------------------------------------------------------------------------------
svn:eol-style = native

Propchange: maven/core-integration-testing/trunk/core-it-support/core-it-plugins/maven-it-plugin-singleton-component/src/main/java/org/apache/maven/plugin/coreit/ItMojo.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision

Added: maven/core-integration-testing/trunk/core-it-support/core-it-plugins/maven-it-plugin-singleton-component/src/main/resources/META-INF/plexus/components.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-support/core-it-plugins/maven-it-plugin-singleton-component/src/main/resources/META-INF/plexus/components.xml?rev=834849&view=auto
==============================================================================
--- maven/core-integration-testing/trunk/core-it-support/core-it-plugins/maven-it-plugin-singleton-component/src/main/resources/META-INF/plexus/components.xml (added)
+++ maven/core-integration-testing/trunk/core-it-support/core-it-plugins/maven-it-plugin-singleton-component/src/main/resources/META-INF/plexus/components.xml Wed Nov 11 12:23:29 2009
@@ -0,0 +1,29 @@
+
+
+<component-set>
+ <components>
+ <component>
+ <role>org.apache.maven.plugin.coreit.Component</role>
+ <role-hint>default</role-hint>
+ <implementation>org.apache.maven.plugin.coreit.DefaultComponent</implementation>
+ <instantiation-strategy>singleton</instantiation-strategy>
+ </component>
+ </components>
+</component-set>

Propchange: maven/core-integration-testing/trunk/core-it-support/core-it-plugins/maven-it-plugin-singleton-component/src/main/resources/META-INF/plexus/components.xml
------------------------------------------------------------------------------
svn:eol-style = native

Propchange: maven/core-integration-testing/trunk/core-it-support/core-it-plugins/maven-it-plugin-singleton-component/src/main/resources/META-INF/plexus/components.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision

Modified: maven/core-integration-testing/trunk/core-it-support/core-it-plugins/pom.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-support/core-it-plugins/pom.xml?rev=834849&r1=834848&r2=834849&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-support/core-it-plugins/pom.xml (original)
+++ maven/core-integration-testing/trunk/core-it-support/core-it-plugins/pom.xml Wed Nov 11 12:23:29 2009
@@ -57,6 +57,7 @@
<module>maven-it-plugin-plugin-dependency</module>
<module>maven-it-plugin-project-interpolation</module>
<module>maven-it-plugin-setter</module>
+ <module>maven-it-plugin-singleton-component</module>
<module>maven-it-plugin-site</module>
<module>maven-it-plugin-toolchain</module>
<module>maven-it-plugin-touch</module>

svn commit: r834832 - /maven/site/trunk/src/site/apt/plugins/index.apt

2009-11-11T02:18:46Z

Author: bentmann
Date: Wed Nov 11 10:18:44 2009
New Revision: 834832

URL: http://svn.apache.org/viewvc?rev=834832&view=rev
Log:
o Updated plugin index to account for release of maven-ant-plugin:2.3

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=834832&r1=834831&r2=834832&view=diff
==============================================================================
--- maven/site/trunk/src/site/apt/plugins/index.apt (original)
+++ maven/site/trunk/src/site/apt/plugins/index.apt Wed Nov 11 10:18:44 2009
@@ -117,7 +117,7 @@
*-----------------------------------------------------------+------------+--------------+------------+------------------+------------------------+--------------------+
| <<Tools>> | | | | <<These are miscellaneous tools available through Maven by default.>> | |
*-----------------------------------------------------------+------------+--------------+------------+------------------+------------------------+--------------------+
-| {{{/plugins/maven-ant-plugin/} <<<ant>>>}} | B | 2.2 | 2009-07-19 | Generate an Ant build file for the project. | {{{http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-ant-plugin}SVN}} | {{{http://jira.codehaus.org/browse/MANT}JIRA}}
+| {{{/plugins/maven-ant-plugin/} <<<ant>>>}} | B | 2.3 | 2009-11-11 | Generate an Ant build file for the project. | {{{http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-ant-plugin}SVN}} | {{{http://jira.codehaus.org/browse/MANT}JIRA}}
*-----------------------------------------------------------+------------+--------------+------------+------------------+------------------------+--------------------+
| {{{/plugins/maven-antrun-plugin/} <<<antrun>>>}} | B |1.3 | 2008-10-11 | Run a set of ant tasks from a phase of the build. | {{{http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-antrun-plugin}SVN}} | {{{http://jira.codehaus.org/browse/MANTRUN}JIRA}}
*-----------------------------------------------------------+------------+--------------+------------+------------------+------------------------+--------------------+

svn commit: r834698 - /maven/maven-3/branches/MNG-4388/maven-dependency-tree-builder/src/main/java/org/apache/maven/repository/

2009-11-10T14:18:35Z

Author: bentmann
Date: Tue Nov 10 22:18:34 2009
New Revision: 834698

URL: http://svn.apache.org/viewvc?rev=834698&view=rev
Log:
o Moved local repo to context
o Added missing interface

Added:
maven/maven-3/branches/MNG-4388/maven-dependency-tree-builder/src/main/java/org/apache/maven/repository/WorkspaceReader.java (with props)
Modified:
maven/maven-3/branches/MNG-4388/maven-dependency-tree-builder/src/main/java/org/apache/maven/repository/CollectRequest.java
maven/maven-3/branches/MNG-4388/maven-dependency-tree-builder/src/main/java/org/apache/maven/repository/DependencyRequest.java
maven/maven-3/branches/MNG-4388/maven-dependency-tree-builder/src/main/java/org/apache/maven/repository/DeployRequest.java
maven/maven-3/branches/MNG-4388/maven-dependency-tree-builder/src/main/java/org/apache/maven/repository/RepositoryContext.java
maven/maven-3/branches/MNG-4388/maven-dependency-tree-builder/src/main/java/org/apache/maven/repository/ResolveRequest.java
maven/maven-3/branches/MNG-4388/maven-dependency-tree-builder/src/main/java/org/apache/maven/repository/VersionRangeRequest.java
maven/maven-3/branches/MNG-4388/maven-dependency-tree-builder/src/main/java/org/apache/maven/repository/VersionRequest.java

Modified: maven/maven-3/branches/MNG-4388/maven-dependency-tree-builder/src/main/java/org/apache/maven/repository/CollectRequest.java
URL: http://svn.apache.org/viewvc/maven/maven-3/branches/MNG-4388/maven-dependency-tree-builder/src/main/java/org/apache/maven/repository/CollectRequest.java?rev=834698&r1=834697&r2=834698&view=diff
==============================================================================
--- maven/maven-3/branches/MNG-4388/maven-dependency-tree-builder/src/main/java/org/apache/maven/repository/CollectRequest.java (original)
+++ maven/maven-3/branches/MNG-4388/maven-dependency-tree-builder/src/main/java/org/apache/maven/repository/CollectRequest.java Tue Nov 10 22:18:34 2009
@@ -33,14 +33,12 @@
// 3. children-only, e.g. the (managed) dependencies of a project, don't resolve root but only its transitive
// closure

- Artifact getRoot();
+ Dependency getRoot();

List<? extends Dependency> getDependencies();

List<? extends Dependency> getManagedDependencies();

- LocalRepository getLocalRepository();
-
List<? extends RemoteRepository> getRemoteRepositories();

RepositoryContext getContext();

Modified: maven/maven-3/branches/MNG-4388/maven-dependency-tree-builder/src/main/java/org/apache/maven/repository/DependencyRequest.java
URL: http://svn.apache.org/viewvc/maven/maven-3/branches/MNG-4388/maven-dependency-tree-builder/src/main/java/org/apache/maven/repository/DependencyRequest.java?rev=834698&r1=834697&r2=834698&view=diff
==============================================================================
--- maven/maven-3/branches/MNG-4388/maven-dependency-tree-builder/src/main/java/org/apache/maven/repository/DependencyRequest.java (original)
+++ maven/maven-3/branches/MNG-4388/maven-dependency-tree-builder/src/main/java/org/apache/maven/repository/DependencyRequest.java Tue Nov 10 22:18:34 2009
@@ -29,8 +29,6 @@

Artifact getArtifact();

- LocalRepository getLocalRepository();
-
List<? extends RemoteRepository> getRemoteRepositories();

RepositoryContext getContext();

Modified: maven/maven-3/branches/MNG-4388/maven-dependency-tree-builder/src/main/java/org/apache/maven/repository/DeployRequest.java
URL: http://svn.apache.org/viewvc/maven/maven-3/branches/MNG-4388/maven-dependency-tree-builder/src/main/java/org/apache/maven/repository/DeployRequest.java?rev=834698&r1=834697&r2=834698&view=diff
==============================================================================
--- maven/maven-3/branches/MNG-4388/maven-dependency-tree-builder/src/main/java/org/apache/maven/repository/DeployRequest.java (original)
+++ maven/maven-3/branches/MNG-4388/maven-dependency-tree-builder/src/main/java/org/apache/maven/repository/DeployRequest.java Tue Nov 10 22:18:34 2009
@@ -30,8 +30,6 @@

List<? extends Artifact> getArtifacts();

- LocalRepository getLocalRepository();
-
RemoteRepository getRemoteRepository();

RepositoryContext getContext();

Modified: maven/maven-3/branches/MNG-4388/maven-dependency-tree-builder/src/main/java/org/apache/maven/repository/RepositoryContext.java
URL: http://svn.apache.org/viewvc/maven/maven-3/branches/MNG-4388/maven-dependency-tree-builder/src/main/java/org/apache/maven/repository/RepositoryContext.java?rev=834698&r1=834697&r2=834698&view=diff
==============================================================================
--- maven/maven-3/branches/MNG-4388/maven-dependency-tree-builder/src/main/java/org/apache/maven/repository/RepositoryContext.java (original)
+++ maven/maven-3/branches/MNG-4388/maven-dependency-tree-builder/src/main/java/org/apache/maven/repository/RepositoryContext.java Tue Nov 10 22:18:34 2009
@@ -33,6 +33,10 @@

String getUpdatePolicy();

+ LocalRepository getLocalRepository();
+
+ WorkspaceReader getWorkspaceReader();
+
TransferListener getTransferListener();

Properties getSystemProperties();

Modified: maven/maven-3/branches/MNG-4388/maven-dependency-tree-builder/src/main/java/org/apache/maven/repository/ResolveRequest.java
URL: http://svn.apache.org/viewvc/maven/maven-3/branches/MNG-4388/maven-dependency-tree-builder/src/main/java/org/apache/maven/repository/ResolveRequest.java?rev=834698&r1=834697&r2=834698&view=diff
==============================================================================
--- maven/maven-3/branches/MNG-4388/maven-dependency-tree-builder/src/main/java/org/apache/maven/repository/ResolveRequest.java (original)
+++ maven/maven-3/branches/MNG-4388/maven-dependency-tree-builder/src/main/java/org/apache/maven/repository/ResolveRequest.java Tue Nov 10 22:18:34 2009
@@ -29,8 +29,6 @@

List<? extends Artifact> getArtifacts();

- LocalRepository getLocalRepository();
-
List<? extends RemoteRepository> getRemoteRepositories( Artifact artifact );

RepositoryContext getContext();

Modified: maven/maven-3/branches/MNG-4388/maven-dependency-tree-builder/src/main/java/org/apache/maven/repository/VersionRangeRequest.java
URL: http://svn.apache.org/viewvc/maven/maven-3/branches/MNG-4388/maven-dependency-tree-builder/src/main/java/org/apache/maven/repository/VersionRangeRequest.java?rev=834698&r1=834697&r2=834698&view=diff
==============================================================================
--- maven/maven-3/branches/MNG-4388/maven-dependency-tree-builder/src/main/java/org/apache/maven/repository/VersionRangeRequest.java (original)
+++ maven/maven-3/branches/MNG-4388/maven-dependency-tree-builder/src/main/java/org/apache/maven/repository/VersionRangeRequest.java Tue Nov 10 22:18:34 2009
@@ -29,8 +29,6 @@

Artifact getArtifact();

- LocalRepository getLocalRepository();
-
List<? extends RemoteRepository> getRemoteRepositories();

RepositoryContext getContext();

Modified: maven/maven-3/branches/MNG-4388/maven-dependency-tree-builder/src/main/java/org/apache/maven/repository/VersionRequest.java
URL: http://svn.apache.org/viewvc/maven/maven-3/branches/MNG-4388/maven-dependency-tree-builder/src/main/java/org/apache/maven/repository/VersionRequest.java?rev=834698&r1=834697&r2=834698&view=diff
==============================================================================
--- maven/maven-3/branches/MNG-4388/maven-dependency-tree-builder/src/main/java/org/apache/maven/repository/VersionRequest.java (original)
+++ maven/maven-3/branches/MNG-4388/maven-dependency-tree-builder/src/main/java/org/apache/maven/repository/VersionRequest.java Tue Nov 10 22:18:34 2009
@@ -29,8 +29,6 @@

Artifact getArtifact();

- LocalRepository getLocalRepository();
-
List<? extends RemoteRepository> getRemoteRepositories();

RepositoryContext getContext();

Added: maven/maven-3/branches/MNG-4388/maven-dependency-tree-builder/src/main/java/org/apache/maven/repository/WorkspaceReader.java
URL: http://svn.apache.org/viewvc/maven/maven-3/branches/MNG-4388/maven-dependency-tree-builder/src/main/java/org/apache/maven/repository/WorkspaceReader.java?rev=834698&view=auto
==============================================================================
--- maven/maven-3/branches/MNG-4388/maven-dependency-tree-builder/src/main/java/org/apache/maven/repository/WorkspaceReader.java (added)
+++ maven/maven-3/branches/MNG-4388/maven-dependency-tree-builder/src/main/java/org/apache/maven/repository/WorkspaceReader.java Tue Nov 10 22:18:34 2009
@@ -0,0 +1,35 @@
+package org.apache.maven.repository;
+
+/*
+ * 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;
+
+/**
+ * @author Benjamin Bentmann
+ */
+public interface WorkspaceReader
+{
+
+ File findArtifact( Artifact artifact );
+
+ List<String> findVersions( Artifact artifact );
+
+}

Propchange: maven/maven-3/branches/MNG-4388/maven-dependency-tree-builder/src/main/java/org/apache/maven/repository/WorkspaceReader.java
------------------------------------------------------------------------------
svn:eol-style = native

Propchange: maven/maven-3/branches/MNG-4388/maven-dependency-tree-builder/src/main/java/org/apache/maven/repository/WorkspaceReader.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision

svn commit: r834692 - /maven/plugins/branches/maven-site-plugin-3.x/pom.xml

2009-11-10T14:01:34Z

Author: olamy
Date: Tue Nov 10 22:01:34 2009
New Revision: 834692

URL: http://svn.apache.org/viewvc?rev=834692&view=rev
Log:
update plexus version
use release javadoc plugin version

Modified:
maven/plugins/branches/maven-site-plugin-3.x/pom.xml

Modified: maven/plugins/branches/maven-site-plugin-3.x/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-site-plugin-3.x/pom.xml?rev=834692&r1=834691&r2=834692&view=diff
==============================================================================
--- maven/plugins/branches/maven-site-plugin-3.x/pom.xml (original)
+++ maven/plugins/branches/maven-site-plugin-3.x/pom.xml Tue Nov 10 22:01:34 2009
@@ -159,9 +159,8 @@
<doxiaSitetoolsVersion>1.1.2-SNAPSHOT</doxiaSitetoolsVersion>
<mavenVersion>3.0-SNAPSHOT</mavenVersion>
<wagonVersion>1.0-beta-6</wagonVersion>
- <plexusVersion>1.4.0</plexusVersion>
- 
- <javadocPluginVersion>2.6.1-SNAPSHOT</javadocPluginVersion>
+ <plexusVersion>1.5.0</plexusVersion>
+ <javadocPluginVersion>2.6.1</javadocPluginVersion>

<projectInfoReportsPluginVersion>2.2-SNAPSHOT</projectInfoReportsPluginVersion>
</properties>

svn commit: r834681 - in /maven/plugin-testing/branches/plugin-testing-mvn-3.x: maven-plugin-testing-tools/pom.xml pom.xml

2009-11-10T13:35:50Z

Author: olamy
Date: Tue Nov 10 21:35:49 2009
New Revision: 834681

URL: http://svn.apache.org/viewvc?rev=834681&view=rev
Log:
upgrade plexus-component-metadata version to 1.5.0.
move plexus version to a property.

Modified:
maven/plugin-testing/branches/plugin-testing-mvn-3.x/maven-plugin-testing-tools/pom.xml
maven/plugin-testing/branches/plugin-testing-mvn-3.x/pom.xml

Modified: maven/plugin-testing/branches/plugin-testing-mvn-3.x/maven-plugin-testing-tools/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugin-testing/branches/plugin-testing-mvn-3.x/maven-plugin-testing-tools/pom.xml?rev=834681&r1=834680&r2=834681&view=diff
==============================================================================
--- maven/plugin-testing/branches/plugin-testing-mvn-3.x/maven-plugin-testing-tools/pom.xml (original)
+++ maven/plugin-testing/branches/plugin-testing-mvn-3.x/maven-plugin-testing-tools/pom.xml Tue Nov 10 21:35:49 2009
@@ -94,7 +94,7 @@
<plugin>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-component-metadata</artifactId>
- <version>1.4.1</version>
+ <version>${plexusVersion}</version>
<executions>
<execution>
<goals>

Modified: maven/plugin-testing/branches/plugin-testing-mvn-3.x/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugin-testing/branches/plugin-testing-mvn-3.x/pom.xml?rev=834681&r1=834680&r2=834681&view=diff
==============================================================================
--- maven/plugin-testing/branches/plugin-testing-mvn-3.x/pom.xml (original)
+++ maven/plugin-testing/branches/plugin-testing-mvn-3.x/pom.xml Tue Nov 10 21:35:49 2009
@@ -141,6 +141,7 @@

<properties>
<mavenVersion>3.0-SNAPSHOT</mavenVersion>
+ <plexusVersion>1.5.0</plexusVersion>
</properties>

<dependencyManagement>
@@ -172,7 +173,7 @@
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-container-default</artifactId>
- <version>1.5.0</version>
+ <version>${plexusVersion}</version>
</dependency>

<dependency>

svn commit: r834674 - in /maven/plugin-testing/branches/plugin-testing-mvn-3.x: maven-plugin-testing-harness/src/main/java/org/apache/maven/plugin/testing/stubs/StubArtifactCollector.java pom.xml

2009-11-10T13:28:24Z

Author: olamy
Date: Tue Nov 10 21:28:24 2009
New Revision: 834674

URL: http://svn.apache.org/viewvc?rev=834674&view=rev
Log:
upgrade dependencies.
fix compilation failure.

Modified:
maven/plugin-testing/branches/plugin-testing-mvn-3.x/maven-plugin-testing-harness/src/main/java/org/apache/maven/plugin/testing/stubs/StubArtifactCollector.java
maven/plugin-testing/branches/plugin-testing-mvn-3.x/pom.xml

Modified: maven/plugin-testing/branches/plugin-testing-mvn-3.x/maven-plugin-testing-harness/src/main/java/org/apache/maven/plugin/testing/stubs/StubArtifactCollector.java
URL: http://svn.apache.org/viewvc/maven/plugin-testing/branches/plugin-testing-mvn-3.x/maven-plugin-testing-harness/src/main/java/org/apache/maven/plugin/testing/stubs/StubArtifactCollector.java?rev=834674&r1=834673&r2=834674&view=diff
==============================================================================
--- maven/plugin-testing/branches/plugin-testing-mvn-3.x/maven-plugin-testing-harness/src/main/java/org/apache/maven/plugin/testing/stubs/StubArtifactCollector.java (original)
+++ maven/plugin-testing/branches/plugin-testing-mvn-3.x/maven-plugin-testing-harness/src/main/java/org/apache/maven/plugin/testing/stubs/StubArtifactCollector.java Tue Nov 10 21:28:24 2009
@@ -28,6 +28,7 @@
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.repository.RepositoryRequest;
import org.apache.maven.artifact.resolver.ArtifactCollector;
+import org.apache.maven.artifact.resolver.ArtifactResolutionRequest;
import org.apache.maven.artifact.resolver.ArtifactResolutionResult;
import org.apache.maven.artifact.resolver.ResolutionListener;
import org.apache.maven.artifact.resolver.filter.ArtifactFilter;
@@ -49,13 +50,11 @@
}

public ArtifactResolutionResult collect( Set<Artifact> artifacts, Artifact originatingArtifact,
- Map managedVersions, ArtifactRepository localRepository,
- List<ArtifactRepository> remoteRepositories,
+ Map managedVersions, ArtifactResolutionRequest repositoryRequest,
ArtifactMetadataSource source, ArtifactFilter filter,
List<ResolutionListener> listeners,
List<ConflictResolver> conflictResolvers )
{
- // TODO check if we have to do more here
return new ArtifactResolutionResult();
}

@@ -63,19 +62,19 @@
Map managedVersions, ArtifactRepository localRepository,
List<ArtifactRepository> remoteRepositories,
ArtifactMetadataSource source, ArtifactFilter filter,
- List<ResolutionListener> listeners )
+ List<ResolutionListener> listeners,
+ List<ConflictResolver> conflictResolvers )
{
- // TODO check if we have to do more here
return new ArtifactResolutionResult();
}

public ArtifactResolutionResult collect( Set<Artifact> artifacts, Artifact originatingArtifact,
- Map managedVersions, RepositoryRequest repositoryRequest,
+ Map managedVersions, ArtifactRepository localRepository,
+ List<ArtifactRepository> remoteRepositories,
ArtifactMetadataSource source, ArtifactFilter filter,
- List<ResolutionListener> listeners,
- List<ConflictResolver> conflictResolvers )
+ List<ResolutionListener> listeners )
{
- // TODO check if we have to do more here
return new ArtifactResolutionResult();
}
+
}

Modified: maven/plugin-testing/branches/plugin-testing-mvn-3.x/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugin-testing/branches/plugin-testing-mvn-3.x/pom.xml?rev=834674&r1=834673&r2=834674&view=diff
==============================================================================
--- maven/plugin-testing/branches/plugin-testing-mvn-3.x/pom.xml (original)
+++ maven/plugin-testing/branches/plugin-testing-mvn-3.x/pom.xml Tue Nov 10 21:28:24 2009
@@ -25,7 +25,7 @@
<parent>
<artifactId>maven-parent</artifactId>
<groupId>org.apache.maven</groupId>
- <version>13</version>
+ <version>14</version>
<relativePath>../pom/maven/pom.xml</relativePath>
</parent>

@@ -114,7 +114,7 @@
</mailingLists>

<prerequisites>
- <maven>2.0.6</maven>
+ <maven>3.0</maven>
</prerequisites>

<modules>
@@ -172,7 +172,7 @@
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-container-default</artifactId>
- <version>1.4.1</version>
+ <version>1.5.0</version>
</dependency>

<dependency>
@@ -239,6 +239,11 @@
<tagBase>https://svn.apache.org/repos/asf/maven/plugin-testing/tags</tagBase>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-remote-resources-plugin</artifactId>
+ <version>1.1</version>
+ </plugin>
</plugins>
</pluginManagement>
</build>
@@ -278,7 +283,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
- <version>2.4</version>
+ <version>2.4.1</version>
</plugin>
</plugins>
</pluginManagement>

svn commit: r834648 - /maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java

2009-11-10T12:18:22Z

Author: dfabulich
Date: Tue Nov 10 20:18:21 2009
New Revision: 834648

URL: http://svn.apache.org/viewvc?rev=834648&view=rev
Log:
Added mng3004 test to integration suite

Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java

Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java?rev=834648&r1=834647&r2=834648&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java Tue Nov 10 20:18:21 2009
@@ -338,6 +338,7 @@
suite.addTestSuite( MavenITmng3043BestEffortReactorResolutionTest.class );
suite.addTestSuite( MavenITmng3023ReactorDependencyResolutionTest.class );
suite.addTestSuite( MavenITmng3012CoreClassImportTest.class );
+ suite.addTestSuite( MavenITmng3004ReactorFailureBehaviorMultithreadedTest.class );
suite.addTestSuite( MavenITmng2972OverridePluginDependencyTest.class );
suite.addTestSuite( MavenITmng2926PluginPrefixOrderTest.class );
suite.addTestSuite( MavenITmng2921ActiveAttachedArtifactsTest.class );