From 1bd966cebdc5f5ad06cccc50d1f193e32cebf61b Mon Sep 17 00:00:00 2001
From: Samuel Langlois <samuel.langlois@alfresco.com>
Date: Tue, 27 Nov 2012 13:43:55 +0000
Subject: [PATCH] ALF-16947: prevent dependency to web-framework-commons war to
 be transitive: this artifact is not generated in Ant build

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@44037 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 pom.xml | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index d4b0d1a5e..969baf918 100644
--- a/pom.xml
+++ b/pom.xml
@@ -49,6 +49,11 @@
             <artifactId>alfresco-repository</artifactId>
             <version>${project.version}</version>
         </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>alfresco-web-framework-commons</artifactId>
+            <version>${project.version}</version>
+        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>alfresco-jndi-client</artifactId>
@@ -143,7 +148,7 @@
             <artifactId>standard</artifactId>
             <version>1.1.0</version>
         </dependency>
-        
+
         <!-- Dependency on the web-framework-commons resources skinny war -->
         <dependency>
             <groupId>${project.groupId}</groupId>
@@ -151,6 +156,7 @@
             <version>${project.version}</version>
             <classifier>webapp</classifier>
             <type>war</type>
+            <scope>provided</scope> <!-- ALF-16947 -->
         </dependency>
 
         <!-- 'provided' dependencies, not packaged in war -->
@@ -280,6 +286,16 @@
             <plugin>
                 <artifactId>maven-war-plugin</artifactId>
                 <configuration>
+                    <overlays>
+                        <overlay>
+                            <groupId>${project.groupId}</groupId>
+                            <artifactId>alfresco-web-framework-commons</artifactId>
+                            <classifier>webapp</classifier>
+                            <excludes>
+                                <exclude>WEB-INF/classes/*</exclude>
+                            </excludes>
+                        </overlay>
+                    </overlays>
                     <attachClasses>true</attachClasses>
                     <archiveClasses>true</archiveClasses>
                 </configuration>