rpms
/
resteasy
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Drop log4j dependency

This commit is contained in:
Endi S. Dewata 2021-06-02 11:01:57 -05:00
parent d43293c9e6
commit b285987f99
2 changed files with 172 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

163
0001-Remove-Log4jLogger.patch Normal file
View File

@ -0,0 +1,163 @@
From d9ad1ff80c45333922fb51e454ee6036b389faa4 Mon Sep 17 00:00:00 2001
From: "Endi S. Dewata" <edewata@redhat.com>
Date: Wed, 2 Jun 2021 19:34:16 -0500
Subject: [PATCH] Remove Log4jLogger
---
.../resteasy/logging/impl/Log4jLogger.java | 144 ------------------
1 file changed, 144 deletions(-)
delete mode 100644 resteasy-jaxrs/src/main/java/org/jboss/resteasy/logging/impl/Log4jLogger.java
diff --git a/resteasy-jaxrs/src/main/java/org/jboss/resteasy/logging/impl/Log4jLogger.java b/resteasy-jaxrs/src/main/java/org/jboss/resteasy/logging/impl/Log4jLogger.java
deleted file mode 100644
index 6cf43d251..000000000
--- a/resteasy-jaxrs/src/main/java/org/jboss/resteasy/logging/impl/Log4jLogger.java
+++ /dev/null
@@ -1,144 +0,0 @@
-package org.jboss.resteasy.logging.impl;
-
-import org.apache.log4j.Logger;
-
-import java.text.MessageFormat;
-
-/**
- * @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>
- * @version $Revision: 1 $
- */
-public class Log4jLogger extends org.jboss.resteasy.logging.Logger
-{
- private transient Logger delegate;
- private String classname;
-
- public Log4jLogger(String classname)
- {
- this.classname = classname;
- delegate = Logger.getLogger(classname);
- }
-
- @Override
- public boolean isTraceEnabled()
- {
- return delegate.isTraceEnabled();
- }
-
- @Override
- public void trace(String message)
- {
- if (!delegate.isTraceEnabled()) return;
- delegate.trace(message);
- }
-
- @Override
- public void trace(String message, Object... params)
- {
- if (!delegate.isTraceEnabled()) return;
- String msg = MessageFormat.format(message, params);
- delegate.trace(msg);
- }
-
- @Override
- public void trace(String message, Throwable error)
- {
- if (!delegate.isTraceEnabled()) return;
- delegate.trace(message, error);
- }
-
- @Override
- public boolean isDebugEnabled()
- {
- return delegate.isDebugEnabled();
- }
-
- @Override
- public void debug(String message)
- {
- if (!delegate.isDebugEnabled()) return;
- delegate.debug(message);
- }
-
- @Override
- public void debug(String message, Object... params)
- {
- if (!delegate.isDebugEnabled()) return;
- String msg = MessageFormat.format(message, params);
- delegate.debug(msg);
- }
-
- @Override
- public void debug(String message, Throwable error)
- {
- if (!isDebugEnabled()) return;
- delegate.debug(message, error);
- }
-
- @Override
- public void info(String message)
- {
- if (!(delegate.isInfoEnabled())) return;
- delegate.info(message);
- }
-
- @Override
- public void info(String message, Object... params)
- {
- if (!delegate.isInfoEnabled()) return;
- String msg = MessageFormat.format(message, params);
- delegate.info(msg);
- }
-
- @Override
- public void info(String message, Throwable error)
- {
- if (!delegate.isInfoEnabled()) return;
- delegate.info(message, error);
- }
-
- @Override
- public void warn(String message)
- {
- delegate.warn(message);
- }
-
- @Override
- public void warn(String message, Object... params)
- {
- String msg = MessageFormat.format(message, params);
- delegate.warn(msg);
- }
-
- @Override
- public void warn(String message, Throwable error)
- {
- delegate.warn(message, error);
- }
-
- @Override
- public void error(String message)
- {
- delegate.warn(message);
- }
-
- @Override
- public void error(String message, Object... params)
- {
- String msg = MessageFormat.format(message, params);
- delegate.error(msg);
- }
-
- @Override
- public void error(String message, Throwable error)
- {
- delegate.warn(message, error);
- }
-
- @Override
- public boolean isWarnEnabled()
- {
- return true;
- }
-
-}
--
2.31.1

11
resteasy.spec
View File

@ -3,12 +3,13 @@
Name: resteasy
Version: 3.0.26
Release: 9%{?dist}
Release: 10%{?dist}
Summary: Framework for RESTful Web services and Java applications
License: ASL 2.0
URL: http://resteasy.jboss.org/
Source0: https://github.com/resteasy/Resteasy/archive/%{namedversion}/%{name}-%{namedversion}.tar.gz
Patch1: 0001-RESTEASY-2559-Improper-validation-of-response-header.patch
Patch2: 0001-Remove-Log4jLogger.patch
BuildArch: noarch
@ -16,7 +17,6 @@ BuildRequires: maven-local
BuildRequires: mvn(commons-io:commons-io)
BuildRequires: mvn(com.sun.xml.bind:jaxb-impl)
BuildRequires: mvn(javax.xml.bind:jaxb-api)
BuildRequires: mvn(log4j:log4j)
BuildRequires: mvn(org.apache.httpcomponents:httpclient)
BuildRequires: mvn(org.apache.maven.plugins:maven-source-plugin)
BuildRequires: mvn(org.apache.tomcat:tomcat-servlet-api)
@ -111,6 +111,7 @@ Provides: %{name}-client = %{version}-%{release}
%prep
%setup -q -n Resteasy-%{namedversion}
%patch1 -p1
%patch2 -p1
%pom_disable_module arquillian
%pom_disable_module eagledns
@ -166,6 +167,9 @@ find -name '*.jar' -print -delete
%pom_remove_dep junit:junit providers/jaxb
%pom_remove_dep junit:junit resteasy-jaxrs
# remove log4j dependency
%pom_remove_dep log4j:log4j resteasy-jaxrs
# depend on servlet-api from pki-servlet-4.0-api
%pom_change_dep org.jboss.spec.javax.servlet: org.apache.tomcat:tomcat-servlet-api resteasy-jaxrs
%pom_change_dep org.jboss.spec.javax.servlet: org.apache.tomcat:tomcat-servlet-api providers/abdera-atom
@ -214,6 +218,9 @@ find -name '*.jar' -print -delete
%license License.html
%changelog
* Wed Jun 2 2021 Dogtag PKI Team <pki-devel@redhat.com> - 3.0.26-10
- Drop log4j dependency
* Wed May 19 2021 Dogtag PKI Team <pki-devel@redhat.com> - 3.0.26-9
- Drop pki-resteasy-javadoc and pki-resteasy-atom-provider