diff --git a/.gitignore b/.gitignore index 02f39ff..c51f465 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/jackson-modules-base-2.11.4.tar.gz +SOURCES/jackson-modules-base-2.14.1.tar.gz diff --git a/.jackson-modules-base.metadata b/.jackson-modules-base.metadata index 3815c8f..156c900 100644 --- a/.jackson-modules-base.metadata +++ b/.jackson-modules-base.metadata @@ -1 +1 @@ -1656df01d0ab926183892363ef77c67f01b1b0e5 SOURCES/jackson-modules-base-2.11.4.tar.gz +11b1d5daee50c58f13038bfd92ae28ad86ad428a SOURCES/jackson-modules-base-2.14.1.tar.gz diff --git a/SOURCES/0001-Expose-javax.security.auth-from-JDK-internals.patch b/SOURCES/0001-Expose-javax.security.auth-from-JDK-internals.patch new file mode 100644 index 0000000..43fb443 --- /dev/null +++ b/SOURCES/0001-Expose-javax.security.auth-from-JDK-internals.patch @@ -0,0 +1,26 @@ +From 45cad535d09c0b67719a1ebe14353636515596f7 Mon Sep 17 00:00:00 2001 +From: Chris Kelley +Date: Thu, 8 Sep 2022 12:44:54 +0100 +Subject: [PATCH] Expose javax.security.auth from JDK internals + +--- + pom.xml | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/pom.xml b/pom.xml +index e72b4934..cafe56de 100644 +--- a/pom.xml ++++ b/pom.xml +@@ -97,6 +97,9 @@ not datatype, data format, or JAX-RS provider modules. + + com/fasterxml/jackson/**/failing/*.java + ++ ++ --add-opens=java.base/javax.security.auth=ALL-UNNAMED ++ + + + +-- +2.38.1 + diff --git a/SPECS/jackson-modules-base.spec b/SPECS/jackson-modules-base.spec index ebc238d..cb8899d 100644 --- a/SPECS/jackson-modules-base.spec +++ b/SPECS/jackson-modules-base.spec @@ -1,13 +1,14 @@ %bcond_with jp_minimal Name: jackson-modules-base -Version: 2.11.4 -Release: 8%{?dist} +Version: 2.14.1 +Release: 2%{?dist} Summary: Jackson modules: Base -License: ASL 2.0 +License: Apache-2.0 URL: https://github.com/FasterXML/jackson-modules-base Source0: %{url}/archive/%{name}-%{version}.tar.gz +Patch1: 0001-Expose-javax.security.auth-from-JDK-internals.patch BuildRequires: maven-local BuildRequires: mvn(cglib:cglib) @@ -53,8 +54,10 @@ framework to read and write XML. %prep %setup -q -n %{name}-%{name}-%{version} +%patch1 -p1 -%pom_remove_dep org.glassfish.jaxb:jaxb-runtime jaxb +%pom_remove_dep -r org.glassfish.jaxb:jaxb-runtime +%pom_remove_plugin "de.jjohannes:gradle-module-metadata-maven-plugin" # no need for Java 9 module stuff %pom_remove_plugin -r :moditect-maven-plugin @@ -80,6 +83,9 @@ cp -p mrbean/src/main/resources/META-INF/{LICENSE,NOTICE} . %pom_disable_module mrbean %pom_disable_module osgi %pom_disable_module paranamer +%pom_disable_module jakarta-xmlbind +%pom_disable_module blackbird +%pom_disable_module no-ctor-deser # Allow javax,activation to be optional %pom_add_plugin "org.apache.felix:maven-bundle-plugin" jaxb " @@ -109,6 +115,10 @@ rm osgi/src/test/java/com/fasterxml/jackson/module/osgi/InjectOsgiServiceTest.ja %license LICENSE NOTICE %changelog +* Wed Nov 23 2022 Chris Kelley - 2.14.1-1 +- Update to version 2.14.1 +- Resolves: #2070122 + * Wed Sep 22 2021 Red Hat PKI Team - 2.11.4-8 - Drop jaxb-runtime dependency