Author: brett
Date: Thu Sep 15 23:47:46 2005
New Revision: 289398
URL: http://svn.apache.org/viewcvs?rev=289398&view=rev
Log:
merge changes from tag, up to 289396
Modified:
maven/components/trunk/maven-plugin-tools/maven-plugin-tools-marmalade/pom.xml
maven/components/trunk/maven-plugins/pom.xml
Modified:
maven/components/trunk/maven-plugin-tools/maven-plugin-tools-marmalade/pom.xml
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugin-tools/maven-plugin-tools-marmalade/pom.xml?rev=289398&r1=289397&r2=289398&view=diff
==============================================================================
---
maven/components/trunk/maven-plugin-tools/maven-plugin-tools-marmalade/pom.xml
(original)
+++
maven/components/trunk/maven-plugin-tools/maven-plugin-tools-marmalade/pom.xml
Thu Sep 15 23:47:46 2005
@@ -23,6 +23,13 @@
<groupId>marmalade</groupId>
<artifactId>marmalade-core</artifactId>
<version>1.0-alpha-4</version>
+ <!-- Uses an old, incompatible version (unfortunately it is the nearest
definition) -->
+ <exclusions>
+ <exclusion>
+ <groupId>plexus</groupId>
+ <artifactId>plexus-utils</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
@@ -30,4 +37,4 @@
<version>2.0-beta-2-SNAPSHOT</version>
</dependency>
</dependencies>
-</project>
\ No newline at end of file
+</project>
Modified: maven/components/trunk/maven-plugins/pom.xml
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/pom.xml?rev=289398&r1=289397&r2=289398&view=diff
==============================================================================
--- maven/components/trunk/maven-plugins/pom.xml (original)
+++ maven/components/trunk/maven-plugins/pom.xml Thu Sep 15 23:47:46 2005
@@ -179,4 +179,14 @@
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/components/trunk/maven-plugins/</developerConnection>
<url>http://svn.apache.org/viewcvs.cgi/maven/components/trunk/maven-plugins/</url>
</scm>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-release-plugin</artifactId>
+ <configuration>
+
<tagBase>https://svn.apache.org/repos/asf/maven/components/tags</tagBase>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
