Merge branch 'master' of https://git.ccalm.org/igor/org.ccalm.weather

# Conflicts: # pom.xml
2026-09-23 19:18:13 +05:00
parent 9d35ac5292 17d0649cee
commit 9eaebc45e3
7 changed files with 118 additions and 34 deletions
@@ -40,11 +40,7 @@
            <artifactId>spring-boot-starter-test</artifactId>
            <scope>test</scope>
        </dependency>
-        <dependency>
-            <groupId>net.logstash.logback</groupId>
-            <artifactId>logstash-logback-encoder</artifactId>
-            <version>6.6</version>
-        </dependency>
+
        <!--dependency>
            <groupId>org.json</groupId>
            <artifactId>json</artifactId>
@@ -94,6 +90,13 @@
            <version>1.18.36</version>
            <scope>provided</scope>
        </dependency>
+
+        <dependency>
+            <groupId>net.logstash.logback</groupId>
+            <artifactId>logstash-logback-encoder</artifactId>
+            <version>8.1</version>
+        </dependency>
+
    </dependencies>

    <build>