build fix for netty 3.10.6.Final
This commit is contained in:
parent
e072b0731b
commit
a127c64a7b
68
resteasy-3.0.19-port-resteasy-netty-to-netty-3.10.6.patch
Normal file
68
resteasy-3.0.19-port-resteasy-netty-to-netty-3.10.6.patch
Normal file
@ -0,0 +1,68 @@
|
|||||||
|
diff -Nru Resteasy-3.0.19.Final/jaxrs/pom.xml Resteasy-3.0.19.Final.netty3/jaxrs/pom.xml
|
||||||
|
--- Resteasy-3.0.19.Final/jaxrs/pom.xml 2016-12-27 11:13:52.980803759 +0100
|
||||||
|
+++ Resteasy-3.0.19.Final.netty3/jaxrs/pom.xml 2016-12-27 11:15:46.080178186 +0100
|
||||||
|
@@ -39,7 +39,7 @@
|
||||||
|
<dep.cdi-api.version>1.2</dep.cdi-api.version>
|
||||||
|
<dep.jboss-ejb-api_3.1_spec.version>1.0.0.Final</dep.jboss-ejb-api_3.1_spec.version>
|
||||||
|
<dep.guice.version>4.0</dep.guice.version>
|
||||||
|
- <dep.netty.version>3.6.4.Final</dep.netty.version>
|
||||||
|
+ <dep.netty.version>3.10.6.Final</dep.netty.version>
|
||||||
|
<dep.netty4.version>4.0.7.Final</dep.netty4.version>
|
||||||
|
<dep.slf4j.version>1.7.5</dep.slf4j.version>
|
||||||
|
<dep.bc.version>1.52</dep.bc.version>
|
||||||
|
diff -Nru Resteasy-3.0.19.Final/jaxrs/server-adapters/resteasy-netty/src/main/java/org/jboss/resteasy/plugins/server/netty/NettyHttpResponse.java Resteasy-3.0.19.Final.netty3/jaxrs/server-adapters/resteasy-netty/src/main/java/org/jboss/resteasy/plugins/server/netty/NettyHttpResponse.java
|
||||||
|
--- Resteasy-3.0.19.Final/jaxrs/server-adapters/resteasy-netty/src/main/java/org/jboss/resteasy/plugins/server/netty/NettyHttpResponse.java 2016-08-02 16:26:27.000000000 +0200
|
||||||
|
+++ Resteasy-3.0.19.Final.netty3/jaxrs/server-adapters/resteasy-netty/src/main/java/org/jboss/resteasy/plugins/server/netty/NettyHttpResponse.java 2016-12-27 11:14:53.477794634 +0100
|
||||||
|
@@ -119,8 +119,9 @@
|
||||||
|
if (keepAlive)
|
||||||
|
{
|
||||||
|
// Add keep alive and content length if needed
|
||||||
|
- response.addHeader(Names.CONNECTION, Values.KEEP_ALIVE);
|
||||||
|
- response.addHeader(Names.CONTENT_LENGTH, 0);
|
||||||
|
+ response.headers()
|
||||||
|
+ .add(Names.CONNECTION, Values.KEEP_ALIVE)
|
||||||
|
+ .add(Names.CONTENT_LENGTH, 0);
|
||||||
|
}
|
||||||
|
channel.write(response);
|
||||||
|
committed = true;
|
||||||
|
diff -Nru Resteasy-3.0.19.Final/jaxrs/server-adapters/resteasy-netty/src/main/java/org/jboss/resteasy/plugins/server/netty/NettyUtil.java Resteasy-3.0.19.Final.netty3/jaxrs/server-adapters/resteasy-netty/src/main/java/org/jboss/resteasy/plugins/server/netty/NettyUtil.java
|
||||||
|
--- Resteasy-3.0.19.Final/jaxrs/server-adapters/resteasy-netty/src/main/java/org/jboss/resteasy/plugins/server/netty/NettyUtil.java 2016-08-02 16:26:27.000000000 +0200
|
||||||
|
+++ Resteasy-3.0.19.Final.netty3/jaxrs/server-adapters/resteasy-netty/src/main/java/org/jboss/resteasy/plugins/server/netty/NettyUtil.java 2016-12-27 11:03:35.816979009 +0100
|
||||||
|
@@ -98,7 +98,7 @@
|
||||||
|
{
|
||||||
|
Headers<String> requestHeaders = new Headers<String>();
|
||||||
|
|
||||||
|
- for (Map.Entry<String, String> header : request.getHeaders())
|
||||||
|
+ for (Map.Entry<String, String> header : request.headers())
|
||||||
|
{
|
||||||
|
requestHeaders.add(header.getKey(), header.getValue());
|
||||||
|
}
|
||||||
|
diff -Nru Resteasy-3.0.19.Final/jaxrs/server-adapters/resteasy-netty/src/main/java/org/jboss/resteasy/plugins/server/netty/RestEasyHttpResponseEncoder.java Resteasy-3.0.19.Final.netty3/jaxrs/server-adapters/resteasy-netty/src/main/java/org/jboss/resteasy/plugins/server/netty/RestEasyHttpResponseEncoder.java
|
||||||
|
--- Resteasy-3.0.19.Final/jaxrs/server-adapters/resteasy-netty/src/main/java/org/jboss/resteasy/plugins/server/netty/RestEasyHttpResponseEncoder.java 2016-08-02 16:26:27.000000000 +0200
|
||||||
|
+++ Resteasy-3.0.19.Final.netty3/jaxrs/server-adapters/resteasy-netty/src/main/java/org/jboss/resteasy/plugins/server/netty/RestEasyHttpResponseEncoder.java 2016-12-27 11:05:34.884907810 +0100
|
||||||
|
@@ -58,11 +58,11 @@
|
||||||
|
RuntimeDelegate.HeaderDelegate delegate = dispatcher.providerFactory.getHeaderDelegate(value.getClass());
|
||||||
|
if (delegate != null)
|
||||||
|
{
|
||||||
|
- response.addHeader(key, delegate.toString(value));
|
||||||
|
+ response.headers().add(key, delegate.toString(value));
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
- response.setHeader(key, value.toString());
|
||||||
|
+ response.headers().add(key, value.toString());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
@@ -77,8 +77,9 @@
|
||||||
|
if (nettyResponse.isKeepAlive())
|
||||||
|
{
|
||||||
|
// Add content length and connection header if needed
|
||||||
|
- response.setHeader(Names.CONTENT_LENGTH, buffer.readableBytes());
|
||||||
|
- response.setHeader(Names.CONNECTION, Values.KEEP_ALIVE);
|
||||||
|
+ response.headers()
|
||||||
|
+ .set(Names.CONTENT_LENGTH, buffer.readableBytes())
|
||||||
|
+ .set(Names.CONNECTION, Values.KEEP_ALIVE);
|
||||||
|
}
|
||||||
|
return response;
|
||||||
|
}
|
@ -3,7 +3,7 @@
|
|||||||
|
|
||||||
Name: resteasy
|
Name: resteasy
|
||||||
Version: 3.0.19
|
Version: 3.0.19
|
||||||
Release: 3%{?dist}
|
Release: 4%{?dist}
|
||||||
Summary: Framework for RESTful Web services and Java applications
|
Summary: Framework for RESTful Web services and Java applications
|
||||||
License: ASL 2.0 and CDDL
|
License: ASL 2.0 and CDDL
|
||||||
URL: http://resteasy.jboss.org/
|
URL: http://resteasy.jboss.org/
|
||||||
@ -12,6 +12,8 @@ Source0: https://github.com/resteasy/Resteasy/archive/%{namedversion}/%{n
|
|||||||
# Support for mime4j 0.7.2
|
# Support for mime4j 0.7.2
|
||||||
Patch0: resteasy-3.0.19-Mime4j-0.7.2-support.patch
|
Patch0: resteasy-3.0.19-Mime4j-0.7.2-support.patch
|
||||||
|
|
||||||
|
Patch1: resteasy-3.0.19-port-resteasy-netty-to-netty-3.10.6.patch
|
||||||
|
|
||||||
BuildArch: noarch
|
BuildArch: noarch
|
||||||
|
|
||||||
BuildRequires: maven-local
|
BuildRequires: maven-local
|
||||||
@ -250,6 +252,7 @@ Summary: Test modules for %{name}
|
|||||||
find -name '*.jar' -print -delete
|
find -name '*.jar' -print -delete
|
||||||
|
|
||||||
%patch0 -p1
|
%patch0 -p1
|
||||||
|
%patch1 -p1
|
||||||
|
|
||||||
# Disable unnecesary modules
|
# Disable unnecesary modules
|
||||||
%pom_disable_module examples jaxrs
|
%pom_disable_module examples jaxrs
|
||||||
@ -418,6 +421,9 @@ done
|
|||||||
%license jaxrs/License.html
|
%license jaxrs/License.html
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Dec 27 2016 gil cattaneo <puntogil@libero.it> 3.0.19-4
|
||||||
|
- build fix for netty 3.10.6.Final
|
||||||
|
|
||||||
* Tue Sep 13 2016 gil cattaneo <puntogil@libero.it> 3.0.19-3
|
* Tue Sep 13 2016 gil cattaneo <puntogil@libero.it> 3.0.19-3
|
||||||
- re-introduce jandex jars
|
- re-introduce jandex jars
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user