Author: jdcasey
Date: Tue Jun 24 11:42:37 2008
New Revision: 671289
URL: http://svn.apache.org/viewvc?rev=671289&view=rev
Log:
Merging 664037:670358 from 2.0.x main branch.
Modified:
maven/components/branches/john-2.0.x-dynamicBuild/apache-maven/pom.xml
maven/components/branches/john-2.0.x-dynamicBuild/maven-core-it-runner/pom.xml
maven/components/branches/john-2.0.x-dynamicBuild/maven-core/src/main/java/org/apache/maven/MavenArtifactFilterManager.java
maven/components/branches/john-2.0.x-dynamicBuild/maven-model/pom.xml
maven/components/branches/john-2.0.x-dynamicBuild/maven-plugin-descriptor/pom.xml
maven/components/branches/john-2.0.x-dynamicBuild/maven-plugin-parameter-documenter/pom.xml
maven/components/branches/john-2.0.x-dynamicBuild/maven-plugin-registry/pom.xml
maven/components/branches/john-2.0.x-dynamicBuild/maven-profile/pom.xml
maven/components/branches/john-2.0.x-dynamicBuild/maven-repository-metadata/pom.xml
maven/components/branches/john-2.0.x-dynamicBuild/maven-settings/pom.xml
maven/components/branches/john-2.0.x-dynamicBuild/maven-toolchain/pom.xml
maven/components/branches/john-2.0.x-dynamicBuild/pom.xml
Modified: maven/components/branches/john-2.0.x-dynamicBuild/apache-maven/pom.xml
URL:
http://svn.apache.org/viewvc/maven/components/branches/john-2.0.x-dynamicBuild/apache-maven/pom.xml?rev=671289&r1=671288&r2=671289&view=diff
==============================================================================
--- maven/components/branches/john-2.0.x-dynamicBuild/apache-maven/pom.xml
(original)
+++ maven/components/branches/john-2.0.x-dynamicBuild/apache-maven/pom.xml Tue
Jun 24 11:42:37 2008
@@ -56,12 +56,11 @@
org.codehaus.plexus:plexus-component-api
</exclude>
<exclude>classworlds:classworlds</exclude>
- <exclude>junit:junit</exclude>
- <exclude>jmock:jmock</exclude>
<exclude>xml-apis:xml-apis</exclude>
</excludes>
</artifactSet>
<relocations>
+ <!-- For slide webdav wagon -->
<relocation>
<pattern>org.jdom</pattern>
</relocation>
@@ -71,12 +70,27 @@
<relocation>
<pattern>org.apache.webdav</pattern>
</relocation>
+ <!-- For http/webdav wagons -->
<relocation>
<pattern>org.apache.commons.httpclient</pattern>
</relocation>
<relocation>
<pattern>org.apache.commons.logging</pattern>
</relocation>
+
+ <!-- For jsch wagon -->
+ <relocation>
+ <pattern>com.jcraft</pattern>
+ </relocation>
+
+ <!-- For wagon API -->
+ <relocation>
+ <pattern>org.cyberneko</pattern>
+ </relocation>
+ <relocation>
+ <pattern>org.apache.xerces</pattern>
+ </relocation>
+
<relocation>
<pattern>org.codehaus.plexus.util</pattern>
<excludes>
Modified:
maven/components/branches/john-2.0.x-dynamicBuild/maven-core-it-runner/pom.xml
URL:
http://svn.apache.org/viewvc/maven/components/branches/john-2.0.x-dynamicBuild/maven-core-it-runner/pom.xml?rev=671289&r1=671288&r2=671289&view=diff
==============================================================================
---
maven/components/branches/john-2.0.x-dynamicBuild/maven-core-it-runner/pom.xml
(original)
+++
maven/components/branches/john-2.0.x-dynamicBuild/maven-core-it-runner/pom.xml
Tue Jun 24 11:42:37 2008
@@ -30,7 +30,7 @@
<dependencies>
<dependency>
<groupId>org.apache.maven</groupId>
- <artifactId>maven-distribution</artifactId>
+ <artifactId>apache-maven</artifactId>
<version>${project.version}</version>
<classifier>bin</classifier>
<type>tar.gz</type>
Modified:
maven/components/branches/john-2.0.x-dynamicBuild/maven-core/src/main/java/org/apache/maven/MavenArtifactFilterManager.java
URL:
http://svn.apache.org/viewvc/maven/components/branches/john-2.0.x-dynamicBuild/maven-core/src/main/java/org/apache/maven/MavenArtifactFilterManager.java?rev=671289&r1=671288&r2=671289&view=diff
==============================================================================
---
maven/components/branches/john-2.0.x-dynamicBuild/maven-core/src/main/java/org/apache/maven/MavenArtifactFilterManager.java
(original)
+++
maven/components/branches/john-2.0.x-dynamicBuild/maven-core/src/main/java/org/apache/maven/MavenArtifactFilterManager.java
Tue Jun 24 11:42:37 2008
@@ -66,7 +66,6 @@
artifacts.add( "commons-cli" );
artifacts.add( "doxia-sink-api" );
artifacts.add( "doxia-logging-api" );
- artifacts.add( "jsch" );
artifacts.add( "maven-artifact" );
artifacts.add( "maven-artifact-manager" );
artifacts.add( "maven-core" );
@@ -84,10 +83,7 @@
artifacts.add( "maven-settings" );
artifacts.add( "plexus-container-default" );
artifacts.add( "plexus-interactivity-api" );
- //adding shared/maven-toolchain project here, even though not part of
the default
- //distro yet.
artifacts.add( "maven-toolchain" );
- //artifacts.add( "plexus-utils" );
artifacts.add( "wagon-provider-api" );
return artifacts;
}
Modified: maven/components/branches/john-2.0.x-dynamicBuild/maven-model/pom.xml
URL:
http://svn.apache.org/viewvc/maven/components/branches/john-2.0.x-dynamicBuild/maven-model/pom.xml?rev=671289&r1=671288&r2=671289&view=diff
==============================================================================
--- maven/components/branches/john-2.0.x-dynamicBuild/maven-model/pom.xml
(original)
+++ maven/components/branches/john-2.0.x-dynamicBuild/maven-model/pom.xml Tue
Jun 24 11:42:37 2008
@@ -39,7 +39,26 @@
<model>src/main/mdo/maven.mdo</model>
</configuration>
</plugin>
+ <plugin>
+ <artifactId>maven-pmd-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
</plugins>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>clirr-maven-plugin</artifactId>
+ <configuration>
+ <includes>
+ <include>org/apache/maven/model/*</include>
+ </includes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
</build>
<profiles>
<profile>
Modified:
maven/components/branches/john-2.0.x-dynamicBuild/maven-plugin-descriptor/pom.xml
URL:
http://svn.apache.org/viewvc/maven/components/branches/john-2.0.x-dynamicBuild/maven-plugin-descriptor/pom.xml?rev=671289&r1=671288&r2=671289&view=diff
==============================================================================
---
maven/components/branches/john-2.0.x-dynamicBuild/maven-plugin-descriptor/pom.xml
(original)
+++
maven/components/branches/john-2.0.x-dynamicBuild/maven-plugin-descriptor/pom.xml
Tue Jun 24 11:42:37 2008
@@ -39,6 +39,19 @@
</configuration>
</plugin>
</plugins>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>clirr-maven-plugin</artifactId>
+ <configuration>
+ <includes>
+ <include>org/apache/maven/plugin/lifecycle/*</include>
+ </includes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
</build>
<dependencies>
<dependency>
Modified:
maven/components/branches/john-2.0.x-dynamicBuild/maven-plugin-parameter-documenter/pom.xml
URL:
http://svn.apache.org/viewvc/maven/components/branches/john-2.0.x-dynamicBuild/maven-plugin-parameter-documenter/pom.xml?rev=671289&r1=671288&r2=671289&view=diff
==============================================================================
---
maven/components/branches/john-2.0.x-dynamicBuild/maven-plugin-parameter-documenter/pom.xml
(original)
+++
maven/components/branches/john-2.0.x-dynamicBuild/maven-plugin-parameter-documenter/pom.xml
Tue Jun 24 11:42:37 2008
@@ -39,6 +39,19 @@
</configuration>
</plugin>
</plugins>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>clirr-maven-plugin</artifactId>
+ <configuration>
+ <includes>
+ <include>org/apache/maven/usability/plugin/*</include>
+ </includes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
</build>
<dependencies>
<dependency>
Modified:
maven/components/branches/john-2.0.x-dynamicBuild/maven-plugin-registry/pom.xml
URL:
http://svn.apache.org/viewvc/maven/components/branches/john-2.0.x-dynamicBuild/maven-plugin-registry/pom.xml?rev=671289&r1=671288&r2=671289&view=diff
==============================================================================
---
maven/components/branches/john-2.0.x-dynamicBuild/maven-plugin-registry/pom.xml
(original)
+++
maven/components/branches/john-2.0.x-dynamicBuild/maven-plugin-registry/pom.xml
Tue Jun 24 11:42:37 2008
@@ -38,6 +38,19 @@
</configuration>
</plugin>
</plugins>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>clirr-maven-plugin</artifactId>
+ <configuration>
+ <includes>
+ <include>org/apache/maven/plugin/registry/*</include>
+ </includes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
</build>
<dependencies>
<dependency>
Modified:
maven/components/branches/john-2.0.x-dynamicBuild/maven-profile/pom.xml
URL:
http://svn.apache.org/viewvc/maven/components/branches/john-2.0.x-dynamicBuild/maven-profile/pom.xml?rev=671289&r1=671288&r2=671289&view=diff
==============================================================================
--- maven/components/branches/john-2.0.x-dynamicBuild/maven-profile/pom.xml
(original)
+++ maven/components/branches/john-2.0.x-dynamicBuild/maven-profile/pom.xml Tue
Jun 24 11:42:37 2008
@@ -39,6 +39,19 @@
</configuration>
</plugin>
</plugins>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>clirr-maven-plugin</artifactId>
+ <configuration>
+ <includes>
+ <include>org/apache/maven/profiles/*</include>
+ </includes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
</build>
<dependencies>
<dependency>
Modified:
maven/components/branches/john-2.0.x-dynamicBuild/maven-repository-metadata/pom.xml
URL:
http://svn.apache.org/viewvc/maven/components/branches/john-2.0.x-dynamicBuild/maven-repository-metadata/pom.xml?rev=671289&r1=671288&r2=671289&view=diff
==============================================================================
---
maven/components/branches/john-2.0.x-dynamicBuild/maven-repository-metadata/pom.xml
(original)
+++
maven/components/branches/john-2.0.x-dynamicBuild/maven-repository-metadata/pom.xml
Tue Jun 24 11:42:37 2008
@@ -41,6 +41,19 @@
</configuration>
</plugin>
</plugins>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>clirr-maven-plugin</artifactId>
+ <configuration>
+ <includes>
+
<include>org/apache/maven/artifact/repository/metadata/*</include>
+ </includes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
</build>
<dependencies>
<dependency>
Modified:
maven/components/branches/john-2.0.x-dynamicBuild/maven-settings/pom.xml
URL:
http://svn.apache.org/viewvc/maven/components/branches/john-2.0.x-dynamicBuild/maven-settings/pom.xml?rev=671289&r1=671288&r2=671289&view=diff
==============================================================================
--- maven/components/branches/john-2.0.x-dynamicBuild/maven-settings/pom.xml
(original)
+++ maven/components/branches/john-2.0.x-dynamicBuild/maven-settings/pom.xml
Tue Jun 24 11:42:37 2008
@@ -39,6 +39,19 @@
</configuration>
</plugin>
</plugins>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>clirr-maven-plugin</artifactId>
+ <configuration>
+ <includes>
+ <include>org/apache/maven/settings/*</include>
+ </includes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
</build>
<dependencies>
<dependency>
Modified:
maven/components/branches/john-2.0.x-dynamicBuild/maven-toolchain/pom.xml
URL:
http://svn.apache.org/viewvc/maven/components/branches/john-2.0.x-dynamicBuild/maven-toolchain/pom.xml?rev=671289&r1=671288&r2=671289&view=diff
==============================================================================
--- maven/components/branches/john-2.0.x-dynamicBuild/maven-toolchain/pom.xml
(original)
+++ maven/components/branches/john-2.0.x-dynamicBuild/maven-toolchain/pom.xml
Tue Jun 24 11:42:37 2008
@@ -96,5 +96,18 @@
</executions>
</plugin>
</plugins>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>clirr-maven-plugin</artifactId>
+ <configuration>
+ <includes>
+ <include>org/apache/maven/toolchain/model/*</include>
+ </includes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
</build>
</project>
Modified: maven/components/branches/john-2.0.x-dynamicBuild/pom.xml
URL:
http://svn.apache.org/viewvc/maven/components/branches/john-2.0.x-dynamicBuild/pom.xml?rev=671289&r1=671288&r2=671289&view=diff
==============================================================================
--- maven/components/branches/john-2.0.x-dynamicBuild/pom.xml (original)
+++ maven/components/branches/john-2.0.x-dynamicBuild/pom.xml Tue Jun 24
11:42:37 2008
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven-parent</artifactId>
- <version>8</version>
+ <version>9-SNAPSHOT</version>
<relativePath>../pom/maven/pom.xml</relativePath>
</parent>
@@ -230,7 +230,7 @@
<properties>
<mavenVersion>2.0.10-SNAPSHOT</mavenVersion>
- <wagonVersion>1.0-beta-2</wagonVersion>
+ <wagonVersion>1.0-beta-3</wagonVersion>
</properties>
<!--start-->
@@ -383,7 +383,7 @@
<dependency>
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-webdav</artifactId>
- <version>${wagonVersion}</version>
+ <version>1.0-beta-2</version>
</dependency>
<dependency>
<groupId>org.apache.maven.wagon</groupId>
