diff --git a/.gitignore b/.gitignore index 51028df..bd3111c 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ /3.3.0.Final.tar.gz /jboss-logging-3.4.1.Final.tar.gz /jboss-logging-3.5.1.Final.tar.gz +/jboss-logging-3.5.2.Final.tar.gz diff --git a/0001-Drop-log4j-dependency.patch b/0001-Drop-log4j-dependency.patch index 0b4c22e..724416b 100644 --- a/0001-Drop-log4j-dependency.patch +++ b/0001-Drop-log4j-dependency.patch @@ -1,4 +1,4 @@ -From 838c62da9c65a917fe7d40c46639a36a8ed823a1 Mon Sep 17 00:00:00 2001 +From e4e26f68563c78291adc7f7aedb924f71c3fc35e Mon Sep 17 00:00:00 2001 From: Chris Kelley Date: Tue, 6 Jun 2023 12:04:45 +0100 Subject: [PATCH 1/3] Drop log4j dependency @@ -25,13 +25,13 @@ Subject: [PATCH 1/3] Drop log4j dependency delete mode 100644 src/test/java/org/jboss/logging/Log4jProviderTestCase.java diff --git a/pom.xml b/pom.xml -index d4d287c..74fc114 100644 +index 486df01..0243e43 100644 --- a/pom.xml +++ b/pom.xml @@ -56,8 +56,6 @@ - 1.4.7 - 1.2 + 1.4.8 + 2.0 - 1.2.17 - 2.20.0 2.1.19.Final @@ -500,7 +500,7 @@ index 9bb0c74..0000000 - } -} diff --git a/src/main/java/org/jboss/logging/LoggerProviders.java b/src/main/java/org/jboss/logging/LoggerProviders.java -index 1ace1e8..8a0ab5e 100644 +index 08c16ce..584fa79 100644 --- a/src/main/java/org/jboss/logging/LoggerProviders.java +++ b/src/main/java/org/jboss/logging/LoggerProviders.java @@ -45,10 +45,6 @@ final class LoggerProviders { @@ -566,7 +566,7 @@ index 1ace1e8..8a0ab5e 100644 - private static LoggerProvider tryJBossLogManager(final ClassLoader cl, final String via) throws ClassNotFoundException { final Class logManagerClass = LogManager.getLogManager().getClass(); - if (logManagerClass == Class.forName("org.jboss.logmanager.LogManager", false, cl) + final Class jblLogManager = Class.forName("org.jboss.logmanager.LogManager", false, diff --git a/src/test/java/org/jboss/logging/Log4j2ClassPathTestCase.java b/src/test/java/org/jboss/logging/Log4j2ClassPathTestCase.java deleted file mode 100644 index 88f05f4..0000000 diff --git a/0002-Drop-jboss-logmanager-dependency.patch b/0002-Drop-jboss-logmanager-dependency.patch index e1c3250..1702441 100644 --- a/0002-Drop-jboss-logmanager-dependency.patch +++ b/0002-Drop-jboss-logmanager-dependency.patch @@ -1,4 +1,4 @@ -From 2053d0851f63bac9d74898c212cc420ed3f94add Mon Sep 17 00:00:00 2001 +From 2030e66936508a0d5ee04bf50b7cfeb0ff745b1d Mon Sep 17 00:00:00 2001 From: Chris Kelley Date: Tue, 6 Jun 2023 21:45:57 +0100 Subject: [PATCH 2/3] Drop jboss-logmanager dependency @@ -7,23 +7,23 @@ Subject: [PATCH 2/3] Drop jboss-logmanager dependency pom.xml | 7 - .../jboss/logging/JBossLogManagerLogger.java | 81 --------- .../logging/JBossLogManagerProvider.java | 163 ------------------ - .../org/jboss/logging/LoggerProviders.java | 22 +-- + .../org/jboss/logging/LoggerProviders.java | 30 +--- .../JBossLogManagerClassPathTestCase.java | 30 ---- .../JBossLogManagerProviderTestCase.java | 158 ----------------- - 6 files changed, 1 insertion(+), 460 deletions(-) + 6 files changed, 1 insertion(+), 468 deletions(-) delete mode 100644 src/main/java/org/jboss/logging/JBossLogManagerLogger.java delete mode 100644 src/main/java/org/jboss/logging/JBossLogManagerProvider.java delete mode 100644 src/test/java/org/jboss/logging/JBossLogManagerClassPathTestCase.java delete mode 100644 src/test/java/org/jboss/logging/JBossLogManagerProviderTestCase.java diff --git a/pom.xml b/pom.xml -index 74fc114..422a767 100644 +index 0243e43..d3048ed 100644 --- a/pom.xml +++ b/pom.xml @@ -56,7 +56,6 @@ - 1.4.7 - 1.2 + 1.4.8 + 2.0 - 2.1.19.Final 5.9.3 2.0.7 @@ -298,7 +298,7 @@ index bdeac67..0000000 - } -} diff --git a/src/main/java/org/jboss/logging/LoggerProviders.java b/src/main/java/org/jboss/logging/LoggerProviders.java -index 8a0ab5e..0154aea 100644 +index 584fa79..0154aea 100644 --- a/src/main/java/org/jboss/logging/LoggerProviders.java +++ b/src/main/java/org/jboss/logging/LoggerProviders.java @@ -21,7 +21,6 @@ package org.jboss.logging; @@ -332,15 +332,23 @@ index 8a0ab5e..0154aea 100644 try { // only use slf4j if Logback is in use Class.forName("ch.qos.logback.classic.Logger", false, cl); -@@ -99,18 +91,6 @@ final class LoggerProviders { +@@ -99,26 +91,6 @@ final class LoggerProviders { return provider; } - private static LoggerProvider tryJBossLogManager(final ClassLoader cl, final String via) throws ClassNotFoundException { - final Class logManagerClass = LogManager.getLogManager().getClass(); -- if (logManagerClass == Class.forName("org.jboss.logmanager.LogManager", false, cl) +- final Class jblLogManager = Class.forName("org.jboss.logmanager.LogManager", false, +- Logger.class.getClassLoader()); +- if (logManagerClass == jblLogManager - && Class.forName("org.jboss.logmanager.Logger$AttachmentKey", true, cl).getClassLoader() == logManagerClass - .getClassLoader()) { +- // We do not have an explicit dependency on org.jboss.logmanager as we could end up with cyclic dependencies. +- // Therefore, we check the modules are named, and if they are we add an explicit reads. +- final Module module = LoggerProviders.class.getModule(); +- if (module.isNamed()) { +- module.addReads(jblLogManager.getModule()); +- } - final LoggerProvider provider = new JBossLogManagerProvider(); - logProvider(provider, via); - return provider; diff --git a/0003-Drop-TestCase-that-depend-on-retired-package.patch b/0003-Drop-TestCase-that-depend-on-retired-package.patch index 38e6f28..690bd6f 100644 --- a/0003-Drop-TestCase-that-depend-on-retired-package.patch +++ b/0003-Drop-TestCase-that-depend-on-retired-package.patch @@ -1,4 +1,4 @@ -From 260e98e9268fa0aff117dbfaa0ba030994f3f54b Mon Sep 17 00:00:00 2001 +From 245223db001dbc45409d41aa4a8e465650ecdc9e Mon Sep 17 00:00:00 2001 From: Chris Kelley Date: Wed, 14 Jun 2023 11:12:00 +0100 Subject: [PATCH 3/3] Drop *TestCase that depend on retired package diff --git a/jboss-logging.spec b/jboss-logging.spec index a243cd6..e705d91 100644 --- a/jboss-logging.spec +++ b/jboss-logging.spec @@ -2,7 +2,7 @@ %global namedversion %{version}%{?namedreltag} Name: jboss-logging -Version: 3.5.1 +Version: 3.5.2 Release: 1%{?dist} Summary: The JBoss Logging Framework License: Apache-2.0 @@ -45,6 +45,9 @@ This package contains the JBoss Logging Framework. %license LICENSE.txt %changelog +* Fri Jun 30 2023 Chris Kelley - 3.5.2-1 +- Rebase to version 3.5.2.Final + * Tue Jun 06 2023 Chris Kelley - 3.5.1-1 - Rebase to version 3.5.1.Final diff --git a/sources b/sources index f9a5ddf..4c33bec 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (jboss-logging-3.5.1.Final.tar.gz) = bfaf6fbc520ea08eb3de324ef8b57bfb3cb7fcd0df436023d7689d0da443b89d523403781ee3f8a4709f1862f5a2c512afc4278bc997265eecaa79a4a5237f44 +SHA512 (jboss-logging-3.5.2.Final.tar.gz) = 0a58056d695f47c354628d10b07c1e584d038c829c98d5b085ac4720a4c7f31bacf9b9dfaa0115dfb6aaf16445d9c588701f1a99b86b46b84509be34f4badda4