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 2009/01/30 02:44:21 UTC
svn commit: r739135 - in /maven/components/trunk/apache-maven: pom.xml
src/main/assembly/bin.xml
Author: jvanzyl
Date: Fri Jan 30 01:44:21 2009
New Revision: 739135
URL: http://svn.apache.org/viewvc?rev=739135&view=rev
Log:
o cleaning up the excludes to trim what we can for now and getting rid of the custom assemblies for IDEs
Modified:
maven/components/trunk/apache-maven/pom.xml
maven/components/trunk/apache-maven/src/main/assembly/bin.xml
Modified: maven/components/trunk/apache-maven/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/trunk/apache-maven/pom.xml?rev=739135&r1=739134&r2=739135&view=diff
==============================================================================
--- maven/components/trunk/apache-maven/pom.xml (original)
+++ maven/components/trunk/apache-maven/pom.xml Fri Jan 30 01:44:21 2009
@@ -68,11 +68,6 @@
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-file</artifactId>
</dependency>
- <!--Wagon-->
- <dependency>
- <groupId>easymock</groupId>
- <artifactId>easymock</artifactId>
- </dependency>
<!--Mercury MP3-->
<dependency>
<groupId>org.sonatype.mercury</groupId>
@@ -95,117 +90,7 @@
</plugins>
</build>
<profiles>
- <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>
- <build>
- <plugins>
- <plugin>
- <artifactId>shade-maven-plugin</artifactId>
- <groupId>org.codehaus.mojo</groupId>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>shade</goal>
- </goals>
- <configuration>
- <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>
- </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>
+ <profile>
<id>standard</id>
<activation>
<activeByDefault>true</activeByDefault>
Modified: maven/components/trunk/apache-maven/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewvc/maven/components/trunk/apache-maven/src/main/assembly/bin.xml?rev=739135&r1=739134&r2=739135&view=diff
==============================================================================
--- maven/components/trunk/apache-maven/src/main/assembly/bin.xml (original)
+++ maven/components/trunk/apache-maven/src/main/assembly/bin.xml Fri Jan 30 01:44:21 2009
@@ -47,6 +47,17 @@
since we're not using the jdom modello stuff here.
-->
<exclude>jdom:jdom</exclude>
+ <!-- Stuff which will be culled or optional as we move toward 3.0 -->
+ <exclude>org.apache.maven:apache-maven</exclude>
+ <exclude>bouncycastle:bcprov-jdk15</exclude>
+ <exclude>bouncycastle:bcpg-jdk15</exclude>
+ <exclude>log4j:log4j</exclude>
+ <exclude>org.sonatype.mercury:mercury-mp3-cli</exclude>
+ <exclude>commons-logging:commons-logging-api</exclude>
+ <exclude>org.slf4j:slf4j-api</exclude>
+ <exclude>org.slf4j:slf4j-jdk14</exclude>
+ <exclude>org.apache.maven.mercury:mercury-crypto-api</exclude>
+ <exclude>org.apache.maven.mercury:mercury-crypto-basic</exclude>
</excludes>
</dependencySet>
<dependencySet>