This is an automated email from the git hooks/post-receive script. jamespage pushed a commit to branch master in repository stapler.
commit 4d66aaf35b33956a1ea95db36ab25c4fd43d1f13 Author: James Page <[email protected]> Date: Mon Aug 12 09:46:43 2013 +0100 Switch to using git patch-queue for patch management. --- debian/changelog | 1 + debian/patches/0001-beanutils18-compat.patch | 21 ++++ debian/patches/0002-disable-jruby-bindings.patch | 20 +++ ...ovy-build.patch => 0003-fix-groovy-build.patch} | 13 +- debian/patches/0004-disable-jrebel-bindings.patch | 20 +++ ...e-asm3.patch => 0005-revert-kohsuke-asm3.patch} | 17 +-- ...25-compat.patch => 0006-servlet25-compat.patch} | 19 ++- debian/patches/0007-Remove-use-of-findbugs.patch | 128 ++++++++++++++++++++ debian/patches/beanutils18-compat.patch | 16 --- debian/patches/disable-jrebel-bindings.patch | 14 --- debian/patches/disable-jruby-bindings.patch | 14 --- debian/patches/series | 13 +- 12 files changed, 229 insertions(+), 67 deletions(-) diff --git a/debian/changelog b/debian/changelog index 7150d03..3fbcf20 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ stapler (1.207-1) UNRELEASED; urgency=low * New upstream release. + * Switch to using git patch-queue for patch management. -- James Page <[email protected]> Mon, 12 Aug 2013 09:38:51 +0100 diff --git a/debian/patches/0001-beanutils18-compat.patch b/debian/patches/0001-beanutils18-compat.patch new file mode 100644 index 0000000..73ffa5e --- /dev/null +++ b/debian/patches/0001-beanutils18-compat.patch @@ -0,0 +1,21 @@ +From: Debian Java Maintainers <[email protected]> +Date: Mon, 12 Aug 2013 09:43:30 +0100 +Subject: beanutils18-compat + +--- + core/src/main/java/org/kohsuke/stapler/RequestImpl.java | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/core/src/main/java/org/kohsuke/stapler/RequestImpl.java b/core/src/main/java/org/kohsuke/stapler/RequestImpl.java +index f804740..f22a001 100644 +--- a/core/src/main/java/org/kohsuke/stapler/RequestImpl.java ++++ b/core/src/main/java/org/kohsuke/stapler/RequestImpl.java +@@ -656,7 +656,7 @@ public class RequestImpl extends HttpServletRequestWrapper implements StaplerReq + if (converter==null) + throw new IllegalArgumentException("Unable to convert to "+type); + +- l.add(converter.convert(type,o)); ++ l.add(converter.convert(l.itemType,o)); + return l.toCollection(); + } + } diff --git a/debian/patches/0002-disable-jruby-bindings.patch b/debian/patches/0002-disable-jruby-bindings.patch new file mode 100644 index 0000000..9b28cd3 --- /dev/null +++ b/debian/patches/0002-disable-jruby-bindings.patch @@ -0,0 +1,20 @@ +From: Debian Java Maintainers <[email protected]> +Date: Mon, 12 Aug 2013 09:43:30 +0100 +Subject: disable-jruby-bindings + +--- + pom.xml | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/pom.xml b/pom.xml +index 81375f2..783cd2c 100644 +--- a/pom.xml ++++ b/pom.xml +@@ -13,7 +13,6 @@ + <module>core</module> + <module>jsp</module> + <module>jelly</module> +- <module>jruby</module> + <module>groovy</module> + <module>jrebel</module> + </modules> diff --git a/debian/patches/fix-groovy-build.patch b/debian/patches/0003-fix-groovy-build.patch similarity index 58% rename from debian/patches/fix-groovy-build.patch rename to debian/patches/0003-fix-groovy-build.patch index def54b0..3bec69f 100644 --- a/debian/patches/fix-groovy-build.patch +++ b/debian/patches/0003-fix-groovy-build.patch @@ -1,8 +1,13 @@ -Description: Groovy module needs ant as well; not pulled in automatically - in Debian/Ubuntu so adding dependency as patch. -Author: James Page <[email protected]> -Forwarded: not-needed +From: Debian Java Maintainers <[email protected]> +Date: Mon, 12 Aug 2013 09:43:30 +0100 +Subject: fix-groovy-build +--- + groovy/pom.xml | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/groovy/pom.xml b/groovy/pom.xml +index 3ade703..1451926 100644 --- a/groovy/pom.xml +++ b/groovy/pom.xml @@ -22,6 +22,11 @@ diff --git a/debian/patches/0004-disable-jrebel-bindings.patch b/debian/patches/0004-disable-jrebel-bindings.patch new file mode 100644 index 0000000..4a9e675 --- /dev/null +++ b/debian/patches/0004-disable-jrebel-bindings.patch @@ -0,0 +1,20 @@ +From: Debian Java Maintainers <[email protected]> +Date: Mon, 12 Aug 2013 09:43:30 +0100 +Subject: disable-jrebel-bindings + +--- + pom.xml | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/pom.xml b/pom.xml +index 783cd2c..8dca04c 100644 +--- a/pom.xml ++++ b/pom.xml +@@ -14,7 +14,6 @@ + <module>jsp</module> + <module>jelly</module> + <module>groovy</module> +- <module>jrebel</module> + </modules> + + <url>http://stapler.kohsuke.org/</url> diff --git a/debian/patches/revert-kohsuke-asm3.patch b/debian/patches/0005-revert-kohsuke-asm3.patch similarity index 60% rename from debian/patches/revert-kohsuke-asm3.patch rename to debian/patches/0005-revert-kohsuke-asm3.patch index c9d0aa2..9860da4 100644 --- a/debian/patches/revert-kohsuke-asm3.patch +++ b/debian/patches/0005-revert-kohsuke-asm3.patch @@ -1,12 +1,13 @@ -Description: Stapler uses a forked version of asm3 to ensure that it - does not conflict with the asm2 used by Jenkins Core. - . - However, in Debian and Ubuntu Jenkins Core uses asm3 as well so rather - than carry the forked package in the archive we can revert to using - stock asm3 in this package. -Author: James Page <[email protected]> -Forwarded: not-needed +From: Debian Java Maintainers <[email protected]> +Date: Mon, 12 Aug 2013 09:43:30 +0100 +Subject: revert-kohsuke-asm3 +--- + core/src/main/java/org/kohsuke/stapler/ClassDescriptor.java | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +diff --git a/core/src/main/java/org/kohsuke/stapler/ClassDescriptor.java b/core/src/main/java/org/kohsuke/stapler/ClassDescriptor.java +index 3c14446..967fd86 100644 --- a/core/src/main/java/org/kohsuke/stapler/ClassDescriptor.java +++ b/core/src/main/java/org/kohsuke/stapler/ClassDescriptor.java @@ -24,11 +24,11 @@ diff --git a/debian/patches/servlet25-compat.patch b/debian/patches/0006-servlet25-compat.patch similarity index 53% rename from debian/patches/servlet25-compat.patch rename to debian/patches/0006-servlet25-compat.patch index 0c42c68..91cda10 100644 --- a/debian/patches/servlet25-compat.patch +++ b/debian/patches/0006-servlet25-compat.patch @@ -1,10 +1,17 @@ -Description: Compatiblity Patch for Servlet 2.5 Specification -Author: James Page <[email protected]> -Forwarded: not-needed +From: Debian Java Maintainers <[email protected]> +Date: Mon, 12 Aug 2013 09:43:30 +0100 +Subject: servlet25-compat +--- + .../test/java/org/kohsuke/stapler/MockRequest.java | 20 ++++++++++++++++++++ + .../java/org/kohsuke/stapler/MockServletContext.java | 4 ++++ + 2 files changed, 24 insertions(+) + +diff --git a/core/src/test/java/org/kohsuke/stapler/MockRequest.java b/core/src/test/java/org/kohsuke/stapler/MockRequest.java +index d8a9436..5a80c83 100644 --- a/core/src/test/java/org/kohsuke/stapler/MockRequest.java +++ b/core/src/test/java/org/kohsuke/stapler/MockRequest.java -@@ -267,4 +267,24 @@ public class MockRequest implements Http +@@ -267,4 +267,24 @@ public class MockRequest implements HttpServletRequest { // TODO throw new UnsupportedOperationException(); } @@ -29,9 +36,11 @@ Forwarded: not-needed + throw new UnsupportedOperationException(); + } } +diff --git a/core/src/test/java/org/kohsuke/stapler/MockServletContext.java b/core/src/test/java/org/kohsuke/stapler/MockServletContext.java +index e759ab1..4c6663b 100644 --- a/core/src/test/java/org/kohsuke/stapler/MockServletContext.java +++ b/core/src/test/java/org/kohsuke/stapler/MockServletContext.java -@@ -105,4 +105,8 @@ public class MockServletContext implemen +@@ -105,4 +105,8 @@ public class MockServletContext implements ServletContext { public String getServletContextName() { return null; } diff --git a/debian/patches/0007-Remove-use-of-findbugs.patch b/debian/patches/0007-Remove-use-of-findbugs.patch new file mode 100644 index 0000000..a0574d9 --- /dev/null +++ b/debian/patches/0007-Remove-use-of-findbugs.patch @@ -0,0 +1,128 @@ +From: James Page <[email protected]> +Date: Mon, 12 Aug 2013 09:45:41 +0100 +Subject: Remove use of findbugs + +findbugs is not yet packaged so drop references from codebase. +--- + core/pom.xml | 6 ------ + core/src/main/java/org/kohsuke/stapler/HttpRedirect.java | 5 ++--- + core/src/main/java/org/kohsuke/stapler/ResponseImpl.java | 9 ++++----- + core/src/main/java/org/kohsuke/stapler/StaplerResponse.java | 5 ++--- + 4 files changed, 8 insertions(+), 17 deletions(-) + +diff --git a/core/pom.xml b/core/pom.xml +index 957c1c0..cf06f68 100644 +--- a/core/pom.xml ++++ b/core/pom.xml +@@ -128,12 +128,6 @@ + <version>1.0.0</version> + <scope>test</scope> + </dependency> +- <dependency> +- <groupId>com.github.stephenc.findbugs</groupId> +- <artifactId>findbugs-annotations</artifactId> +- <version>1.3.9-1</version> +- <scope>provided</scope> +- </dependency> + </dependencies> + + <profiles> +diff --git a/core/src/main/java/org/kohsuke/stapler/HttpRedirect.java b/core/src/main/java/org/kohsuke/stapler/HttpRedirect.java +index 8d2724a..c80b222 100644 +--- a/core/src/main/java/org/kohsuke/stapler/HttpRedirect.java ++++ b/core/src/main/java/org/kohsuke/stapler/HttpRedirect.java +@@ -23,7 +23,6 @@ + + package org.kohsuke.stapler; + +-import edu.umd.cs.findbugs.annotations.NonNull; + import javax.servlet.ServletException; + import java.io.IOException; + +@@ -39,11 +38,11 @@ public final class HttpRedirect extends RuntimeException implements HttpResponse + private final int statusCode; + private final String url; + +- public HttpRedirect(@NonNull String url) { ++ public HttpRedirect(String url) { + this(SC_MOVED_TEMPORARILY,url); + } + +- public HttpRedirect(int statusCode, @NonNull String url) { ++ public HttpRedirect(int statusCode, String url) { + this.statusCode = statusCode; + if (url == null) { + throw new NullPointerException(); +diff --git a/core/src/main/java/org/kohsuke/stapler/ResponseImpl.java b/core/src/main/java/org/kohsuke/stapler/ResponseImpl.java +index 3cc12d2..884cb9f 100644 +--- a/core/src/main/java/org/kohsuke/stapler/ResponseImpl.java ++++ b/core/src/main/java/org/kohsuke/stapler/ResponseImpl.java +@@ -23,7 +23,6 @@ + + package org.kohsuke.stapler; + +-import edu.umd.cs.findbugs.annotations.NonNull; + import org.kohsuke.stapler.compression.CompressionFilter; + import org.kohsuke.stapler.compression.FilterServletOutputStream; + import org.kohsuke.stapler.export.ExportConfig; +@@ -125,7 +124,7 @@ public class ResponseImpl extends HttpServletResponseWrapper implements StaplerR + } + + @Override +- public void sendRedirect(@NonNull String url) throws IOException { ++ public void sendRedirect(String url) throws IOException { + // WebSphere doesn't apparently handle relative URLs, so + // to be safe, always resolve relative URLs to absolute URLs by ourselves. + // see http://www.nabble.com/Hudson%3A-1.262%3A-Broken-link-using-update-manager-to21067157.html +@@ -143,13 +142,13 @@ public class ResponseImpl extends HttpServletResponseWrapper implements StaplerR + super.sendRedirect(base); + } + +- public void sendRedirect2(@NonNull String url) throws IOException { ++ public void sendRedirect2(String url) throws IOException { + // Tomcat doesn't encode URL (servlet spec isn't very clear on it) + // so do the encoding by ourselves + sendRedirect(encode(url)); + } + +- public void sendRedirect(int statusCode, @NonNull String url) throws IOException { ++ public void sendRedirect(int statusCode, String url) throws IOException { + if (statusCode==SC_MOVED_TEMPORARILY) { + sendRedirect(url); // to be safe, let the servlet container handles this default case + return; +@@ -338,7 +337,7 @@ public class ResponseImpl extends HttpServletResponseWrapper implements StaplerR + /** + * Escapes non-ASCII characters. + */ +- public static @NonNull String encode(@NonNull String s) { ++ public static String encode(String s) { + try { + boolean escaped = false; + +diff --git a/core/src/main/java/org/kohsuke/stapler/StaplerResponse.java b/core/src/main/java/org/kohsuke/stapler/StaplerResponse.java +index ff61a67..a29f411 100644 +--- a/core/src/main/java/org/kohsuke/stapler/StaplerResponse.java ++++ b/core/src/main/java/org/kohsuke/stapler/StaplerResponse.java +@@ -23,7 +23,6 @@ + + package org.kohsuke.stapler; + +-import edu.umd.cs.findbugs.annotations.NonNull; + import org.kohsuke.stapler.export.Flavor; + + import javax.servlet.ServletException; +@@ -71,12 +70,12 @@ public interface StaplerResponse extends HttpServletResponse { + * Works like {@link #sendRedirect(String)} except that this method + * escapes the URL. + */ +- void sendRedirect2(@NonNull String url) throws IOException; ++ void sendRedirect2(String url) throws IOException; + + /** + * Works like {@link #sendRedirect2(String)} but allows the caller to specify the HTTP status code. + */ +- void sendRedirect(int statusCore, @NonNull String url) throws IOException; ++ void sendRedirect(int statusCore, String url) throws IOException; + + /** + * Serves a static resource. diff --git a/debian/patches/beanutils18-compat.patch b/debian/patches/beanutils18-compat.patch deleted file mode 100644 index ea4aaf5..0000000 --- a/debian/patches/beanutils18-compat.patch +++ /dev/null @@ -1,16 +0,0 @@ -Descrition: Patch to sort out compatibility with Commons Beanutils 1.8 - (upstream builds against 1.7). -Author: James Page <[email protected]> -Forwarded: no - ---- a/core/src/main/java/org/kohsuke/stapler/RequestImpl.java -+++ b/core/src/main/java/org/kohsuke/stapler/RequestImpl.java -@@ -642,7 +642,7 @@ public class RequestImpl extends HttpSer - if (converter==null) - throw new IllegalArgumentException("Unable to convert to "+type); - -- l.add(converter.convert(type,o)); -+ l.add(converter.convert(l.itemType,o)); - return l.toCollection(); - } - } diff --git a/debian/patches/disable-jrebel-bindings.patch b/debian/patches/disable-jrebel-bindings.patch deleted file mode 100644 index e1bf394..0000000 --- a/debian/patches/disable-jrebel-bindings.patch +++ /dev/null @@ -1,14 +0,0 @@ -Description: Don't build jrebel bindings as jrebel is not packaged. -Author: James Page <[email protected]> -Forwarded: not-needed - ---- a/pom.xml -+++ b/pom.xml -@@ -14,7 +14,6 @@ - <module>jsp</module> - <module>jelly</module> - <module>groovy</module> -- <module>jrebel</module> - </modules> - - <url>http://stapler.kohsuke.org/</url> diff --git a/debian/patches/disable-jruby-bindings.patch b/debian/patches/disable-jruby-bindings.patch deleted file mode 100644 index a98ab2c..0000000 --- a/debian/patches/disable-jruby-bindings.patch +++ /dev/null @@ -1,14 +0,0 @@ -Description: Disable jruby binding until upgraded in Debian -Author: James Page <[email protected]> -Forwarded: not-needed - ---- a/pom.xml -+++ b/pom.xml -@@ -13,7 +13,6 @@ - <module>core</module> - <module>jsp</module> - <module>jelly</module> -- <module>jruby</module> - <module>groovy</module> - <module>jrebel</module> - </modules> diff --git a/debian/patches/series b/debian/patches/series index 51c6641..d22700e 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,6 +1,7 @@ -beanutils18-compat.patch -disable-jruby-bindings.patch -fix-groovy-build.patch -disable-jrebel-bindings.patch -revert-kohsuke-asm3.patch -servlet25-compat.patch +0001-beanutils18-compat.patch +0002-disable-jruby-bindings.patch +0003-fix-groovy-build.patch +0004-disable-jrebel-bindings.patch +0005-revert-kohsuke-asm3.patch +0006-servlet25-compat.patch +0007-Remove-use-of-findbugs.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/stapler.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
