Skip to content

Commit 1abd91d

Browse files
committed
Start building against Spring Framework 4.3.7 snapshots
See gh-8248
1 parent 461d561 commit 1abd91d

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

spring-boot-dependencies/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@
145145
<snakeyaml.version>1.17</snakeyaml.version>
146146
<solr.version>5.5.3</solr.version>
147147
<spock.version>1.0-groovy-2.4</spock.version>
148-
<spring.version>4.3.6.RELEASE</spring.version>
148+
<spring.version>4.3.7.BUILD-SNAPSHOT</spring.version>
149149
<spring-amqp.version>1.6.7.RELEASE</spring-amqp.version>
150150
<spring-cloud-connectors.version>1.2.3.RELEASE</spring-cloud-connectors.version>
151151
<spring-batch.version>3.0.7.RELEASE</spring-batch.version>

spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/orm/jpa/TestEntityManager.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2016 the original author or authors.
2+
* Copyright 2012-2017 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.
@@ -224,7 +224,7 @@ public Object getId(Object entity) {
224224
@SuppressWarnings("unchecked")
225225
public <T> T getId(Object entity, Class<T> idType) {
226226
Object id = getId(entity);
227-
Assert.isInstanceOf(idType, id, "ID mismatch");
227+
Assert.isInstanceOf(idType, id, "ID mismatch:");
228228
return (T) id;
229229
}
230230

spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/orm/jpa/TestEntityManagerTests.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2016 the original author or authors.
2+
* Copyright 2012-2017 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.
@@ -191,7 +191,7 @@ public void getIdForTypeShouldGetId() throws Exception {
191191
public void getIdForTypeWhenTypeIsWrongShouldThrowException() throws Exception {
192192
TestEntity entity = new TestEntity();
193193
given(this.persistenceUnitUtil.getIdentifier(entity)).willReturn(123);
194-
this.thrown.expectMessage("ID mismatch Object of class [java.lang.Integer] "
194+
this.thrown.expectMessage("ID mismatch: Object of class [java.lang.Integer] "
195195
+ "must be an instance of class java.lang.Long");
196196
this.testEntityManager.getId(entity, Long.class);
197197
}

0 commit comments

Comments
 (0)