Skip to content

Commit e6180d4

Browse files
Merge pull request #10 from ximanta/master
Updated to SpringBoot 1.4.2
2 parents 9106bc8 + 16bf006 commit e6180d4

File tree

5 files changed

+8
-8
lines changed

5 files changed

+8
-8
lines changed

pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<parent>
1515
<groupId>org.springframework.boot</groupId>
1616
<artifactId>spring-boot-starter-parent</artifactId>
17-
<version>1.2.4.RELEASE</version>
17+
<version>1.4.2.RELEASE</version>
1818
<relativePath/> <!-- lookup parent from repository -->
1919
</parent>
2020

@@ -54,7 +54,7 @@
5454
<dependency>
5555
<groupId>com.h2database</groupId>
5656
<artifactId>h2</artifactId>
57-
<scope>runtime</scope>
57+
<scope>compile</scope>
5858
</dependency>
5959
<dependency>
6060
<groupId>org.postgresql</groupId>

src/main/java/guru/springframework/configuration/WebConfiguration.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package guru.springframework.configuration;
22

33
import org.h2.server.web.WebServlet;
4-
import org.springframework.boot.context.embedded.ServletRegistrationBean;
4+
import org.springframework.boot.web.servlet.ServletRegistrationBean;
55
import org.springframework.context.annotation.Bean;
66
import org.springframework.context.annotation.Configuration;
77

src/test/java/guru/springframework/SpringBootWebApplicationTests.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22

33
import org.junit.Test;
44
import org.junit.runner.RunWith;
5+
import org.springframework.boot.test.context.SpringBootTest;
56
import org.springframework.test.context.web.WebAppConfiguration;
6-
import org.springframework.boot.test.SpringApplicationConfiguration;
77
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
88

99
@RunWith(SpringJUnit4ClassRunner.class)
10-
@SpringApplicationConfiguration(classes = SpringBootWebApplication.class)
10+
@SpringBootTest(classes = SpringBootWebApplication.class)
1111
@WebAppConfiguration
1212
public class SpringBootWebApplicationTests {
1313

src/test/java/guru/springframework/configuration/RepositoryConfiguration.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package guru.springframework.configuration;
22

33
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
4-
import org.springframework.boot.orm.jpa.EntityScan;
4+
import org.springframework.boot.autoconfigure.domain.EntityScan;
55
import org.springframework.context.annotation.Configuration;
66
import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
77
import org.springframework.transaction.annotation.EnableTransactionManagement;

src/test/java/guru/springframework/repositories/ProductRepositoryTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,15 @@
55
import org.junit.Test;
66
import org.junit.runner.RunWith;
77
import org.springframework.beans.factory.annotation.Autowired;
8-
import org.springframework.boot.test.SpringApplicationConfiguration;
8+
import org.springframework.boot.test.context.SpringBootTest;
99
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
1010

1111
import java.math.BigDecimal;
1212

1313
import static org.junit.Assert.*;
1414

1515
@RunWith(SpringJUnit4ClassRunner.class)
16-
@SpringApplicationConfiguration(classes = {RepositoryConfiguration.class})
16+
@SpringBootTest(classes = {RepositoryConfiguration.class})
1717
public class ProductRepositoryTest {
1818

1919
private ProductRepository productRepository;

0 commit comments

Comments
 (0)