diff --git a/pom.xml b/pom.xml
index 0693bbc65..e56640af0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -15,7 +15,7 @@
 	<parent>
 		<groupId>org.springframework.data.build</groupId>
 		<artifactId>spring-data-parent</artifactId>
-		<version>1.2.0.RELEASE</version>
+		<version>1.3.0.BUILD-SNAPSHOT</version>
 		<relativePath>../spring-data-build/parent/pom.xml</relativePath>
 	</parent>
 	
@@ -91,8 +91,8 @@
 	
 	<repositories>
 		<repository>
-			<id>spring-lib-release</id>
-			<url>http://repo.springsource.org/libs-release-local</url>
+			<id>spring-lib-snapshot</id>
+			<url>http://repo.springsource.org/libs-snapshot-local</url>
 		</repository>
 	</repositories>
 
diff --git a/spring-data-mongodb-cross-store/template.mf b/spring-data-mongodb-cross-store/template.mf
index 5f02da1bd..25a004b3a 100644
--- a/spring-data-mongodb-cross-store/template.mf
+++ b/spring-data-mongodb-cross-store/template.mf
@@ -12,7 +12,7 @@ Import-Template:
  org.aspectj.*;version="${aspectj:[1.0.0, 2.0.0)}",
  org.bson.*;version="0",
  org.slf4j.*;version="${slf4j:[=.=.=,+1.0.0)}",
- org.springframework.*;version="${spring30:[=.=.=.=,+1.0.0)}",
+ org.springframework.*;version="${spring:[=.=.=.=,+1.0.0)}",
  org.springframework.data.*;version="${springdata.commons:[=.=.=.=,+1.0.0)}",
  org.springframework.data.mongodb.*;version="${project.version:[=.=.=.=,+1.0.0)}",
  org.w3c.dom.*;version="0"
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/SpelExpressionTransformer.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/SpelExpressionTransformer.java
index 958d4291f..6c9b958b5 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/SpelExpressionTransformer.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/SpelExpressionTransformer.java
@@ -29,6 +29,7 @@ import org.springframework.data.mongodb.core.spel.MethodReferenceNode;
 import org.springframework.data.mongodb.core.spel.OperatorNode;
 import org.springframework.expression.spel.ExpressionState;
 import org.springframework.expression.spel.SpelNode;
+import org.springframework.expression.spel.SpelParserConfiguration;
 import org.springframework.expression.spel.ast.CompoundExpression;
 import org.springframework.expression.spel.ast.Indexer;
 import org.springframework.expression.spel.ast.InlineList;
@@ -50,7 +51,9 @@ import com.mongodb.DBObject;
  */
 class SpelExpressionTransformer implements AggregationExpressionTransformer {
 
-	private final SpelExpressionParser parser = new SpelExpressionParser();
+	// TODO: remove explicit usage of a configuration once SPR-11031 gets fixed
+	private static final SpelParserConfiguration CONFIG = new SpelParserConfiguration(false, false);
+	private static final SpelExpressionParser PARSER = new SpelExpressionParser(CONFIG);
 	private final List<ExpressionNodeConversion<? extends ExpressionNode>> conversions;
 
 	/**
@@ -87,8 +90,8 @@ class SpelExpressionTransformer implements AggregationExpressionTransformer {
 		Assert.notNull(context, "AggregationOperationContext must not be null!");
 		Assert.notNull(params, "Parameters must not be null!");
 
-		SpelExpression spelExpression = (SpelExpression) parser.parseExpression(expression);
-		ExpressionState state = new ExpressionState(new StandardEvaluationContext(params));
+		SpelExpression spelExpression = (SpelExpression) PARSER.parseExpression(expression);
+		ExpressionState state = new ExpressionState(new StandardEvaluationContext(params), CONFIG);
 		ExpressionNode node = ExpressionNode.from(spelExpression.getAST(), state);
 
 		return transform(new AggregationExpressionTransformationContext<ExpressionNode>(node, null, null, context));
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/convert/CustomConversionsUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/convert/CustomConversionsUnitTests.java
index 9fae44fe6..d4ac002fb 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/convert/CustomConversionsUnitTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/convert/CustomConversionsUnitTests.java
@@ -100,7 +100,6 @@ public class CustomConversionsUnitTests {
 	public void populatesConversionServiceCorrectly() {
 
 		GenericConversionService conversionService = new DefaultConversionService();
-		assertThat(conversionService.canConvert(String.class, UUID.class), is(false));
 
 		CustomConversions conversions = new CustomConversions(Arrays.asList(StringToFormatConverter.INSTANCE));
 		conversions.registerConvertersIn(conversionService);
diff --git a/spring-data-mongodb/template.mf b/spring-data-mongodb/template.mf
index e8fe82a46..054079017 100644
--- a/spring-data-mongodb/template.mf
+++ b/spring-data-mongodb/template.mf
@@ -18,7 +18,7 @@ Import-Template:
  org.aopalliance.*;version="[1.0.0, 2.0.0)";resolution:=optional,
  org.bson.*;version="0",
  org.slf4j.*;version="${slf4j:[=.=.=,+1.0.0)}",
- org.springframework.*;version="${spring30:[=.=.=.=,+1.0.0)}",
+ org.springframework.*;version="${spring:[=.=.=.=,+1.0.0)}",
  org.springframework.data.*;version="${springdata.commons:[=.=.=.=,+1.0.0)}",
  org.springframework.data.mongodb.*;version="${project.version:[=.=.=.=,+1.0.0)}",
  org.w3c.dom.*;version="0"