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
This commit is contained in:
Mark Rogers
2014-07-22 15:21:41 +00:00
parent fdf2d9e883
commit 1ce2c554c2

View File

@@ -538,12 +538,12 @@
<dependency>
<groupId>org.springframework.extensions.surf</groupId>
<artifactId>spring-surf-core-configservice</artifactId>
<version>${dependency.surf.version}</version>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.extensions.surf</groupId>
<artifactId>spring-webscripts</artifactId>
<version>${dependency.surf.version}</version>
<version>${project.version}</version>
<exclusions>
<exclusion>
<groupId>com.sun</groupId>
@@ -558,7 +558,7 @@
<dependency>
<groupId>org.springframework.extensions.surf</groupId>
<artifactId>spring-webscripts-api</artifactId>
<version>${dependency.surf.version}</version>
<version>${project.version}</version>
</dependency>
<!-- Spring Social -->