Upgrade to Spring Framework 4.2.0.RC1

Closes spring-projectsgh-2947
Eviradnus · May 27, 2015 · b838513 · b838513
1 parent c5566e2
commit b838513
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/...cli/src/test/java/org/springframework/boot/cli/compiler/grape/AetherGrapeEngineTests.java b/...cli/src/test/java/org/springframework/boot/cli/compiler/grape/AetherGrapeEngineTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2014 the original author or authors.
+ * Copyright 2012-2015 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -51,7 +51,9 @@ public class AetherGrapeEngineTests {
 	private AetherGrapeEngine createGrapeEngine() {
 		return AetherGrapeEngineFactory.create(this.groovyClassLoader, Arrays
 				.asList(new RepositoryConfiguration("central", URI
-						.create("http://repo1.maven.org/maven2"), false)),
+							.create("http://repo1.maven.org/maven2"), false),
+						new RepositoryConfiguration("spring-milestone", URI
+							.create("http://repo.spring.io/milestone"), false)),
 				new DependencyResolutionContext());
 	}
 
@@ -92,7 +94,7 @@ public void run() {
 
 				List<RemoteRepository> repositories = (List<RemoteRepository>) ReflectionTestUtils
 						.getField(grapeEngine, "repositories");
-				assertEquals(1, repositories.size());
+				assertEquals(2, repositories.size());
 				assertEquals("central-mirror", repositories.get(0).getId());
 			}
 		});
@@ -109,7 +111,7 @@ public void run() {
 
 				List<RemoteRepository> repositories = (List<RemoteRepository>) ReflectionTestUtils
 						.getField(grapeEngine, "repositories");
-				assertEquals(1, repositories.size());
+				assertEquals(2, repositories.size());
 				Authentication authentication = repositories.get(0).getAuthentication();
 				assertNotNull(authentication);
 			}

diff --git a/spring-boot-dependencies/pom.xml b/spring-boot-dependencies/pom.xml
@@ -119,7 +119,7 @@
 		<snakeyaml.version>1.15</snakeyaml.version>
 		<solr.version>4.10.4</solr.version>
 		<spock.version>1.0-groovy-2.4</spock.version>
-		<spring.version>4.2.0.BUILD-SNAPSHOT</spring.version>
+		<spring.version>4.2.0.RC1</spring.version>
 		<spring-amqp.version>1.5.0.M1</spring-amqp.version>
 		<spring-cloud-connectors.version>1.1.1.RELEASE</spring-cloud-connectors.version>
 		<spring-batch.version>3.0.4.RELEASE</spring-batch.version>