From 06ccf6fb074c8497b6fdac15f7d028609eda73a6 Mon Sep 17 00:00:00 2001
From: Olivier Lamy <olamy@apache.org>
Date: Wed, 23 Nov 2011 00:08:26 +0000
Subject: [PATCH] enforcer commons-digester and beanutils versions used to
 avoid dup with redback overlay

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1205245 13f79535-47bb-0310-9956-ffa450edef68
---
 .../archiva-web/archiva-webapp/pom.xml        | 51 ++++++++++++++++---
 pom.xml                                       | 22 ++++++++
 2 files changed, 67 insertions(+), 6 deletions(-)

diff --git a/archiva-modules/archiva-web/archiva-webapp/pom.xml b/archiva-modules/archiva-web/archiva-webapp/pom.xml
index f97b2a9e6..861c61f1e 100644
--- a/archiva-modules/archiva-web/archiva-webapp/pom.xml
+++ b/archiva-modules/archiva-web/archiva-webapp/pom.xml
@@ -234,6 +234,30 @@
     <dependency>
       <groupId>commons-configuration</groupId>
       <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>
@@ -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>
diff --git a/pom.xml b/pom.xml
index 713a9e7ce..5afca4895 100644
--- a/pom.xml
+++ b/pom.xml
@@ -551,6 +551,28 @@
           </exclusion>
         </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>
-- 
2.39.5