diff --git a/.gitignore b/.gitignore index be9d764..a7361dd 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/jackson-jaxrs-providers-2.9.9.tar.gz +SOURCES/jackson-jaxrs-providers-2.14.2.tar.gz diff --git a/.jackson-jaxrs-providers.metadata b/.jackson-jaxrs-providers.metadata index e7306fa..aa491b7 100644 --- a/.jackson-jaxrs-providers.metadata +++ b/.jackson-jaxrs-providers.metadata @@ -1 +1 @@ -ba7ad72a802d098d5e635cf2d914e04f8b88fd32 SOURCES/jackson-jaxrs-providers-2.9.9.tar.gz +bce208cbb7a24c4e22258d0611e82e6fe7d52f93 SOURCES/jackson-jaxrs-providers-2.14.2.tar.gz diff --git a/SPECS/jackson-jaxrs-providers.spec b/SPECS/jackson-jaxrs-providers.spec index fc090ef..7562939 100644 --- a/SPECS/jackson-jaxrs-providers.spec +++ b/SPECS/jackson-jaxrs-providers.spec @@ -1,54 +1,50 @@ +%bcond_without jp_minimal + Name: jackson-jaxrs-providers -Version: 2.9.9 +Version: 2.14.2 Release: 1%{?dist} Summary: Jackson JAX-RS providers -License: ASL 2.0 -URL: https://github.com/FasterXML/jackson-jaxrs-providers -Source0: https://github.com/FasterXML/jackson-jaxrs-providers/archive/%{name}-%{version}.tar.gz +License: Apache-2.0 -# package_option with_cbor -# package_option with_smile -# package_option with_xml -# package_option with_yaml +URL: https://github.com/FasterXML/jackson-jaxrs-providers +Source0: %{url}/archive/%{name}-%{version}.tar.gz + +BuildArch: noarch +%if 0%{?fedora} +ExclusiveArch: %{java_arches} noarch +%endif BuildRequires: maven-local BuildRequires: mvn(com.fasterxml.jackson.core:jackson-core) >= %{version} BuildRequires: mvn(com.fasterxml.jackson.core:jackson-databind) >= %{version} -%if %{with cbor} -BuildRequires: mvn(com.fasterxml.jackson.dataformat:jackson-dataformat-cbor) -%endif -%if %{with smile} -BuildRequires: mvn(com.fasterxml.jackson.dataformat:jackson-dataformat-smile) -%endif -%if %{with xml} -BuildRequires: mvn(com.fasterxml.jackson.dataformat:jackson-dataformat-xml) -%endif -%if %{with yaml} -BuildRequires: mvn(com.fasterxml.jackson.dataformat:jackson-dataformat-yaml) -%endif +BuildRequires: mvn(com.fasterxml.jackson.module:jackson-module-jaxb-annotations) >= %{version} BuildRequires: mvn(com.fasterxml.jackson:jackson-base:pom:) >= %{version} -BuildRequires: mvn(com.fasterxml.jackson.module:jackson-module-jaxb-annotations) BuildRequires: mvn(com.google.code.maven-replacer-plugin:replacer) -BuildRequires: mvn(javax.ws.rs:javax.ws.rs-api) +BuildRequires: mvn(org.jboss.spec.javax.ws.rs:jboss-jaxrs-api_2.0_spec) BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) -BuildRequires: mvn(org.ow2.asm:asm) -BuildArch: noarch +%if %{without jp_minimal} +BuildRequires: mvn(com.fasterxml.jackson.dataformat:jackson-dataformat-cbor) +BuildRequires: mvn(com.fasterxml.jackson.dataformat:jackson-dataformat-smile) +BuildRequires: mvn(com.fasterxml.jackson.dataformat:jackson-dataformat-xml) +BuildRequires: mvn(com.fasterxml.jackson.dataformat:jackson-dataformat-yaml) +BuildRequires: mvn(org.glassfish.jersey.containers:jersey-container-servlet) +BuildRequires: mvn(org.glassfish.jersey.core:jersey-server) +BuildRequires: mvn(org.jboss.resteasy:resteasy-jaxrs) +%endif + +%if %{with jp_minimal} +Obsoletes: jackson-jaxrs-cbor-provider < 2.10.0-1 +Obsoletes: jackson-jaxrs-smile-provider < 2.10.0-1 +Obsoletes: jackson-jaxrs-xml-provider < 2.10.0-1 +Obsoletes: jackson-jaxrs-yaml-provider < 2.10.0-1 +%endif %description This is a multi-module project that contains Jackson-based JAX-RS providers for following data formats: JSON, Smile (binary JSON), XML, CBOR (another kind of binary JSON), YAML. -%if %{with cbor} -%package -n jackson-jaxrs-cbor-provider -Summary: Jackson-JAXRS-CBOR - -%description -n jackson-jaxrs-cbor-provider -Functionality to handle CBOR encoded input/output for JAX-RS implementations -(like Jersey and RESTeasy) using standard Jackson data binding. -%endif - %package -n jackson-jaxrs-json-provider Summary: Jackson-JAXRS-JSON @@ -56,7 +52,14 @@ Summary: Jackson-JAXRS-JSON Functionality to handle JSON input/output for JAX-RS implementations (like Jersey and RESTeasy) using standard Jackson data binding. -%if %{with smile} +%if %{without jp_minimal} +%package -n jackson-jaxrs-cbor-provider +Summary: Jackson-JAXRS-CBOR + +%description -n jackson-jaxrs-cbor-provider +Functionality to handle CBOR encoded input/output for JAX-RS implementations +(like Jersey and RESTeasy) using standard Jackson data binding. + %package -n jackson-jaxrs-smile-provider Summary: Jackson-JAXRS-Smile @@ -64,18 +67,14 @@ Summary: Jackson-JAXRS-Smile Functionality to handle Smile (binary JSON) input/output for JAX-RS implementations (like Jersey and RESTeasy) using standard Jackson data binding. -%endif -%if %{with xml} %package -n jackson-jaxrs-xml-provider Summary: Jackson-JAXRS-XML %description -n jackson-jaxrs-xml-provider Functionality to handle Smile XML input/output for JAX-RS implementations (like Jersey and RESTeasy) using standard Jackson data binding. -%endif -%if %{with yaml} %package -n jackson-jaxrs-yaml-provider Summary: Jackson-JAXRS-YAML @@ -96,11 +95,13 @@ Summary: Parent for Jackson JAX-RS providers %description parent Parent POM for Jackson JAX-RS providers. +%if %{without jp_minimal} %package javadoc Summary: Javadoc for %{name} %description javadoc This package contains API documentation for %{name}. +%endif %prep %setup -q -n %{name}-%{name}-%{version} @@ -109,6 +110,9 @@ cp -p xml/src/main/resources/META-INF/LICENSE . cp -p xml/src/main/resources/META-INF/NOTICE . sed -i 's/\r//' LICENSE NOTICE +%pom_remove_plugin -r :moditect-maven-plugin +%pom_remove_plugin "de.jjohannes:gradle-module-metadata-maven-plugin" + # Disable jar with no-meta-inf-services classifier, breaks build %pom_remove_plugin :maven-jar-plugin cbor %pom_remove_plugin :maven-jar-plugin json @@ -117,39 +121,35 @@ sed -i 's/\r//' LICENSE NOTICE %pom_remove_plugin :maven-jar-plugin yaml %pom_remove_plugin :maven-jar-plugin datatypes +%pom_change_dep jakarta.xml.bind:jakarta.xml.bind-api jakarta.xml.bind:jakarta.xml.bind-api:4 +# Replace jakarta-ws-rs with jboss-jaxrs-2.0-api +%pom_change_dep javax.ws.rs:javax.ws.rs-api org.jboss.spec.javax.ws.rs:jboss-jaxrs-api_2.0_spec + # Add missing deps to fix java.lang.ClassNotFoundException during tests +%pom_add_dep com.google.guava:guava:18.0:test datatypes cbor json smile xml yaml %pom_add_dep org.ow2.asm:asm:5.1:test cbor json smile xml yaml -# Remove circular dep on resteasy in tests -%pom_remove_dep org.jboss.resteasy: json +# Circular dep? +%pom_remove_dep org.jboss.resteasy:resteasy-jackson2-provider json rm json/src/test/java/com/fasterxml/jackson/jaxrs/json/resteasy/RestEasyProviderLoadingTest.java -# Don't build test classes -%pom_remove_dep org.eclipse.jetty: +%if %{with jp_minimal} +# Disable extra test deps %pom_remove_dep org.glassfish.jersey.core: %pom_remove_dep org.glassfish.jersey.containers: -%pom_remove_dep org.codehaus.woodstox: xml -# XXX: is there a better way to disable building tests? -rm -rf */src/test - -%if ! %{with cbor} +# Disable extra providers %pom_disable_module cbor -%endif - -%if ! %{with smile} %pom_disable_module smile -%endif - -%if ! %{with xml} %pom_disable_module xml -%endif - -%if ! %{with yaml} %pom_disable_module yaml %endif %build -%mvn_build -s +%if %{with jp_minimal} +%mvn_build -s -f -j +%else +%mvn_build -s +%endif %install %mvn_install @@ -158,21 +158,12 @@ rm -rf */src/test %doc README.md release-notes/* %license LICENSE NOTICE -%if %{with cbor} -%files -n jackson-jaxrs-cbor-provider -f .mfiles-jackson-jaxrs-cbor-provider -%endif - %files -n jackson-jaxrs-json-provider -f .mfiles-jackson-jaxrs-json-provider -%if %{with smile} +%if %{without jp_minimal} +%files -n jackson-jaxrs-cbor-provider -f .mfiles-jackson-jaxrs-cbor-provider %files -n jackson-jaxrs-smile-provider -f .mfiles-jackson-jaxrs-smile-provider -%endif - -%if %{with xml} %files -n jackson-jaxrs-xml-provider -f .mfiles-jackson-jaxrs-xml-provider -%endif - -%if %{with yaml} %files -n jackson-jaxrs-yaml-provider -f .mfiles-jackson-jaxrs-yaml-provider %endif @@ -182,10 +173,15 @@ rm -rf */src/test %files parent -f .mfiles-jackson-jaxrs-providers %license LICENSE NOTICE +%if %{without jp_minimal} %files javadoc -f .mfiles-javadoc %license LICENSE NOTICE +%endif %changelog +* Wed Nov 22 2023 Red Hat PKI Team - 2.14.2-1 +- Rebase to upstream version 2.14.2 + * Wed Jul 31 2019 Red Hat PKI Team - 2.9.9-1 - Update to latest upstream release