|
|
|
@ -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
|
|
|
|
|