Spring Boot 2.3.0 to 2.4.0

Gradle 6.4.1 to 6.7

build.gradle

@@ -1,13 +1,13 @@
 plugins {
     id "java"
     id "eclipse"
-    id "org.springframework.boot" version "2.3.0.RELEASE"
-    id "io.spring.dependency-management" version "1.0.9.RELEASE"
+    id "org.springframework.boot" version "2.4.0"
+    id "io.spring.dependency-management" version "1.0.10.RELEASE"
 }
 
-ext['lombok.version'] = "1.18.12"
+ext['lombok.version'] = "1.18.16"
 
-version = "2.3.0"
+version = "2.4.0"
 
 sourceCompatibility = '1.8'
 targetCompatibility = '1.8'
@@ -49,5 +49,5 @@ dependencies {
 }
 
 wrapper {
-    gradleVersion = "6.4.1"
+    gradleVersion = "6.7"
 }

src/test/java/sample/EntityTestSupport.java

@@ -7,7 +7,7 @@
 import javax.sql.DataSource;
 
 import org.hibernate.cfg.AvailableSettings;
-import org.junit.*;
+import org.junit.jupiter.api.*;
 import org.springframework.boot.orm.jpa.EntityManagerFactoryBuilder;
 import org.springframework.boot.orm.jpa.EntityManagerFactoryBuilder.Builder;
 import org.springframework.orm.jpa.*;
@@ -41,7 +41,7 @@ public class EntityTestSupport {
     /** テスト対象とするEntityクラス一覧 */
     private List<Class<?>> targetEntities = new ArrayList<>();
 
-    @Before
+    @BeforeEach
     public final void setup() {
         setupPreset();
         dh = new MockDomainHelper();
@@ -79,7 +79,7 @@ protected void setting(String id, String value) {
         dh.setting(id, value);
     }
 
-    @After
+    @AfterEach
     public void cleanup() {
         emf.close();
     }

src/test/java/sample/model/account/AccountTest.java

@@ -1,8 +1,8 @@
 package sample.model.account;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import sample.*;
 import sample.model.account.Account.AccountStatusType;

src/test/java/sample/model/asset/AssetTest.java

@@ -1,10 +1,10 @@
 package sample.model.asset;
 
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
 
 import java.math.BigDecimal;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import sample.EntityTestSupport;
 import sample.model.account.Account;

src/test/java/sample/model/asset/CashBalanceTest.java

@@ -1,10 +1,10 @@
 package sample.model.asset;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.math.BigDecimal;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import sample.EntityTestSupport;
 

src/test/java/sample/model/asset/CashInOutTest.java

@@ -1,10 +1,10 @@
 package sample.model.asset;
 
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
 
 import java.math.BigDecimal;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import sample.*;
 import sample.model.account.Account;

src/test/java/sample/model/asset/CashflowTest.java

@@ -1,10 +1,10 @@
 package sample.model.asset;
 
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
 
 import java.math.BigDecimal;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import sample.*;
 

src/test/java/sample/util/CalculatorTest.java

@@ -1,10 +1,10 @@
 package sample.util;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.math.*;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class CalculatorTest {