From 58dc1e35df54657c745d5c576f673276ad0674da Mon Sep 17 00:00:00 2001 From: gil Date: Jul 04 2014 13:03:07 +0000 Subject: update to 2.4.1 --- 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/LICENSE-2.0.txt b/LICENSE-2.0.txt deleted file mode 100644 index d645695..0000000 --- a/LICENSE-2.0.txt +++ /dev/null @@ -1,202 +0,0 @@ - - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright [yyyy] [name of copyright owner] - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. 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:<1<...> but was:<1<...> 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 2.4.1-1 +- update to 2.4.1 + * Sat Jun 07 2014 Fedora Release Engineering - 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