From b8ff6c1f86216a6fbe095d027845a3640350e4c4 Mon Sep 17 00:00:00 2001
From: Chris Beams <cbeams@vmware.com>
Date: Fri, 1 Jun 2012 15:35:29 +0200
Subject: [PATCH] Update dependencies for spring-aspects

 - Explicitly specify compile-time dependencies on other spring-*
   modules, primarily for accuracy in pom generation and ensuring
   minimal dependencies for users of spring-aspects.

 - Remove use of p: namespace from annotation-cache-aspectj.xml to
   avoid parser-related test failures under Eclipse (likely due to
   classpath differences between Gradle and Eclipse).
---
 build.gradle                                  | 11 +++++--
 .../cache/config/annotation-cache-aspectj.xml | 30 +++++++++++--------
 2 files changed, 26 insertions(+), 15 deletions(-)

diff --git a/build.gradle b/build.gradle
index 85c932289f..296af4f03f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -504,12 +504,17 @@ project('spring-aspects') {
     description = 'Spring Aspects'
     apply from: 'aspects.gradle'
     dependencies {
-        compile project(":spring-core")
-        compile project(":spring-tx")
-        compile project(":spring-orm")
+        compile(project(":spring-beans"), optional) // for @Configurable support
+        compile(project(":spring-aop"), optional) // for @Async support
+        compile(project(":spring-context"), optional) // for @Enable* support
+        compile(project(":spring-context-support"), optional) // for JavaMail support
+        compile(project(":spring-tx"), optional) // for JPA, @Transactional support
+        compile(project(":spring-orm"), optional) // for JPA exception translation support
         aspects project(":spring-orm")
         ajc "org.aspectj:aspectjtools:${aspectjVersion}"
         compile "org.aspectj:aspectjrt:${aspectjVersion}"
+        testCompile project(":spring-core") // for CodeStyleAspect
+        compile project(":spring-beans") // for 'p' namespace visibility
         testCompile project(":spring-test")
     }
     eclipse.project {
diff --git a/spring-aspects/src/test/java/org/springframework/cache/config/annotation-cache-aspectj.xml b/spring-aspects/src/test/java/org/springframework/cache/config/annotation-cache-aspectj.xml
index 5aaaf6b2d7..5650a370d2 100644
--- a/spring-aspects/src/test/java/org/springframework/cache/config/annotation-cache-aspectj.xml
+++ b/spring-aspects/src/test/java/org/springframework/cache/config/annotation-cache-aspectj.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:aop="http://www.springframework.org/schema/aop"
-       xmlns:p="http://www.springframework.org/schema/p"
-       xmlns:cache="http://www.springframework.org/schema/cache"
-       xmlns:context="http://www.springframework.org/schema/context"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-       		http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop.xsd
-       		http://www.springframework.org/schema/cache http://www.springframework.org/schema/cache/spring-cache.xsd
-       		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd">
+<beans xmlns="http://www.springframework.org/schema/beans"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:aop="http://www.springframework.org/schema/aop"
+	xmlns:cache="http://www.springframework.org/schema/cache"
+	xmlns:context="http://www.springframework.org/schema/context"
+	xsi:schemaLocation="http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop.xsd
+		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+		http://www.springframework.org/schema/cache http://www.springframework.org/schema/cache/spring-cache.xsd
+		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd">
 
 
 	<!--
@@ -30,9 +30,15 @@
 	<bean id="cacheManager" class="org.springframework.cache.support.SimpleCacheManager">
 		<property name="caches">
 			<set>
-				<bean class="org.springframework.cache.concurrent.ConcurrentMapCacheFactoryBean" p:name="default"/>
-				<bean class="org.springframework.cache.concurrent.ConcurrentMapCacheFactoryBean" p:name="primary"/>
-				<bean class="org.springframework.cache.concurrent.ConcurrentMapCacheFactoryBean" p:name="secondary"/>
+				<bean class="org.springframework.cache.concurrent.ConcurrentMapCacheFactoryBean">
+					<property name="name" value="default"/>
+				</bean>
+				<bean class="org.springframework.cache.concurrent.ConcurrentMapCacheFactoryBean">
+					<property name="name" value="primary"/>
+				</bean>
+				<bean class="org.springframework.cache.concurrent.ConcurrentMapCacheFactoryBean">
+					<property name="name" value="secondary"/>
+				</bean>
 			</set>
 		</property>
 	</bean>