Author: mkleint
Date: Sat Mar 1 06:07:09 2008
New Revision: 632594
URL: http://svn.apache.org/viewvc?rev=632594&view=rev
Log:
integrate maven-toolchain, make buildable
Modified:
maven/components/trunk/build.xml
maven/components/trunk/maven-toolchain/pom.xml
maven/components/trunk/pom.xml
Modified: maven/components/trunk/build.xml
URL:
http://svn.apache.org/viewvc/maven/components/trunk/build.xml?rev=632594&r1=632593&r2=632594&view=diff
==============================================================================
--- maven/components/trunk/build.xml (original)
+++ maven/components/trunk/build.xml Sat Mar 1 06:07:09 2008
@@ -220,6 +220,7 @@
<modello file="maven-plugin-api/src/main/mdo/lifecycle.mdo"/>
<modello file="maven-profile/src/main/mdo/profiles.mdo"/>
<modello file="maven-core/src/main/mdo/settings.mdo"/>
+ <modello file="maven-toolchain/src/main/mdo/toolchains.xml"/>
</target>
<target name="compile-boot" depends="generate-sources" description="compiles
the bootstrap sources">
Modified: maven/components/trunk/maven-toolchain/pom.xml
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-toolchain/pom.xml?rev=632594&r1=632593&r2=632594&view=diff
==============================================================================
--- maven/components/trunk/maven-toolchain/pom.xml (original)
+++ maven/components/trunk/maven-toolchain/pom.xml Sat Mar 1 06:07:09 2008
@@ -3,12 +3,12 @@
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven</artifactId>
- <version>2.0.6</version>
+ <version>2.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>maven-toolchain</artifactId>
<name>Maven Toolchains</name>
- <version>1.0-SNAPSHOT</version>
+ <version>2.1-SNAPSHOT</version>
<url>http://maven.apache.org</url>
<dependencies>
<dependency>
@@ -20,12 +20,12 @@
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-core</artifactId>
- <version>2.0.6</version>
+ <version>2.1-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>org.apache.maven</groupId>
+ <groupId>org.apache.maven.artifact</groupId>
<artifactId>maven-artifact</artifactId>
- <version>2.0.6</version>
+ <version>3.0-SNAPSHOT</version>
</dependency>
</dependencies>
<build>
@@ -49,37 +49,6 @@
<model>src/main/mdo/toolchains.xml</model>
</configuration>
</plugin>
- <plugin>
- <artifactId>maven-shade-plugin</artifactId>
- <groupId>org.apache.maven.plugins</groupId>
- <version>1.0-alpha-15</version>
- <executions>
- <execution>
- <id>shading</id>
- <phase>package</phase>
- <goals>
- <goal>shade</goal>
- </goals>
- <configuration>
- <artifactSet>
- <includes>
-
<include>${project.groupId}:${project.artifactId}</include>
- </includes>
- </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>
Modified: maven/components/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/maven/components/trunk/pom.xml?rev=632594&r1=632593&r2=632594&view=diff
==============================================================================
--- maven/components/trunk/pom.xml (original)
+++ maven/components/trunk/pom.xml Sat Mar 1 06:07:09 2008
@@ -210,6 +210,7 @@
<module>maven-reporting-api</module>
<module>maven-embedder</module>
<module>maven-workspace</module>
+ <module>maven-toolchain</module>
</modules>
<properties>
