From 0b176957d3f6e21c81e86d0cd4e3fae5fe280b9c Mon Sep 17 00:00:00 2001
From: jkazama <kazama.junichiro@gmail.com>
Date: Wed, 24 Nov 2021 10:23:13 +0900
Subject: [PATCH] Spring Boot 2.5 to 2.6 Gradle 7.0 to 7.3

---
 build.gradle                                         | 12 ++++++------
 gradle/wrapper/gradle-wrapper.properties             |  2 +-
 .../sample/context/security/SecurityProperties.java  |  8 ++++----
 src/test/java/sample/DdlExporter.java                |  5 +++--
 4 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/build.gradle b/build.gradle
index 043aae2..026507d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,12 +1,12 @@
 plugins {
     id "java"
-    id "org.springframework.boot" version "2.5.0"
+    id "org.springframework.boot" version "2.6.0"
     id "io.spring.dependency-management" version "1.0.11.RELEASE"
 }
 
-ext['lombok.version'] = "1.18.20"
+ext['lombok.version'] = "1.18.22"
 
-version = "2.5.0"
+version = "2.6.0"
 
 sourceCompatibility = '11'
 targetCompatibility = '11'
@@ -46,9 +46,9 @@ dependencies {
     implementation "org.springframework.boot:spring-boot-starter-data-jpa"
     implementation "org.springframework.boot:spring-boot-starter-web"
     implementation "com.fasterxml.jackson.datatype:jackson-datatype-hibernate5"
-    implementation "commons-io:commons-io:2.8.0"
+    implementation "commons-io:commons-io:2.11.0"
     implementation "org.apache.commons:commons-lang3"
-    implementation "com.ibm.icu:icu4j:69.1"
+    implementation "com.ibm.icu:icu4j:70.1"
     implementation fileTree(dir: 'libs', includes: ['*.jar'])
     runtimeOnly "com.h2database:h2"
     runtimeOnly "mysql:mysql-connector-java"
@@ -58,7 +58,7 @@ dependencies {
 }
 
 wrapper {
-    gradleVersion = "7.0.2"
+    gradleVersion = "7.3"
 }
 
 // 自分のプロジェクトとしてディープコピーしたい時は以下の変数を編集した後
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 0f80bbf..e750102 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/src/main/java/sample/context/security/SecurityProperties.java b/src/main/java/sample/context/security/SecurityProperties.java
index 7589839..1172dd2 100644
--- a/src/main/java/sample/context/security/SecurityProperties.java
+++ b/src/main/java/sample/context/security/SecurityProperties.java
@@ -22,7 +22,7 @@ public SecurityAuthProperties auth() {
     public SecurityCorsProperties cors() {
         return cors;
     }
-    
+
     /** Spring Securityに対する拡張設定情報 */
     @Data
     public static class SecurityAuthProperties {
@@ -37,7 +37,7 @@ public static class SecurityAuthProperties {
         /** 認証除外パス(認証対象からの除外) */
         private String[] excludesPath = new String[] { "/api/system/job/**" };
         /** 認証無視パス(フィルタ未適用の認証未考慮、静的リソース等) */
-        private String[] ignorePath = new String[] { "/css/**", "/js/**", "/img/**", "/**/favicon.ico" };
+        private String[] ignorePath = new String[] { "/css/**", "/js/**", "/img/**", "/*/favicon.ico" };
         /** ログインAPIパス */
         private String loginPath = "/api/login";
         /** ログアウトAPIパス */
@@ -50,13 +50,13 @@ public static class SecurityAuthProperties {
          * <ul>
          * <li>true: SecurityUserService
          * <li>false: SecurityAdminService
-         * </ul> 
+         * </ul>
          */
         private boolean admin = false;
         /** 認証が有効な時はtrue */
         private boolean enabled = true;
     }
-    
+
     /** CORS設定情報を表現します。 */
     @Data
     public static class SecurityCorsProperties {
diff --git a/src/test/java/sample/DdlExporter.java b/src/test/java/sample/DdlExporter.java
index c715c4a..bce61f8 100644
--- a/src/test/java/sample/DdlExporter.java
+++ b/src/test/java/sample/DdlExporter.java
@@ -6,10 +6,11 @@
 
 import org.hibernate.boot.*;
 import org.hibernate.boot.internal.MetadataBuilderImpl;
+import org.hibernate.boot.model.naming.CamelCaseToUnderscoresNamingStrategy;
 import org.hibernate.boot.registry.*;
 import org.hibernate.tool.hbm2ddl.SchemaExport;
 import org.hibernate.tool.schema.TargetType;
-import org.springframework.boot.orm.jpa.hibernate.*;
+import org.springframework.boot.orm.jpa.hibernate.SpringImplicitNamingStrategy;
 import org.springframework.orm.hibernate5.LocalSessionFactoryBean;
 
 /**
@@ -76,7 +77,7 @@ private Metadata metadata(StandardServiceRegistry serviceRegistry, MetadataSourc
             throws Exception {
         MetadataBuilder builder = new MetadataBuilderImpl(metadataSources, serviceRegistry);
         Metadata metadata = builder
-                .applyPhysicalNamingStrategy(new SpringPhysicalNamingStrategy())
+                .applyPhysicalNamingStrategy(new CamelCaseToUnderscoresNamingStrategy())
                 .applyImplicitNamingStrategy(new SpringImplicitNamingStrategy())
                 .build();
         return metadata;