Author: brett
Date: Sun Jun 22 06:23:27 2008
New Revision: 670358
URL: http://svn.apache.org/viewvc?rev=670358&view=rev
Log:
[MNG-3622] upgrade to wagon 1.0-beta-3
Modified:
maven/components/branches/maven-2.0.x/apache-maven/pom.xml
maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/MavenArtifactFilterManager.java
maven/components/branches/maven-2.0.x/pom.xml
Modified: maven/components/branches/maven-2.0.x/apache-maven/pom.xml
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/apache-maven/pom.xml?rev=670358&r1=670357&r2=670358&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.x/apache-maven/pom.xml (original)
+++ maven/components/branches/maven-2.0.x/apache-maven/pom.xml Sun Jun 22
06:23:27 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/maven-2.0.x/maven-core/src/main/java/org/apache/maven/MavenArtifactFilterManager.java
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/MavenArtifactFilterManager.java?rev=670358&r1=670357&r2=670358&view=diff
==============================================================================
---
maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/MavenArtifactFilterManager.java
(original)
+++
maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/MavenArtifactFilterManager.java
Sun Jun 22 06:23:27 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/maven-2.0.x/pom.xml
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/pom.xml?rev=670358&r1=670357&r2=670358&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.x/pom.xml (original)
+++ maven/components/branches/maven-2.0.x/pom.xml Sun Jun 22 06:23:27 2008
@@ -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>
