Spring Boot 2.3.1.RELEASE Upgrade

in28minutes · Jun 25, 2020 · 60b6150 · 60b6150
1 parent 5932a10
commit 60b6150
Show file tree

Hide file tree

Showing 13 changed files with 37 additions and 23 deletions.
diff --git a/00-framework-tool-introductions/02.Maven-Introduction-In-5-Steps/pom.xml b/00-framework-tool-introductions/02.Maven-Introduction-In-5-Steps/pom.xml
@@ -15,14 +15,15 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.0.0.RELEASE</version>
+		<version>2.3.1.RELEASE</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 		<java.version>1.8</java.version>
+		<maven-jar-plugin.version>3.1.1</maven-jar-plugin.version>
 	</properties>
 
 	<dependencies>

diff --git a/00-framework-tool-introductions/04.Mockito-Introduction-In-5-Steps/pom.xml b/00-framework-tool-introductions/04.Mockito-Introduction-In-5-Steps/pom.xml
@@ -14,14 +14,15 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.0.0.RELEASE</version>
+		<version>2.3.1.RELEASE</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 		<java.version>1.8</java.version>
+		<maven-jar-plugin.version>3.1.1</maven-jar-plugin.version>
 	</properties>
 
 	<dependencies>
@@ -34,6 +35,12 @@
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-test</artifactId>
 			<scope>test</scope>
+			<exclusions>
+  				<exclusion>
+  					<groupId>org.junit.vintage</groupId>
+  					<artifactId>junit-vintage-engine</artifactId>
+  				</exclusion>
+  			</exclusions>
 		</dependency>
 	</dependencies>
 

diff --git a/...o-Introduction-In-5-Steps/src/test/java/com/in28minutes/mockito/mockitodemo/ListTest.java b/...o-Introduction-In-5-Steps/src/test/java/com/in28minutes/mockito/mockitodemo/ListTest.java
@@ -1,12 +1,12 @@
 package com.in28minutes.mockito.mockitodemo;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
 import java.util.List;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mockito.Mockito;
 
 public class ListTest {

diff --git a/...-Steps/src/test/java/com/in28minutes/mockito/mockitodemo/MockitoDemoApplicationTests.java b/...-Steps/src/test/java/com/in28minutes/mockito/mockitodemo/MockitoDemoApplicationTests.java
@@ -1,11 +1,8 @@
 package com.in28minutes.mockito.mockitodemo;
 
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.junit4.SpringRunner;
 
-@RunWith(SpringRunner.class)
 @SpringBootTest
 public class MockitoDemoApplicationTests {
 

diff --git a/...ps/src/test/java/com/in28minutes/mockito/mockitodemo/SomeBusinessMockAnnotationsTest.java b/...ps/src/test/java/com/in28minutes/mockito/mockitodemo/SomeBusinessMockAnnotationsTest.java
@@ -1,15 +1,15 @@
 package com.in28minutes.mockito.mockitodemo;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.mockito.Mockito.when;
 
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
 
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
 public class SomeBusinessMockAnnotationsTest {
 
 	@Mock

diff --git a/...on-In-5-Steps/src/test/java/com/in28minutes/mockito/mockitodemo/SomeBusinessMockTest.java b/...on-In-5-Steps/src/test/java/com/in28minutes/mockito/mockitodemo/SomeBusinessMockTest.java
@@ -1,10 +1,11 @@
 package com.in28minutes.mockito.mockitodemo;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
 
 public class SomeBusinessMockTest {
 

diff --git a/...on-In-5-Steps/src/test/java/com/in28minutes/mockito/mockitodemo/SomeBusinessStubTest.java b/...on-In-5-Steps/src/test/java/com/in28minutes/mockito/mockitodemo/SomeBusinessStubTest.java
@@ -1,8 +1,8 @@
 package com.in28minutes.mockito.mockitodemo;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class SomeBusinessStubTest {
 	@Test

diff --git a/00-framework-tool-introductions/05.Spring-Boot-Introduction-In-10-Steps/pom.xml b/00-framework-tool-introductions/05.Spring-Boot-Introduction-In-10-Steps/pom.xml
@@ -14,14 +14,15 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.0.0.RELEASE</version>
+		<version>2.3.1.RELEASE</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 		<java.version>1.8</java.version>
+		<maven-jar-plugin.version>3.1.1</maven-jar-plugin.version>
 	</properties>
 
 	<dependencies>

diff --git a/...uctions/05.Spring-Boot-Introduction-In-10-Steps/src/main/resources/application.properties b/...uctions/05.Spring-Boot-Introduction-In-10-Steps/src/main/resources/application.properties
@@ -1,2 +1,3 @@
 #logging.level.org.springframework = DEBUG
-management.security.enabled=false
+management.security.enabled=false
+management.endpoints.web.exposure.include=*
diff --git a/01-spring-in-depth/pom.xml b/01-spring-in-depth/pom.xml
@@ -14,14 +14,15 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.0.0.RELEASE</version>
+		<version>2.3.1.RELEASE</version>
 		<relativePath /> <!-- lookup parent from repository -->
 	</parent>
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 		<java.version>1.8</java.version>
+		<maven-jar-plugin.version>3.1.1</maven-jar-plugin.version>
 	</properties>
 
 	<dependencies>

diff --git a/03-spring-aop/pom.xml b/03-spring-aop/pom.xml
@@ -14,14 +14,15 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.0.0.RELEASE</version>
+		<version>2.3.1.RELEASE</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 		<java.version>1.8</java.version>
+		<maven-jar-plugin.version>3.1.1</maven-jar-plugin.version>
 	</properties>
 
 	<dependencies>

diff --git a/04-spring-jdbc-to-jpa/pom.xml b/04-spring-jdbc-to-jpa/pom.xml
@@ -14,14 +14,15 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.0.0.RELEASE</version>
+		<version>2.3.1.RELEASE</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 		<java.version>1.8</java.version>
+		<maven-jar-plugin.version>3.1.1</maven-jar-plugin.version>
 	</properties>
 
 	<dependencies>

diff --git a/04-spring-jdbc-to-jpa/src/main/resources/application.properties b/04-spring-jdbc-to-jpa/src/main/resources/application.properties
@@ -1,3 +1,6 @@
 spring.h2.console.enabled=true
 spring.jpa.show-sql=true
-logging.level.root=debug
+logging.level.root=debug
+
+spring.datasource.url=jdbc:h2:mem:testdb
+spring.data.jpa.repositories.bootstrap-mode=default