Author: brianf
Date: Mon Oct 19 00:19:31 2009
New Revision: 826567
URL: http://svn.apache.org/viewvc?rev=826567&view=rev
Log:
insert the correct url for the plexus snapshots and set for snapshots only
restored tar.gz and commented out unused excludes in the assembly bin.xml
Modified:
maven/maven-3/trunk/apache-maven/src/main/assembly/bin.xml
maven/maven-3/trunk/pom.xml
Modified: maven/maven-3/trunk/apache-maven/src/main/assembly/bin.xml
URL:
http://svn.apache.org/viewvc/maven/maven-3/trunk/apache-maven/src/main/assembly/bin.xml?rev=826567&r1=826566&r2=826567&view=diff
==============================================================================
--- maven/maven-3/trunk/apache-maven/src/main/assembly/bin.xml (original)
+++ maven/maven-3/trunk/apache-maven/src/main/assembly/bin.xml Mon Oct 19
00:19:31 2009
@@ -21,6 +21,7 @@
<id>bin</id>
<formats>
<format>zip</format>
+ <format>tar.gz</format>
</formats>
<dependencySets>
<dependencySet>
@@ -32,7 +33,13 @@
<dependencySet>
<outputDirectory>lib</outputDirectory>
<excludes>
- <exclude>org.codehaus.plexus:plexus-classworlds</exclude>
+ <exclude>org.codehaus.plexus:plexus-classworlds</exclude>
+ <exclude>junit:junit</exclude>
+ <exclude>org.apache.maven:apache-maven</exclude>
+ <exclude>log4j:log4j</exclude>
+ <exclude>commons-logging:commons-logging-api</exclude>
+
+ <!--exclude>org.codehaus.plexus:plexus-classworlds</exclude>
<exclude>org.codehaus.plexus:plexus-component-api</exclude>
<exclude>classworlds:classworlds</exclude>
<exclude>junit:junit</exclude>
@@ -41,11 +48,7 @@
<exclude>org.apache.maven:maven-artifact</exclude>
<exclude>org.apache.maven:maven-monitor</exclude>
<exclude>org.apache.maven:maven-plugin-descriptor</exclude>
- <!-- NOTE: Excluding to avoid maven-model and maven-profile inclusions,
- 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>
@@ -55,7 +58,7 @@
<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>
+ <exclude>org.apache.maven.mercury:mercury-crypto-basic</exclude-->
</excludes>
</dependencySet>
</dependencySets>
Modified: maven/maven-3/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/maven/maven-3/trunk/pom.xml?rev=826567&r1=826566&r2=826567&view=diff
==============================================================================
--- maven/maven-3/trunk/pom.xml (original)
+++ maven/maven-3/trunk/pom.xml Mon Oct 19 00:19:31 2009
@@ -162,13 +162,19 @@
<repositories>
<repository>
<id>sonatype.public</id>
- <url>http://repository.sonatype.org/content/groups/public/</url>
+
<url>http://repository.sonatype.org/content/repositories/plexus-oss-snapshots</url>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
</repository>
</repositories>
<pluginRepositories>
<pluginRepository>
<id>sonatype.public</id>
- <url>http://repository.sonatype.org/content/groups/public/</url>
+
<url>http://repository.sonatype.org/content/repositories/plexus-oss-snapshots</url>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
</pluginRepository>
</pluginRepositories>
