Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)

57022: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      56484: ALF-20275 Declare dependencies to alfresco-web-framework-commons as provided, so that they are not transitive


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@61654 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2014-02-11 17:59:09 +00:00
parent 62467c8dcc
commit c456ae2d6b

View File

@@ -61,6 +61,7 @@
<artifactId>alfresco-web-framework-commons</artifactId>
<version>${project.version}</version>
<classifier>classes</classifier>
<scope>provided</scope> <!-- ALF-16947 -->
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
@@ -169,10 +170,13 @@
<artifactId>standard</artifactId>
<version>1.1.0</version>
</dependency>
<!-- Dependency on the web-framework-commons resources skinny war -->
<dependency>
<groupId>org.apache.chemistry.opencmis</groupId>
<artifactId>chemistry-opencmis-test-browser</artifactId>
<version>${dependency.opencmis.version}</version>
<scope>provided</scope> <!-- ALF-16947 -->
</dependency>
<!-- 'provided' dependencies, not packaged in war -->