diff --git a/.gitignore b/.gitignore index d75be94..2c0b02b 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ /jackson-modules-base-2.11.4.tar.gz /jackson-modules-base-2.14.1.tar.gz /jackson-modules-base-2.14.2.tar.gz +/jackson-modules-base-2.19.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..b214748 --- /dev/null +++ b/0001-Expose-javax.security.auth-from-JDK-internals.patch @@ -0,0 +1,26 @@ +From 9cc0fa5a5b4cc1e6462b1e61d279b31e87ded2ea Mon Sep 17 00:00:00 2001 +From: Marco Fargetta +Date: Thu, 17 Jul 2025 11:19:53 +0200 +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 a535fafc..6963d1a6 100644 +--- a/pom.xml ++++ b/pom.xml +@@ -115,6 +115,9 @@ not datatype, data format, or JAX-RS provider modules. + + org.apache.maven.plugins + maven-surefire-plugin ++ ++ --add-opens=java.base/javax.security.auth=ALL-UNNAMED ++ + + + +-- +2.50.1 + diff --git a/jackson-modules-base.spec b/jackson-modules-base.spec index 06dd658..44bde83 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.14.2 -Release: 2%{?dist} +Version: 2.19.1 +Release: 1%{?dist} Summary: Jackson modules: Base 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) @@ -18,7 +19,7 @@ BuildRequires: mvn(com.fasterxml.jackson:jackson-base:pom:) >= %{version} BuildRequires: mvn(com.google.code.maven-replacer-plugin:replacer) BuildRequires: mvn(jakarta.activation:jakarta.activation-api:2) BuildRequires: mvn(jakarta.xml.bind:jakarta.xml.bind-api:4) -BuildRequires: mvn(junit:junit) +BuildRequires: mvn(org.junit.jupiter:junit-jupiter) BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) BuildRequires: mvn(org.mockito:mockito-all) BuildRequires: mvn(org.ow2.asm:asm) @@ -43,19 +44,17 @@ framework to read and write XML. %prep %setup -q -n %{name}-%{name}-%{version} +%patch -P1 -p1 -%pom_change_dep jakarta.activation:jakarta.activation-api jakarta.activation:jakarta.activation-api:2 jaxb -%pom_change_dep jakarta.xml.bind:jakarta.xml.bind-api jakarta.xml.bind:jakarta.xml.bind-api:4 jaxb +%pom_change_dep -r jakarta.xml.bind:jakarta.xml.bind-api javax.xml.bind:jaxb-api %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 # Disable bundling of asm %pom_remove_plugin ":maven-shade-plugin" afterburner mrbean paranamer -%pom_xpath_remove "pom:properties/pom:osgi.private" mrbean paranamer sed -i 's/\r//' mrbean/src/main/resources/META-INF/{LICENSE,NOTICE} cp -p mrbean/src/main/resources/META-INF/{LICENSE,NOTICE} . @@ -67,7 +66,8 @@ cp -p mrbean/src/main/resources/META-INF/{LICENSE,NOTICE} . %pom_add_dep cglib:cglib:3.2.4:test guice %pom_disable_module afterburner -%pom_disable_module guice +%pom_disable_module android-record +%pom_disable_module guice7 %pom_disable_module mrbean %pom_disable_module osgi %pom_disable_module paranamer @@ -75,6 +75,8 @@ cp -p mrbean/src/main/resources/META-INF/{LICENSE,NOTICE} . %pom_disable_module blackbird %pom_disable_module no-ctor-deser +%pom_remove_plugin "org.gradlex:gradle-module-metadata-maven-plugin" jaxb + # Allow javax,activation to be optional %pom_add_plugin "org.apache.felix:maven-bundle-plugin" jaxb " @@ -83,6 +85,10 @@ cp -p mrbean/src/main/resources/META-INF/{LICENSE,NOTICE} . " +# Revert jaxb annotation dependency to 2.17 mode +%pom_remove_dep javax.xml.bind:jaxb-api jaxb +%pom_add_dep jakarta.xml.bind:jakarta.xml.bind-api jaxb + # This test fails since mockito was upgraded to 2.x rm osgi/src/test/java/com/fasterxml/jackson/module/osgi/InjectOsgiServiceTest.java @@ -103,6 +109,10 @@ rm osgi/src/test/java/com/fasterxml/jackson/module/osgi/InjectOsgiServiceTest.ja %license LICENSE NOTICE %changelog +* Thu Jul 31 2025 Red Hat PKI Team - 2.19.1-2 +- Update to version 2.19.1 +- Resolves: RHEL-103106 + * Thu Dec 07 2023 Red Hat PKI Team - 2.14.2-2 - Remove patch for java 11 diff --git a/sources b/sources index 50a951c..35af801 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (jackson-modules-base-2.14.2.tar.gz) = 17033d9d9174079fad5b8a1dfc645909358340af193bb9ec3dcc4dc8f9b3d8e8097900921c0a268f1399b9d68639304d6087b298ee4d790f1f65fd66f8eb550a +SHA512 (jackson-modules-base-2.19.1.tar.gz) = af5e6534038b14fac2138f66c174964718e985e7c6164405d56b7742e7610414cdb9652a787f949344804b891332fb7816e7b4cbf17235f7eac709dff83dbec8