diff --git a/.gitignore b/.gitignore index 2bfb048..6e9efe1 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /jackson-jaxrs-providers-2.4.1.tar.gz /jackson-jaxrs-providers-2.4.2.tar.gz /jackson-jaxrs-providers-2.5.0.tar.gz +/jackson-jaxrs-providers-2.6.2.tar.gz diff --git a/jackson-jaxrs-providers.spec b/jackson-jaxrs-providers.spec index 4ba89e6..35423c0 100644 --- a/jackson-jaxrs-providers.spec +++ b/jackson-jaxrs-providers.spec @@ -1,19 +1,32 @@ Name: jackson-jaxrs-providers -Version: 2.5.0 -Release: 2%{?dist} +Version: 2.6.2 +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 - +BuildRequires: maven-local BuildRequires: mvn(com.fasterxml.jackson:jackson-parent:pom:) BuildRequires: mvn(com.fasterxml.jackson.core:jackson-core) BuildRequires: mvn(com.fasterxml.jackson.core:jackson-databind) 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-yaml) BuildRequires: mvn(com.fasterxml.jackson.module:jackson-module-jaxb-annotations) +BuildRequires: mvn(com.google.code.maven-replacer-plugin:replacer) +BuildRequires: mvn(com.sun.jersey:jersey-core:1) +BuildRequires: mvn(com.sun.jersey:jersey-server:1) +BuildRequires: mvn(com.sun.jersey:jersey-servlet:1) BuildRequires: mvn(javax.ws.rs:jsr311-api) +BuildRequires: mvn(junit:junit) +BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) +BuildRequires: mvn(org.apache.maven.plugins:maven-enforcer-plugin) +BuildRequires: mvn(org.apache.maven.plugins:maven-site-plugin) +BuildRequires: mvn(org.apache.maven.plugins:maven-source-plugin) +BuildRequires: mvn(org.codehaus.mojo:build-helper-maven-plugin) +BuildRequires: mvn(org.eclipse.jetty:jetty-server) +BuildRequires: mvn(org.eclipse.jetty:jetty-servlet) # Disabled for now, too many problems # https://github.com/FasterXML/jackson-jaxrs-providers/issues/20 @@ -24,24 +37,6 @@ BuildRequires: mvn(org.codehaus.woodstox:stax2-api) BuildRequires: mvn(org.codehaus.woodstox:woodstox-core-asl) %endif -# test deps -BuildRequires: mvn(com.sun.jersey:jersey-core:1.19) -BuildRequires: mvn(com.sun.jersey:jersey-server:1.19) -BuildRequires: mvn(com.sun.jersey:jersey-servlet:1.19) -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 -BuildRequires: maven-plugin-build-helper -BuildRequires: maven-plugin-bundle -BuildRequires: maven-site-plugin -BuildRequires: maven-source-plugin -BuildRequires: maven-surefire-provider-junit -BuildRequires: replacer - BuildArch: noarch %description @@ -52,6 +47,7 @@ following data formats: * Smile (https://github.com/FasterXML/jackson-dataformat-smile) * XML (https://github.com/FasterXML/jackson-dataformat-xml) * CBOR (https://github.com/FasterXML/jackson-dataformat-cbor) +* YAML (https://github.com/FasterXML/jackson-dataformat-yaml) %package -n jackson-jaxrs-cbor-provider Summary: Jackson-JAXRS-CBOR @@ -62,8 +58,6 @@ Functionality to handle CBOR encoded input/output for JAX-RS implementations %package -n jackson-jaxrs-json-provider Summary: Jackson-JAXRS-JSON -Provides: jackson2-jaxrs-json-provider = %{version}-%{release} -Obsoletes: jackson2-jaxrs-json-provider < 2.1.5-3 %description -n jackson-jaxrs-json-provider Functionality to handle JSON input/output for JAX-RS implementations @@ -86,6 +80,13 @@ Functionality to handle Smile XML input/output for JAX-RS implementations (like Jersey and RESTeasy) using standard Jackson data binding. %endif +%package -n jackson-jaxrs-yaml-provider +Summary: Jackson-JAXRS-YAML + +%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. + %package javadoc Summary: Javadoc for %{name} @@ -111,7 +112,7 @@ rm xml/src/test/java/com/fasterxml/jackson/jaxrs/xml/TestCanDeserialize.java \ %pom_disable_module xml %endif -%pom_xpath_set "pom:properties/pom:version.jersey" 1.19 +%pom_xpath_set "pom:properties/pom:version.jersey" 1 # Circular dep? %pom_remove_dep org.jboss.resteasy:resteasy-jackson2-provider json @@ -145,10 +146,16 @@ rm json/src/test/java/com/fasterxml/jackson/jaxrs/json/resteasy/RestEasyProvider %license LICENSE NOTICE %endif +%files -n jackson-jaxrs-yaml-provider -f .mfiles-jackson-jaxrs-yaml-provider +%license LICENSE NOTICE + %files javadoc -f .mfiles-javadoc %license LICENSE NOTICE %changelog +* Mon Sep 28 2015 gil cattaneo 2.6.2-1 +- update to 2.6.2 + * Wed Jun 17 2015 Fedora Release Engineering - 2.5.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild diff --git a/sources b/sources index b126a2b..84e6234 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ba148259aface5fc05e0786f1b90d8cf jackson-jaxrs-providers-2.5.0.tar.gz +ed6cce4280c4d9d296405c55317e861e jackson-jaxrs-providers-2.6.2.tar.gz