diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/rest/RepositoryRestMvcAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/rest/RepositoryRestMvcAutoConfigurationTests.java index c552b8cad5..bad694cc93 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/rest/RepositoryRestMvcAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/rest/RepositoryRestMvcAutoConfigurationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2017 the original author or authors. + * Copyright 2012-2018 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. @@ -17,11 +17,7 @@ package org.springframework.boot.autoconfigure.data.rest; import java.net.URI; -import java.util.Date; -import java.util.Map; -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.databind.ObjectMapper; import org.junit.After; import org.junit.Test; @@ -146,31 +142,6 @@ public class RepositoryRestMvcAutoConfigurationTests { assertThat(bean.getBaseUri()).isEqualTo(URI.create("")); } - @Test - public void objectMappersAreConfiguredUsingObjectMapperBuilder() - throws JsonProcessingException { - load(TestConfigurationWithObjectMapperBuilder.class); - - assertThatDateIsFormattedCorrectly("halObjectMapper"); - assertThatDateIsFormattedCorrectly("objectMapper"); - } - - @Test - public void primaryObjectMapperIsAvailable() { - load(TestConfiguration.class); - Map objectMappers = this.context - .getBeansOfType(ObjectMapper.class); - assertThat(objectMappers.size()).isGreaterThan(1); - this.context.getBean(ObjectMapper.class); - } - - public void assertThatDateIsFormattedCorrectly(String beanName) - throws JsonProcessingException { - ObjectMapper objectMapper = this.context.getBean(beanName, ObjectMapper.class); - assertThat(objectMapper.writeValueAsString(new Date(1413387983267L))) - .isEqualTo("\"2014-10\""); - } - private void load(Class config, String... environment) { AnnotationConfigWebApplicationContext applicationContext = new AnnotationConfigWebApplicationContext(); applicationContext.setServletContext(new MockServletContext()); diff --git a/spring-boot-project/spring-boot-dependencies/pom.xml b/spring-boot-project/spring-boot-dependencies/pom.xml index 664e0507f0..c272023ae6 100644 --- a/spring-boot-project/spring-boot-dependencies/pom.xml +++ b/spring-boot-project/spring-boot-dependencies/pom.xml @@ -155,7 +155,7 @@ 2.0.5.BUILD-SNAPSHOT 4.0.1.RELEASE 2.0.2.RELEASE - Kay-SR8 + Kay-BUILD-SNAPSHOT 0.25.0.BUILD-SNAPSHOT 5.0.7.BUILD-SNAPSHOT 2.1.8.BUILD-SNAPSHOT