Rebase to version 2.14.1

Resolves: #2070122
side-tag: c9s-build-side-1372-stack-gate
This commit is contained in:
Chris Kelley 2022-11-24 14:41:27 +00:00
parent 5d24df54be
commit 36e00b2b59
4 changed files with 42 additions and 5 deletions

1
.gitignore vendored
View File

@ -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

View File

@ -0,0 +1,26 @@
From 45cad535d09c0b67719a1ebe14353636515596f7 Mon Sep 17 00:00:00 2001
From: Chris Kelley <ckelley@redhat.com>
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.
<excludes>
<exclude>com/fasterxml/jackson/**/failing/*.java</exclude>
</excludes>
+ <argLine>
+ --add-opens=java.base/javax.security.auth=ALL-UNNAMED
+ </argLine>
</configuration>
</plugin>
</plugins>
--
2.38.1

View File

@ -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 <ckelley@redhat.com> - 2.14.1-1
- Update to version 2.14.1
- Resolves: #2070122
* Wed Sep 22 2021 Red Hat PKI Team <rhcs-maint@redhat.com> - 2.11.4-8
- Drop jaxb-runtime dependency

View File

@ -1 +1 @@
SHA512 (jackson-modules-base-2.11.4.tar.gz) = 06a9a6ed9fa68dcf0d345645455b37c5e4b45e06e4f88511903aea03b787f77f6c4425addd739c728543707e48ad7609f56ff17a7369dcc4eb9b6d4e96216118
SHA512 (jackson-modules-base-2.14.1.tar.gz) = d87d5917c2d0df93537aaf6b2cfd452530e677ef318a6c3b7ac2f82c5221f9958699c534d5dbe87f2fc17f833e1dfca83ccb775e6001bf89db2e8c94c437faf0