diff --git a/SOURCES/resteasy-3.0.6.Final-resteasy-1280539.patch b/SOURCES/resteasy-3.0.6.Final-resteasy-1280539.patch new file mode 100644 index 0000000..6c4e2d6 --- /dev/null +++ b/SOURCES/resteasy-3.0.6.Final-resteasy-1280539.patch @@ -0,0 +1,12 @@ +diff -up Resteasy-3.0.6.Final/pom.xml.1280539 Resteasy-3.0.6.Final/pom.xml +--- Resteasy-3.0.6.Final/pom.xml.1280539 2016-06-24 15:16:14.043320655 +0200 ++++ Resteasy-3.0.6.Final/pom.xml 2016-06-24 15:16:38.648927622 +0200 +@@ -5,7 +5,7 @@ + RESTEasy + org.jboss.resteasy + resteasy-pom +- 1.2.GA ++ 3.0.6 + pom + + http://rest-easy.org diff --git a/SOURCES/resteasy-3.0.6.Final-resteasy-1357624.patch b/SOURCES/resteasy-3.0.6.Final-resteasy-1357624.patch new file mode 100644 index 0000000..44bc080 --- /dev/null +++ b/SOURCES/resteasy-3.0.6.Final-resteasy-1357624.patch @@ -0,0 +1,22 @@ +diff -up Resteasy-3.0.6.Final/pom.xml.1357624 Resteasy-3.0.6.Final/pom.xml +--- Resteasy-3.0.6.Final/pom.xml.1357624 2016-07-28 12:11:35.780819192 +0200 ++++ Resteasy-3.0.6.Final/pom.xml 2016-07-28 12:13:14.163986190 +0200 +@@ -8,6 +8,18 @@ + 3.0.6 + pom + ++ ++ ++ disable-java8-doclint ++ ++ [1.8,) ++ ++ ++ -Xdoclint:none ++ ++ ++ ++ + http://rest-easy.org + + diff --git a/SOURCES/resteasy-3.0.6.Final-resteasy-1378619.patch b/SOURCES/resteasy-3.0.6.Final-resteasy-1378619.patch new file mode 100644 index 0000000..276c033 --- /dev/null +++ b/SOURCES/resteasy-3.0.6.Final-resteasy-1378619.patch @@ -0,0 +1,11 @@ +diff -up Resteasy-3.0.6.Final/jaxrs/resteasy-jaxrs/src/main/resources/META-INF/services/javax.ws.rs.ext.Providers.1378619 Resteasy-3.0.6.Final/jaxrs/resteasy-jaxrs/src/main/resources/META-INF/services/javax.ws.rs.ext.Providers +--- Resteasy-3.0.6.Final/jaxrs/resteasy-jaxrs/src/main/resources/META-INF/services/javax.ws.rs.ext.Providers.1378619 2016-09-26 17:16:26.991046613 -0400 ++++ Resteasy-3.0.6.Final/jaxrs/resteasy-jaxrs/src/main/resources/META-INF/services/javax.ws.rs.ext.Providers 2016-09-26 17:17:19.504200735 -0400 +@@ -12,7 +12,6 @@ org.jboss.resteasy.plugins.providers.Fil + org.jboss.resteasy.plugins.providers.FileRangeWriter + org.jboss.resteasy.plugins.providers.StreamingOutputProvider + org.jboss.resteasy.plugins.providers.IIOImageProvider +-org.jboss.resteasy.plugins.providers.SerializableProvider + org.jboss.resteasy.plugins.interceptors.CacheControlFeature + org.jboss.resteasy.plugins.interceptors.encoding.AcceptEncodingGZIPInterceptor + org.jboss.resteasy.plugins.interceptors.encoding.AcceptEncodingGZIPFilter diff --git a/SPECS/resteasy-base.spec b/SPECS/resteasy-base.spec index dc87ecd..f3dc639 100644 --- a/SPECS/resteasy-base.spec +++ b/SPECS/resteasy-base.spec @@ -4,7 +4,7 @@ Name: resteasy-base Version: 3.0.6 -Release: 1%{?dist} +Release: 4%{?dist} Summary: Framework for RESTful Web services and Java applications License: ASL 2.0 and CDDL URL: http://www.jboss.org/resteasy @@ -16,6 +16,9 @@ Source0: %{prodname}-%{namedversion}.tar.gz Patch0: 0001-Mime4j-0.7.2-support.patch Patch1: 0002-bcmail-api-change.patch Patch2: %{prodname}-%{namedversion}-resteasy-1073.patch +Patch3: %{prodname}-%{namedversion}-resteasy-1280539.patch +Patch4: %{prodname}-%{namedversion}-resteasy-1357624.patch +Patch5: %{prodname}-%{namedversion}-resteasy-1378619.patch BuildArch: noarch @@ -216,6 +219,9 @@ done %patch0 -p1 %patch1 -p0 %patch2 -p1 +%patch3 -p1 +%patch4 -p1 +%patch5 -p1 # additional gId:aId for jaxrs-api %mvn_alias ":jaxrs-api" "org.jboss.spec.javax.ws.rs:jboss-jaxrs-api_1.1_spec" @@ -262,6 +268,15 @@ done %changelog +* Mon Sep 26 2016 Ade Lee - 3.0.6-4 +- Resolves: rhbz1378619 - disable SerializerProvider by default + +* Thu Jul 28 2016 Ade Lee - 3.0.6-3 +- Resolves: rhbz1357624 - fail to build with java 8 + +* Fri Jun 24 2016 Ade Lee - 3.0.6-2 +- Resolves: rhbz1280539 - fix pom version + * Sun Sep 7 2014 Ade Lee - 3.0.6-1 - Resolves: rhbz1139067 - rebase to 3.0.6