Apache
/
maven
mirror of https://github.com/apache/maven.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

integrate maven-toolchain, make buildable 

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@632594 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Milos Kleint 2008-03-01 14:07:09 +00:00
parent 5377165201
commit 667d800240
3 changed files with 7 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
build.xml
View File

@ -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">

41
maven-toolchain/pom.xml
View File

@ -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>

1
pom.xml
View File

@ -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>