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

104572: Merge RA-SPRINT4 to HEAD-BUG-FIX (5.1)
      102752: RA-190 Switch to surf-webscripts 5.1 + remove spurious dependencies


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@104640 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2015-05-20 12:12:33 +00:00
parent 0bdeee43d1
commit bc806b3309

15
pom.xml
View File

@@ -38,18 +38,7 @@
<dependency>
<groupId>org.springframework.extensions.surf</groupId>
<artifactId>spring-webscripts</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.extensions.surf</groupId>
<artifactId>spring-cmis-framework</artifactId>
<version>${project.version}</version>
<exclusions>
<exclusion>
<groupId>org.apache.chemistry.opencmis</groupId>
<artifactId>chemistry-opencmis-client-impl</artifactId>
</exclusion>
</exclusions>
<version>${dependency.webscripts.version}</version>
</dependency>
<dependency>
<groupId>org.alfresco.cmis.client</groupId>
@@ -123,7 +112,7 @@
<dependency>
<groupId>org.springframework.extensions.surf</groupId>
<artifactId>spring-webscripts</artifactId>
<version>${project.version}</version>
<version>${dependency.webscripts.version}</version>
<classifier>tests</classifier>
<scope>test</scope>
</dependency>