From 667d80024085ba0c6bc039d28b20d685fd2b7eea Mon Sep 17 00:00:00 2001
From: Milos Kleint <mkleint@apache.org>
Date: Sat, 1 Mar 2008 14:07:09 +0000
Subject: [PATCH] integrate maven-toolchain, make buildable

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@632594 13f79535-47bb-0310-9956-ffa450edef68
---
 build.xml               |  1 +
 maven-toolchain/pom.xml | 41 +++++------------------------------------
 pom.xml                 |  1 +
 3 files changed, 7 insertions(+), 36 deletions(-)

diff --git a/build.xml b/build.xml
index 5a5ce3619a..ad2dd8363d 100644
--- a/build.xml
+++ b/build.xml
@@ -220,6 +220,7 @@ under the License.
     <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">
diff --git a/maven-toolchain/pom.xml b/maven-toolchain/pom.xml
index e6e21d1e5d..f573862918 100644
--- a/maven-toolchain/pom.xml
+++ b/maven-toolchain/pom.xml
@@ -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>
     
diff --git a/pom.xml b/pom.xml
index 8d69b86928..fc0a91ac91 100644
--- a/pom.xml
+++ b/pom.xml
@@ -210,6 +210,7 @@ under the License.
     <module>maven-reporting-api</module>
     <module>maven-embedder</module>
     <module>maven-workspace</module>
+    <module>maven-toolchain</module>
   </modules>
 
   <properties>