From 1ce2c554c2c18ef74ad1e4cb580061b0ab23b0b3 Mon Sep 17 00:00:00 2001 From: Mark Rogers Date: Tue, 22 Jul 2014 15:21:41 +0000 Subject: [PATCH] Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud) 76552: Merged EOL2 to HEAD-BUG-FIX (5.0/Cloud) 76438: ACE-2219 EOL use of external spring surf (bring spring surf back into Alfresco) - SpringSurf is coming home. Part 1 - copy of remaining SpringSurf projects from r1567 and refactor of pom files to build in Alfresco parent structure. 76444: ACE-2219 EOL use of external spring surf (bring spring surf back into Alfresco) - Merge of r1568 from SpringSurf - Clear an additional cache in DojoDependencyHandler to prevent a cached reference being found for a resource that doesn't exist. 76445: ACE-2219 EOL use of external spring surf (bring spring surf back into Alfresco) - Ignore patterns for surf projects 76450: ACE-2219 EOL use of external spring surf (bring spring surf back into Alfresco) - Surf now building from root alfresco pom - full maven builds for Community, Enterprise and Thor all building and working. SURF IS HOME. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@77621 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 9c2121c20f..1def9c6894 100644 --- a/pom.xml +++ b/pom.xml @@ -538,12 +538,12 @@ org.springframework.extensions.surf spring-surf-core-configservice - ${dependency.surf.version} + ${project.version} org.springframework.extensions.surf spring-webscripts - ${dependency.surf.version} + ${project.version} com.sun @@ -558,7 +558,7 @@ org.springframework.extensions.surf spring-webscripts-api - ${dependency.surf.version} + ${project.version}