[jackson-jaxrs-providers] update to 2.4.1

[gil]

commit 58dc1e35df54657c745d5c576f673276ad0674da
Author: gil <puntogil at libero.it>
Date:   Fri Jul 4 15:03:07 2014 +0200

    update to 2.4.1

 .gitignore                   |    1 +
 LICENSE-2.0.txt              |  202 ------------------------------------------
 jackson-jaxrs-providers.spec |   69 +++++++++++---
 sources                      |    2 +-
 4 files changed, 56 insertions(+), 218 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e8f98da..dede860 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /jackson-jaxrs-providers-2.2.2.tar.gz
+/jackson-jaxrs-providers-2.4.1.tar.gz
diff --git a/jackson-jaxrs-providers.spec b/jackson-jaxrs-providers.spec
index 391c023..604a4ee 100644
--- a/jackson-jaxrs-providers.spec
+++ b/jackson-jaxrs-providers.spec
@@ -1,18 +1,26 @@
+%if 0%{?fedora}
+# Unavailable deps
+%bcond_with cbor
+%endif
 Name:          jackson-jaxrs-providers
-Version:       2.2.2
-Release:       3%{?dist}
+Version:       2.4.1
+Release:       1%{?dist}
 Summary:       Jackson JAX-RS providers
 License:       ASL 2.0
 URL:           http://wiki.fasterxml.com/JacksonHome
 Source0:       https://github.com/FasterXML/jackson-jaxrs-providers/archive/%{name}-%{version}.tar.gz
-# jackson-jaxrs-json-provider package don't include the license file
-# https://github.com/FasterXML/jackson-jaxrs-json-provider/issues/23
-Source1:       http://www.apache.org/licenses/LICENSE-2.0.txt
 
-BuildRequires: java-devel
-BuildRequires: mvn(com.fasterxml:oss-parent)
+%if %{?fedora} > 20
+BuildRequires: mvn(com.fasterxml.jackson:jackson-parent:pom:)
+%else
+BuildRequires: mvn(com.fasterxml.jackson:jackson-parent)
+%endif
 BuildRequires: mvn(com.fasterxml.jackson.core:jackson-core)
 BuildRequires: mvn(com.fasterxml.jackson.core:jackson-databind)
+%if %{with cbor}
+# https://bugzilla.redhat.com/show_bug.cgi?id=1116363
+BuildRequires: mvn(com.fasterxml.jackson.dataformat:jackson-dataformat-cbor)
+%endif
 BuildRequires: mvn(com.fasterxml.jackson.dataformat:jackson-dataformat-smile)
 BuildRequires: mvn(com.fasterxml.jackson.module:jackson-module-jaxb-annotations)
 BuildRequires: mvn(javax.ws.rs:jsr311-api)
@@ -33,6 +41,7 @@ BuildRequires: mvn(com.sun.jersey:jersey-servlet)
 BuildRequires: mvn(junit:junit)
 BuildRequires: mvn(org.eclipse.jetty:jetty-server)
 BuildRequires: mvn(org.eclipse.jetty:jetty-servlet)
+#BuildRequires: mvn(org.jboss.resteasy:resteasy-jackson2-provider)
 
 BuildRequires: maven-local
 BuildRequires: maven-enforcer-plugin
@@ -53,6 +62,15 @@ following data formats:
 * Smile (https://github.com/FasterXML/jackson-dataformat-smile)
 * XML (https://github.com/FasterXML/jackson-dataformat-xml)
 
+%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
 Provides:      jackson2-jaxrs-json-provider = %{version}-%{release}
@@ -88,19 +106,32 @@ This package contains javadoc for %{name}.
 %prep
 %setup -q -n %{name}-%{name}-%{version}
 
-cp -p %{SOURCE1} .
-sed -i 's/\r//' LICENSE-2.0.txt
+cp -p xml/src/main/resources/META-INF/LICENSE .
+cp -p xml/src/main/resources/META-INF/NOTICE .
+sed -i 's/\r//' LICENSE NOTICE
+
 %if 0
 # these test fails e.g. expected:<<Bean[]><value1>1</value1><...> but was:<<Bean[ xmlns=""]><value1>1</value1><...>
 rm xml/src/test/java/com/fasterxml/jackson/jaxrs/xml/TestCanDeserialize.java \
   xml/src/test/java/com/fasterxml/jackson/jaxrs/xml/TestJacksonFeaturesWithXML.java \
   xml/src/test/java/com/fasterxml/jackson/jaxrs/xml/TestJsonView.java \
   xml/src/test/java/com/fasterxml/jackson/jaxrs/xml/TestRootType.java \
-  xml/src/test/java/com/fasterxml/jackson/jaxrs/xml/TestSerialize.java
+  xml/src/test/java/com/fasterxml/jackson/jaxrs/xml/TestSerialize.java \
+  xml/src/test/java/com/fasterxml/jackson/jaxrs/xml/jersey/SimpleEndpointTest.java
 %else
 %pom_disable_module xml
 %endif
 
+# 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
+
+# Disabled for now
+# Unavailable deps
+%if %{without cbor}
+%pom_disable_module cbor
+%endif
+
 %build
 
 %mvn_package ":jackson-jaxrs-providers" %{name}
@@ -112,23 +143,31 @@ rm xml/src/test/java/com/fasterxml/jackson/jaxrs/xml/TestCanDeserialize.java \
 %mvn_install
 
 %files -f .mfiles-%{name}
-%doc LICENSE-2.0.txt README.md release-notes/*
+%doc LICENSE NOTICE README.md release-notes/*
+
+%if %{with cbor}
+%files -n jackson-jaxrs-cbor-provider -f .mfiles-jackson-jaxrs-cbor-provider
+%doc LICENSE NOTICE
+%endif
 
 %files -n jackson-jaxrs-json-provider -f .mfiles-jackson-jaxrs-json-provider
-%doc LICENSE-2.0.txt
+%doc LICENSE NOTICE
 
 %files -n jackson-jaxrs-smile-provider -f .mfiles-jackson-jaxrs-smile-provider
-%doc LICENSE-2.0.txt
+%doc LICENSE NOTICE
 
 %if 0
 %files -n jackson-jaxrs-xml-provider -f .mfiles-jackson-jaxrs-xml-provider
-%doc LICENSE-2.0.txt
+%doc LICENSE NOTICE
 %endif
 
 %files javadoc -f .mfiles-javadoc
-%doc LICENSE-2.0.txt
+%doc LICENSE NOTICE
 
 %changelog
+* Fri Jul 04 2014 gil cattaneo <puntogil at libero.it> 2.4.1-1
+- update to 2.4.1
+
 * Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.2.2-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 
diff --git a/sources b/sources
index 0d8d878..cb72417 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d30a02ca5f04ca14a8c6082eb92961b0  jackson-jaxrs-providers-2.2.2.tar.gz
+c0739785a4452344ef04d77eb44cbfff  jackson-jaxrs-providers-2.4.1.tar.gz