commit c64391e45add5d890aa18e677e9f956b2fb4f756 Author: MSVSphere Packaging Team Date: Wed Mar 15 17:38:25 2023 +0300 import jboss-logging-3.4.1-9.el9 diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..3c65e5c --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +SOURCES/jboss-logging-3.4.1.Final.tar.gz diff --git a/.jboss-logging.metadata b/.jboss-logging.metadata new file mode 100644 index 0000000..f6d5b34 --- /dev/null +++ b/.jboss-logging.metadata @@ -0,0 +1 @@ +99927dff7c3de27628fa0ca2faa64bc19bd901a8 SOURCES/jboss-logging-3.4.1.Final.tar.gz diff --git a/SOURCES/0001-Drop-jboss-logmanager-dependency.patch b/SOURCES/0001-Drop-jboss-logmanager-dependency.patch new file mode 100644 index 0000000..071e016 --- /dev/null +++ b/SOURCES/0001-Drop-jboss-logmanager-dependency.patch @@ -0,0 +1,332 @@ +From 83f101442cc126dab0ff4bf793f4ed518ff5df19 Mon Sep 17 00:00:00 2001 +From: "Endi S. Dewata" +Date: Fri, 4 Jun 2021 13:17:33 -0500 +Subject: [PATCH] Drop jboss-logmanager dependency + +--- + pom.xml | 7 - + .../jboss/logging/JBossLogManagerLogger.java | 78 --------- + .../logging/JBossLogManagerProvider.java | 150 ------------------ + .../org/jboss/logging/LoggerProviders.java | 21 +-- + 4 files changed, 1 insertion(+), 255 deletions(-) + delete mode 100644 src/main/java/org/jboss/logging/JBossLogManagerLogger.java + delete mode 100644 src/main/java/org/jboss/logging/JBossLogManagerProvider.java + +diff --git a/pom.xml b/pom.xml +index 88af23f..03e036c 100644 +--- a/pom.xml ++++ b/pom.xml +@@ -31,17 +31,10 @@ + + + +- 2.1.9.Final + 1.7.25 + + + +- +- org.jboss.logmanager +- jboss-logmanager +- ${version.org.jboss.logmanager} +- provided +- + + org.slf4j + slf4j-api +diff --git a/src/main/java/org/jboss/logging/JBossLogManagerLogger.java b/src/main/java/org/jboss/logging/JBossLogManagerLogger.java +deleted file mode 100644 +index e4242cf..0000000 +--- a/src/main/java/org/jboss/logging/JBossLogManagerLogger.java ++++ /dev/null +@@ -1,78 +0,0 @@ +-/* +- * JBoss, Home of Professional Open Source. +- * +- * Copyright 2010 Red Hat, Inc. +- * +- * Licensed under the Apache License, Version 2.0 (the "License"); +- * you may not use this file except in compliance with the License. +- * You may obtain a copy of the License at +- * +- * http://www.apache.org/licenses/LICENSE-2.0 +- * +- * Unless required by applicable law or agreed to in writing, software +- * distributed under the License is distributed on an "AS IS" BASIS, +- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or +- * implied. See the License for the specific language governing +- * permissions and limitations under the License. +- */ +- +-package org.jboss.logging; +- +-import org.jboss.logmanager.ExtLogRecord; +- +-final class JBossLogManagerLogger extends Logger { +- +- private static final long serialVersionUID = 7429618317727584742L; +- +- private final org.jboss.logmanager.Logger logger; +- +- JBossLogManagerLogger(final String name, final org.jboss.logmanager.Logger logger) { +- super(name); +- this.logger = logger; +- } +- +- public boolean isEnabled(final Level level) { +- return logger.isLoggable(translate(level)); +- } +- +- protected void doLog(final Level level, final String loggerClassName, final Object message, final Object[] parameters, final Throwable thrown) { +- java.util.logging.Level translatedLevel = translate(level); +- if (logger.isLoggable(translatedLevel)) { +- if (parameters == null) { +- logger.log(loggerClassName, translatedLevel, String.valueOf(message), thrown); +- } else { +- logger.log(loggerClassName, translatedLevel, String.valueOf(message), ExtLogRecord.FormatStyle.MESSAGE_FORMAT, parameters, thrown); +- } +- } +- } +- +- protected void doLogf(final Level level, final String loggerClassName, final String format, final Object[] parameters, final Throwable thrown) { +- if (parameters == null) { +- logger.log(loggerClassName, translate(level), format, thrown); +- } else { +- logger.log(loggerClassName, translate(level), format, ExtLogRecord.FormatStyle.PRINTF, parameters, thrown); +- } +- } +- +- private static java.util.logging.Level translate(final Level level) { +- if (level == Level.TRACE) { +- return org.jboss.logmanager.Level.TRACE; +- } else if (level == Level.DEBUG) { +- return org.jboss.logmanager.Level.DEBUG; +- } +- return infoOrHigher(level); +- } +- +- private static java.util.logging.Level infoOrHigher(final Level level) { +- if (level == Level.INFO) { +- return org.jboss.logmanager.Level.INFO; +- } else if (level == Level.WARN) { +- return org.jboss.logmanager.Level.WARN; +- } else if (level == Level.ERROR) { +- return org.jboss.logmanager.Level.ERROR; +- } else if (level == Level.FATAL) { +- return org.jboss.logmanager.Level.FATAL; +- } +- return org.jboss.logmanager.Level.ALL; +- } +-} +diff --git a/src/main/java/org/jboss/logging/JBossLogManagerProvider.java b/src/main/java/org/jboss/logging/JBossLogManagerProvider.java +deleted file mode 100644 +index 6cdbce3..0000000 +--- a/src/main/java/org/jboss/logging/JBossLogManagerProvider.java ++++ /dev/null +@@ -1,150 +0,0 @@ +-/* +- * JBoss, Home of Professional Open Source. +- * +- * Copyright 2010 Red Hat, Inc. +- * +- * Licensed under the Apache License, Version 2.0 (the "License"); +- * you may not use this file except in compliance with the License. +- * You may obtain a copy of the License at +- * +- * http://www.apache.org/licenses/LICENSE-2.0 +- * +- * Unless required by applicable law or agreed to in writing, software +- * distributed under the License is distributed on an "AS IS" BASIS, +- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +- * See the License for the specific language governing permissions and +- * limitations under the License. +- */ +- +-package org.jboss.logging; +- +-import java.security.AccessController; +-import java.security.PrivilegedAction; +-import java.util.Map; +-import java.util.concurrent.ConcurrentHashMap; +-import java.util.concurrent.ConcurrentMap; +- +-import org.jboss.logmanager.LogContext; +-import org.jboss.logmanager.MDC; +-import org.jboss.logmanager.NDC; +- +-import static org.jboss.logmanager.Logger.AttachmentKey; +- +-final class JBossLogManagerProvider implements LoggerProvider { +- +- private static final AttachmentKey KEY = new AttachmentKey(); +- private static final AttachmentKey> LEGACY_KEY = new AttachmentKey>(); +- +- public Logger getLogger(final String name) { +- final SecurityManager sm = System.getSecurityManager(); +- if (sm != null) { +- return AccessController.doPrivileged(new PrivilegedAction() { +- public Logger run() { +- try { +- return doGetLogger(name) ; +- } catch (NoSuchMethodError ignore) { +- } +- // fallback +- return doLegacyGetLogger(name); +- } +- }); +- } else { +- try { +- return doGetLogger(name) ; +- } catch (NoSuchMethodError ignore) { +- } +- // fallback +- return doLegacyGetLogger(name); +- } +- } +- +- private static Logger doLegacyGetLogger(final String name) { +- final org.jboss.logmanager.Logger lmLogger = LogContext.getLogContext().getLogger(""); +- ConcurrentMap loggers = lmLogger.getAttachment(LEGACY_KEY); +- if (loggers == null) { +- loggers = new ConcurrentHashMap(); +- final ConcurrentMap appearing = lmLogger.attachIfAbsent(LEGACY_KEY, loggers); +- if (appearing != null) { +- loggers = appearing; +- } +- } +- +- Logger l = loggers.get(name); +- if (l != null) { +- return l; +- } +- +- final org.jboss.logmanager.Logger logger = org.jboss.logmanager.Logger.getLogger(name); +- l = new JBossLogManagerLogger(name, logger); +- final Logger appearing = loggers.putIfAbsent(name, l); +- if (appearing == null) { +- return l; +- } +- return appearing; +- } +- +- private static Logger doGetLogger(final String name) { +- Logger l = LogContext.getLogContext().getAttachment(name, KEY); +- if (l != null) { +- return l; +- } +- final org.jboss.logmanager.Logger logger = org.jboss.logmanager.Logger.getLogger(name); +- l = new JBossLogManagerLogger(name, logger); +- Logger a = logger.attachIfAbsent(KEY, l); +- if (a == null) { +- return l; +- } else { +- return a; +- } +- } +- +- public void clearMdc() { +- MDC.clear(); +- } +- +- public Object putMdc(final String key, final Object value) { +- return MDC.put(key, String.valueOf(value)); +- } +- +- public Object getMdc(final String key) { +- return MDC.get(key); +- } +- +- public void removeMdc(final String key) { +- MDC.remove(key); +- } +- +- @SuppressWarnings({ "unchecked" }) +- public Map getMdcMap() { +- // we can re-define the erasure of this map because MDC does not make further use of the copy +- return (Map)MDC.copy(); +- } +- +- public void clearNdc() { +- NDC.clear(); +- } +- +- public String getNdc() { +- return NDC.get(); +- } +- +- public int getNdcDepth() { +- return NDC.getDepth(); +- } +- +- public String popNdc() { +- return NDC.pop(); +- } +- +- public String peekNdc() { +- return NDC.get(); +- } +- +- public void pushNdc(final String message) { +- NDC.push(message); +- } +- +- public void setNdcMaxDepth(final int maxDepth) { +- NDC.trimTo(maxDepth); +- } +-} +diff --git a/src/main/java/org/jboss/logging/LoggerProviders.java b/src/main/java/org/jboss/logging/LoggerProviders.java +index 8e393d1..2e8c994 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; + import java.util.Iterator; + import java.util.ServiceConfigurationError; + import java.util.ServiceLoader; +-import java.util.logging.LogManager; + + final class LoggerProviders { + static final String LOGGING_PROVIDER_KEY = "org.jboss.logging.provider"; +@@ -41,9 +40,7 @@ final class LoggerProviders { + // Check the system property + final String loggerProvider = SecurityActions.getSystemProperty(LOGGING_PROVIDER_KEY); + if (loggerProvider != null) { +- if ("jboss".equalsIgnoreCase(loggerProvider)) { +- return tryJBossLogManager(cl, "system property"); +- } else if ("jdk".equalsIgnoreCase(loggerProvider)) { ++ if ("jdk".equalsIgnoreCase(loggerProvider)) { + return tryJDK("system property"); + } else if ("slf4j".equalsIgnoreCase(loggerProvider)) { + return trySlf4j("system property"); +@@ -71,11 +68,6 @@ final class LoggerProviders { + } + + // Finally search the class path +- try { +- return tryJBossLogManager(cl, null); +- } catch (Throwable t) { +- // nope... +- } + try { + // only use slf4j if Logback is in use + Class.forName("ch.qos.logback.classic.Logger", false, cl); +@@ -98,17 +90,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) +- && Class.forName("org.jboss.logmanager.Logger$AttachmentKey", true, cl).getClassLoader() == logManagerClass.getClassLoader()) { +- final LoggerProvider provider = new JBossLogManagerProvider(); +- logProvider(provider, via); +- return provider; +- } +- throw new IllegalStateException(); +- } +- + private static void logProvider(final LoggerProvider provider, final String via) { + // Log a debug message indicating which logger we are using + final Logger logger = provider.getLogger(LoggerProviders.class.getPackage().getName()); +-- +2.31.1 + diff --git a/SOURCES/0001-Drop-log4j-dependency.patch b/SOURCES/0001-Drop-log4j-dependency.patch new file mode 100644 index 0000000..c833cd9 --- /dev/null +++ b/SOURCES/0001-Drop-log4j-dependency.patch @@ -0,0 +1,504 @@ +From db9a311cb2bf17f9febdf5e31d28ca83af399cf9 Mon Sep 17 00:00:00 2001 +From: "Endi S. Dewata" +Date: Fri, 4 Jun 2021 12:20:45 -0500 +Subject: [PATCH] Drop log4j dependency + +--- + pom.xml | 25 ----- + .../java/org/jboss/logging/Log4j2Logger.java | 92 ------------------ + .../jboss/logging/Log4j2LoggerProvider.java | 96 ------------------- + .../java/org/jboss/logging/Log4jLogger.java | 74 -------------- + .../jboss/logging/Log4jLoggerProvider.java | 86 ----------------- + .../org/jboss/logging/LoggerProviders.java | 36 ------- + 6 files changed, 409 deletions(-) + delete mode 100644 src/main/java/org/jboss/logging/Log4j2Logger.java + delete mode 100644 src/main/java/org/jboss/logging/Log4j2LoggerProvider.java + delete mode 100644 src/main/java/org/jboss/logging/Log4jLogger.java + delete mode 100644 src/main/java/org/jboss/logging/Log4jLoggerProvider.java + +diff --git a/pom.xml b/pom.xml +index 60a9de3..88af23f 100644 +--- a/pom.xml ++++ b/pom.xml +@@ -31,8 +31,6 @@ + + + +- 1.2.16 +- 2.11.2 + 2.1.9.Final + 1.7.25 + +@@ -44,28 +42,6 @@ + ${version.org.jboss.logmanager} + provided + +- +- log4j +- log4j +- ${version.org.apache.log4j} +- provided +- +- +- com.sun.jdmk +- jmxtools +- +- +- com.sun.jmx +- jmxri +- +- +- +- +- org.apache.logging.log4j +- log4j-api +- ${version.org.apache.logging.log4j} +- provided +- + + org.slf4j + slf4j-api +@@ -109,7 +85,6 @@ + ${project.groupId}.*;version=${project.version};-split-package:=error + + +- org.apache.log4j.config;resolution:=optional, + *;resolution:=optional + + +diff --git a/src/main/java/org/jboss/logging/Log4j2Logger.java b/src/main/java/org/jboss/logging/Log4j2Logger.java +deleted file mode 100644 +index 3603499..0000000 +--- a/src/main/java/org/jboss/logging/Log4j2Logger.java ++++ /dev/null +@@ -1,92 +0,0 @@ +-/* +- * JBoss, Home of Professional Open Source. +- * +- * Copyright 2013 Red Hat, Inc. +- * +- * Licensed under the Apache License, Version 2.0 (the "License"); +- * you may not use this file except in compliance with the License. +- * You may obtain a copy of the License at +- * +- * http://www.apache.org/licenses/LICENSE-2.0 +- * +- * Unless required by applicable law or agreed to in writing, software +- * distributed under the License is distributed on an "AS IS" BASIS, +- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +- * See the License for the specific language governing permissions and +- * limitations under the License. +- */ +- +-package org.jboss.logging; +- +-import org.apache.logging.log4j.LogManager; +-import org.apache.logging.log4j.LoggingException; +-import org.apache.logging.log4j.message.MessageFormatMessageFactory; +-import org.apache.logging.log4j.message.StringFormattedMessage; +-import org.apache.logging.log4j.spi.AbstractLogger; +- +-final class Log4j2Logger extends Logger { +- +- private static final long serialVersionUID = -2507841068232627725L; +- +- private final AbstractLogger logger; +- private final MessageFormatMessageFactory messageFactory; +- +- Log4j2Logger(final String name) { +- super(name); +- org.apache.logging.log4j.Logger logger = LogManager.getLogger(name); +- if (!(logger instanceof AbstractLogger)) { +- throw new LoggingException("The logger for [" + name + "] does not extend AbstractLogger. Actual logger: " + logger.getClass().getName()); +- } +- this.logger = (AbstractLogger)logger; +- this.messageFactory = new MessageFormatMessageFactory(); +- } +- +- @Override +- public boolean isEnabled(final Level level) { +- return this.logger.isEnabled(Log4j2Logger.translate(level)); +- } +- +- @Override +- protected void doLog(final Level level, final String loggerClassName, final Object message, final Object[] parameters, final Throwable thrown) { +- final org.apache.logging.log4j.Level translatedLevel = Log4j2Logger.translate(level); +- if (this.logger.isEnabled(translatedLevel)) { +- try { +- this.logger.logMessage(loggerClassName, translatedLevel, null, +- (parameters == null || parameters.length == 0) ? this.messageFactory.newMessage(message) : this.messageFactory.newMessage(String.valueOf(message), parameters), +- thrown); +- } catch (Throwable ignored) { } +- } +- } +- +- @Override +- protected void doLogf(final Level level, final String loggerClassName, final String format, final Object[] parameters, final Throwable thrown) { +- final org.apache.logging.log4j.Level translatedLevel = Log4j2Logger.translate(level); +- if (this.logger.isEnabled(translatedLevel)) { +- try { +- this.logger.logMessage(loggerClassName, translatedLevel, null, new StringFormattedMessage(format, parameters), thrown); +- } catch (Throwable ignored) { } +- } +- } +- +- private static org.apache.logging.log4j.Level translate(final Level level) { +- if (level == Level.TRACE) { +- return org.apache.logging.log4j.Level.TRACE; +- } else if (level == Level.DEBUG) { +- return org.apache.logging.log4j.Level.DEBUG; +- } +- return infoOrHigher(level); +- } +- +- private static org.apache.logging.log4j.Level infoOrHigher(final Level level) { +- if (level == Level.INFO) { +- return org.apache.logging.log4j.Level.INFO; +- } else if (level == Level.WARN) { +- return org.apache.logging.log4j.Level.WARN; +- } else if (level == Level.ERROR) { +- return org.apache.logging.log4j.Level.ERROR; +- } else if (level == Level.FATAL) { +- return org.apache.logging.log4j.Level.FATAL; +- } +- return org.apache.logging.log4j.Level.ALL; +- } +-} +diff --git a/src/main/java/org/jboss/logging/Log4j2LoggerProvider.java b/src/main/java/org/jboss/logging/Log4j2LoggerProvider.java +deleted file mode 100644 +index 84417d2..0000000 +--- a/src/main/java/org/jboss/logging/Log4j2LoggerProvider.java ++++ /dev/null +@@ -1,96 +0,0 @@ +-/* +- * JBoss, Home of Professional Open Source. +- * +- * Copyright 2013 Red Hat, Inc. +- * +- * Licensed under the Apache License, Version 2.0 (the "License"); +- * you may not use this file except in compliance with the License. +- * You may obtain a copy of the License at +- * +- * http://www.apache.org/licenses/LICENSE-2.0 +- * +- * Unless required by applicable law or agreed to in writing, software +- * distributed under the License is distributed on an "AS IS" BASIS, +- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +- * See the License for the specific language governing permissions and +- * limitations under the License. +- */ +- +-package org.jboss.logging; +- +-import java.util.HashMap; +-import java.util.Map; +- +-import org.apache.logging.log4j.ThreadContext; +- +-final class Log4j2LoggerProvider implements LoggerProvider { +- +- @Override +- public Log4j2Logger getLogger(String name) { +- return new Log4j2Logger(name); +- } +- +- @Override +- public void clearMdc() { +- ThreadContext.clearMap(); +- } +- +- @Override +- public Object putMdc(String key, Object value) { +- try { +- return ThreadContext.get(key); +- } finally { +- ThreadContext.put(key, String.valueOf(value)); +- } +- } +- +- @Override +- public Object getMdc(String key) { +- return ThreadContext.get(key); +- } +- +- @Override +- public void removeMdc(String key) { +- ThreadContext.remove(key); +- } +- +- @Override +- public Map getMdcMap() { +- return new HashMap(ThreadContext.getImmutableContext()); +- } +- +- @Override +- public void clearNdc() { +- ThreadContext.clearStack(); +- } +- +- @Override +- public String getNdc() { +- return ThreadContext.peek(); +- } +- +- @Override +- public int getNdcDepth() { +- return ThreadContext.getDepth(); +- } +- +- @Override +- public String popNdc() { +- return ThreadContext.pop(); +- } +- +- @Override +- public String peekNdc() { +- return ThreadContext.peek(); +- } +- +- @Override +- public void pushNdc(String message) { +- ThreadContext.push(message); +- } +- +- @Override +- public void setNdcMaxDepth(int maxDepth) { +- ThreadContext.trim(maxDepth); +- } +-} +diff --git a/src/main/java/org/jboss/logging/Log4jLogger.java b/src/main/java/org/jboss/logging/Log4jLogger.java +deleted file mode 100644 +index 3f7a3f2..0000000 +--- a/src/main/java/org/jboss/logging/Log4jLogger.java ++++ /dev/null +@@ -1,74 +0,0 @@ +-/* +- * JBoss, Home of Professional Open Source. +- * +- * Copyright 2010 Red Hat, Inc. +- * +- * Licensed under the Apache License, Version 2.0 (the "License"); +- * you may not use this file except in compliance with the License. +- * You may obtain a copy of the License at +- * +- * http://www.apache.org/licenses/LICENSE-2.0 +- * +- * Unless required by applicable law or agreed to in writing, software +- * distributed under the License is distributed on an "AS IS" BASIS, +- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +- * See the License for the specific language governing permissions and +- * limitations under the License. +- */ +- +-package org.jboss.logging; +- +-import java.text.MessageFormat; +- +-final class Log4jLogger extends Logger { +- +- private static final long serialVersionUID = -5446154366955151335L; +- +- private final org.apache.log4j.Logger logger; +- +- Log4jLogger(final String name) { +- super(name); +- logger = org.apache.log4j.Logger.getLogger(name); +- } +- +- public boolean isEnabled(final Level level) { +- final org.apache.log4j.Level l = translate(level); +- return logger.isEnabledFor(l) && l.isGreaterOrEqual(logger.getEffectiveLevel()); +- } +- +- protected void doLog(final Level level, final String loggerClassName, final Object message, final Object[] parameters, final Throwable thrown) { +- final org.apache.log4j.Level translatedLevel = translate(level); +- if (logger.isEnabledFor(translatedLevel)) try { +- logger.log(loggerClassName, translatedLevel, parameters == null || parameters.length == 0 ? message : MessageFormat.format(String.valueOf(message), parameters), thrown); +- } catch (Throwable ignored) {} +- } +- +- protected void doLogf(final Level level, final String loggerClassName, final String format, final Object[] parameters, final Throwable thrown) { +- final org.apache.log4j.Level translatedLevel = translate(level); +- if (logger.isEnabledFor(translatedLevel)) try { +- logger.log(loggerClassName, translatedLevel, parameters == null ? String.format(format) : String.format(format, parameters), thrown); +- } catch (Throwable ignored) {} +- } +- +- private static org.apache.log4j.Level translate(final Level level) { +- if (level == Level.TRACE) { +- return org.apache.log4j.Level.TRACE; +- } else if (level == Level.DEBUG) { +- return org.apache.log4j.Level.DEBUG; +- } +- return infoOrHigher(level); +- } +- +- private static org.apache.log4j.Level infoOrHigher(final Level level) { +- if (level == Level.INFO) { +- return org.apache.log4j.Level.INFO; +- } else if (level == Level.WARN) { +- return org.apache.log4j.Level.WARN; +- } else if (level == Level.ERROR) { +- return org.apache.log4j.Level.ERROR; +- } else if (level == Level.FATAL) { +- return org.apache.log4j.Level.FATAL; +- } +- return org.apache.log4j.Level.ALL; +- } +-} +diff --git a/src/main/java/org/jboss/logging/Log4jLoggerProvider.java b/src/main/java/org/jboss/logging/Log4jLoggerProvider.java +deleted file mode 100644 +index 69bdd5f..0000000 +--- a/src/main/java/org/jboss/logging/Log4jLoggerProvider.java ++++ /dev/null +@@ -1,86 +0,0 @@ +-/* +- * JBoss, Home of Professional Open Source. +- * +- * Copyright 2010 Red Hat, Inc. +- * +- * Licensed under the Apache License, Version 2.0 (the "License"); +- * you may not use this file except in compliance with the License. +- * You may obtain a copy of the License at +- * +- * http://www.apache.org/licenses/LICENSE-2.0 +- * +- * Unless required by applicable law or agreed to in writing, software +- * distributed under the License is distributed on an "AS IS" BASIS, +- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +- * See the License for the specific language governing permissions and +- * limitations under the License. +- */ +- +-package org.jboss.logging; +- +-import java.util.Collections; +-import java.util.Map; +- +-import org.apache.log4j.MDC; +-import org.apache.log4j.NDC; +- +-final class Log4jLoggerProvider implements LoggerProvider { +- +- public Logger getLogger(final String name) { +- return new Log4jLogger("".equals(name) ? "ROOT" : name); +- } +- +- public void clearMdc() { +- MDC.clear(); +- } +- +- public Object getMdc(String key) { +- return MDC.get(key); +- } +- +- public Map getMdcMap() { +- @SuppressWarnings("unchecked") +- final Map map = MDC.getContext(); +- return map == null ? Collections.emptyMap() : map; +- } +- +- public Object putMdc(String key, Object val) { +- try { +- return MDC.get(key); +- } finally { +- MDC.put(key, val); +- } +- } +- +- public void removeMdc(String key) { +- MDC.remove(key); +- } +- +- public void clearNdc() { +- NDC.remove(); +- } +- +- public String getNdc() { +- return NDC.get(); +- } +- +- public int getNdcDepth() { +- return NDC.getDepth(); +- } +- +- public String peekNdc() { +- return NDC.peek(); +- } +- +- public String popNdc() { +- return NDC.pop(); +- } +- +- public void pushNdc(String message) { +- NDC.push(message); +- } +- +- public void setNdcMaxDepth(int maxDepth) { +- NDC.setMaxDepth(maxDepth); +- } +-} +diff --git a/src/main/java/org/jboss/logging/LoggerProviders.java b/src/main/java/org/jboss/logging/LoggerProviders.java +index 0608283..8e393d1 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 { + return tryJBossLogManager(cl, "system property"); + } else if ("jdk".equalsIgnoreCase(loggerProvider)) { + return tryJDK("system property"); +- } else if ("log4j2".equalsIgnoreCase(loggerProvider)) { +- return tryLog4j2(cl, "system property"); +- } else if ("log4j".equalsIgnoreCase(loggerProvider)) { +- return tryLog4j(cl, "system property"); + } else if ("slf4j".equalsIgnoreCase(loggerProvider)) { + return trySlf4j("system property"); + } +@@ -80,17 +76,6 @@ final class LoggerProviders { + } catch (Throwable t) { + // nope... + } +- try { +- // MUST try Log4j 2.x BEFORE Log4j 1.x because Log4j 2.x also passes Log4j 1.x test in some circumstances +- return tryLog4j2(cl, null); +- } catch (Throwable t) { +- // nope... +- } +- try { +- return tryLog4j(cl, null); +- } catch (Throwable t) { +- // nope... +- } + try { + // only use slf4j if Logback is in use + Class.forName("ch.qos.logback.classic.Logger", false, cl); +@@ -113,27 +98,6 @@ final class LoggerProviders { + return provider; + } + +- // JBLOGGING-95 - Add support for Log4j 2.x +- private static LoggerProvider tryLog4j2(final ClassLoader cl, final String via) throws ClassNotFoundException { +- Class.forName("org.apache.logging.log4j.Logger", true, cl); +- Class.forName("org.apache.logging.log4j.LogManager", true, cl); +- Class.forName("org.apache.logging.log4j.spi.AbstractLogger", true, cl); +- LoggerProvider provider = new Log4j2LoggerProvider(); +- // if Log4j 2 has a bad implementation that doesn't extend AbstractLogger, we won't know until getting the first logger throws an exception +- logProvider(provider, via); +- return provider; +- } +- +- private static LoggerProvider tryLog4j(final ClassLoader cl, final String via) throws ClassNotFoundException { +- Class.forName("org.apache.log4j.LogManager", true, cl); +- // JBLOGGING-65 - slf4j can disguise itself as log4j. Test for a class that slf4j doesn't provide. +- // JBLOGGING-94 - JBoss Logging does not detect org.apache.logging.log4j:log4j-1.2-api:2.0 +- Class.forName("org.apache.log4j.config.PropertySetter", true, cl); +- final LoggerProvider provider = new Log4jLoggerProvider(); +- logProvider(provider, via); +- 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) +-- +2.31.1 + diff --git a/SPECS/jboss-logging.spec b/SPECS/jboss-logging.spec new file mode 100644 index 0000000..4e353ba --- /dev/null +++ b/SPECS/jboss-logging.spec @@ -0,0 +1,160 @@ +%global namedreltag .Final +%global namedversion %{version}%{?namedreltag} + +Name: jboss-logging +Version: 3.4.1 +Release: 9%{?dist} +Summary: The JBoss Logging Framework +License: ASL 2.0 + +URL: https://github.com/jboss-logging/jboss-logging +Source0: %{url}/archive/%{namedversion}/%{name}-%{namedversion}.tar.gz +Patch1: 0001-Drop-log4j-dependency.patch +Patch2: 0001-Drop-jboss-logmanager-dependency.patch + +BuildArch: noarch + +BuildRequires: maven-local +BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) +BuildRequires: mvn(org.jboss:jboss-parent:pom:) +BuildRequires: mvn(org.slf4j:slf4j-api) + +%description +This package contains the JBoss Logging Framework. + +%prep +%autosetup -n %{name}-%{namedversion} -p 1 + +# Unneeded task +%pom_remove_plugin :maven-source-plugin + +cp -p src/main/resources/META-INF/LICENSE.txt . +sed -i 's/\r//' LICENSE.txt + +%build +%mvn_build -j + +%install +%mvn_install + +%files -f .mfiles +%license LICENSE.txt + +%changelog +* Wed Mar 15 2023 MSVSphere Packaging Team - 3.4.1-9 +- Rebuilt for MSVSphere 9.1. + +* Mon Aug 09 2021 Mohan Boddu - 3.4.1-9 +- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags + Related: rhbz#1991688 + +* Fri Jun 07 2021 Dogtag PKI Team - 3.4.1-8 +- Drop log4j and jboss-logmanager dependencies +- Drop jboss-logging-javadoc + +* Fri Apr 16 2021 Mohan Boddu - 3.4.1-7 +- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937 + +* Tue Jan 26 2021 Fedora Release Engineering - 3.4.1-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Wed Sep 09 2020 Fabio Valentini - 3.4.1-5 +- Switch from log4j 1.2 compat package to log4j 1.2 API shim. + +* Tue Jul 28 2020 Fedora Release Engineering - 3.4.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Fri Jul 10 2020 Jiri Vanek - 3.4.1-3 +- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 + +* Wed Jan 29 2020 Fedora Release Engineering - 3.4.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Sat Oct 05 2019 Fabio Valentini - 3.4.1-1 +- Update to version 3.4.1. + +* Thu Jul 25 2019 Fedora Release Engineering - 3.3.0-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Fri Feb 01 2019 Fedora Release Engineering - 3.3.0-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Fri Jul 13 2018 Fedora Release Engineering - 3.3.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Wed Feb 07 2018 Fedora Release Engineering - 3.3.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Wed Jul 26 2017 Fedora Release Engineering - 3.3.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Fri Feb 10 2017 Fedora Release Engineering - 3.3.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Fri May 27 2016 gil cattaneo 3.3.0-1 +- update to 3.3.0.Final + +* Sun Feb 14 2016 gil cattaneo 3.1.4-6 +- fix FTBFS rhbz#1307647 +- fix BR list and use BR mvn()-like +- introduce license macro +- fix some rpmlint problem + +* Thu Feb 04 2016 Fedora Release Engineering - 3.1.4-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Wed Jun 17 2015 Fedora Release Engineering - 3.1.4-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Tue Jul 01 2014 Marek Goldmann - 3.1.4-3 +- Upgrade to SLF4j 1.7 + +* Sat Jun 07 2014 Fedora Release Engineering - 3.1.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Fri Feb 14 2014 Marek Goldmann - 3.1.4-1 +- Upstream release 3.1.4.GA + +* Sat Aug 03 2013 Fedora Release Engineering - 3.1.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Fri Jun 28 2013 Marek Goldmann - 3.1.3-1 +- Upstream release 3.1.3.GA + +* Tue Feb 26 2013 Marek Goldmann - 3.1.2-1 +- Upstream release 3.1.2.GA +- Move to mvn_build and mvn_install macros +- License change to ASL 2.0 + +* Thu Feb 14 2013 Fedora Release Engineering - 3.1.0-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Wed Feb 06 2013 Java SIG - 3.1.0-5 +- Update for https://fedoraproject.org/wiki/Fedora_19_Maven_Rebuild +- Replace maven BuildRequires with maven-local + +* Fri Jul 20 2012 Marek Goldmann - 3.1.0-4 +- Fixed BR + +* Thu Jul 19 2012 Fedora Release Engineering - 3.1.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Sun Feb 26 2012 Marek Goldmann 3.1.0-2 +- Release bump + +* Sun Feb 26 2012 Marek Goldmann 3.1.0-1 +- Upstream release 3.1.0.GA +- Relocated jars to _javadir + +* Fri Jan 13 2012 Fedora Release Engineering - 3.1.0-0.2.CR1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Fri Nov 18 2011 Marek Goldmann 3.1.0-0.1.CR1 +- Upstream release 3.1.0.CR1 + +* Mon Sep 19 2011 Marek Goldmann 3.0.1-1 +- Upstream release 3.0.1.GA + +* Thu Jul 28 2011 Marek Goldmann 3.0.0-1 +- Initial packaging +