From 0d000c11186c9ad23b6c8baeeb226648393bb211 Mon Sep 17 00:00:00 2001
From: "f.shimich" <fshim.dev@gmail.com>
Date: Tue, 3 Jun 2025 00:23:13 +0300
Subject: [PATCH 1/6] Updated logback-spring.xml to fix system warnings

---
 src/main/resources/logback-spring.xml | 122 +++++++++++++-------------
 1 file changed, 63 insertions(+), 59 deletions(-)

diff --git a/src/main/resources/logback-spring.xml b/src/main/resources/logback-spring.xml
index 5bcd4333..8c4aa714 100755
--- a/src/main/resources/logback-spring.xml
+++ b/src/main/resources/logback-spring.xml
@@ -4,67 +4,71 @@
     <springProperty scope="context" name="logbackAppender" source="logback.appender" defaultValue="COLOR_CONSOLE"/>
     <springProperty scope="context" name="loggingLevelRoot" source="logging.level.root" defaultValue="INFO"/>
 
-    <appender name="DEFAULT_CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
-        <encoder>
-            <pattern>${CONSOLE_LOG_PATTERN}</pattern>
-            <charset>${CONSOLE_LOG_CHARSET}</charset>
-        </encoder>
-    </appender>
-
-    <appender name="COLOR_CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
-        <layout class="ch.qos.logback.classic.PatternLayout">
-            <Pattern>
-                %black(%d{ISO8601}) [%blue(%t)] %magenta(${PID:- }) %highlight(%-5level) %cyan(%logger{36}).%yellow(%M):%white(%L) — %m%n%wEx
-            </Pattern>
-        </layout>
-    </appender>
-
-    <appender name="JSON_K8S_CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
-        <encoder class="net.logstash.logback.encoder.LoggingEventCompositeJsonEncoder">
-            <providers>
-                <mdc/>
-                <pattern>
+    <if condition='"${logbackAppender}".equals("COLOR_CONSOLE")'>
+        <then>
+            <appender name="COLOR_CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
+                <encoder>
                     <pattern>
-                        {
-                            "@timestamp": "%date{yyy-MM-dd'T'HH:mm:ss.SSSXXX, UTC}",
-                            "@severity": "%level",
-                            "thread_name": "%thread",
-                            "logger_name": "%logger",
-                            "message": "%message"
-                        }
+                        %black(%d{ISO8601}) [%blue(%t)] %magenta(${PID:- }) %highlight(%-5level) %cyan(%logger{36}).%yellow(%M):%white(%L) — %m%n%wEx
                     </pattern>
-                </pattern>
-                <stackTrace>
-                    <throwableConverter class="net.logstash.logback.stacktrace.ShortenedThrowableConverter">
-                        <maxDepthPerThrowable>30</maxDepthPerThrowable>
-                        <maxLength>2048</maxLength>
-                        <shortenedClassNameLength>20</shortenedClassNameLength>
-                        <exclude>^sun\.reflect\..*\.invoke</exclude>
-                        <exclude>^net\.sf\.cglib\.proxy\.MethodProxy\.invoke</exclude>
-                        <rootCauseFirst>true</rootCauseFirst>
-                    </throwableConverter>
-                </stackTrace>
-            </providers>
-        </encoder>
-    </appender>
+                </encoder>
+            </appender>
 
-    <root level="${loggingLevelRoot}">
-        <if condition='"${logbackAppender}".equals("COLOR_CONSOLE")'>
-            <then>
+            <root level="${loggingLevelRoot}">
                 <appender-ref ref="COLOR_CONSOLE"/>
-            </then>
-            <else>
-                <if condition='"${logbackAppender}".equals("JSON_K8S_CONSOLE")'>
-                    <then>
-                        <appender-ref ref="JSON_K8S_CONSOLE"/>
-                    </then>
-                    <else>
-                        <appender-ref ref="DEFAULT_CONSOLE"/>
-                    </else>
-                </if>
-            </else>
-        </if>
-    </root>
+            </root>
+        </then>
+    </if>
+
+    <if condition='"${logbackAppender}".equals("DEFAULT_CONSOLE")'>
+        <then>
+            <appender name="DEFAULT_CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
+                <encoder>
+                    <pattern>${CONSOLE_LOG_PATTERN}</pattern>
+                    <charset>${CONSOLE_LOG_CHARSET}</charset>
+                </encoder>
+            </appender>
+
+            <root level="${loggingLevelRoot}">
+                <appender-ref ref="DEFAULT_CONSOLE"/>
+            </root>
+        </then>
+    </if>
+
+    <if condition='"${logbackAppender}".equals("JSON_K8S_CONSOLE")'>
+        <then>
+            <appender name="JSON_K8S_CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
+                <encoder class="net.logstash.logback.encoder.LoggingEventCompositeJsonEncoder">
+                    <providers>
+                        <mdc/>
+                        <pattern>
+                            <pattern>
+                                {
+                                    "@timestamp": "%date{yyy-MM-dd'T'HH:mm:ss.SSSXXX, UTC}",
+                                    "@severity": "%level",
+                                    "thread_name": "%thread",
+                                    "logger_name": "%logger",
+                                    "message": "%message"
+                                }
+                            </pattern>
+                        </pattern>
+                        <stackTrace>
+                            <throwableConverter class="net.logstash.logback.stacktrace.ShortenedThrowableConverter">
+                                <maxDepthPerThrowable>30</maxDepthPerThrowable>
+                                <maxLength>2048</maxLength>
+                                <shortenedClassNameLength>20</shortenedClassNameLength>
+                                <exclude>^sun\.reflect\..*\.invoke</exclude>
+                                <exclude>^net\.sf\.cglib\.proxy\.MethodProxy\.invoke</exclude>
+                                <rootCauseFirst>true</rootCauseFirst>
+                            </throwableConverter>
+                        </stackTrace>
+                    </providers>
+                </encoder>
+            </appender>
 
-    <jmxConfigurator/>
-</configuration>
+            <root level="${loggingLevelRoot}">
+                <appender-ref ref="JSON_K8S_CONSOLE"/>
+            </root>
+        </then>
+    </if>
+</configuration>
\ No newline at end of file

From b1a6eefc0b146378b37033c0d4ae85b85dbb83d2 Mon Sep 17 00:00:00 2001
From: "f.shimich" <fshim.dev@gmail.com>
Date: Tue, 3 Jun 2025 00:30:23 +0300
Subject: [PATCH 2/6] bump

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index d6794d48..46d309d9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,7 +11,7 @@
     </parent>
 
     <artifactId>shared-resources</artifactId>
-    <version>3.0.0</version>
+    <version>3.0.1</version>
     <packaging>jar</packaging>
 
     <name>Java shared resources</name>

From a438cec294f4c8050386edc1699c2df617439795 Mon Sep 17 00:00:00 2001
From: "f.shimich" <fshim.dev@gmail.com>
Date: Tue, 3 Jun 2025 00:35:54 +0300
Subject: [PATCH 3/6] bump

---
 .github/workflows/build.yml  | 2 +-
 .github/workflows/deploy.yml | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 70f1a7a7..863cfe7b 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -7,4 +7,4 @@ on:
 
 jobs:
   build:
-    uses: valitydev/java-workflow/.github/workflows/maven-library-build.yml@v2
+    uses: valitydev/java-workflow/.github/workflows/maven-library-build.yml@v3
\ No newline at end of file
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 5e2da3ac..33a63ae9 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -8,10 +8,10 @@ on:
 
 jobs:
   deploy:
-    uses: valitydev/java-workflow/.github/workflows/maven-library-deploy.yml@v2
+    uses: valitydev/java-workflow/.github/workflows/maven-library-deploy.yml@v3
     secrets:
       server-username: ${{ secrets.OSSRH_USERNAME }}
       server-password: ${{ secrets.OSSRH_TOKEN }}
       deploy-secret-key: ${{ secrets.OSSRH_GPG_SECRET_KEY }}
       deploy-secret-key-password: ${{ secrets.OSSRH_GPG_SECRET_KEY_PASSWORD }}
-      mm-webhook-url: ${{ secrets.MATTERMOST_WEBHOOK_URL }}
+      mm-webhook-url: ${{ secrets.MATTERMOST_WEBHOOK_URL }}
\ No newline at end of file

From f19c7752f1bee7a69c822768278e20513b71058d Mon Sep 17 00:00:00 2001
From: "f.shimich" <fshim.dev@gmail.com>
Date: Tue, 3 Jun 2025 00:37:02 +0300
Subject: [PATCH 4/6] fix

---
 .github/workflows/deploy.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 33a63ae9..3ccda4ee 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -14,4 +14,4 @@ jobs:
       server-password: ${{ secrets.OSSRH_TOKEN }}
       deploy-secret-key: ${{ secrets.OSSRH_GPG_SECRET_KEY }}
       deploy-secret-key-password: ${{ secrets.OSSRH_GPG_SECRET_KEY_PASSWORD }}
-      mm-webhook-url: ${{ secrets.MATTERMOST_WEBHOOK_URL }}
\ No newline at end of file
+      mm-webhook-url: ${{ secrets.MATTERMOST_WEBHOOK_URL }}

From ed16f744944632c1bceec1e3fcc5b66d27309e2b Mon Sep 17 00:00:00 2001
From: "f.shimich" <fshim.dev@gmail.com>
Date: Tue, 3 Jun 2025 00:37:56 +0300
Subject: [PATCH 5/6] fix

---
 .github/workflows/build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 863cfe7b..92f0c6c0 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -7,4 +7,4 @@ on:
 
 jobs:
   build:
-    uses: valitydev/java-workflow/.github/workflows/maven-library-build.yml@v3
\ No newline at end of file
+    uses: valitydev/java-workflow/.github/workflows/maven-library-build.yml@v3

From a4c6f722e2606359e300888d418b81e1a150b339 Mon Sep 17 00:00:00 2001
From: "f.shimich" <fshim.dev@gmail.com>
Date: Tue, 3 Jun 2025 00:50:10 +0300
Subject: [PATCH 6/6] bump dependencies

---
 pom.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index 46d309d9..5cc41899 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>dev.vality</groupId>
         <artifactId>library-parent-pom</artifactId>
-        <version>2.0.1</version>
+        <version>3.0.1</version>
     </parent>
 
     <artifactId>shared-resources</artifactId>
@@ -42,13 +42,13 @@
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot</artifactId>
-            <version>2.7.5</version>
+            <version>3.5.0</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>net.logstash.logback</groupId>
             <artifactId>logstash-logback-encoder</artifactId>
-            <version>7.2</version>
+            <version>8.1</version>
         </dependency>
         <dependency>
             <groupId>org.codehaus.janino</groupId>