rpms/jackson-modules-base
7
0
Fork 0
Code Issues Pull Requests Releases Activity

import CS jackson-modules-base-2.14.2-2.module_el8+988+30834131

Browse Source
This commit is contained in:
eabdullin 2024-03-28 14:01:16 +00:00
parent 63ca4977d5
commit 54365c8006
4 changed files with 23 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -1 +1 @@
SOURCES/jackson-modules-base-2.14.1.tar.gz
SOURCES/jackson-modules-base-2.14.2.tar.gz

2
.jackson-modules-base.metadata
View File

@ -1 +1 @@
11b1d5daee50c58f13038bfd92ae28ad86ad428a SOURCES/jackson-modules-base-2.14.1.tar.gz
4322635aa05711b1a3841703d81e8b77f1b95413 SOURCES/jackson-modules-base-2.14.2.tar.gz

26
SOURCES/0001-Expose-javax.security.auth-from-JDK-internals.patch
View File

@ -1,26 +0,0 @@
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

48
SPECS/jackson-modules-base.spec
View File

@ -1,14 +1,13 @@
%bcond_with jp_minimal
Name: jackson-modules-base
Version: 2.14.1
Version: 2.14.2
Release: 2%{?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
@ -98,23 +86,29 @@ cp -p mrbean/src/main/resources/META-INF/{LICENSE,NOTICE} .
# This test fails since mockito was upgraded to 2.x
rm osgi/src/test/java/com/fasterxml/jackson/module/osgi/InjectOsgiServiceTest.java
%mvn_file ":{*}" jackson-modules/@1
%mvn_file ":{*}" jackson-modules/@1 @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
* Thu Dec 07 2023 Red Hat PKI Team <rhcs-maint@redhat.com> - 2.14.2-2
- Remove patch for java 11
* Mon Feb 27 2023 Red Hat PKI Team <rhcs-maint@redhat.com> - 2.14.2-1
- Rebase to upstream version 2.14.2
* Wed Nov 23 2022 Chris Kelley <ckelley@redhat.com> - 2.14.1-1
- Update to version 2.14.1
- Resolves: #2070122