From d0377a0adf9beb90723d42c3045741c05bf05589 Mon Sep 17 00:00:00 2001 From: "Endi S. Dewata" Date: Fri, 21 May 2021 14:38:34 -0500 Subject: [PATCH] Drop unused subpackages Resolves: #1952530 --- jackson-modules-base.spec | 118 ++++---------------------------------- 1 file changed, 10 insertions(+), 108 deletions(-) diff --git a/jackson-modules-base.spec b/jackson-modules-base.spec index acbbae3..31d983b 100644 --- a/jackson-modules-base.spec +++ b/jackson-modules-base.spec @@ -2,7 +2,7 @@ Name: jackson-modules-base Version: 2.11.4 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Jackson modules: Base License: ASL 2.0 @@ -16,17 +16,12 @@ 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(com.google.inject:guice) -%if %{without jp_minimal} -BuildRequires: mvn(com.thoughtworks.paranamer:paranamer) -%endif BuildRequires: mvn(jakarta.activation:jakarta.activation-api) BuildRequires: mvn(javax.xml.bind:jaxb-api) BuildRequires: mvn(junit:junit) BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) BuildRequires: mvn(org.glassfish.jaxb:jaxb-runtime) BuildRequires: mvn(org.mockito:mockito-all) -BuildRequires: mvn(org.osgi:osgi.core) BuildRequires: mvn(org.ow2.asm:asm) BuildArch: noarch @@ -45,27 +40,6 @@ Provides: %{name} = %{version}-%{release} 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-afterburner -Summary: Jackson module that uses byte-code generation to further speed up data binding -Obsoletes: jackson-module-afterburner < %{version}-%{release} -Conflicts: jackson-module-afterburner < %{version}-%{release} -Provides: jackson-module-afterburner = %{version}-%{release} - -%description -n pki-jackson-module-afterburner -Module that will add dynamic bytecode generation for standard Jackson POJO -serializers and deserializers, eliminating majority of remaining data binding -overhead. - -%package -n pki-jackson-module-guice -Summary: Jackson module to make integration with Guice a bit easier -Obsoletes: jackson-module-guice < %{version}-%{release} -Conflicts: jackson-module-guice < %{version}-%{release} -Provides: jackson-module-guice = %{version}-%{release} - -%description -n pki-jackson-module-guice -This extension allows Jackson to delegate ObjectMapper creation and value -injection to Guice when handling data bindings. - %package -n pki-jackson-module-jaxb-annotations Summary: Support for using JAXB annotations as an alternative to "native" Jackson annotations Obsoletes: jackson-module-jaxb-annotations < %{version}-%{release} @@ -78,55 +52,6 @@ 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 framework to read and write XML. -%if %{without jp_minimal} -%package -n pki-jackson-module-mrbean -Summary: Functionality for implementing interfaces and abstract types dynamically -Obsoletes: jackson-module-mrbean < %{version}-%{release} -Conflicts: jackson-module-mrbean < %{version}-%{release} -Provides: jackson-module-mrbean = %{version}-%{release} - -%description -n pki-jackson-module-mrbean -Mr Bean is an extension that implements support for "POJO type materialization" -ability for databinder to construct implementation classes for Java interfaces -and abstract classes, as part of deserialization. -%endif - -%package -n pki-jackson-module-osgi -Summary: Jackson module to inject OSGI services in deserialized beans -Obsoletes: jackson-module-osgi < %{version}-%{release} -Conflicts: jackson-module-osgi < %{version}-%{release} -Provides: jackson-module-osgi = %{version}-%{release} - -%description -n pki-jackson-module-osgi -This module provides a way to inject OSGI services into deserialized objects. -Thanks to the JacksonInject annotations, the OsgiJacksonModule will search for -the required service in the OSGI service registry and injects it in the object -while deserializing. - -%if %{without jp_minimal} -%package -n pki-jackson-module-paranamer -Summary: Jackson module that uses Paranamer to introspect names of constructor params -Obsoletes: jackson-module-paranamer < %{version}-%{release} -Conflicts: jackson-module-paranamer < %{version}-%{release} -Provides: jackson-module-paranamer = %{version}-%{release} - -%description -n pki-jackson-module-paranamer -Module that uses Paranamer library to auto-detect names of Creator -(constructor, static factory method, annotated with @JsonCreator) methods. -%endif - -%package -n pki-%{name}-javadoc -Summary: Javadoc for %{name} -Obsoletes: %{name}-javadoc < %{version}-%{release} -Conflicts: %{name}-javadoc < %{version}-%{release} -Provides: %{name}-javadoc = %{version}-%{release} -# Obsoletes standalone jackson-module-jaxb-annotations since F28 -Obsoletes: jackson-module-jaxb-annotations-javadoc < %{version}-%{release} -Provides: jackson-module-jaxb-annotations-javadoc = %{version}-%{release} - -%description -n pki-%{name}-javadoc -This package contains API documentation for %{name}. - %prep %setup -q -n %{name}-%{name}-%{version} @@ -149,11 +74,11 @@ 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 -%if %{with jp_minimal} -# Disable modules with additional deps -%pom_disable_module paranamer +%pom_disable_module afterburner +%pom_disable_module guice %pom_disable_module mrbean -%endif +%pom_disable_module osgi +%pom_disable_module paranamer # Allow javax,activation to be optional %pom_add_plugin "org.apache.felix:maven-bundle-plugin" jaxb " @@ -169,7 +94,7 @@ rm osgi/src/test/java/com/fasterxml/jackson/module/osgi/InjectOsgiServiceTest.ja %mvn_file ":{*}" jackson-modules/@1 %build -%mvn_build -s +%mvn_build -s -j %install %mvn_install @@ -178,38 +103,15 @@ rm osgi/src/test/java/com/fasterxml/jackson/module/osgi/InjectOsgiServiceTest.ja %doc README.md release-notes %license LICENSE NOTICE -%files -n pki-jackson-module-afterburner -f .mfiles-jackson-module-afterburner -%doc afterburner/README.md afterburner/release-notes -%license LICENSE NOTICE - -%files -n pki-jackson-module-guice -f .mfiles-jackson-module-guice -%doc guice/README.md -%license LICENSE NOTICE - %files -n pki-jackson-module-jaxb-annotations -f .mfiles-jackson-module-jaxb-annotations %doc jaxb/README.md jaxb/release-notes %license LICENSE NOTICE -%if %{without jp_minimal} -%files -n pki-jackson-module-mrbean -f .mfiles-jackson-module-mrbean -%doc mrbean/README.md mrbean/release-notes -%license LICENSE NOTICE -%endif - -%files -n pki-jackson-module-osgi -f .mfiles-jackson-module-osgi -%doc osgi/README.md osgi/release-notes -%license LICENSE NOTICE - -%if %{without jp_minimal} -%files -n pki-jackson-module-paranamer -f .mfiles-jackson-module-paranamer -%doc paranamer/README.md paranamer/release-notes -%license LICENSE NOTICE -%endif - -%files -n pki-%{name}-javadoc -f .mfiles-javadoc -%license LICENSE NOTICE - %changelog +* Fri May 21 2021 Red Hat PKI Team - 2.11.4-6 +- Drop jackson-module-afterburner, jackson-module-guice, jackson-module-mrbean, + jackson-module-osgi, jackson-module-paranamer, and jackson-module-javadoc + * Wed Apr 28 2021 Red Hat PKI Team - 2.11.4-5 - Add Obsoletes and Conflicts