[stapler] 02/07: Refreshed the patches Added a dependency on libjsr305-java and removed 0007-Remove-use-of-findbugs.patch
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Sun Sep 7 21:21:06 UTC 2014
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository stapler.
commit 6621edd4016d9e6e880f41ec1dc85bc42e3f8510
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Wed Sep 3 23:36:53 2014 +0200
Refreshed the patches
Added a dependency on libjsr305-java and removed 0007-Remove-use-of-findbugs.patch
---
debian/changelog | 6 +-
debian/control | 1 +
debian/maven.ignoreRules | 3 +
debian/maven.rules | 3 +-
debian/patches/0001-beanutils18-compat.patch | 4 +-
debian/patches/0007-Remove-use-of-findbugs.patch | 128 -----------------------
debian/patches/series | 1 -
7 files changed, 12 insertions(+), 134 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 502f0b5..4829673 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,10 @@
-stapler (1.218-3) UNRELEASED; urgency=medium
+stapler (1.223-1) UNRELEASED; urgency=medium
* Team upload.
+ * New upstream release
+ - Refreshed the patches
+ - New dependency on libjsr305-java
+ - Removed 0007-Remove-use-of-findbugs.patch
* Replaced the patches disabling the jruby and jrebel modules
with ignore rules in debian/libstapler-java.poms
* Switch to debhelper level 9
diff --git a/debian/control b/debian/control
index d0660ee..4a7884e 100644
--- a/debian/control
+++ b/debian/control
@@ -29,6 +29,7 @@ Build-Depends-Indep:
libjenkins-dom4j-java,
libjenkins-json-java,
libjetty-java,
+ libjsr305-java,
libjzlib-java,
liblocalizer-java,
libmaven-enforcer-plugin-java,
diff --git a/debian/maven.ignoreRules b/debian/maven.ignoreRules
index ef0f798..1ad4fd1 100644
--- a/debian/maven.ignoreRules
+++ b/debian/maven.ignoreRules
@@ -13,6 +13,7 @@
# and version starting with 3., this dependency is then removed
# from the POM
# junit junit jar s/3\\..*/3.x/
+org.apache.maven.plugins maven-enforcer-plugin * * * *
org.apache.maven.plugins maven-project-info-reports-plugin * * * *
org.apache.maven.plugins maven-release-plugin * * * *
org.jvnet.maven-jellydoc-plugin maven-jellydoc-plugin * * * *
@@ -24,3 +25,5 @@ org.apache.maven.plugins maven-site-plugin * * * *
com.jolira hickory * * * *
org.kohsuke.stapler stapler * * tests *
org.kohsuke.stapler stapler-adjunct-jquery * * * test
+org.codehaus.mojo animal-sniffer-maven-plugin * * * *
+javax.annotation javax.annotation-api * * * *
diff --git a/debian/maven.rules b/debian/maven.rules
index a4af4a6..f83897e 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -23,8 +23,9 @@ org.codehaus.groovy * * s/.*/1.x/ * *
s/javax.servlet/javax.servlet.jsp/ jsp-api jar s/2\..*/2.1/ * *
javax.servlet servlet-api jar s/2\..*/2.5/ * *
org.jvnet.maven-jellydoc-plugin * * s/.*/1.x/ * *
-s/org.jvnet.hudson/org.jenkins-ci/ commons-jelly-tags-define * * * *
+s/org.jvnet.hudson/org.jenkins-ci/ commons-jelly-tags-define * s/.*/debian/ * *
s/org.jvnet.hudson/org.jenkins-ci/ htmlunit * s/.*/debian/ * *
org.mockito s/mockito-all/mockito-core/ * s/.*/debian/ * *
org.mortbay.jetty jetty * s/6\..*/6.x/ * *
s/org.jvnet.hudson/org.jenkins-ci/ annotation-indexer * s/.*/debian/ * *
+s/com.google.code.findbugs/org.jsr-305/ jsr305 * s/.*/0.x/ * *
diff --git a/debian/patches/0001-beanutils18-compat.patch b/debian/patches/0001-beanutils18-compat.patch
index bb82647..051b580 100644
--- a/debian/patches/0001-beanutils18-compat.patch
+++ b/debian/patches/0001-beanutils18-compat.patch
@@ -6,11 +6,9 @@ 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 c1b8b2a..f6c8c12 100644
--- a/core/src/main/java/org/kohsuke/stapler/RequestImpl.java
+++ b/core/src/main/java/org/kohsuke/stapler/RequestImpl.java
-@@ -657,7 +657,7 @@ public class RequestImpl extends HttpServletRequestWrapper implements StaplerReq
+@@ -649,7 +649,7 @@
if (converter==null)
throw new IllegalArgumentException("Unable to convert to "+type);
diff --git a/debian/patches/0007-Remove-use-of-findbugs.patch b/debian/patches/0007-Remove-use-of-findbugs.patch
deleted file mode 100644
index f976154..0000000
--- a/debian/patches/0007-Remove-use-of-findbugs.patch
+++ /dev/null
@@ -1,128 +0,0 @@
-From: James Page <james.page at ubuntu.com>
-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 f163dda..796751a 100644
---- a/core/pom.xml
-+++ b/core/pom.xml
-@@ -129,12 +129,6 @@
- <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>
-- <dependency>
- <groupId>com.jcraft</groupId>
- <artifactId>jzlib</artifactId>
- <version>1.1.2</version>
-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 db4b6a4..7547af2 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 net.sf.json.JsonConfig;
- import org.kohsuke.stapler.compression.CompressionFilter;
- import org.kohsuke.stapler.compression.FilterServletOutputStream;
-@@ -128,7 +127,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
-@@ -146,13 +145,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;
-@@ -352,7 +351,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 385843f..259e244 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 net.sf.json.JsonConfig;
- import org.kohsuke.stapler.export.Flavor;
-
-@@ -72,12 +71,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/series b/debian/patches/series
index b56c648..82a1908 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,5 +2,4 @@
0003-fix-groovy-build.patch
0005-revert-kohsuke-asm3.patch
0006-servlet25-compat.patch
-0007-Remove-use-of-findbugs.patch
0008-Drop-use-of-custom-doklet.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/stapler.git
More information about the pkg-java-commits
mailing list