Merge 1.5.0 changes back to master.

2025-09-06 05:07:41 +00:00 · 2022-11-11 23:39:29 +00:00
parent 2f6687cd78 ed0930212c
commit 20344353ac
5 changed files with 5 additions and 5 deletions
--- a/doc/licenses/logback-1.3.4/LICENSE.txt
+++ b/doc/licenses/logback-1.3.4/LICENSE.txt
--- a/doc/licenses/logback-1.3.4/README
+++ b/doc/licenses/logback-1.3.4/README
@@ -1,8 +1,8 @@
 Logback (http://logback.qos.ch/)
 --------------------------------

-    Version: 1.4.4
+    Version: 1.3.4
    From: 'QOS.ch Sàrl' (http://qos.ch/)
    License(s):
-        EPL v1.0 (bundled/logback-1.4.4/LICENSE.txt)
+        EPL v1.0 (bundled/logback-1.3.4/LICENSE.txt)

--- a/doc/licenses/logback-1.3.4/dep-coordinates.txt
+++ b/doc/licenses/logback-1.3.4/dep-coordinates.txt
@@ -0,0 +1,2 @@
+ch.qos.logback:logback-classic:jar:1.3.4
+ch.qos.logback:logback-core:jar:1.3.4
--- a/doc/licenses/logback-1.4.4/dep-coordinates.txt
+++ b/doc/licenses/logback-1.4.4/dep-coordinates.txt
@@ -1,2 +0,0 @@
-ch.qos.logback:logback-classic:jar:1.4.4
-ch.qos.logback:logback-core:jar:1.4.4
--- a/pom.xml
+++ b/pom.xml
@@ -44,7 +44,7 @@
        <jersey.version>2.37</jersey.version>
        <junit.version>5.9.1</junit.version>
        <junit4.version>4.13.2</junit4.version>
-        <logback.version>1.4.4</logback.version>
+        <logback.version>1.3.4</logback.version>
        <slf4j.version>2.0.3</slf4j.version>

        <!-- The directory that should receive all generated dependency lists