diff --git a/build.gradle b/build.gradle
index 9e45b055f0..df7b5bc446 100644
--- a/build.gradle
+++ b/build.gradle
@@ -90,12 +90,29 @@ configure(javaprojects) {
     apply from: "$rootDir/gradle/bundlor.gradle"
     apply from: "$rootDir/gradle/maven-deployment.gradle"
 
+    aspectjVersion = '1.6.5'
+    jacksonVersion = '1.4.3'
+    log4jVersion = '1.2.12'
     springVersion = '3.0.5.RELEASE'
 
+	sourceSets {
+	    test {
+	        resources {
+	            srcDirs = ['src/test/resources', 'src/test/java']
+	        }
+	    }
+	}
+
     // dependencies that are common across all java projects
     dependencies {
         testCompile 'junit:junit:4.7'
-        testCompile "log4j:log4j:1.2.12"
+        testCompile "cglib:cglib-nodep:2.2"
+        testCompile "log4j:log4j:$log4jVersion"
+        testCompile "org.easymock:easymock:2.3"
+        testCompile "org.easymock:easymockclassextension:2.3"
+        testCompile "org.hamcrest:hamcrest-all:1.1"
+        testCompile "org.mockito:mockito-all:1.8.4"
+        testCompile "org.springframework:spring-test:$springVersion"
     }
 
     // enable all compiler warnings (GRADLE-1077)
@@ -114,27 +131,37 @@ configure(javaprojects) {
 project('spring-integration-core') {
     description = 'Spring Integration Core'
     dependencies {
-        compile "org.codehaus.jackson:jackson-mapper-asl:1.4.3"
-        compile "org.springframework:spring-aop:3.0.5.RELEASE"
-        compile "org.springframework:spring-context:3.0.5.RELEASE"
-        compile "org.springframework:spring-tx:3.0.5.RELEASE"
-        testCompile "org.hamcrest:hamcrest-all:1.1"
-        testCompile "org.easymock:easymock:2.3"
-        testCompile "org.mockito:mockito-all:1.8.4"
-        testCompile "org.springframework:spring-test:3.0.5.RELEASE"
-        testCompile "org.aspectj:aspectjrt:1.6.5"
-        testCompile "org.aspectj:aspectjweaver:1.6.5"
-        testCompile "cglib:cglib-nodep:2.2"
+        compile "org.codehaus.jackson:jackson-mapper-asl:$jacksonVersion"
+        compile "org.springframework:spring-aop:$springVersion"
+        compile "org.springframework:spring-context:$springVersion"
+        compile "org.springframework:spring-tx:$springVersion"
+        testCompile "org.aspectj:aspectjrt:$aspectjVersion"
+        testCompile "org.aspectj:aspectjweaver:$aspectjVersion"
+    }
+}
+
+project('spring-integration-event') {
+    description = 'Spring Integration Event Support'
+    dependencies {
+        compile "org.springframework:spring-context:$springVersion"
+        compile "org.springframework.integration:spring-integration-core:$version"
+        testCompile "org.springframework.integration:spring-integration-test:$version"
+    }
+}
+
+project('spring-integration-feed') {
+    description = 'Spring Integration RSS Feed Support'
+    dependencies {
+        compile "org.springframework:spring-context:$springVersion"
+        compile "org.springframework.integration:spring-integration-core:$version"
+        compile "commons-lang:commons-lang:2.5"
+        compile "net.java.dev.rome:rome-fetcher:1.0.0"
+        compile "net.java.dev.rome:rome:1.0.0"
+        testCompile "org.springframework.integration:spring-integration-test:2.0.0.BUILD-SNAPSHOT"
     }
 }
 
 /*
-project('spring-integration-event') {
-}
-
-project('spring-integration-feed') {
-}
-
 project('spring-integration-file') {
 }
 
diff --git a/settings.gradle b/settings.gradle
index d3e834281c..8f6dd1fb75 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -15,3 +15,5 @@
  */
 
 include 'spring-integration-core'
+include 'spring-integration-event'
+include 'spring-integration-feed'
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/handler/ExpressionEvaluatingMessageProcessorTests.java b/spring-integration-core/src/test/java/org/springframework/integration/handler/ExpressionEvaluatingMessageProcessorTests.java
index 2cc5c5aa2b..b7ed92dacd 100644
--- a/spring-integration-core/src/test/java/org/springframework/integration/handler/ExpressionEvaluatingMessageProcessorTests.java
+++ b/spring-integration-core/src/test/java/org/springframework/integration/handler/ExpressionEvaluatingMessageProcessorTests.java
@@ -106,7 +106,7 @@ public class ExpressionEvaluatingMessageProcessorTests {
 		processor.setBeanFactory(new GenericApplicationContext().getBeanFactory());
 		EvaluationContext evaluationContext = TestUtils.getPropertyValue(processor, "evaluationContext", EvaluationContext.class);
 		evaluationContext.setVariable("target", new TestTarget());
-		String result = (String) processor.processMessage(new GenericMessage<String>("classpath:*.properties"));
+		String result = (String) processor.processMessage(new GenericMessage<String>("classpath*:*.properties"));
 		assertTrue("Wrong result: "+result, result.contains("log4j.properties"));
 	}