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/11/23 01:08:27 UTC
svn commit: r1205245 - in /archiva/trunk:
archiva-modules/archiva-web/archiva-webapp/pom.xml pom.xml
Author: olamy
Date: Wed Nov 23 00:08:26 2011
New Revision: 1205245
URL: http://svn.apache.org/viewvc?rev=1205245&view=rev
Log:
enforcer commons-digester and beanutils versions used to avoid dup with redback overlay
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=1205245&r1=1205244&r2=1205245&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml Wed Nov 23 00:08:26 2011
@@ -236,6 +236,30 @@
<artifactId>commons-configuration</artifactId>
<exclusions>
<exclusion>
+ <groupId>commons-beanutils</groupId>
+ <artifactId>commons-beanutils-core</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>commons-digester</groupId>
+ <artifactId>commons-digester</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>commons-beanutils</groupId>
+ <artifactId>commons-beanutils</artifactId>
+ <exclusions>
+ <exclusion>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</exclusion>
@@ -338,12 +362,7 @@
</exclusions>
</dependency>
<!-- Redback Dependencies -->
- <dependency>
- <groupId>org.codehaus.redback</groupId>
- <artifactId>redback-struts2-content</artifactId>
- <type>war</type>
- <scope>runtime</scope>
- </dependency>
+
<dependency>
<groupId>org.codehaus.redback</groupId>
<artifactId>redback-struts2-integration</artifactId>
@@ -383,6 +402,14 @@
</exclusion>
</exclusions>
</dependency>
+
+ <dependency>
+ <groupId>org.codehaus.redback</groupId>
+ <artifactId>redback-struts2-content</artifactId>
+ <scope>runtime</scope>
+ <type>war</type>
+ </dependency>
+
<!-- Other dependencies -->
<dependency>
<groupId>org.apache.archiva</groupId>
@@ -723,6 +750,18 @@
<addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
</manifest>
</archive>
+ <overlays>
+ <overlay>
+ <id>redback-contents</id>
+ <groupId>org.codehaus.redback</groupId>
+ <artifactId>redback-struts2-content</artifactId>
+ <excludes>
+ <exclude>WEB-INF/lib/**.jar</exclude>
+ <exclude>WEB-INF/web.xml</exclude>
+ <exclude>META-INF/**</exclude>
+ </excludes>
+ </overlay>
+ </overlays>
</configuration>
</plugin>
<plugin>
Modified: archiva/trunk/pom.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/pom.xml?rev=1205245&r1=1205244&r2=1205245&view=diff
==============================================================================
--- archiva/trunk/pom.xml (original)
+++ archiva/trunk/pom.xml Wed Nov 23 00:08:26 2011
@@ -552,6 +552,28 @@
</exclusions>
</dependency>
<dependency>
+ <groupId>commons-digester</groupId>
+ <artifactId>commons-digester</artifactId>
+ <version>1.8.1</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>commons-beanutils</groupId>
+ <artifactId>commons-beanutils</artifactId>
+ <version>1.8.3</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
<version>3.2</version>