You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by jv...@apache.org on 2007/09/01 23:36:35 UTC
svn commit: r571876 - in /maven/components/trunk/maven-embedder: pom.xml
src/main/assembly/bin.xml
Author: jvanzyl
Date: Sat Sep 1 14:36:35 2007
New Revision: 571876
URL: http://svn.apache.org/viewvc?rev=571876&view=rev
Log:
o putting the old style assembly back as it is too much pain to for the uber jar
Modified:
maven/components/trunk/maven-embedder/pom.xml
maven/components/trunk/maven-embedder/src/main/assembly/bin.xml
Modified: maven/components/trunk/maven-embedder/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/pom.xml?rev=571876&r1=571875&r2=571876&view=diff
==============================================================================
--- maven/components/trunk/maven-embedder/pom.xml (original)
+++ maven/components/trunk/maven-embedder/pom.xml Sat Sep 1 14:36:35 2007
@@ -108,7 +108,6 @@
<!-- 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>
- <!-- this will work with shade plugin 1.0-alpha-11-SNAP -->
<keepDependenciesWithProvidedScope>true</keepDependenciesWithProvidedScope>
<transformers>
<transformer implementation="org.codehaus.mojo.shade.resource.ComponentsXmlResourceTransformer"/>
@@ -173,7 +172,6 @@
<configuration>
<finalName>maven-embedder-tycho-${bundleVersion}</finalName>
<createDependencyReducedPom>false</createDependencyReducedPom>
- <!-- this will work with shade plugin 1.0-alpha-11-SNAP -->
<keepDependenciesWithProvidedScope>true</keepDependenciesWithProvidedScope>
<transformers>
<transformer implementation="org.codehaus.mojo.shade.resource.ComponentsXmlResourceTransformer"/>
@@ -210,46 +208,6 @@
</activation>
<build>
<plugins>
- <plugin>
- <artifactId>shade-maven-plugin</artifactId>
- <groupId>org.codehaus.mojo</groupId>
- <version>1.0-alpha-12</version>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>shade</goal>
- </goals>
- <configuration>
- <shadedArtifactAttached>true</shadedArtifactAttached>
- <createDependencyReducedPom>false</createDependencyReducedPom>
- <!-- this will work with shade plugin 1.0-alpha-11-SNAP -->
- <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>
- </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>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<version>2.2-beta-1</version>
Modified: maven/components/trunk/maven-embedder/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/src/main/assembly/bin.xml?rev=571876&r1=571875&r2=571876&view=diff
==============================================================================
--- maven/components/trunk/maven-embedder/src/main/assembly/bin.xml (original)
+++ maven/components/trunk/maven-embedder/src/main/assembly/bin.xml Sat Sep 1 14:36:35 2007
@@ -31,6 +31,18 @@
<include>org.codehaus.plexus:plexus-classworlds</include>
</includes>
</dependencySet>
+ <dependencySet>
+ <outputDirectory>lib</outputDirectory>
+ <excludes>
+ <exclude>org.codehaus.plexus:plexus-classworlds</exclude>
+ <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>
+ <exclude>org.apache.maven:maven-artifact</exclude>
+ </excludes>
+ </dependencySet>
</dependencySets>
<fileSets>
<fileSet>
@@ -67,7 +79,7 @@
<directory>target</directory>
<outputDirectory>lib</outputDirectory>
<includes>
- <include>maven-embedder*.jar</include>
+ <include>maven*.jar</include>
</includes>
</fileSet>
</fileSets>