From 9a56bf4ebb9233d0e973d1e31c6ace86f8cf4fe2 Mon Sep 17 00:00:00 2001 From: tasso94 <3015690+tasso94@users.noreply.github.com> Date: Tue, 14 May 2024 13:35:00 +0200 Subject: [PATCH 1/9] chore(parent): bump logback to 1.5.6 related to camunda/camunda-bpm-platform#4343 --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index 435b9734ba7..77663b45b39 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -45,7 +45,7 @@ 4.5.14 1.7.26 - 1.2.11 + 1.5.6 4.13.1 2.9.1 5.10.0 From a7fc22dca000d86c454f2b29147f7a42fd242b76 Mon Sep 17 00:00:00 2001 From: tasso94 <3015690+tasso94@users.noreply.github.com> Date: Tue, 18 Jun 2024 11:00:38 +0200 Subject: [PATCH 2/9] Bump slf4j --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index 77663b45b39..384784eae21 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -44,7 +44,7 @@ 4.0.2 4.5.14 - 1.7.26 + 2.0.13 1.5.6 4.13.1 2.9.1 From 54dbd9b570ee4aa8f1a4120d048c4001f3dbe72b Mon Sep 17 00:00:00 2001 From: tasso94 <3015690+tasso94@users.noreply.github.com> Date: Tue, 18 Jun 2024 13:30:59 +0200 Subject: [PATCH 3/9] REVERT ME --- .../functional/slf4j/Slf4jClassloadingTest.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/qa/integration-tests-engine/src/test/java/org/camunda/bpm/integrationtest/functional/slf4j/Slf4jClassloadingTest.java b/qa/integration-tests-engine/src/test/java/org/camunda/bpm/integrationtest/functional/slf4j/Slf4jClassloadingTest.java index d3bf8c9b1c0..12ce2de4804 100644 --- a/qa/integration-tests-engine/src/test/java/org/camunda/bpm/integrationtest/functional/slf4j/Slf4jClassloadingTest.java +++ b/qa/integration-tests-engine/src/test/java/org/camunda/bpm/integrationtest/functional/slf4j/Slf4jClassloadingTest.java @@ -55,10 +55,13 @@ public void shouldNotUseNopLoggerFactory() { ILoggerFactory loggerFactory = LoggerFactory.getILoggerFactory(); // verify that a SLF4J backend is used which is not the NOP logger + + System.out.println(loggerFactory.getClass().getCanonicalName()); assertFalse("Should not use NOPLoggerFactory", loggerFactory instanceof NOPLoggerFactory); // should either use slf4j-jdk14 or slf4j-jboss-logmanager String loggerFactoryClassName = loggerFactory.getClass().getCanonicalName(); + System.out.println(loggerFactoryClassName); assertTrue("Should use slf4j-jdk14 or slf4j-jboss-logmanager", JDK14_LOGGER_FACTORY.equals(loggerFactoryClassName) || JBOSS_SLF4J_LOGGER_FACTORY.equals(loggerFactoryClassName)); } From b9898358a0b9c193c4e6d714bf04ab8becec55af Mon Sep 17 00:00:00 2001 From: tasso94 <3015690+tasso94@users.noreply.github.com> Date: Tue, 18 Jun 2024 16:47:39 +0200 Subject: [PATCH 4/9] Revert back to logback 1.3 --- parent/pom.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index 384784eae21..c9821786804 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -45,7 +45,8 @@ 4.5.14 2.0.13 - 1.5.6 + + 1.3.14 4.13.1 2.9.1 5.10.0 From d6abc9c98244579122b964f6b84bcf1b0d6295f3 Mon Sep 17 00:00:00 2001 From: tasso94 <3015690+tasso94@users.noreply.github.com> Date: Wed, 21 Aug 2024 10:19:41 +0200 Subject: [PATCH 5/9] Update pom.xml --- parent/pom.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index c9821786804..c8a857a8c2d 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -44,7 +44,8 @@ 4.0.2 4.5.14 - 2.0.13 + + 1.7.36 1.3.14 4.13.1 From afe1dd800277e62394afbe5e711deda0e082cc28 Mon Sep 17 00:00:00 2001 From: tasso94 <3015690+tasso94@users.noreply.github.com> Date: Wed, 21 Aug 2024 10:20:00 +0200 Subject: [PATCH 6/9] Update Slf4jClassloadingTest.java --- .../integrationtest/functional/slf4j/Slf4jClassloadingTest.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/qa/integration-tests-engine/src/test/java/org/camunda/bpm/integrationtest/functional/slf4j/Slf4jClassloadingTest.java b/qa/integration-tests-engine/src/test/java/org/camunda/bpm/integrationtest/functional/slf4j/Slf4jClassloadingTest.java index 12ce2de4804..6d043a31bfd 100644 --- a/qa/integration-tests-engine/src/test/java/org/camunda/bpm/integrationtest/functional/slf4j/Slf4jClassloadingTest.java +++ b/qa/integration-tests-engine/src/test/java/org/camunda/bpm/integrationtest/functional/slf4j/Slf4jClassloadingTest.java @@ -56,12 +56,10 @@ public void shouldNotUseNopLoggerFactory() { // verify that a SLF4J backend is used which is not the NOP logger - System.out.println(loggerFactory.getClass().getCanonicalName()); assertFalse("Should not use NOPLoggerFactory", loggerFactory instanceof NOPLoggerFactory); // should either use slf4j-jdk14 or slf4j-jboss-logmanager String loggerFactoryClassName = loggerFactory.getClass().getCanonicalName(); - System.out.println(loggerFactoryClassName); assertTrue("Should use slf4j-jdk14 or slf4j-jboss-logmanager", JDK14_LOGGER_FACTORY.equals(loggerFactoryClassName) || JBOSS_SLF4J_LOGGER_FACTORY.equals(loggerFactoryClassName)); } From 6031971ef5a875b19ae5d119ab78aaab586bd67d Mon Sep 17 00:00:00 2001 From: tasso94 <3015690+tasso94@users.noreply.github.com> Date: Wed, 21 Aug 2024 10:20:25 +0200 Subject: [PATCH 7/9] Update Slf4jClassloadingTest.java --- .../integrationtest/functional/slf4j/Slf4jClassloadingTest.java | 1 - 1 file changed, 1 deletion(-) diff --git a/qa/integration-tests-engine/src/test/java/org/camunda/bpm/integrationtest/functional/slf4j/Slf4jClassloadingTest.java b/qa/integration-tests-engine/src/test/java/org/camunda/bpm/integrationtest/functional/slf4j/Slf4jClassloadingTest.java index 6d043a31bfd..d3bf8c9b1c0 100644 --- a/qa/integration-tests-engine/src/test/java/org/camunda/bpm/integrationtest/functional/slf4j/Slf4jClassloadingTest.java +++ b/qa/integration-tests-engine/src/test/java/org/camunda/bpm/integrationtest/functional/slf4j/Slf4jClassloadingTest.java @@ -55,7 +55,6 @@ public void shouldNotUseNopLoggerFactory() { ILoggerFactory loggerFactory = LoggerFactory.getILoggerFactory(); // verify that a SLF4J backend is used which is not the NOP logger - assertFalse("Should not use NOPLoggerFactory", loggerFactory instanceof NOPLoggerFactory); // should either use slf4j-jdk14 or slf4j-jboss-logmanager From f677e4eda540ad4a86d3ac3f6728ab93afe99125 Mon Sep 17 00:00:00 2001 From: tasso94 <3015690+tasso94@users.noreply.github.com> Date: Tue, 27 Aug 2024 13:39:25 +0200 Subject: [PATCH 8/9] Update pom.xml --- commons/pom.xml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/commons/pom.xml b/commons/pom.xml index b243c357f8a..d18a5ddbf2d 100644 --- a/commons/pom.xml +++ b/commons/pom.xml @@ -49,6 +49,12 @@ ${version.slf4j} + + org.slf4j + slf4j-jdk14 + ${version.slf4j} + + ch.qos.logback logback-classic From 803ed06b4874e9b7000e75b904a6260b9b625efe Mon Sep 17 00:00:00 2001 From: tasso94 <3015690+tasso94@users.noreply.github.com> Date: Tue, 27 Aug 2024 13:39:52 +0200 Subject: [PATCH 9/9] Update pom.xml --- commons/logging/pom.xml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/commons/logging/pom.xml b/commons/logging/pom.xml index 195ede33bfc..62258d0b5f4 100644 --- a/commons/logging/pom.xml +++ b/commons/logging/pom.xml @@ -17,6 +17,11 @@ slf4j-api + + org.slf4j + slf4j-jdk14 + + ch.qos.logback logback-classic