root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 12 Packages Projects Releases Wiki Activity

Upgrade to Spring Framework 4.2.0.RC1 

Closes gh-2947
This commit is contained in:
Stephane Nicoll 2015-05-27 15:31:10 +02:00
parent c5566e2755
commit b838513fda
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -51,7 +51,9 @@ public class AetherGrapeEngineTests {
private AetherGrapeEngine createGrapeEngine() { private AetherGrapeEngine createGrapeEngine() {
return AetherGrapeEngineFactory.create(this.groovyClassLoader, Arrays return AetherGrapeEngineFactory.create(this.groovyClassLoader, Arrays
.asList(new RepositoryConfiguration("central", URI .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()); new DependencyResolutionContext());
} }
@ -92,7 +94,7 @@ public class AetherGrapeEngineTests {
List<RemoteRepository> repositories = (List<RemoteRepository>) ReflectionTestUtils List<RemoteRepository> repositories = (List<RemoteRepository>) ReflectionTestUtils
.getField(grapeEngine, "repositories"); .getField(grapeEngine, "repositories");
assertEquals(1, repositories.size()); assertEquals(2, repositories.size());
assertEquals("central-mirror", repositories.get(0).getId()); assertEquals("central-mirror", repositories.get(0).getId());
} }
}); });
@ -109,7 +111,7 @@ public class AetherGrapeEngineTests {
List<RemoteRepository> repositories = (List<RemoteRepository>) ReflectionTestUtils List<RemoteRepository> repositories = (List<RemoteRepository>) ReflectionTestUtils
.getField(grapeEngine, "repositories"); .getField(grapeEngine, "repositories");
assertEquals(1, repositories.size()); assertEquals(2, repositories.size());
Authentication authentication = repositories.get(0).getAuthentication(); Authentication authentication = repositories.get(0).getAuthentication();
assertNotNull(authentication); assertNotNull(authentication);
} }

2
spring-boot-dependencies/pom.xml
View File

@ -119,7 +119,7 @@
<snakeyaml.version>1.15</snakeyaml.version> <snakeyaml.version>1.15</snakeyaml.version>
<solr.version>4.10.4</solr.version> <solr.version>4.10.4</solr.version>
<spock.version>1.0-groovy-2.4</spock.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-amqp.version>1.5.0.M1</spring-amqp.version>
<spring-cloud-connectors.version>1.1.1.RELEASE</spring-cloud-connectors.version> <spring-cloud-connectors.version>1.1.1.RELEASE</spring-cloud-connectors.version>
<spring-batch.version>3.0.4.RELEASE</spring-batch.version> <spring-batch.version>3.0.4.RELEASE</spring-batch.version>