From b0247ecc7ad52f729001709d0310c7d95e394059 Mon Sep 17 00:00:00 2001 From: Marco Fargetta Date: Wed, 22 Nov 2023 12:34:04 +0100 Subject: [PATCH] Rebase to upstream version 2.14.2 Resolves: RHEL-9625 --- .gitignore | 1 + ...vax.security.auth-from-JDK-internals.patch | 26 ----------- jackson-modules-base.spec | 45 ++++++++----------- sources | 2 +- 4 files changed, 20 insertions(+), 54 deletions(-) delete mode 100644 0001-Expose-javax.security.auth-from-JDK-internals.patch diff --git a/.gitignore b/.gitignore index 59e2e40..d75be94 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ /jackson-modules-base-2.11.3.tar.gz /jackson-modules-base-2.11.4.tar.gz /jackson-modules-base-2.14.1.tar.gz +/jackson-modules-base-2.14.2.tar.gz diff --git a/0001-Expose-javax.security.auth-from-JDK-internals.patch b/0001-Expose-javax.security.auth-from-JDK-internals.patch deleted file mode 100644 index 43fb443..0000000 --- a/0001-Expose-javax.security.auth-from-JDK-internals.patch +++ /dev/null @@ -1,26 +0,0 @@ -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 cb8899d..caea1f0 100644 --- a/jackson-modules-base.spec +++ b/jackson-modules-base.spec @@ -1,14 +1,13 @@ %bcond_with jp_minimal Name: jackson-modules-base -Version: 2.14.1 -Release: 2%{?dist} +Version: 2.14.2 +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) @@ -17,36 +16,26 @@ 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) -BuildRequires: mvn(javax.xml.bind:jaxb-api) +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.apache.felix:maven-bundle-plugin) BuildRequires: mvn(org.mockito:mockito-all) BuildRequires: mvn(org.ow2.asm:asm) BuildArch: noarch +%if 0%{?fedora} +ExclusiveArch: %{java_arches} noarch +%endif %description Jackson "base" modules: modules that build directly on databind, and are not data-type, data format, or JAX-RS provider modules. -%package -n pki-%{name} -Summary: Jackson modules: Base -Obsoletes: %{name} < %{version}-%{release} -Conflicts: %{name} < %{version}-%{release} -Provides: %{name} = %{version}-%{release} - -%description -n pki-%{name} -Jackson "base" modules: modules that build directly on databind, -and are not data-type, data format, or JAX-RS provider modules. - -%package -n pki-jackson-module-jaxb-annotations +%package -n jackson-module-jaxb-annotations Summary: Support for using JAXB annotations as an alternative to "native" Jackson annotations -Obsoletes: jackson-module-jaxb-annotations < %{version}-%{release} -Conflicts: jackson-module-jaxb-annotations < %{version}-%{release} -Provides: jackson-module-jaxb-annotations = %{version}-%{release} -%description -n pki-jackson-module-jaxb-annotations +%description -n jackson-module-jaxb-annotations This Jackson extension module provides support for using JAXB (javax.xml.bind) annotations as an alternative to native Jackson annotations. It is most often used to make it easier to reuse existing data beans that used with JAXB @@ -54,7 +43,9 @@ framework to read and write XML. %prep %setup -q -n %{name}-%{name}-%{version} -%patch1 -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" @@ -62,9 +53,6 @@ framework to read and write XML. # no need for Java 9 module stuff %pom_remove_plugin -r :moditect-maven-plugin -# move to "old" glassfish-jaxb-api artifactId -%pom_change_dep -r jakarta.xml.bind:jakarta.xml.bind-api javax.xml.bind:jaxb-api - # Disable bundling of asm %pom_remove_plugin ":maven-shade-plugin" afterburner mrbean paranamer %pom_xpath_remove "pom:properties/pom:osgi.private" mrbean paranamer @@ -101,20 +89,23 @@ rm osgi/src/test/java/com/fasterxml/jackson/module/osgi/InjectOsgiServiceTest.ja %mvn_file ":{*}" jackson-modules/@1 %build -%mvn_build -s -j +%mvn_build -f -s -j %install %mvn_install -%files -n pki-%{name} -f .mfiles-jackson-modules-base +%files -f .mfiles-jackson-modules-base %doc README.md release-notes %license LICENSE NOTICE -%files -n pki-jackson-module-jaxb-annotations -f .mfiles-jackson-module-jaxb-annotations +%files -n jackson-module-jaxb-annotations -f .mfiles-jackson-module-jaxb-annotations %doc jaxb/README.md jaxb/release-notes %license LICENSE NOTICE %changelog +* Wed Nov 22 2023 Red Hat PKI Team - 2.14.2-1 +- Rebase to upstream version 2.14.2 + * Wed Nov 23 2022 Chris Kelley - 2.14.1-1 - Update to version 2.14.1 - Resolves: #2070122 diff --git a/sources b/sources index 5bf28fd..50a951c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (jackson-modules-base-2.14.1.tar.gz) = d87d5917c2d0df93537aaf6b2cfd452530e677ef318a6c3b7ac2f82c5221f9958699c534d5dbe87f2fc17f833e1dfca83ccb775e6001bf89db2e8c94c437faf0 +SHA512 (jackson-modules-base-2.14.2.tar.gz) = 17033d9d9174079fad5b8a1dfc645909358340af193bb9ec3dcc4dc8f9b3d8e8097900921c0a268f1399b9d68639304d6087b298ee4d790f1f65fd66f8eb550a