diff --git a/.gitignore b/.gitignore index 1d484e2..a4ff515 100644 --- a/.gitignore +++ b/.gitignore @@ -1,9 +1,2 @@ -/jackson-jaxrs-providers-2.2.2.tar.gz -/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 -/jackson-jaxrs-providers-2.6.3.tar.gz -/jackson-jaxrs-providers-2.6.6.tar.gz -/jackson-jaxrs-providers-2.6.7.tar.gz -/jackson-jaxrs-providers-2.7.6.tar.gz +/jackson-jaxrs-providers-*.tar.gz +/*.src.rpm diff --git a/jackson-jaxrs-providers.spec b/jackson-jaxrs-providers.spec index f0e520f..903eab8 100644 --- a/jackson-jaxrs-providers.spec +++ b/jackson-jaxrs-providers.spec @@ -1,47 +1,40 @@ Name: jackson-jaxrs-providers -Version: 2.7.6 -Release: 3%{?dist} +Version: 2.9.4 +Release: 1%{?dist} Summary: Jackson JAX-RS providers License: ASL 2.0 -URL: http://wiki.fasterxml.com/JacksonHome +URL: https://github.com/FasterXML/jackson-jaxrs-providers 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-xml) -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.codehaus.woodstox:stax2-api) -BuildRequires: mvn(org.codehaus.woodstox:woodstox-core-asl) -BuildRequires: mvn(org.eclipse.jetty:jetty-server) -BuildRequires: mvn(org.eclipse.jetty:jetty-servlet) - -BuildArch: noarch +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.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(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(com.google.guava:guava) +BuildRequires: mvn(javax.ws.rs:javax.ws.rs-api) +BuildRequires: mvn(junit:junit) +BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) +BuildRequires: mvn(org.codehaus.woodstox:stax2-api) +BuildRequires: mvn(org.codehaus.woodstox:woodstox-core-asl) +BuildRequires: mvn(org.eclipse.jetty:jetty-server) +BuildRequires: mvn(org.eclipse.jetty:jetty-servlet) +BuildRequires: mvn(org.glassfish.jersey.containers:jersey-container-servlet) +BuildRequires: mvn(org.glassfish.jersey.core:jersey-server) +BuildRequires: mvn(org.jboss.resteasy:resteasy-jaxrs) +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 (https://github.com/FasterXML/jackson-core) -* 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) +following data formats: JSON, Smile (binary JSON), XML, CBOR (another kind of +binary JSON), YAML. %package -n jackson-jaxrs-cbor-provider Summary: Jackson-JAXRS-CBOR @@ -79,17 +72,23 @@ Summary: Jackson-JAXRS-YAML Functionality to handle YAML input/output for JAX-RS implementations (like Jersey and RESTeasy) using standard Jackson data binding. +%package datatypes +Summary: Functionality for reading/writing core JAX-RS helper types + +%description datatypes +Functionality for reading/writing core JAX-RS helper types. + %package parent -Summary: Jackson JAX-RS providers Parent POM +Summary: Parent for Jackson JAX-RS providers %description parent Parent POM for Jackson JAX-RS providers. %package javadoc -Summary: Javadoc for %{name} +Summary: Javadoc for %{name} %description javadoc -This package contains javadoc for %{name}. +This package contains API documentation for %{name}. %prep %setup -q -n %{name}-%{name}-%{version} @@ -98,21 +97,23 @@ 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_xpath_set "pom:properties/pom:version.jersey" 1 - # Disable jar with no-meta-inf-services classifier, breaks build %pom_remove_plugin :maven-jar-plugin cbor %pom_remove_plugin :maven-jar-plugin json %pom_remove_plugin :maven-jar-plugin smile %pom_remove_plugin :maven-jar-plugin xml %pom_remove_plugin :maven-jar-plugin yaml +%pom_remove_plugin :maven-jar-plugin datatypes + +# 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? %pom_remove_dep org.jboss.resteasy:resteasy-jackson2-provider json rm json/src/test/java/com/fasterxml/jackson/jaxrs/json/resteasy/RestEasyProviderLoadingTest.java %build - %mvn_build -s %install @@ -127,6 +128,10 @@ rm json/src/test/java/com/fasterxml/jackson/jaxrs/json/resteasy/RestEasyProvider %files -n jackson-jaxrs-smile-provider -f .mfiles-jackson-jaxrs-smile-provider %files -n jackson-jaxrs-xml-provider -f .mfiles-jackson-jaxrs-xml-provider %files -n jackson-jaxrs-yaml-provider -f .mfiles-jackson-jaxrs-yaml-provider + +%files datatypes -f .mfiles-jackson-datatype-jaxrs +%license LICENSE NOTICE + %files parent -f .mfiles-jackson-jaxrs-providers %license LICENSE NOTICE @@ -134,6 +139,9 @@ rm json/src/test/java/com/fasterxml/jackson/jaxrs/json/resteasy/RestEasyProvider %license LICENSE NOTICE %changelog +* Wed Jan 24 2018 Mat Booth - 2.9.4-1 +- Update to latest upstream release + * Wed Jul 26 2017 Fedora Release Engineering - 2.7.6-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild diff --git a/sources b/sources index 856d3a1..88e8d07 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -cb5e10cc5e038e03a7f7426505213ed3 jackson-jaxrs-providers-2.7.6.tar.gz +SHA512 (jackson-jaxrs-providers-2.9.4.tar.gz) = cc7262065c88e43025015d3460b429e66cec9ec57e3982174e3ed305e5b5cd2b587b760a9fe5c405d2d6327394bf184eedbecb3da00c6a4811bb48ef7a48148c