You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ol...@apache.org on 2011/05/18 18:28:58 UTC

svn commit: r1124329 - in /archiva/trunk: archiva-modules/archiva-web/archiva-webapp/pom.xml pom.xml

Author: olamy
Date: Wed May 18 16:28:58 2011
New Revision: 1124329

URL: http://svn.apache.org/viewvc?rev=1124329&view=rev
Log:
doh I have been to fast about excluding plexus-spring : need more job

Modified:
    archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml
    archiva/trunk/pom.xml

Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml?rev=1124329&r1=1124328&r2=1124329&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml Wed May 18 16:28:58 2011
@@ -189,12 +189,6 @@
     <dependency>
       <groupId>org.codehaus.redback</groupId>
       <artifactId>redback-struts2-integration</artifactId>
-      <exclusions>
-        <exclusion>
-          <groupId>org.codehaus.redback</groupId>
-          <artifactId>plexus-spring</artifactId>
-        </exclusion>
-      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.codehaus.redback</groupId>

Modified: archiva/trunk/pom.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/pom.xml?rev=1124329&r1=1124328&r2=1124329&view=diff
==============================================================================
--- archiva/trunk/pom.xml (original)
+++ archiva/trunk/pom.xml Wed May 18 16:28:58 2011
@@ -63,7 +63,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-enforcer-plugin</artifactId>
-        <version>1.0-alpha-4</version>
+        <version>1.0</version>
         <executions>
           <execution>
             <goals>
@@ -75,8 +75,10 @@
                   <excludes>
                     <exclude>org.codehaus.plexus:plexus-container-default</exclude>
                     <exclude>org.codehaus.plexus:plexus-log4j-logging</exclude>
+                    <!--
                     <exclude>org.codehaus.plexus:plexus-spring</exclude>
                     <exclude>org.codehaus.redback:plexus-spring</exclude>
+                    -->
                     <exclude>commons-logging:commons-logging</exclude>
                     <exclude>org.slf4j:jcl104-over-slf4j</exclude>
                     <exclude>velocity:velocity-dep</exclude>