From 36e00b2b59d58b10213ac52a3da063aadb523ffb Mon Sep 17 00:00:00 2001 From: Chris Kelley Date: Thu, 24 Nov 2022 14:41:27 +0000 Subject: [PATCH] =?UTF-8?q?Rebase=20to=20version=202.14.1=20=C2=A0=C2=A0?= =?UTF-8?q?=C2=A0=C2=A0=20Resolves:=20#2070122=20side-tag:=20c9s-build-sid?= =?UTF-8?q?e-1372-stack-gate?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 1 + ...vax.security.auth-from-JDK-internals.patch | 26 +++++++++++++++++++ jackson-modules-base.spec | 18 ++++++++++--- sources | 2 +- 4 files changed, 42 insertions(+), 5 deletions(-) create mode 100644 0001-Expose-javax.security.auth-from-JDK-internals.patch diff --git a/.gitignore b/.gitignore index 4191ef4..59e2e40 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ /jackson-modules-base-2.11.2.tar.gz /jackson-modules-base-2.11.3.tar.gz /jackson-modules-base-2.11.4.tar.gz +/jackson-modules-base-2.14.1.tar.gz diff --git a/0001-Expose-javax.security.auth-from-JDK-internals.patch b/0001-Expose-javax.security.auth-from-JDK-internals.patch new file mode 100644 index 0000000..43fb443 --- /dev/null +++ b/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/jackson-modules-base.spec b/jackson-modules-base.spec index ebc238d..a615c14 100644 --- a/jackson-modules-base.spec +++ b/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: 1%{?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 diff --git a/sources b/sources index 520e019..5bf28fd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (jackson-modules-base-2.11.4.tar.gz) = 06a9a6ed9fa68dcf0d345645455b37c5e4b45e06e4f88511903aea03b787f77f6c4425addd739c728543707e48ad7609f56ff17a7369dcc4eb9b6d4e96216118 +SHA512 (jackson-modules-base-2.14.1.tar.gz) = d87d5917c2d0df93537aaf6b2cfd452530e677ef318a6c3b7ac2f82c5221f9958699c534d5dbe87f2fc17f833e1dfca83ccb775e6001bf89db2e8c94c437faf0