.gitignore

@@ -1 +1 @@
-SOURCES/jackson-jaxrs-providers-2.14.1.tar.gz
+SOURCES/jackson-jaxrs-providers-2.9.9.tar.gz

.jackson-jaxrs-providers.metadata

@@ -1 +1 @@
-bb9ccf74b89240bd497d323357e8b9f205d24a26 SOURCES/jackson-jaxrs-providers-2.14.1.tar.gz
+ba7ad72a802d098d5e635cf2d914e04f8b88fd32 SOURCES/jackson-jaxrs-providers-2.9.9.tar.gz

SPECS/jackson-jaxrs-providers.spec

@@ -1,136 +1,105 @@
-%bcond_without  jp_minimal
+Name:          jackson-jaxrs-providers
-
+Version:       2.9.9
-Name:           jackson-jaxrs-providers
+Release:       1%{?dist}
-Version:        2.14.1
+Summary:       Jackson JAX-RS providers
-Release:        2%{?dist}
+License:       ASL 2.0
-Summary:        Jackson JAX-RS providers
+URL:           https://github.com/FasterXML/jackson-jaxrs-providers
-License:        Apache-2.0
+Source0:       https://github.com/FasterXML/jackson-jaxrs-providers/archive/%{name}-%{version}.tar.gz
-
+
-URL:            https://github.com/FasterXML/jackson-jaxrs-providers
+# package_option with_cbor
-Source0:        %{url}/archive/%{name}-%{version}.tar.gz
+# package_option with_smile
-
+# package_option with_xml
-BuildArch:      noarch
+# package_option with_yaml
 
 BuildRequires:  maven-local
 BuildRequires:  mvn(com.fasterxml.jackson.core:jackson-core) >= %{version}
 BuildRequires:  mvn(com.fasterxml.jackson.core:jackson-databind) >= %{version}
-BuildRequires:  mvn(com.fasterxml.jackson.module:jackson-module-jaxb-annotations) >= %{version}
+%if %{with cbor}
-BuildRequires:  mvn(com.fasterxml.jackson:jackson-base:pom:) >= %{version}
-BuildRequires:  mvn(com.google.code.maven-replacer-plugin:replacer)
-BuildRequires:  mvn(org.jboss.spec.javax.ws.rs:jboss-jaxrs-api_2.0_spec)
-BuildRequires:  mvn(org.apache.felix:maven-bundle-plugin)
-
-%if %{without jp_minimal}
 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)
-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
+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.apache.felix:maven-bundle-plugin)
+BuildRequires:  mvn(org.ow2.asm:asm)
+
+BuildArch:      noarch
 
 %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.
 
-%package -n pki-%{name}
+%if %{with cbor}
-Summary:        Jackson JAX-RS providers
+%package -n jackson-jaxrs-cbor-provider
-Obsoletes:      %{name} < %{version}-%{release}
+Summary:       Jackson-JAXRS-CBOR
-Conflicts:      %{name} < %{version}-%{release}
-Provides:       %{name} = %{version}-%{release}
-
-%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 -n pki-%{name}
+%description -n jackson-jaxrs-cbor-provider
-This is a multi-module project that contains Jackson-based JAX-RS providers for
+Functionality to handle CBOR encoded input/output for JAX-RS implementations
-following data formats: JSON, Smile (binary JSON), XML, CBOR (another kind of
+(like Jersey and RESTeasy) using standard Jackson data binding.
-binary JSON), YAML.
+%endif
 
-%package -n pki-jackson-jaxrs-json-provider
+%package -n jackson-jaxrs-json-provider
 Summary:       Jackson-JAXRS-JSON
-Obsoletes:     jackson-jaxrs-json-provider < %{version}-%{release}
-Conflicts:     jackson-jaxrs-json-provider < %{version}-%{release}
-Provides:      jackson-jaxrs-json-provider = %{version}-%{release}
 
-%description -n pki-jackson-jaxrs-json-provider
+%description -n jackson-jaxrs-json-provider
 Functionality to handle JSON input/output for JAX-RS implementations
 (like Jersey and RESTeasy) using standard Jackson data binding.
 
-%if %{without jp_minimal}
+%if %{with smile}
-%package -n pki-jackson-jaxrs-cbor-provider
+%package -n jackson-jaxrs-smile-provider
-Summary:       Jackson-JAXRS-CBOR
-Obsoletes:     jackson-jaxrs-cbor-provider < %{version}-%{release}
-Conflicts:     jackson-jaxrs-cbor-provider < %{version}-%{release}
-Provides:      jackson-jaxrs-cbor-provider = %{version}-%{release}
-
-%description -n pki-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 pki-jackson-jaxrs-smile-provider
 Summary:       Jackson-JAXRS-Smile
-Obsoletes:     jackson-jaxrs-smile-provider < %{version}-%{release}
-Conflicts:     jackson-jaxrs-smile-provider < %{version}-%{release}
-Provides:      jackson-jaxrs-smile-provider = %{version}-%{release}
 
-%description -n pki-jackson-jaxrs-smile-provider
+%description -n jackson-jaxrs-smile-provider
 Functionality to handle Smile (binary JSON) input/output for
 JAX-RS implementations (like Jersey and RESTeasy) using standard
 Jackson data binding.
+%endif
 
-%package -n pki-jackson-jaxrs-xml-provider
+%if %{with xml}
+%package -n jackson-jaxrs-xml-provider
 Summary:       Jackson-JAXRS-XML
-Obsoletes:     jackson-jaxrs-xml-provider < %{version}-%{release}
-Conflicts:     jackson-jaxrs-xml-provider < %{version}-%{release}
-Provides:      jackson-jaxrs-xml-provider = %{version}-%{release}
 
-%description -n pki-jackson-jaxrs-xml-provider
+%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
 
-%package -n pki-jackson-jaxrs-yaml-provider
+%if %{with yaml}
+%package -n jackson-jaxrs-yaml-provider
 Summary:       Jackson-JAXRS-YAML
-Obsoletes:     jackson-jaxrs-yaml-provider < %{version}-%{release}
-Conflicts:     jackson-jaxrs-yaml-provider < %{version}-%{release}
-Provides:      jackson-jaxrs-yaml-provider = %{version}-%{release}
 
-%description -n pki-jackson-jaxrs-yaml-provider
+%description -n jackson-jaxrs-yaml-provider
 Functionality to handle YAML input/output for JAX-RS implementations
 (like Jersey and RESTeasy) using standard Jackson data binding.
 %endif
 
-%package -n pki-%{name}-datatypes
+%package datatypes
 Summary: Functionality for reading/writing core JAX-RS helper types
-Obsoletes:     %{name}-datatypes < %{version}-%{release}
-Conflicts:     %{name}-datatypes < %{version}-%{release}
-Provides:      %{name}-datatypes = %{version}-%{release}
 
-%description -n pki-%{name}-datatypes
+%description datatypes
 Functionality for reading/writing core JAX-RS helper types.
 
-%package -n pki-%{name}-parent
+%package parent
 Summary: Parent for Jackson JAX-RS providers
-Obsoletes:     %{name}-parent < %{version}-%{release}
-Conflicts:     %{name}-parent < %{version}-%{release}
-Provides:      %{name}-parent = %{version}-%{release}
 
-%description -n pki-%{name}-parent
+%description parent
 Parent POM for Jackson JAX-RS providers.
 
-%package -n pki-%{name}-javadoc
+%package javadoc
 Summary: Javadoc for %{name}
-Obsoletes:     %{name}-javadoc < %{version}-%{release}
-Conflicts:     %{name}-javadoc < %{version}-%{release}
-Provides:      %{name}-javadoc = %{version}-%{release}
 
-%description -n pki-%{name}-javadoc
+%description javadoc
 This package contains API documentation for %{name}.
 
 %prep
@@ -140,9 +109,6 @@ 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
@@ -151,140 +117,89 @@ sed -i 's/\r//' LICENSE NOTICE
 %pom_remove_plugin :maven-jar-plugin yaml
 %pom_remove_plugin :maven-jar-plugin datatypes
 
-# 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
 
-# Circular dep?
+# Remove circular dep on resteasy in tests
-%pom_remove_dep org.jboss.resteasy:resteasy-jackson2-provider json
+%pom_remove_dep org.jboss.resteasy: json
 rm json/src/test/java/com/fasterxml/jackson/jaxrs/json/resteasy/RestEasyProviderLoadingTest.java
 
-%if %{with jp_minimal}
+# Don't build test classes
-# Disable extra test deps
+%pom_remove_dep org.eclipse.jetty:
 %pom_remove_dep org.glassfish.jersey.core:
 %pom_remove_dep org.glassfish.jersey.containers:
-# Disable extra providers
+%pom_remove_dep org.codehaus.woodstox: xml
+# XXX: is there a better way to disable building tests?
+rm -rf */src/test
+
+%if ! %{with cbor}
 %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
-%if %{with jp_minimal}
-%mvn_build -s -f
-%else
 %mvn_build -s 
-%endif
 
 %install
 %mvn_install
 
-%files -n pki-%{name} -f .mfiles-jackson-jaxrs-base
+%files -f .mfiles-jackson-jaxrs-base
 %doc README.md release-notes/*
 %license LICENSE NOTICE
 
-%files -n pki-jackson-jaxrs-json-provider -f .mfiles-jackson-jaxrs-json-provider
+%if %{with cbor}
-%if %{without jp_minimal}
+%files -n jackson-jaxrs-cbor-provider -f .mfiles-jackson-jaxrs-cbor-provider
-%files -n pki-jackson-jaxrs-cbor-provider -f .mfiles-jackson-jaxrs-cbor-provider
-%files -n pki-jackson-jaxrs-smile-provider -f .mfiles-jackson-jaxrs-smile-provider
-%files -n pki-jackson-jaxrs-xml-provider -f .mfiles-jackson-jaxrs-xml-provider
-%files -n pki-jackson-jaxrs-yaml-provider -f .mfiles-jackson-jaxrs-yaml-provider
 %endif
 
-%files -n pki-%{name}-datatypes -f .mfiles-jackson-datatype-jaxrs
+%files -n jackson-jaxrs-json-provider -f .mfiles-jackson-jaxrs-json-provider
-%license LICENSE NOTICE
-
-%files -n pki-%{name}-parent -f .mfiles-jackson-jaxrs-providers
-%license LICENSE NOTICE
-
-%files -n pki-%{name}-javadoc -f .mfiles-javadoc
-%license LICENSE NOTICE
-
-%changelog
-* Wed Nov 23 2022 Chris Kelley <ckelley@redhat.com> - 2.14.1-1
-- Update to version 2.14.1
-- Resolves: #2070122
-
-* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 2.11.4-7
-- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
-  Related: rhbz#1991688
-
-* Wed Jun 30 2021 Red Hat PKI Team <rhcs-maint@redhat.com> - 2.11.4-6
-- Replace jakarta-ws-rs with jboss-jaxrs-2.0-api
-
-* Wed Apr 28 2021 Red Hat PKI Team <rhcs-maint@redhat.com> - 2.11.4-5
-- Add Obsoletes and Conflicts
-
-* Thu Apr 22 2021 Red Hat PKI Team <rhcs-maint@redhat.com> - 2.11.4-4
-- Rename subpackages to pki-jackson
-
-* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 2.11.4-3
-- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
 
-* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.11.4-2
+%if %{with smile}
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+%files -n jackson-jaxrs-smile-provider -f .mfiles-jackson-jaxrs-smile-provider
-
+%endif
-* Mon Jan 18 2021 Fabio Valentini <decathorpe@gmail.com> - 2.11.4-1
-- Update to version 2.11.4.
-
-* Wed Oct 14 2020 Fabio Valentini <decathorpe@gmail.com> - 2.11.3-1
-- Update to version 2.11.3.
-
-* Sat Aug 08 2020 Fabio Valentini <decathorpe@gmail.com> - 2.11.2-1
-- Update to version 2.11.2.
-
-* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.11.1-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Fri Jul 10 2020 Jiri Vanek <jvanek@redhat.com> - 2.11.1-2
-- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11
-
-* Mon Jul 06 2020 Fabio Valentini <decathorpe@gmail.com> - 2.11.1-1
-- Update to version 2.11.1.
-
-* Mon May 25 2020 Fabio Valentini <decathorpe@gmail.com> - 2.11.0-1
-- Update to version 2.11.0.
-
-* Fri May 08 2020 Fabio Valentini <decathorpe@gmail.com> - 2.10.4-1
-- Update to version 2.10.4.
 
-* Tue Mar 03 2020 Fabio Valentini <decathorpe@gmail.com> - 2.10.3-1
+%if %{with xml}
-- Update to version 2.10.3.
+%files -n jackson-jaxrs-xml-provider -f .mfiles-jackson-jaxrs-xml-provider
+%endif
 
-* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.10.2-2
+%if %{with yaml}
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+%files -n jackson-jaxrs-yaml-provider -f .mfiles-jackson-jaxrs-yaml-provider
+%endif
 
-* Fri Jan 17 2020 Fabio Valentini <decathorpe@gmail.com> - 2.10.2-1
+%files datatypes -f .mfiles-jackson-datatype-jaxrs
-- Update to version 2.10.2.
+%license LICENSE NOTICE
 
-* Wed Nov 13 2019 Fabio Valentini <decathorpe@gmail.com> - 2.10.1-1
+%files parent -f .mfiles-jackson-jaxrs-providers
-- Update to version 2.10.1.
+%license LICENSE NOTICE
 
-* Tue Nov 12 2019 Alexander Scheel <ascheel@redhat.com> - 2.10.0-2
+%files javadoc -f .mfiles-javadoc
-- Minimize build dependencies.
+%license LICENSE NOTICE
 
-* Sun Oct 27 2019 Fabio Valentini <decathorpe@gmail.com> - 2.10.0-1
+%changelog
-- Update to version 2.10.0.
+* Sun Dec 10 2023 MSVSphere Packaging Team <packager@msvsphere-os.ru> - 2.9.9-1
-- Build with minimized dependencies.
+- Rebuilt for MSVSphere 8.8
 
-* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.9.8-2
+* Wed Jul 31 2019 Red Hat PKI Team <rhcs-maint@redhat.com> - 2.9.9-1
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+- Update to latest upstream release
 
 * Wed Feb 06 2019 Mat Booth <mat.booth@redhat.com> - 2.9.8-1
 - Update to latest upstream release
 
-* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.9.4-5
+* Thu Aug 02 2018 Fraser Tweedale <ftweedal@redhat.com> - 2.9.4-3.1
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+- Fix circular dependency on resteasy
-
-* Fri Sep 07 2018 Mat Booth <mat.booth@redhat.com> - 2.9.4-4
-- Allow conditional building of modules that have extra deps
 
-* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.9.4-3
+* Fri Jul 27 2018 Fraser Tweedale <ftweedal@redhat.com> - 2.9.4-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+- Disable cbor, smile, xml and yaml subpackages, and tests
 
 * Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.9.4-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild