From 0e4472055c2c76428a78158ab099e0bb56a70098 Mon Sep 17 00:00:00 2001 From: Ximanta Date: Mon, 5 Dec 2016 19:35:34 +0530 Subject: [PATCH 1/3] Updated SpringBoot reference to 14.2 and @EntityScan package --- pom.xml | 2 +- .../springframework/configuration/RepositoryConfiguration.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 5110db38..832b29bd 100644 --- a/pom.xml +++ b/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 1.2.4.RELEASE + 1.4.2.RELEASE diff --git a/src/test/java/guru/springframework/configuration/RepositoryConfiguration.java b/src/test/java/guru/springframework/configuration/RepositoryConfiguration.java index 1171ffc8..4f8aad2e 100644 --- a/src/test/java/guru/springframework/configuration/RepositoryConfiguration.java +++ b/src/test/java/guru/springframework/configuration/RepositoryConfiguration.java @@ -1,7 +1,7 @@ package guru.springframework.configuration; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; -import org.springframework.boot.orm.jpa.EntityScan; +import org.springframework.boot.autoconfigure.domain.EntityScan; import org.springframework.context.annotation.Configuration; import org.springframework.data.jpa.repository.config.EnableJpaRepositories; import org.springframework.transaction.annotation.EnableTransactionManagement; From 90f6c9ba0f918ed5841f48038822f668fa49d926 Mon Sep 17 00:00:00 2001 From: Ximanta Date: Mon, 5 Dec 2016 19:41:52 +0530 Subject: [PATCH 2/3] Updated ServletRegistrationBean to org.springframework.boot.web.servlet.ServletRegistrationBean --- pom.xml | 2 +- .../guru/springframework/configuration/WebConfiguration.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 832b29bd..a7f3bd04 100644 --- a/pom.xml +++ b/pom.xml @@ -54,7 +54,7 @@ com.h2database h2 - runtime + compile org.postgresql diff --git a/src/main/java/guru/springframework/configuration/WebConfiguration.java b/src/main/java/guru/springframework/configuration/WebConfiguration.java index 6d4567c0..18723229 100644 --- a/src/main/java/guru/springframework/configuration/WebConfiguration.java +++ b/src/main/java/guru/springframework/configuration/WebConfiguration.java @@ -1,7 +1,7 @@ package guru.springframework.configuration; import org.h2.server.web.WebServlet; -import org.springframework.boot.context.embedded.ServletRegistrationBean; +import org.springframework.boot.web.servlet.ServletRegistrationBean; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; From 16bf006233cf500bccfa98345caa6fc172003a80 Mon Sep 17 00:00:00 2001 From: Ximanta Date: Mon, 5 Dec 2016 19:48:23 +0530 Subject: [PATCH 3/3] Updated @SpringApplicationConfiguration to @SpringBootTest --- .../guru/springframework/SpringBootWebApplicationTests.java | 4 ++-- .../springframework/repositories/ProductRepositoryTest.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/test/java/guru/springframework/SpringBootWebApplicationTests.java b/src/test/java/guru/springframework/SpringBootWebApplicationTests.java index a1db764b..01cc997e 100644 --- a/src/test/java/guru/springframework/SpringBootWebApplicationTests.java +++ b/src/test/java/guru/springframework/SpringBootWebApplicationTests.java @@ -2,12 +2,12 @@ import org.junit.Test; import org.junit.runner.RunWith; +import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.web.WebAppConfiguration; -import org.springframework.boot.test.SpringApplicationConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; @RunWith(SpringJUnit4ClassRunner.class) -@SpringApplicationConfiguration(classes = SpringBootWebApplication.class) +@SpringBootTest(classes = SpringBootWebApplication.class) @WebAppConfiguration public class SpringBootWebApplicationTests { diff --git a/src/test/java/guru/springframework/repositories/ProductRepositoryTest.java b/src/test/java/guru/springframework/repositories/ProductRepositoryTest.java index de744082..c989fbf1 100644 --- a/src/test/java/guru/springframework/repositories/ProductRepositoryTest.java +++ b/src/test/java/guru/springframework/repositories/ProductRepositoryTest.java @@ -5,7 +5,7 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.SpringApplicationConfiguration; +import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import java.math.BigDecimal; @@ -13,7 +13,7 @@ import static org.junit.Assert.*; @RunWith(SpringJUnit4ClassRunner.class) -@SpringApplicationConfiguration(classes = {RepositoryConfiguration.class}) +@SpringBootTest(classes = {RepositoryConfiguration.class}) public class ProductRepositoryTest { private ProductRepository productRepository;