Rebase to version 2.19.1
Resolves: RHEL-100245
This commit is contained in:
Marco Fargetta
parent
83adf8da00
commit
173eca0784
1
.gitignore
vendored
1
.gitignore
vendored
@ -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.19.1.tar.gz
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
From 45cad535d09c0b67719a1ebe14353636515596f7 Mon Sep 17 00:00:00 2001
|
||||
From: Chris Kelley <ckelley@redhat.com>
|
||||
Date: Thu, 8 Sep 2022 12:44:54 +0100
|
||||
From 9cc0fa5a5b4cc1e6462b1e61d279b31e87ded2ea Mon Sep 17 00:00:00 2001
|
||||
From: Marco Fargetta <mfargett@redhat.com>
|
||||
Date: Thu, 17 Jul 2025 11:19:53 +0200
|
||||
Subject: [PATCH] Expose javax.security.auth from JDK internals
|
||||
|
||||
---
|
||||
@ -8,19 +8,19 @@ Subject: [PATCH] Expose javax.security.auth from JDK internals
|
||||
1 file changed, 3 insertions(+)
|
||||
|
||||
diff --git a/pom.xml b/pom.xml
|
||||
index e72b4934..cafe56de 100644
|
||||
index a535fafc..6963d1a6 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>
|
||||
@@ -115,6 +115,9 @@ not datatype, data format, or JAX-RS provider modules.
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-surefire-plugin</artifactId>
|
||||
+ <configuration>
|
||||
+ <argLine>--add-opens=java.base/javax.security.auth=ALL-UNNAMED</argLine>
|
||||
+ </configuration>
|
||||
</plugin>
|
||||
</plugins>
|
||||
</pluginManagement>
|
||||
--
|
||||
2.38.1
|
||||
2.50.1
|
||||
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
%bcond_with jp_minimal
|
||||
|
||||
Name: jackson-modules-base
|
||||
Version: 2.14.1
|
||||
Release: 2%{?dist}
|
||||
Version: 2.19.1
|
||||
Release: 1%{?dist}
|
||||
Summary: Jackson modules: Base
|
||||
License: Apache-2.0
|
||||
|
||||
@ -18,13 +18,16 @@ 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(junit:junit)
|
||||
BuildRequires: mvn(jakarta.xml.bind:jakarta.xml.bind-api)
|
||||
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)
|
||||
|
||||
BuildArch: noarch
|
||||
%if 0%{?fedora} || 0%{?rhel} >= 10
|
||||
ExclusiveArch: %{java_arches} noarch
|
||||
%endif
|
||||
|
||||
%description
|
||||
Jackson "base" modules: modules that build directly on databind,
|
||||
@ -54,10 +57,9 @@ framework to read and write XML.
|
||||
|
||||
%prep
|
||||
%setup -q -n %{name}-%{name}-%{version}
|
||||
%patch1 -p1
|
||||
%patch -P1 -p1
|
||||
|
||||
%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
|
||||
@ -67,7 +69,6 @@ framework to read and write XML.
|
||||
|
||||
# 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} .
|
||||
@ -78,8 +79,10 @@ cp -p mrbean/src/main/resources/META-INF/{LICENSE,NOTICE} .
|
||||
# NoClassDefFoundError: net/sf/cglib/core/CodeGenerationException
|
||||
%pom_add_dep cglib:cglib:3.2.4:test guice
|
||||
|
||||
%pom_disable_module afterburner
|
||||
%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
|
||||
@ -87,6 +90,7 @@ 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 "
|
||||
<configuration>
|
||||
@ -95,6 +99,12 @@ cp -p mrbean/src/main/resources/META-INF/{LICENSE,NOTICE} .
|
||||
</instructions>
|
||||
</configuration>"
|
||||
|
||||
|
||||
# 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
|
||||
|
||||
@ -115,6 +125,10 @@ rm osgi/src/test/java/com/fasterxml/jackson/module/osgi/InjectOsgiServiceTest.ja
|
||||
%license LICENSE NOTICE
|
||||
|
||||
%changelog
|
||||
* Thu Jul 17 2025 Red Hat PKI Team <rhcs-maint@redhat.com> - 2.19.1-1
|
||||
- Update to version 2.19.1
|
||||
- Resolves: RHEL-100245
|
||||
|
||||
* Wed Nov 23 2022 Chris Kelley <ckelley@redhat.com> - 2.14.1-1
|
||||
- Update to version 2.14.1
|
||||
- Resolves: #2070122
|
||||
|
||||
2
sources
2
sources
@ -1 +1 @@
|
||||
SHA512 (jackson-modules-base-2.14.1.tar.gz) = d87d5917c2d0df93537aaf6b2cfd452530e677ef318a6c3b7ac2f82c5221f9958699c534d5dbe87f2fc17f833e1dfca83ccb775e6001bf89db2e8c94c437faf0
|
||||
SHA512 (jackson-modules-base-2.19.1.tar.gz) = af5e6534038b14fac2138f66c174964718e985e7c6164405d56b7742e7610414cdb9652a787f949344804b891332fb7816e7b4cbf17235f7eac709dff83dbec8
|
||||
|
||||
Loading…
Reference in New Issue
Block a user