Skip to content

Commit 01d991d

Browse files
kenjiyoshid-akenjiyoshid-a
authored
バックエンドのライブラリを最新化する (#3923)
* 認証機能、トップ画面、エラー画面を追加 * AnnouncementContentのDTO変換メソッド名をtoContentからtoContentDtoに変更 * 不要な引数を削除し、handleNotFoundExceptionメソッドを簡素化 * ログイン機能のモデル名を統一し、viewModelに変更 * ログインリダイレクトURLの検証を強化し、不正なURLを排除 * ユーザー名の取得方法を変更し、emailを返すように修正。また、AuthenticatedUserModelAdviceでUserDetailsImplからUserDetailsに型を変更。 * copilotの指摘事項に対応 * ログインフォームにリダイレクト先URLのhiddenフィールドを追加 * getUsernameメソッドのコメントを修正し、Dressca CMSにおけるメールアドレスの使用について明確にしました。 * loadUserByUsernameメソッドのコメントを追加し、メールアドレスを使用する理由を明確にしました。 * 共通の例外 ID 定数を追加し、エラーメッセージを定義しました。 * LogicExceptionのハンドリングを追加し、エラーメッセージに関する情報をモデルに追加しました。また、システムエラーのエラーメッセージ定数を修正しました。 * LoginViewModelクラスを追加し、メールアドレスとパスワードのバリデーションを実装 * ログインフォームのエラーメッセージ表示を改善し、リスト形式で表示するように変更 * 認証機能のための日本語バリデーションメッセージを追加し、不要なバリデーションメッセージファイルを削除 * LoginControllerから不要なMessageSourceのインポートを削除し、認証エラーメッセージの処理を改善 * ログインフォームのラベルを国際化対応し、認証メッセージをプロパティファイルから取得するように変更 * favicon.icoを新規追加 * 認証機能のためのエラーメッセージとトップページメッセージを国際化対応で追加 * 業務例外のハンドリングメソッドのJavaDocコメントを追加 * prettier準拠のDOCTYPEの記法に修正 * メッセージプロパティの階層を変更 * テストクラスのメッセージプロパティのベース名を認証機能とお知らせ機能に合わせて変更 * dressca-cmsのライブラリを最新化 * springboot starter security をspring boot securityに変更 * dressca-cmsの依存関係を整理 * dressca-cmsの依存関係の整理 * jacocoToolVersionの位置を修正 * バックエンドのライブラリの依存関係を整理し、最新のバージョンに更新 * Gradleプラグインツールのセクション名を修正 * バックエンドの依存関係を最新のバージョンに更新し、JDBCスターターを追加 * バックエンドのテスト依存関係を整理し、バッチテスト用の依存関係を統一 * バックエンドの依存関係を整理し、MyBatis関連のテスト依存関係を修正。bootJarとJarの設定を統一。 * バックエンドのビルド設定を修正し、bootJarとjarの設定を統一 * バックエンドの依存関係を整理し、セキュリティスターターを追加。Springdoc OpenAPIの依存関係をテスト用に移動。 * バックエンドの依存関係を整理し、セキュリティとログ関連のスターターを追加。プロジェクトの依存関係を最適化。 * バックエンドの依存関係を最新化し、セキュリティ関連のスターターを追加。不要な依存関係を整理。 * dresscaのライブラリ最新化 * spotbugsのバージョンを4.8.6から4.9.8に更新 * spring_boot_starter_testの位置を修正 * 外部IDサンプルの依存関係を整理 * インデントを整理
1 parent 84e0f99 commit 01d991d

16 files changed

Lines changed: 157 additions & 145 deletions

File tree

‎samples/dressca-cms/announcement/build.gradle‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,10 @@ dependencies {
3737
implementation supportDependencies.mybatis_spring_boot_starter
3838
implementation supportDependencies.h2database
3939
implementation supportDependencies.postgresql
40-
testImplementation supportDependencies.spring_boot_starter_test
41-
testImplementation supportDependencies.mybatis_spring_boot_starter_test
40+
41+
implementation project(':system-common')
4242

43-
implementation project(':system-common')
43+
testImplementation supportDependencies.mybatis_spring_boot_starter_test
4444

4545
mybatisTasks supportDependencies.mybatis_generator_core
4646
mybatisTasks supportDependencies.h2database
@@ -55,7 +55,7 @@ bootJar {
5555
}
5656

5757
jar {
58-
enabled = true
58+
enabled = true
5959
}
6060

6161
tasks.register('runMyBatisGenerator') {

‎samples/dressca-cms/authentication/build.gradle‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,13 +35,13 @@ configurations {
3535

3636
dependencies {
3737
implementation supportDependencies.mybatis_spring_boot_starter
38+
implementation supportDependencies.spring_boot_starter_security
3839
implementation supportDependencies.h2database
3940
implementation supportDependencies.postgresql
40-
implementation supportDependencies.spring_boot_starter_security
41-
testImplementation supportDependencies.spring_boot_starter_test
42-
testImplementation supportDependencies.mybatis_spring_boot_starter_test
41+
42+
implementation project(':system-common')
4343

44-
implementation project(':system-common')
44+
testImplementation supportDependencies.mybatis_spring_boot_starter_test
4545

4646
mybatisTasks supportDependencies.mybatis_generator_core
4747
mybatisTasks supportDependencies.h2database

‎samples/dressca-cms/dependencies.gradle‎

Lines changed: 35 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,55 +1,59 @@
11
ext {
22
// -- PLUGINS
3-
springBootVersion = "4.0.0"
3+
springBootVersion = "4.0.1"
44
springDependencyManagementVersion = "1.1.7"
55
springdocOpenapiGradlePluginVersion = "1.9.0"
6-
spotbugsVersion = "6.4.7"
7-
8-
// -- TOOLS
9-
jacocoToolVersion = "0.8.14"
10-
checkstyleToolVersion = "13.0.0"
11-
spotbugsToolVersion = "4.8.6"
6+
spotbugsVersion = "6.4.8"
127

138
// -- DEPENDENCIES
14-
mybatisSpringBootStarterVersion = "4.0.0"
15-
mybatisSpringBootStarterTestVersion = "4.0.0"
16-
h2Version = "2.4.240"
17-
postgresqlVersion = "42.7.8"
18-
springdocOpenapiVersion = "3.0.0"
19-
servletApiVersion = "6.1.0"
20-
commonsLangVersion = "3.20.0"
219
mybatisGeneratorVersion = "1.4.2"
22-
javaUuidGeneratorVersion = "5.1.1"
23-
thymeleafLayoutDialectVersion = "3.4.0"
10+
mybatisSpringBootStarterVersion = "4.0.1"
11+
mybatisSpringBootStarterTestVersion = "4.0.1"
12+
javaUuidGeneratorVersion = "5.2.0"
13+
springdocOpenapiVersion = "3.0.1"
14+
15+
// -- GRADLE PLUGIN TOOLS
16+
checkstyleToolVersion = "13.0.0"
17+
jacocoToolVersion = "0.8.14"
18+
spotbugsToolVersion = "4.9.8"
2419

2520
supportDependencies = [
21+
// SPRING BOOT STARTERS
2622
spring_boot_starter : "org.springframework.boot:spring-boot-starter",
27-
spring_boot_starter_test : "org.springframework.boot:spring-boot-starter-test",
28-
spring_boot_starter_log4j2 : "org.springframework.boot:spring-boot-starter-log4j2",
29-
spring_boot_starter_validation : "org.springframework.boot:spring-boot-starter-validation",
30-
spring_boot_starter_webmvc : "org.springframework.boot:spring-boot-starter-webmvc",
3123
spring_boot_starter_actuator : "org.springframework.boot:spring-boot-starter-actuator",
24+
spring_boot_starter_log4j2 : "org.springframework.boot:spring-boot-starter-log4j2",
3225
spring_boot_starter_security : "org.springframework.boot:spring-boot-starter-security",
3326
spring_boot_starter_thymeleaf : "org.springframework.boot:spring-boot-starter-thymeleaf",
34-
spring_boot_h2console : "org.springframework.boot:spring-boot-h2console",
27+
spring_boot_starter_validation : "org.springframework.boot:spring-boot-starter-validation",
28+
spring_boot_starter_webmvc : "org.springframework.boot:spring-boot-starter-webmvc",
29+
30+
// SPRING BOOT TESTS
31+
spring_boot_starter_test : "org.springframework.boot:spring-boot-starter-test",
32+
spring_boot_starter_security_test : "org.springframework.boot:spring-boot-starter-security-test",
3533

36-
springdoc_openapi_starter_webmvc_ui : "org.springdoc:springdoc-openapi-starter-webmvc-ui:$springdocOpenapiVersion",
34+
// SPRING BOOT MODULES
35+
spring_boot_h2console : "org.springframework.boot:spring-boot-h2console",
36+
37+
// MYBATIS DEPENDENCIES
38+
mybatis_generator_core: "org.mybatis.generator:mybatis-generator-core:$mybatisGeneratorVersion",
3739
mybatis_spring_boot_starter : "org.mybatis.spring.boot:mybatis-spring-boot-starter:$mybatisSpringBootStarterVersion",
3840
mybatis_spring_boot_starter_test : "org.mybatis.spring.boot:mybatis-spring-boot-starter-test:$mybatisSpringBootStarterTestVersion",
39-
spring_security_test : "org.springframework.security:spring-security-test",
40-
h2database : "com.h2database:h2:$h2Version",
41-
postgresql : "org.postgresql:postgresql:$postgresqlVersion",
42-
commons_lang3 : "org.apache.commons:commons-lang3:$commonsLangVersion",
43-
servlet_api : "jakarta.servlet:jakarta.servlet-api:$servletApiVersion",
44-
mybatis_generator_core: "org.mybatis.generator:mybatis-generator-core:$mybatisGeneratorVersion",
45-
java_uuid_generator : "com.fasterxml.uuid:java-uuid-generator:$javaUuidGeneratorVersion",
46-
thymeleaf_layout_dialect : "nz.net.ultraq.thymeleaf:thymeleaf-layout-dialect:$thymeleafLayoutDialectVersion",
41+
42+
// DATABASE
43+
h2database : "com.h2database:h2",
44+
postgresql : "org.postgresql:postgresql",
4745

46+
// OTHER LIBRARIES
47+
commons_lang3 : "org.apache.commons:commons-lang3",
48+
java_uuid_generator : "com.fasterxml.uuid:java-uuid-generator:$javaUuidGeneratorVersion",
4849
lombok : "org.projectlombok:lombok",
4950
slf4j : "org.slf4j:slf4j-simple",
51+
springdoc_openapi_starter_webmvc_ui : "org.springdoc:springdoc-openapi-starter-webmvc-ui:$springdocOpenapiVersion",
52+
thymeleaf_layout_dialect : "nz.net.ultraq.thymeleaf:thymeleaf-layout-dialect",
5053

51-
jacoco : "org.jacoco:org.jacoco.core:$jacocoToolVersion",
54+
// GRADLE PLUGIN TOOLS
5255
checkstyle : "com.puppycrawl.tools:checkstyle:$checkstyleToolVersion",
56+
jacoco : "org.jacoco:org.jacoco.core:$jacocoToolVersion",
5357
spotbugs : "com.github.spotbugs:spotbugs:$spotbugsToolVersion"
5458
]
5559
}

‎samples/dressca-cms/system-common/build.gradle‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ repositories {
2020
dependencies {
2121
implementation supportDependencies.spring_boot_starter
2222
implementation supportDependencies.java_uuid_generator
23+
2324
testImplementation supportDependencies.spring_boot_starter_test
2425
}
2526

‎samples/dressca-cms/web/build.gradle‎

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -18,25 +18,24 @@ repositories {
1818
}
1919

2020
dependencies {
21-
implementation supportDependencies.spring_boot_starter_webmvc
22-
implementation supportDependencies.spring_boot_starter_validation
2321
implementation supportDependencies.spring_boot_starter_actuator
24-
implementation supportDependencies.springdoc_openapi_starter_webmvc_ui
22+
implementation supportDependencies.spring_boot_starter_log4j2
23+
implementation supportDependencies.spring_boot_starter_security
24+
implementation supportDependencies.spring_boot_starter_thymeleaf
25+
implementation supportDependencies.spring_boot_starter_validation
26+
implementation supportDependencies.spring_boot_starter_webmvc
27+
2528
implementation supportDependencies.commons_lang3
2629
implementation supportDependencies.h2database
27-
implementation supportDependencies.spring_boot_starter_thymeleaf
28-
implementation supportDependencies.thymeleaf_layout_dialect
29-
implementation supportDependencies.spring_boot_starter_log4j2
3030
implementation supportDependencies.spring_boot_h2console
31-
implementation supportDependencies.spring_boot_starter_security
31+
implementation supportDependencies.springdoc_openapi_starter_webmvc_ui
32+
implementation supportDependencies.thymeleaf_layout_dialect
3233

3334
implementation project(':announcement')
3435
implementation project(':authentication')
3536
implementation project(':system-common')
36-
37-
testImplementation supportDependencies.spring_boot_starter_test
38-
testImplementation supportDependencies.spring_security_test
39-
compileOnly supportDependencies.servlet_api
37+
38+
testImplementation supportDependencies.spring_boot_starter_security_test
4039
}
4140

4241
configurations {

‎samples/external-id-sample-for-spa/auth-backend/dependencies.gradle‎

Lines changed: 19 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,39 @@
11
ext {
22
// -- PLUGINS
3-
springBootVersion = "4.0.0"
3+
springBootVersion = "4.0.1"
44
springDependencyManagementVersion = "1.1.7"
55
springdocOpenapiGradlePluginVersion = "1.9.0"
6-
spotbugsVersion = "6.4.7"
7-
8-
// -- TOOLS
9-
jacocoToolVersion = "0.8.14"
10-
checkstyleToolVersion = "13.0.0"
11-
spotbugsToolVersion = "4.8.6"
6+
spotbugsVersion = "6.4.8"
127

138
// -- DEPENDENCIES
14-
springdocOpenapiVersion = "3.0.0"
9+
springdocOpenapiVersion = "3.0.1"
10+
11+
// -- GRADLE PLUGIN TOOLS
12+
checkstyleToolVersion = "13.0.0"
13+
jacocoToolVersion = "0.8.14"
14+
spotbugsToolVersion = "4.9.8"
1515

1616
supportDependencies = [
17+
// SPRING BOOT STARTERS
1718
spring_boot_starter : "org.springframework.boot:spring-boot-starter",
18-
spring_boot_starter_test : "org.springframework.boot:spring-boot-starter-test",
19+
spring_boot_starter_actuator : "org.springframework.boot:spring-boot-starter-actuator",
1920
spring_boot_starter_log4j2 : "org.springframework.boot:spring-boot-starter-log4j2",
21+
spring_boot_starter_security_oauth2_resource_server : "org.springframework.boot:spring-boot-starter-security-oauth2-resource-server",
2022
spring_boot_starter_webmvc : "org.springframework.boot:spring-boot-starter-webmvc",
21-
spring_boot_starter_actuator : "org.springframework.boot:spring-boot-starter-actuator",
22-
spring_boot_starter_security : "org.springframework.boot:spring-boot-starter-security",
2323

24-
springdoc_openapi_starter_webmvc_ui : "org.springdoc:springdoc-openapi-starter-webmvc-ui:$springdocOpenapiVersion",
25-
spring_boot_starter_security_oauth2_resource_server : "org.springframework.boot:spring-boot-starter-security-oauth2-resource-server",
26-
spring_boot_starter_webmvc_test : "org.springframework.boot:spring-boot-starter-webmvc-test",
24+
// SPRING BOOT TESTS
25+
spring_boot_starter_test : "org.springframework.boot:spring-boot-starter-test",
2726
spring_boot_starter_security_test : "org.springframework.boot:spring-boot-starter-security-test",
27+
spring_boot_starter_webmvc_test : "org.springframework.boot:spring-boot-starter-webmvc-test",
2828

29+
// OTHER LIBRARIES
2930
lombok : "org.projectlombok:lombok",
3031
slf4j : "org.slf4j:slf4j-simple",
31-
32-
jacoco : "org.jacoco:org.jacoco.core:$jacocoToolVersion",
32+
springdoc_openapi_starter_webmvc_ui : "org.springdoc:springdoc-openapi-starter-webmvc-ui:$springdocOpenapiVersion",
33+
34+
// GRADLE PLUGIN TOOLS
3335
checkstyle : "com.puppycrawl.tools:checkstyle:$checkstyleToolVersion",
36+
jacoco : "org.jacoco:org.jacoco.core:$jacocoToolVersion",
3437
spotbugs : "com.github.spotbugs:spotbugs:$spotbugsToolVersion"
3538
]
3639
}

‎samples/external-id-sample-for-spa/auth-backend/system-common/build.gradle‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ repositories {
2020
dependencies {
2121
implementation supportDependencies.spring_boot_starter
2222
implementation supportDependencies.spring_boot_starter_log4j2
23+
2324
testImplementation supportDependencies.spring_boot_starter_test
2425
}
2526

‎samples/external-id-sample-for-spa/auth-backend/web/build.gradle‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,19 +19,16 @@ repositories {
1919
}
2020

2121
dependencies {
22-
implementation supportDependencies.spring_boot_starter_webmvc
2322
implementation supportDependencies.spring_boot_starter_actuator
24-
implementation supportDependencies.springdoc_openapi_starter_webmvc_ui
25-
implementation supportDependencies.spring_boot_starter_security_oauth2_resource_server
2623
implementation supportDependencies.spring_boot_starter_log4j2
27-
implementation supportDependencies.spring_boot_starter_security
24+
implementation supportDependencies.spring_boot_starter_security_oauth2_resource_server
25+
implementation supportDependencies.spring_boot_starter_webmvc
26+
implementation supportDependencies.springdoc_openapi_starter_webmvc_ui
2827

2928
implementation project(':system-common')
3029

31-
testImplementation supportDependencies.spring_boot_starter_webmvc_test
32-
testImplementation supportDependencies.spring_boot_starter_test
33-
testImplementation supportDependencies.spring_boot_starter_log4j2
3430
testImplementation supportDependencies.spring_boot_starter_security_test
31+
testImplementation supportDependencies.spring_boot_starter_webmvc_test
3532
}
3633

3734
configurations {

‎samples/web-csr/dressca-backend/application-core/build.gradle‎

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@ repositories {
1818
}
1919

2020
dependencies {
21-
implementation supportDependencies.spring_boot_starter
22-
implementation supportDependencies.mybatis_spring_boot_starter
23-
implementation supportDependencies.spring_boot_starter_validation
21+
implementation supportDependencies.spring_boot_starter_jdbc
2422
implementation supportDependencies.commons_lang3
23+
2524
implementation project(':system-common')
25+
2626
testImplementation supportDependencies.spring_boot_starter_test
2727
}
2828

@@ -37,12 +37,9 @@ tasks.named('test') {
3737
}
3838

3939
bootJar {
40-
enabled = false
40+
enabled = false
4141
}
4242

4343
jar {
44-
enabled = true
44+
enabled = true
4545
}
46-
47-
bootJar.enabled = false
48-
jar.enabled = true

‎samples/web-csr/dressca-backend/batch/build.gradle‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ repositories {
1818
}
1919

2020
dependencies {
21-
implementation supportDependencies.spring_boot_starter_batch
21+
implementation supportDependencies.spring_boot_starter_batch_jdbc
2222
implementation supportDependencies.mybatis_spring_boot_starter
2323
implementation supportDependencies.commons_lang3
2424
implementation supportDependencies.spring_boot_starter_log4j2
@@ -27,9 +27,7 @@ dependencies {
2727
implementation project(':infrastructure')
2828
implementation project(':system-common')
2929

30-
testImplementation supportDependencies.spring_boot_starter_test
31-
testImplementation supportDependencies.spring_batch_test
32-
testImplementation supportDependencies.spring_boot_starter_batch_jdbc
30+
testImplementation supportDependencies.spring_boot_starter_batch_jdbc_test
3331
testImplementation supportDependencies.h2database
3432
}
3533

0 commit comments

Comments
 (0)