rpms/pki-core
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Drop BuildRequires and Requires on glassfish-jaxb-api and jaxb-impl

Browse Source 
This commit introduces a temporarily bundled JAR, required to drop the
runtime dependencies. This will be removed before RHEL 9 GA.

Resolves: #2002594
This commit is contained in:
Chris Kelley 2021-09-13 12:11:13 +01:00
parent a4ead51e2e
commit 3be34241c2
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
jakarta.xml.bind-api.jar Normal file
View File

Binary file not shown.

17
pki-core.spec
View File

@ -177,7 +177,6 @@ BuildRequires: apache-commons-io
BuildRequires: apache-commons-lang3 >= 3.2
BuildRequires: apache-commons-logging
BuildRequires: apache-commons-net
BuildRequires: glassfish-jaxb-api
BuildRequires: slf4j
BuildRequires: slf4j-jdk14
BuildRequires: nspr-devel
@ -412,7 +411,6 @@ Requires: apache-commons-io
Requires: apache-commons-lang3 >= 3.2
Requires: apache-commons-logging
Requires: apache-commons-net
Requires: glassfish-jaxb-api
Requires: slf4j
Requires: slf4j-jdk14
Requires: jpackage-utils >= 0:1.7.5-10
@ -429,10 +427,6 @@ Requires: resteasy-core >= 3.0.17-1
Requires: resteasy-jackson2-provider >= 3.0.17-1
%endif
%if 0%{?fedora} >= 33 || 0%{?rhel} > 8
Requires: jaxb-impl >= 2.3.3
%endif
Requires: xalan-j2
Requires: xerces-j2
Requires: xml-commons-resolver
@ -947,6 +941,10 @@ ln -sf /usr/share/java/jakarta-annotations/jakarta.annotation-api.jar %{buildroo
# with server
%endif
# TEMP provide links to the temporarily bundled JAXB JAR (#2002594)
ln -sf /usr/share/java/jaxb-api.jar /usr/share/java/glassfish-jaxb-api/jakarta.xml.bind-api.jar
ln -sf /usr/share/java/glassfish-jaxb-api/jakarta.xml.bind-api.jar %{buildroot}/jakarta.xml.bind-api.jar
%if %{with server}
%pre -n pki-server
@ -1375,6 +1373,13 @@ fi
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
Related: rhbz#1991688
* Thu Sep 09 2021 Red Hat PKI Team <rhcs-maint@redhat.com> - 10.11.0-0.2.alpha1
- Drop BuildRequires and Requires on glassfish-jaxb-api and jaxb-impl
Resolves #2002594
* Tue May 18 2021 Red Hat PKI Team <rhcs-maint@redhat.com> 10.11.0-0.1
- Rebase to PKI 10.11.0-alpha1
* Thu Jul 1 2021 Red Hat PKI Team <rhcs-maint@redhat.com> - 11.0.0-0.3
- Drop sudo dependency