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 df852bbdc3
commit bf2e3bf36e

View File

@@ -28,12 +28,6 @@
<artifactId>alfresco-repository</artifactId> <artifactId>alfresco-repository</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
</dependency> </dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>alfresco-web-framework-commons</artifactId>
<version>${project.version}</version>
<classifier>classes</classifier>
</dependency>
<dependency> <dependency>
<groupId>org.apache.xmlgraphics</groupId> <groupId>org.apache.xmlgraphics</groupId>
<artifactId>fop</artifactId> <artifactId>fop</artifactId>
@@ -154,7 +148,7 @@
<dependency> <dependency>
<groupId>org.springframework.extensions.surf</groupId> <groupId>org.springframework.extensions.surf</groupId>
<artifactId>spring-webscripts</artifactId> <artifactId>spring-webscripts</artifactId>
<version>${project.version}</version> <version>${dependency.webscripts.version}</version>
<classifier>tests</classifier> <classifier>tests</classifier>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>