rpms/resteasy
5
0
Fork 0
Code Issues Pull Requests Releases Activity

Fix failure to build from source

Browse Source
This commit is contained in:
Mat Booth 2016-02-22 09:42:46 +00:00
parent 65acab20ee
commit d03d37fef3
2 changed files with 38 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
0004-fix-deprecated-api-usage.patch Normal file
View File

@ -0,0 +1,32 @@
diff --git a/jaxrs/providers/jackson2/src/main/java/org/jboss/resteasy/plugins/providers/jackson/ResteasyJackson2Provider.java b/jaxrs/providers/jackson2/src/main/java/org/jboss/resteasy/plugins/providers/jackson/ResteasyJackson2Provider.java
index bf9a5f5..21d0886 100644
--- a/jaxrs/providers/jackson2/src/main/java/org/jboss/resteasy/plugins/providers/jackson/ResteasyJackson2Provider.java
+++ b/jaxrs/providers/jackson2/src/main/java/org/jboss/resteasy/plugins/providers/jackson/ResteasyJackson2Provider.java
@@ -64,7 +64,7 @@ public class ResteasyJackson2Provider extends JacksonJaxbJsonProvider
private ClassAnnotationKey(Class<?> clazz, Annotation[] annotations)
{
- this.annotations = new AnnotationBundleKey(annotations);
+ this.annotations = new AnnotationBundleKey(annotations, AnnotationBundleKey.class);
this.classKey = new ClassKey(clazz);
hash = this.annotations.hashCode();
hash = 31 * hash + classKey.hashCode();
@@ -104,7 +104,7 @@ public class ResteasyJackson2Provider extends JacksonJaxbJsonProvider
// not yet resolved (or not cached any more)? Resolve!
if (endpoint == null) {
ObjectMapper mapper = locateMapper(type, mediaType);
- endpoint = _configForReading(mapper, annotations);
+ endpoint = _configForReading(mapper, annotations, type);
_readers.put(key, endpoint);
}
ObjectReader reader = endpoint.getReader();
@@ -134,7 +134,7 @@ public class ResteasyJackson2Provider extends JacksonJaxbJsonProvider
// not yet resolved (or not cached any more)? Resolve!
if (endpoint == null) {
ObjectMapper mapper = locateMapper(type, mediaType);
- endpoint = _configForWriting(mapper, annotations);
+ endpoint = _configForWriting(mapper, annotations, type);
// and cache for future reuse
_writers.put(key, endpoint);
}

7
resteasy.spec
View File

@ -3,7 +3,7 @@
Name: resteasy
Version: 3.0.6
Release: 10%{?dist}
Release: 11%{?dist}
Summary: Framework for RESTful Web services and Java applications
License: ASL 2.0 and CDDL
URL: http://www.jboss.org/resteasy
@ -13,6 +13,7 @@ Source0: https://github.com/resteasy/Resteasy/archive/%{namedversion}.tar.gz
Patch0: 0001-Mime4j-0.7.2-support.patch
Patch1: 0002-bcmail-api-change.patch
Patch2: 0003-resteasy-cve-2014-3490.patch
Patch3: 0004-fix-deprecated-api-usage.patch
BuildArch: noarch
@ -313,6 +314,7 @@ done
%patch0 -p1
%patch1 -p0
%patch2 -p1
%patch3 -p1
# additional gId:aId for jaxrs-api
%mvn_alias ":jaxrs-api" "org.jboss.spec.javax.ws.rs:jboss-jaxrs-api_1.1_spec"
@ -385,6 +387,9 @@ done
%changelog
* Mon Feb 22 2016 Mat Booth <mat.booth@redhat.com> - 3.0.6-11
- Fix failure to build from source
* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.6-10
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild