continuum-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From joak...@apache.org
Subject svn commit: r472538 - in /maven/continuum/trunk: continuum-webapp/pom.xml pom.xml
Date Wed, 08 Nov 2006 16:45:15 GMT
Author: joakime
Date: Wed Nov  8 08:45:14 2006
New Revision: 472538

URL: http://svn.apache.org/viewvc?view=rev&rev=472538
Log:
Updating pom's to reduce occurances of duplicate artifacts in continuum-webapp due to war:overlay

Modified:
    maven/continuum/trunk/continuum-webapp/pom.xml
    maven/continuum/trunk/pom.xml

Modified: maven/continuum/trunk/continuum-webapp/pom.xml
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/pom.xml?view=diff&rev=472538&r1=472537&r2=472538
==============================================================================
--- maven/continuum/trunk/continuum-webapp/pom.xml (original)
+++ maven/continuum/trunk/continuum-webapp/pom.xml Wed Nov  8 08:45:14 2006
@@ -70,7 +70,7 @@
           <!-- Some versions of maven-war-plugin (snapshots) have this incorrectly defaulted
to true.
                Specifically setting this to false to avoid accidental jar file creation.
-->
           <archiveClasses>false</archiveClasses>
-          <dependentWarExcludes>META-INF/**,WEB-INF/web.xml,WEB-INF/classes/xwork.xml</dependentWarExcludes>
+          <dependentWarExcludes>META-INF/**,WEB-INF/web.xml,WEB-INF/classes/xwork.xml,WEB-INF/lib/**</dependentWarExcludes>
         </configuration>
         <!-- TODO: would be good to make the jetty plugin aware of these and remove the
below -->
         <executions>
@@ -298,10 +298,6 @@
       <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-xmlrpc</artifactId>
       <version>1.0-beta-4</version>
-    </dependency>
-    <dependency>
-      <groupId>org.codehaus.plexus</groupId>
-      <artifactId>plexus-mail-sender-javamail</artifactId>
     </dependency>
     <dependency>
       <groupId>org.apache.maven.wagon</groupId>

Modified: maven/continuum/trunk/pom.xml
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/pom.xml?view=diff&rev=472538&r1=472537&r2=472538
==============================================================================
--- maven/continuum/trunk/pom.xml (original)
+++ maven/continuum/trunk/pom.xml Wed Nov  8 08:45:14 2006
@@ -378,22 +378,22 @@
       <dependency>
         <groupId>org.codehaus.plexus</groupId>
         <artifactId>plexus-mail-sender-api</artifactId>
-        <version>1.0-alpha-3</version>
+        <version>${mail-sender.version}</version>
       </dependency>
       <dependency>
         <groupId>org.codehaus.plexus</groupId>
         <artifactId>plexus-mail-sender-simple</artifactId>
-        <version>1.0-alpha-3</version>
+        <version>${mail-sender.version}</version>
       </dependency>
       <dependency>
         <groupId>org.codehaus.plexus</groupId>
         <artifactId>plexus-mail-sender-test</artifactId>
-        <version>1.0-alpha-3</version>
+        <version>${mail-sender.version}</version>
       </dependency>
       <dependency>
         <groupId>org.codehaus.plexus</groupId>
         <artifactId>plexus-mail-sender-javamail</artifactId>
-        <version>1.0-alpha-3</version>
+        <version>${mail-sender.version}</version>
       </dependency>
       <dependency>
         <groupId>org.codehaus.plexus</groupId>
@@ -511,5 +511,6 @@
     <maven.version>2.0.4</maven.version>
     <maven-scm.version>1.0-SNAPSHOT</maven-scm.version>
     <plexus-security.version>1.0-alpha-6-SNAPSHOT</plexus-security.version>
+    <mail-sender.version>1.0-alpha-5-SNAPSHOT</mail-sender.version>
   </properties>
 </project>



Mime
View raw message