Skip to content

Commit b838513

Browse files
committed
Upgrade to Spring Framework 4.2.0.RC1
Closes gh-2947
1 parent c5566e2 commit b838513

File tree

2 files changed

+7
-5
lines changed

2 files changed

+7
-5
lines changed

spring-boot-cli/src/test/java/org/springframework/boot/cli/compiler/grape/AetherGrapeEngineTests.java

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2014 the original author or authors.
2+
* Copyright 2012-2015 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -51,7 +51,9 @@ public class AetherGrapeEngineTests {
5151
private AetherGrapeEngine createGrapeEngine() {
5252
return AetherGrapeEngineFactory.create(this.groovyClassLoader, Arrays
5353
.asList(new RepositoryConfiguration("central", URI
54-
.create("http://repo1.maven.org/maven2"), false)),
54+
.create("http://repo1.maven.org/maven2"), false),
55+
new RepositoryConfiguration("spring-milestone", URI
56+
.create("http://repo.spring.io/milestone"), false)),
5557
new DependencyResolutionContext());
5658
}
5759

@@ -92,7 +94,7 @@ public void run() {
9294

9395
List<RemoteRepository> repositories = (List<RemoteRepository>) ReflectionTestUtils
9496
.getField(grapeEngine, "repositories");
95-
assertEquals(1, repositories.size());
97+
assertEquals(2, repositories.size());
9698
assertEquals("central-mirror", repositories.get(0).getId());
9799
}
98100
});
@@ -109,7 +111,7 @@ public void run() {
109111

110112
List<RemoteRepository> repositories = (List<RemoteRepository>) ReflectionTestUtils
111113
.getField(grapeEngine, "repositories");
112-
assertEquals(1, repositories.size());
114+
assertEquals(2, repositories.size());
113115
Authentication authentication = repositories.get(0).getAuthentication();
114116
assertNotNull(authentication);
115117
}

spring-boot-dependencies/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@
119119
<snakeyaml.version>1.15</snakeyaml.version>
120120
<solr.version>4.10.4</solr.version>
121121
<spock.version>1.0-groovy-2.4</spock.version>
122-
<spring.version>4.2.0.BUILD-SNAPSHOT</spring.version>
122+
<spring.version>4.2.0.RC1</spring.version>
123123
<spring-amqp.version>1.5.0.M1</spring-amqp.version>
124124
<spring-cloud-connectors.version>1.1.1.RELEASE</spring-cloud-connectors.version>
125125
<spring-batch.version>3.0.4.RELEASE</spring-batch.version>

0 commit comments

Comments
 (0)