From 4bc0bf630449c1961a02d60d313badf82b0488b7 Mon Sep 17 00:00:00 2001 From: eabdullin Date: Wed, 20 Aug 2025 09:09:26 +0000 Subject: [PATCH] Import from CS git --- .gitignore | 2 +- .jackson-modules-base.metadata | 2 +- ...vax.security.auth-from-JDK-internals.patch | 26 +++++++++++++++++++ SPECS/jackson-modules-base.spec | 26 +++++++++++-------- 4 files changed, 43 insertions(+), 13 deletions(-) create mode 100644 SOURCES/0001-Expose-javax.security.auth-from-JDK-internals.patch diff --git a/.gitignore b/.gitignore index 0655884..f64440b 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/jackson-modules-base-2.14.2.tar.gz +SOURCES/jackson-modules-base-2.19.1.tar.gz diff --git a/.jackson-modules-base.metadata b/.jackson-modules-base.metadata index b1bf11c..b88bb3c 100644 --- a/.jackson-modules-base.metadata +++ b/.jackson-modules-base.metadata @@ -1 +1 @@ -4322635aa05711b1a3841703d81e8b77f1b95413 SOURCES/jackson-modules-base-2.14.2.tar.gz +d386394952005cbb27dfb7b9ad72e90941be5d41 SOURCES/jackson-modules-base-2.19.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..b214748 --- /dev/null +++ b/SOURCES/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/SPECS/jackson-modules-base.spec b/SPECS/jackson-modules-base.spec index 06dd658..8307759 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.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) @@ -16,9 +17,8 @@ BuildRequires: mvn(com.fasterxml.jackson.core:jackson-core) >= %{version} BuildRequires: mvn(com.fasterxml.jackson.core:jackson-databind) >= %{version} 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(jakarta.activation:jakarta.activation-api) +BuildRequires: mvn(javax.xml.bind:jaxb-api) BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) BuildRequires: mvn(org.mockito:mockito-all) BuildRequires: mvn(org.ow2.asm:asm) @@ -43,19 +43,15 @@ 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_remove_dep -r org.glassfish.jaxb:jaxb-runtime -%pom_remove_plugin "de.jjohannes:gradle-module-metadata-maven-plugin" +%pom_change_dep -r jakarta.activation:jakarta.activation-api:1.2.2 jakarta.activation:jakarta.activation-api:1.2.1 # 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 +63,9 @@ 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 android-record %pom_disable_module guice +%pom_disable_module guice7 %pom_disable_module mrbean %pom_disable_module osgi %pom_disable_module paranamer @@ -75,6 +73,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 " @@ -103,6 +103,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