This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository resteasy.
commit 3b3027e01364b6bee271f6c0165fb5b7391b74ff Author: Emmanuel Bourg <[email protected]> Date: Wed Jan 18 01:01:03 2017 +0100 Refreshed the patches --- debian/changelog | 8 + debian/patches/01-ignore-tjws.patch | 8 +- debian/patches/02-servlet-api-compatibility.patch | 180 ---------------------- debian/patches/series | 1 - 4 files changed, 12 insertions(+), 185 deletions(-) diff --git a/debian/changelog b/debian/changelog index 6b9efe9..3c27377 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +resteasy (3.1.0-1) UNRELEASED; urgency=medium + + * Team upload. + * New upstream release + - Refreshed the patches + + -- Emmanuel Bourg <[email protected]> Wed, 18 Jan 2017 00:33:19 +0100 + resteasy (3.0.19-3) unstable; urgency=medium * Team upload. diff --git a/debian/patches/01-ignore-tjws.patch b/debian/patches/01-ignore-tjws.patch index 4a262d0..b8c62a1 100644 --- a/debian/patches/01-ignore-tjws.patch +++ b/debian/patches/01-ignore-tjws.patch @@ -1,11 +1,11 @@ Description: Disables the TJWS module (deprecated upstream, limited to the Servlet API 2.5) Author: Emmanuel Bourg <[email protected]> Forwarded: not-needed ---- a/jaxrs/resteasy-jaxrs/pom.xml -+++ b/jaxrs/resteasy-jaxrs/pom.xml -@@ -142,6 +142,18 @@ +--- a/resteasy-jaxrs/pom.xml ++++ b/resteasy-jaxrs/pom.xml +@@ -123,6 +123,18 @@ + <groupId>com.atlassian.maven.plugins</groupId> <artifactId>maven-clover2-plugin</artifactId> - <version>3.1.6</version> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> diff --git a/debian/patches/02-servlet-api-compatibility.patch b/debian/patches/02-servlet-api-compatibility.patch deleted file mode 100644 index 28113c1..0000000 --- a/debian/patches/02-servlet-api-compatibility.patch +++ /dev/null @@ -1,180 +0,0 @@ -Description: Fixes the compatibility with the latest version of the Servlet API -Author: Emmanuel Bourg <[email protected]> -Forwarded: no ---- a/jaxrs/resteasy-jaxrs/src/main/java/org/jboss/resteasy/core/ResteasyHttpServletResponseWrapper.java -+++ b/jaxrs/resteasy-jaxrs/src/main/java/org/jboss/resteasy/core/ResteasyHttpServletResponseWrapper.java -@@ -260,4 +260,28 @@ - { - proxy.setStatus(sc, sm); - } -+ -+ @Override -+ public int getStatus() -+ { -+ return proxy.getStatus(); -+ } -+ -+ @Override -+ public String getHeader(String name) -+ { -+ return proxy.getHeader(name); -+ } -+ -+ @Override -+ public java.util.Collection<String> getHeaders(String name) -+ { -+ return proxy.getHeaders(name); -+ } -+ -+ @Override -+ public java.util.Collection<String> getHeaderNames() -+ { -+ return proxy.getHeaderNames(); -+ } - } ---- a/jaxrs/resteasy-jaxrs/src/main/java/org/jboss/resteasy/util/HttpServletRequestDelegate.java -+++ b/jaxrs/resteasy-jaxrs/src/main/java/org/jboss/resteasy/util/HttpServletRequestDelegate.java -@@ -300,4 +300,94 @@ - { - return delegate.getLocalAddr(); - } -+ -+ @Override -+ public String changeSessionId() -+ { -+ return delegate.changeSessionId(); -+ } -+ -+ @Override -+ public boolean authenticate(javax.servlet.http.HttpServletResponse response) throws IOException, javax.servlet.ServletException -+ { -+ return delegate.authenticate(response); -+ } -+ -+ @Override -+ public void login(String username, String password) throws javax.servlet.ServletException -+ { -+ delegate.login(username, password); -+ } -+ -+ @Override -+ public void logout() throws javax.servlet.ServletException -+ { -+ delegate.logout(); -+ } -+ -+ @Override -+ public java.util.Collection<javax.servlet.http.Part> getParts() throws IOException, javax.servlet.ServletException -+ { -+ return delegate.getParts(); -+ } -+ -+ @Override -+ public javax.servlet.http.Part getPart(String name) throws IOException, javax.servlet.ServletException -+ { -+ return delegate.getPart(name); -+ } -+ -+ @Override -+ public <T extends javax.servlet.http.HttpUpgradeHandler> T upgrade(Class<T> handlerClass) throws IOException, javax.servlet.ServletException -+ { -+ return delegate.upgrade(handlerClass); -+ } -+ -+ @Override -+ public long getContentLengthLong() -+ { -+ return delegate.getContentLengthLong(); -+ } -+ -+ @Override -+ public javax.servlet.ServletContext getServletContext() -+ { -+ return delegate.getServletContext(); -+ } -+ -+ @Override -+ public javax.servlet.AsyncContext startAsync() throws IllegalStateException -+ { -+ return delegate.startAsync(); -+ } -+ -+ @Override -+ public javax.servlet.AsyncContext startAsync(javax.servlet.ServletRequest request, javax.servlet.ServletResponse response) throws IllegalStateException -+ { -+ return delegate.startAsync(request, response); -+ } -+ -+ @Override -+ public boolean isAsyncStarted() -+ { -+ return delegate.isAsyncStarted(); -+ } -+ -+ @Override -+ public boolean isAsyncSupported() -+ { -+ return delegate.isAsyncSupported(); -+ } -+ -+ @Override -+ public javax.servlet.AsyncContext getAsyncContext() -+ { -+ return delegate.getAsyncContext(); -+ } -+ -+ @Override -+ public javax.servlet.DispatcherType getDispatcherType() -+ { -+ return delegate.getDispatcherType(); -+ } - } ---- a/jaxrs/resteasy-jaxrs/src/main/java/org/jboss/resteasy/core/ResteasyHttpServletRequestWrapper.java -+++ b/jaxrs/resteasy-jaxrs/src/main/java/org/jboss/resteasy/core/ResteasyHttpServletRequestWrapper.java -@@ -200,4 +200,46 @@ - { - return proxy.isRequestedSessionIdFromUrl(); - } -+ -+ @Override -+ public String changeSessionId() -+ { -+ return proxy.changeSessionId(); -+ } -+ -+ @Override -+ public boolean authenticate(javax.servlet.http.HttpServletResponse response) throws java.io.IOException, javax.servlet.ServletException -+ { -+ return proxy.authenticate(response); -+ } -+ -+ @Override -+ public void login(String username, String password) throws javax.servlet.ServletException -+ { -+ proxy.login(username, password); -+ } -+ -+ @Override -+ public void logout() throws javax.servlet.ServletException -+ { -+ proxy.logout(); -+ } -+ -+ @Override -+ public java.util.Collection<javax.servlet.http.Part> getParts() throws java.io.IOException, javax.servlet.ServletException -+ { -+ return proxy.getParts(); -+ } -+ -+ @Override -+ public javax.servlet.http.Part getPart(String name) throws java.io.IOException, javax.servlet.ServletException -+ { -+ return proxy.getPart(name); -+ } -+ -+ @Override -+ public <T extends javax.servlet.http.HttpUpgradeHandler> T upgrade(Class<T> handlerClass) throws java.io.IOException, javax.servlet.ServletException -+ { -+ return proxy.upgrade(handlerClass); -+ } - } diff --git a/debian/patches/series b/debian/patches/series index 42e096c..5b62eb9 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1 @@ 01-ignore-tjws.patch -02-servlet-api-compatibility.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/resteasy.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
