From 7be25f8fe984dafc8d09a18f1adfffb54771550e Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Sat, 21 Sep 2024 15:46:26 +0800
Subject: [PATCH] chore(deps): update spring boot to v3.3.4 (#1120)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* chore(deps): update spring boot to v3.3.4

* chore: 更新logback配置

* chore: update logback

* chore: go to spring-logback

---------

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Arthur Ming <mingguobin@live.com>
---
 WORKSPACE                                     | 26 +++++++-------
 build.gradle                                  |  2 +-
 pom.xml                                       |  2 +-
 ...{logback-spring.xml => spring-logback.xml} | 35 ++++++++-----------
 4 files changed, 30 insertions(+), 35 deletions(-)
 rename src/main/resources/{logback-spring.xml => spring-logback.xml} (79%)

diff --git a/WORKSPACE b/WORKSPACE
index c69cbc8e..b0bb1d3e 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -38,21 +38,21 @@ Jsonwebtoken_Version = "0.12.5"
 
 maven_install(
     artifacts = [
-        "org.springframework.boot:spring-boot-starter-web:3.3.3",
-        "org.springframework.boot:spring-boot-starter-jdbc:3.3.3",
-        "org.springframework.boot:spring-boot-starter-aop:3.3.3",
-        "org.springframework.boot:spring-boot-starter-security:3.3.3",
-        "org.springframework.boot:spring-boot-starter-cache:3.3.3",
-        "org.springframework.boot:spring-boot-starter-actuator:3.3.3",
-        "org.springframework.boot:spring-boot-starter-data-redis:3.3.3",
-        "org.springframework.boot:spring-boot-starter-graphql:3.3.3",
-        "org.springframework.boot:spring-boot-starter-quartz:3.3.3",
+        "org.springframework.boot:spring-boot-starter-web:3.3.4",
+        "org.springframework.boot:spring-boot-starter-jdbc:3.3.4",
+        "org.springframework.boot:spring-boot-starter-aop:3.3.4",
+        "org.springframework.boot:spring-boot-starter-security:3.3.4",
+        "org.springframework.boot:spring-boot-starter-cache:3.3.4",
+        "org.springframework.boot:spring-boot-starter-actuator:3.3.4",
+        "org.springframework.boot:spring-boot-starter-data-redis:3.3.4",
+        "org.springframework.boot:spring-boot-starter-graphql:3.3.4",
+        "org.springframework.boot:spring-boot-starter-quartz:3.3.4",
         "org.mybatis.spring.boot:mybatis-spring-boot-starter:3.0.3",
         "com.graphql-java:graphql-java-extended-scalars:2023-01-24T02-11-56-babda5f",
         #"org.springframework.boot:spring-boot:3.2.2",
         #"org.springframework.boot:spring-boot-starter:3.2.2",
-        "org.springframework.boot:spring-boot-loader:3.3.3",
-        "org.springframework.boot:spring-boot-loader-tools:3.3.3",
+        "org.springframework.boot:spring-boot-loader:3.3.4",
+        "org.springframework.boot:spring-boot-loader-tools:3.3.4",
 
         "org.postgresql:postgresql:42.7.4",
 
@@ -73,8 +73,8 @@ maven_install(
         "org.bouncycastle:bcpkix-jdk18on:1.78.1",
         "com.lmax:disruptor:4.0.0",
 
-        "org.springframework.boot:spring-boot-devtools:3.3.3",
-        "org.springframework.boot:spring-boot-starter-test:3.3.3",
+        "org.springframework.boot:spring-boot-devtools:3.3.4",
+        "org.springframework.boot:spring-boot-starter-test:3.3.4",
         "org.springframework.security:spring-security-test:6.3.3",
 
     ],
diff --git a/build.gradle b/build.gradle
index e0888044..ad9b64a2 100644
--- a/build.gradle
+++ b/build.gradle
@@ -11,7 +11,7 @@ buildscript {
 }
 
 plugins {
-	id 'org.springframework.boot' version '3.3.3'
+	id 'org.springframework.boot' version '3.3.4'
 	id 'io.spring.dependency-management' version '1.1.6'
 	id 'org.flywaydb.flyway' version '10.17.3'
 	id 'java'
diff --git a/pom.xml b/pom.xml
index d8ee5edc..7e3a6a7e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>3.3.3</version>
+        <version>3.3.4</version>
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
     <groupId>org.daming</groupId>
diff --git a/src/main/resources/logback-spring.xml b/src/main/resources/spring-logback.xml
similarity index 79%
rename from src/main/resources/logback-spring.xml
rename to src/main/resources/spring-logback.xml
index f83f810a..44e59105 100644
--- a/src/main/resources/logback-spring.xml
+++ b/src/main/resources/spring-logback.xml
@@ -23,11 +23,10 @@
 
     <appender name="common.logger" class="ch.qos.logback.core.rolling.RollingFileAppender">
         <file>${COMMON_LOG_PATH}/log_common.log</file>
-        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
             <fileNamePattern>${COMMON_LOG_PATH}/log-common-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
-            <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
-                <maxFileSize>200MB</maxFileSize>
-            </timeBasedFileNamingAndTriggeringPolicy>
+            <maxHistory>30</maxHistory>
+            <maxFileSize>200MB</maxFileSize>
         </rollingPolicy>
         <append>true</append>
         <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
@@ -44,11 +43,10 @@
 
     <appender name="error.logger" class="ch.qos.logback.core.rolling.RollingFileAppender">
         <file>${ERROR_LOG_PATH}/log_error.log</file>
-        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
             <fileNamePattern>${ERROR_LOG_PATH}/log-error-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
-            <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
-                <maxFileSize>200MB</maxFileSize>
-            </timeBasedFileNamingAndTriggeringPolicy>
+            <maxHistory>30</maxHistory>
+            <maxFileSize>200MB</maxFileSize>
         </rollingPolicy>
         <append>true</append>
         <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
@@ -65,11 +63,10 @@
 
     <appender name="api.logger" class="ch.qos.logback.core.rolling.RollingFileAppender">
         <file>${API_LOG_PATH}/log_api.log</file>
-        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
             <fileNamePattern>${API_LOG_PATH}/log-api-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
-            <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
-                <maxFileSize>200MB</maxFileSize>
-            </timeBasedFileNamingAndTriggeringPolicy>
+            <maxHistory>30</maxHistory>
+            <maxFileSize>200MB</maxFileSize>
         </rollingPolicy>
         <append>true</append>
         <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
@@ -86,11 +83,10 @@
 
     <appender name="jdbc.logger" class="ch.qos.logback.core.rolling.RollingFileAppender">
         <file>${JDBC_LOG_PATH}/log_jdbc.log</file>
-        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
             <fileNamePattern>${JDBC_LOG_PATH}/log-jdbc-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
-            <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
-                <maxFileSize>200MB</maxFileSize>
-            </timeBasedFileNamingAndTriggeringPolicy>
+            <maxHistory>30</maxHistory>
+            <maxFileSize>200MB</maxFileSize>
         </rollingPolicy>
         <append>true</append>
         <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
@@ -107,11 +103,10 @@
 
     <appender name="job.logger" class="ch.qos.logback.core.rolling.RollingFileAppender">
         <file>${JOB_LOG_PATH}/log_job.log</file>
-        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
             <fileNamePattern>${DY_LOG_PATH}/log-job-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
-            <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
-                <maxFileSize>200MB</maxFileSize>
-            </timeBasedFileNamingAndTriggeringPolicy>
+            <maxHistory>30</maxHistory>
+            <maxFileSize>200MB</maxFileSize>
         </rollingPolicy>
         <append>true</append>
         <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">