Compare commits

...

No commits in common. "c8-stream-10.6" and "c9-beta" have entirely different histories.

3 changed files with 348 additions and 78 deletions

View File

@ -1 +1 @@
46f76675a579ac45441399220b0cefff9ffa8dbf SOURCES/resteasy-3.0.26.Final.tar.gz
436481bef27b4ff00b3ec239f44688422af068e1 SOURCES/resteasy-3.0.26.Final.tar.gz

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

View File

@ -3,23 +3,25 @@
Name: resteasy
Version: 3.0.26
Release: 7%{?dist}
Release: 19%{?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
BuildRequires: maven-local
BuildRequires: mvn(commons-io:commons-io)
BuildRequires: mvn(com.sun.xml.bind:jaxb-impl)
BuildRequires: mvn(log4j:log4j:12)
BuildRequires: mvn(jakarta.activation:jakarta.activation-api)
BuildRequires: mvn(org.apache.httpcomponents:httpclient)
BuildRequires: mvn(org.apache.maven.plugins:maven-source-plugin)
BuildRequires: mvn(org.apache.tomcat:tomcat-servlet-api)
# Jackson 2
BuildRequires: mvn(com.fasterxml.jackson.core:jackson-annotations)
BuildRequires: mvn(com.fasterxml.jackson.core:jackson-core)
BuildRequires: mvn(com.fasterxml.jackson.core:jackson-databind)
BuildRequires: mvn(com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider)
@ -28,22 +30,10 @@ BuildRequires: mvn(org.jboss:jboss-parent:pom:)
BuildRequires: mvn(org.jboss.logging:jboss-logging)
BuildRequires: mvn(org.jboss.logging:jboss-logging-annotations)
BuildRequires: mvn(org.jboss.logging:jboss-logging-processor)
BuildRequires: mvn(org.jboss.spec.javax.annotation:jboss-annotations-api_1.2_spec)
BuildRequires: mvn(javax.annotation:javax.annotation-api)
BuildRequires: mvn(org.jboss.spec.javax.ws.rs:jboss-jaxrs-api_2.0_spec)
BuildRequires: mvn(org.slf4j:slf4j-api)
# Require the Servlet API 4.0
BuildRequires: tomcat-servlet-4.0-api
Requires: tomcat-servlet-4.0-api
#XXX just to make pki-core build. pki-core should switch to mvn requires
Provides: resteasy-atom-provider
Provides: resteasy-client
Provides: resteasy-jaxb-provider
Provides: resteasy-core
Provides: resteasy-jackson2-provider
%description
%global desc \
RESTEasy contains a JBoss project that provides frameworks to help\
@ -54,15 +44,75 @@ certified and portable implementation of the JAX-RS specification.
\
This package contains
%package javadoc
Summary: Javadoc for %{name}
%package -n pki-%{name}
Summary: Framework for RESTful Web services and Java applications
Obsoletes: %{name} < %{version}-%{release}
Conflicts: %{name} < %{version}-%{release}
Provides: %{name} = %{version}-%{release}
%description javadoc
This package contains the API documentation for %{name}.
Recommends: pki-%{name}-client = %{version}-%{release}
Recommends: pki-%{name}-core = %{version}-%{release}
Recommends: pki-%{name}-jackson2-provider = %{version}-%{release}
Recommends: pki-%{name}-servlet-initializer = %{version}-%{release}
# subpackages removed in fedora 32
Obsoletes: %{name}-fastinfoset-provider < 3.0.26-1
Obsoletes: %{name}-jackson-provider < 3.0.26-1
Obsoletes: %{name}-jettison-provider < 3.0.26-1
Obsoletes: %{name}-json-p-provider < 3.0.26-1
Obsoletes: %{name}-multipart-provider < 3.0.26-1
Obsoletes: %{name}-netty3 < 3.0.26-1
Obsoletes: %{name}-optional < 3.0.26-1
Obsoletes: %{name}-test < 3.0.26-1
Obsoletes: %{name}-validator-provider-11 < 3.0.26-1
Obsoletes: %{name}-yaml-provider < 3.0.26-1
%description -n pki-%{name}
%{desc}
%package -n pki-%{name}-core
Summary: Core modules for %{name}
Obsoletes: resteasy-jaxrs-api < 3.0.7
Obsoletes: pki-%{name} < %{version}-%{release}
Obsoletes: %{name}-core < %{version}-%{release}
Conflicts: %{name}-core < %{version}-%{release}
Provides: %{name}-core = %{version}-%{release}
%description -n pki-%{name}-core
%{extdesc} %{summary}.
%package -n pki-%{name}-jackson2-provider
Summary: Module jackson2-provider for %{name}
Obsoletes: pki-%{name} < %{version}-%{release}
Obsoletes: %{name}-jackson2-provider < %{version}-%{release}
Conflicts: %{name}-jackson2-provider < %{version}-%{release}
Provides: %{name}-jackson2-provider = %{version}-%{release}
%description -n pki-%{name}-jackson2-provider
%{extdesc} %{summary}.
%package -n pki-%{name}-client
Summary: Client for %{name}
Obsoletes: pki-%{name} < %{version}-%{release}
Obsoletes: %{name}-client < %{version}-%{release}
Conflicts: %{name}-client < %{version}-%{release}
Provides: %{name}-client = %{version}-%{release}
%description -n pki-%{name}-client
%{extdesc} %{summary}.
%package -n pki-%{name}-servlet-initializer
Summary: %{name} Servlet Initializer
Obsoletes: pki-%{name} < %{version}-%{release}
Obsoletes: %{name}-servlet-initializer < %{version}-%{release}
Conflicts: %{name}-servlet-initializer < %{version}-%{release}
Provides: %{name}-servlet-initializer = %{version}-%{release}
%description -n pki-%{name}-servlet-initializer
%{extdesc} %{summary}.
%prep
%setup -q -n resteasy-jaxrs-all-%{namedversion}-redhat-1
%patch1 -p1
%autosetup -n Resteasy-%{namedversion} -p 1
%pom_disable_module arquillian
%pom_disable_module eagledns
@ -77,7 +127,6 @@ This package contains the API documentation for %{name}.
%pom_disable_module resteasy-jsapi
%pom_disable_module resteasy-jsapi-testing
%pom_disable_module resteasy-links
%pom_disable_module resteasy-servlet-initializer
%pom_disable_module resteasy-spring
%pom_disable_module resteasy-wadl
%pom_disable_module resteasy-wadl-undertow-connector
@ -92,20 +141,35 @@ pushd providers
%pom_disable_module jettison
%pom_disable_module json-p-ee7
%pom_disable_module multipart
%pom_disable_module resteasy-atom
%pom_disable_module resteasy-html
%pom_disable_module resteasy-validator-provider-11
%pom_disable_module yaml
%pom_disable_module jaxb
popd
find -name '*.jar' -print -delete
%pom_remove_plugin :maven-clover2-plugin
%pom_remove_plugin :maven-javadoc-plugin
# Specify log4j v1.2
%pom_change_dep "log4j:log4j" "log4j:log4j:12" resteasy-jaxrs
# depend on jakarta-activation
%pom_change_dep javax.activation:activation jakarta.activation:jakarta.activation-api resteasy-jaxrs
%pom_change_dep javax.activation:activation jakarta.activation:jakarta.activation-api resteasy-spring
# remove activation.jar dependencies
%pom_remove_dep -r javax.activation:activation resteasy-jaxrs resteasy-spring
# depend on jakarta-annotations
%pom_change_dep org.jboss.spec.javax.annotation:jboss-annotations-api_1.2_spec javax.annotation:javax.annotation-api jboss-modules
%pom_change_dep org.jboss.spec.javax.annotation:jboss-annotations-api_1.2_spec javax.annotation:javax.annotation-api providers/jaxb
%pom_change_dep org.jboss.spec.javax.annotation:jboss-annotations-api_1.2_spec javax.annotation:javax.annotation-api resteasy-dependencies-bom
%pom_change_dep org.jboss.spec.javax.annotation:jboss-annotations-api_1.2_spec javax.annotation:javax.annotation-api resteasy-guice
%pom_change_dep org.jboss.spec.javax.annotation:jboss-annotations-api_1.2_spec javax.annotation:javax.annotation-api resteasy-jaxrs
%pom_change_dep org.jboss.spec.javax.annotation:jboss-annotations-api_1.2_spec javax.annotation:javax.annotation-api resteasy-links
%pom_change_dep org.jboss.spec.javax.annotation:jboss-annotations-api_1.2_spec javax.annotation:javax.annotation-api resteasy-spring
%pom_change_dep org.jboss.spec.javax.annotation:jboss-annotations-api_1.2_spec javax.annotation:javax.annotation-api security/keystone/keystone-core
%pom_change_dep org.jboss.spec.javax.annotation:jboss-annotations-api_1.2_spec javax.annotation:javax.annotation-api security/resteasy-crypto
%pom_change_dep org.jboss.spec.javax.annotation:jboss-annotations-api_1.2_spec javax.annotation:javax.annotation-api security/skeleton-key-idm/skeleton-key-core
%pom_change_dep org.jboss.spec.javax.annotation:jboss-annotations-api_1.2_spec javax.annotation:javax.annotation-api security/skeleton-key-idm/skeleton-key-idp
%pom_change_dep org.jboss.spec.javax.annotation:jboss-annotations-api_1.2_spec javax.annotation:javax.annotation-api server-adapters/resteasy-jdk-http
# remove resteasy-dependencies pom
%pom_remove_dep "org.jboss.resteasy:resteasy-dependencies"
@ -118,49 +182,30 @@ find -name '*.jar' -print -delete
%pom_remove_dep junit:junit providers/resteasy-atom
%pom_remove_dep junit:junit providers/jaxb
%pom_remove_dep junit:junit resteasy-jaxrs
%pom_remove_dep junit:junit resteasy-servlet-initializer
# depend on servlet-api from tomcat-servlet-4.0-api
# 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 resteasy-servlet-initializer
%pom_change_dep org.jboss.spec.javax.servlet: org.apache.tomcat:tomcat-servlet-api providers/abdera-atom
%pom_change_dep org.jboss.spec.javax.servlet: org.apache.tomcat:tomcat-servlet-api providers/jaxb
%pom_change_dep org.jboss.spec.javax.servlet: org.apache.tomcat:tomcat-servlet-api providers/jackson2
%pom_remove_plugin com.redhat.rcm.maven.plugin:buildmetadata-maven-plugin
%pom_remove_plugin org.commonjava.maven.plugins:project-sources-maven-plugin
# add dependencies for EE APIs that were removed in Java 11
%pom_add_dep javax.xml.bind:jaxb-api resteasy-jaxrs
%pom_remove_plugin :maven-clean-plugin
# Fixing JDK7 ASCII issues
files='
resteasy-jaxrs/src/main/java/org/jboss/resteasy/annotations/Query.java
resteasy-jaxrs/src/main/java/org/jboss/resteasy/core/QueryInjector.java
resteasy-jsapi/src/main/java/org/jboss/resteasy/jsapi/JSAPIWriter.java
resteasy-jsapi/src/main/java/org/jboss/resteasy/jsapi/JSAPIServlet.java
resteasy-jsapi/src/main/java/org/jboss/resteasy/jsapi/ServiceRegistry.java
resteasy-links/src/main/java/org/jboss/resteasy/links/AddLinks.java
resteasy-links/src/main/java/org/jboss/resteasy/links/ELProvider.java
resteasy-links/src/main/java/org/jboss/resteasy/links/LinkELProvider.java
resteasy-links/src/main/java/org/jboss/resteasy/links/LinkResource.java
resteasy-links/src/main/java/org/jboss/resteasy/links/LinkResources.java
resteasy-links/src/main/java/org/jboss/resteasy/links/ParentResource.java
resteasy-links/src/main/java/org/jboss/resteasy/links/RESTServiceDiscovery.java
resteasy-links/src/main/java/org/jboss/resteasy/links/ResourceFacade.java
resteasy-links/src/main/java/org/jboss/resteasy/links/ResourceID.java
resteasy-links/src/main/java/org/jboss/resteasy/links/ResourceIDs.java
security/resteasy-oauth/src/main/java/org/jboss/resteasy/auth/oauth/OAuthConsumer.java
security/resteasy-oauth/src/main/java/org/jboss/resteasy/auth/oauth/OAuthException.java
security/resteasy-oauth/src/main/java/org/jboss/resteasy/auth/oauth/OAuthFilter.java
security/resteasy-oauth/src/main/java/org/jboss/resteasy/auth/oauth/OAuthMemoryProvider.java
security/resteasy-oauth/src/main/java/org/jboss/resteasy/auth/oauth/OAuthProvider.java
security/resteasy-oauth/src/main/java/org/jboss/resteasy/auth/oauth/OAuthProviderChecker.java
security/resteasy-oauth/src/main/java/org/jboss/resteasy/auth/oauth/OAuthRequestToken.java
security/resteasy-oauth/src/main/java/org/jboss/resteasy/auth/oauth/OAuthServlet.java
security/resteasy-oauth/src/main/java/org/jboss/resteasy/auth/oauth/OAuthToken.java
security/resteasy-oauth/src/main/java/org/jboss/resteasy/auth/oauth/OAuthValidator.java
'
for f in ${files}; do
native2ascii -encoding UTF8 ${f} ${f}
done
%mvn_package ":resteasy-jaxrs" core
%mvn_package ":providers-pom" core
%mvn_package ":resteasy-jaxrs-all" core
%mvn_package ":resteasy-pom" core
%mvn_package ":resteasy-jackson2-provider" jackson2-provider
%mvn_package ":resteasy-client" client
%mvn_package ":resteasy-servlet-initializer" servlet-initializer
# Disable useless artifacts generation, package __noinstall do not work
%pom_add_plugin org.apache.maven.plugins:maven-source-plugin . '
@ -169,37 +214,99 @@ done
</configuration>'
%build
%mvn_build -f
%mvn_build -f -j
%install
%mvn_install
%files -f .mfiles
%files -n pki-%{name}
%doc README.md
%license License.html
%files javadoc -f .mfiles-javadoc
%files -n pki-%{name}-core -f .mfiles-core
%license License.html
%files -n pki-%{name}-jackson2-provider -f .mfiles-jackson2-provider
%license License.html
%files -n pki-%{name}-client -f .mfiles-client
%license License.html
%files -n pki-%{name}-servlet-initializer -f .mfiles-servlet-initializer
%license License.html
%changelog
* Tue Jan 09 2024 Red Hat PKI Team <rhcs-maint@redhat.com> - 3.0.26-7
- RHEL-16724: Replace pki-servlet-4.0-api with tomcat-servlet-4.0-api
* Wed Wed 07 2024 Red Hat PKI Team <rhcs-maint@redhat.com> - 3.0.26-19
- Fix obsolete for main resteasy to each subpackage
* Wed Jan 31 2024 Red Hat PKI Team <rhcs-maint@redhat.com> - 3.0.26-18
- Add obsolete for main resteasy to each subpackage
* Tue Jan 30 2024 Red Hat PKI Team <rhcs-maint@redhat.com> - 3.0.26-17
- Make weak requirement to subpackages
* Mon Dec 11 2023 Red Hat PKI Team <rhcs-maint@redhat.com> - 3.0.26-16
- Enable servlet-initializer subpackage
* Fri Sep 24 2021 Red Hat PKI Team <rhcs-maint@redhat.com> - 3.0.26-15
- Drop pki-resteasy-jaxb-provider
* Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 3.0.26-14
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
Related: rhbz#1991688
* Fri Jun 18 2021 Red Hat PKI Team <rhcs-maint@redhat.com> - 3.0.26-13
- Replace jboss-annotations-1.2-api with jakarta-annotations
- Drop log4j dependency
- Add jakarta-activation dependency
* Fri May 21 2021 Red Hat PKI Team <rhcs-maint@redhat.com> - 3.0.26-12
- Drop pki-resteasy-javadoc and pki-resteasy-atom-provider
* Wed Apr 28 2021 Red Hat PKI Team <rhcs-maint@redhat.com> - 3.0.26-11
- Fix license
* Wed Apr 28 2021 Red Hat PKI Team <rhcs-maint@redhat.com> - 3.0.26-10
- Add Obsoletes and Conflicts
* Thu Apr 22 2021 Red Hat PKI Team <rhcs-maint@redhat.com> - 3.0.26-9
- Rename subpackages to pki-resteasy
* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 3.0.26-8
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.26-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Mon Nov 30 2020 Alexander Scheel <ascheel@redhat.com> - 3.0.26-6
- CVE-2020-1695: Improper validation of response header in MediaTypeHeaderDelegate.java class
Resolves: rh-bz#1845548
Resolves: rh-bz#1845547
* Tue Aug 07 2018 Fraser Tweedale <ftweedal@redhat.com> 3.5.1-3
- Avoid redundant jcip-annotations dependency
* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.26-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Fri Aug 03 2018 Fraser Tweedale <ftweedal@redhat.com> 3.5.1-2
- Use servlet-api from pki-servlet-container package
* Wed Jul 22 2020 Fabio Valentini <decathorpe@gmail.com> - 3.0.26-4
- Migrate away from native2ascii (removed with OpenJDK 11).
- Add missing dependencies for packages that were removed from OpenJDK 11.
* Wed Jul 11 2018 Fraser Tweedale <ftweedal@redhat.com> 3.5.1-1
- Switch to JBoss sources and build Jackson 2 provider instead of Jackson 1
* Sat Jul 11 2020 Jiri Vanek <jvanek@redhat.com> - 3.0.26-3
- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11
* Thu May 24 2018 Michael Simacek <msimacek@redhat.com> - 3.0.19-8
- Minimize to contain just components needed by pki-core
* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.26-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Fri Oct 18 2019 Dogtag PKI Team <pki-devel@redhat.com> 3.0.26-1
- Update to version 3.0.26.
- Build with reduced functionality and dependency set.
* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.19-10
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.19-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.19-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.19-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild