Author: jvanzyl
Date: Tue Sep 23 22:57:36 2008
New Revision: 698433
URL: http://svn.apache.org/viewvc?rev=698433&view=rev
Log:
o changing the necessary files to enable the mercury wagon
Modified:
maven/components/branches/maven-3.0.x-mercury-wagon/maven-distribution/pom.xml
maven/components/branches/maven-3.0.x-mercury-wagon/maven-embedder/pom.xml
maven/components/branches/maven-3.0.x-mercury-wagon/pom.xml
Modified:
maven/components/branches/maven-3.0.x-mercury-wagon/maven-distribution/pom.xml
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-3.0.x-mercury-wagon/maven-distribution/pom.xml?rev=698433&r1=698432&r2=698433&view=diff
==============================================================================
---
maven/components/branches/maven-3.0.x-mercury-wagon/maven-distribution/pom.xml
(original)
+++
maven/components/branches/maven-3.0.x-mercury-wagon/maven-distribution/pom.xml
Tue Sep 23 22:57:36 2008
@@ -51,7 +51,7 @@
</dependency>
<dependency>
<groupId>org.apache.maven.wagon</groupId>
- <artifactId>wagon-http-lightweight</artifactId>
+ <artifactId>wagon-mercury</artifactId>
</dependency>
<dependency>
<groupId>org.apache.maven.wagon</groupId>
@@ -79,69 +79,6 @@
<profile>
<!--
| | This profile is specifically for creating an embedder that
- can be used for IntelliJ integration. We need to | remove the
- JDOM JAR because IntelliJ include its own version, and the JTidy
- JAR includes org.xml.* classes | which causes a loader
- constraint issues while loading the embedder. |
- -->
- <id>idea</id>
- <build>
- <plugins>
- <plugin>
- <artifactId>shade-maven-plugin</artifactId>
- <groupId>org.codehaus.mojo</groupId>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>shade</goal>
- </goals>
- <configuration>
- <!--
- The IDEA folks don't want to put SNAPSHOT libs in
- their projects even though they are
- -->
- <finalName>maven-embedder-idea-2.1</finalName>
-
<createDependencyReducedPom>false</createDependencyReducedPom>
-
<keepDependenciesWithProvidedScope>true</keepDependenciesWithProvidedScope>
- <transformers>
- <transformer
-
implementation="org.codehaus.mojo.shade.resource.ComponentsXmlResourceTransformer"
/>
- </transformers>
- <artifactSet>
- <excludes>
-
<exclude>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>
- <!--
- So this is required for the IDEA embedder which
- already has its own copy of JDOM
- -->
- <exclude>jdom:jdom</exclude>
- <exclude>jtidy:jtidy</exclude>
- </excludes>
- </artifactSet>
- <relocations>
- <relocation>
- <pattern>org.codehaus.plexus.util</pattern>
- <excludes>
- <exclude>org.codehaus.plexus.util.xml.Xpp3Dom</exclude>
- <exclude>org.codehaus.plexus.util.xml.pull.*</exclude>
- </excludes>
- </relocation>
- </relocations>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
- <!--
- | | This profile is specifically for creating an embedder that
can be used for netbeans integration |
-->
<id>netbeans</id>
Modified:
maven/components/branches/maven-3.0.x-mercury-wagon/maven-embedder/pom.xml
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-3.0.x-mercury-wagon/maven-embedder/pom.xml?rev=698433&r1=698432&r2=698433&view=diff
==============================================================================
--- maven/components/branches/maven-3.0.x-mercury-wagon/maven-embedder/pom.xml
(original)
+++ maven/components/branches/maven-3.0.x-mercury-wagon/maven-embedder/pom.xml
Tue Sep 23 22:57:36 2008
@@ -45,10 +45,10 @@
<groupId>commons-cli</groupId>
<artifactId>commons-cli</artifactId>
</dependency>
- <dependency>
+ <dependency>
<groupId>org.apache.maven.wagon</groupId>
- <artifactId>wagon-http-lightweight</artifactId>
- </dependency>
+ <artifactId>wagon-mercury</artifactId>
+ </dependency>
<dependency>
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-ssh</artifactId>
Modified: maven/components/branches/maven-3.0.x-mercury-wagon/pom.xml
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-3.0.x-mercury-wagon/pom.xml?rev=698433&r1=698432&r2=698433&view=diff
==============================================================================
--- maven/components/branches/maven-3.0.x-mercury-wagon/pom.xml (original)
+++ maven/components/branches/maven-3.0.x-mercury-wagon/pom.xml Tue Sep 23
22:57:36 2008
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven-parent</artifactId>
- <version>10-SNAPSHOT</version>
+ <version>9</version>
<relativePath>../pom/maven/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -276,6 +276,7 @@
<wagonVersion>1.0-beta-4</wagonVersion>
<mavenSharedModel>1.0-SNAPSHOT</mavenSharedModel>
<woodstoxVersion>3.2.6</woodstoxVersion>
+ <mercuryVersion>1.0.0-alpha-1-SNAPSHOT</mercuryVersion>
</properties>
<!--start-->
@@ -388,8 +389,8 @@
</dependency>
<dependency>
<groupId>org.apache.maven.wagon</groupId>
- <artifactId>wagon-http-lightweight</artifactId>
- <version>${wagonVersion}</version>
+ <artifactId>wagon-mercury</artifactId>
+ <version>${mercuryVersion}</version>
</dependency>
<dependency>
<groupId>org.apache.maven.wagon</groupId>
