[stapler] 02/03: New upstream release

James Downing Page jamespage at moszumanska.debian.org
Tue Dec 31 15:00:14 UTC 2013


This is an automated email from the git hooks/post-receive script.

jamespage pushed a commit to branch master
in repository stapler.

commit 127a474e3cd76bdd353d6b1a9b32844e39ffdfd1
Author: James Page <james.page at ubuntu.com>
Date:   Tue Dec 31 14:23:42 2013 +0000

    New upstream release
---
 debian/changelog                                   | 10 ++++++++
 debian/control                                     |  1 +
 debian/libstapler-java.poms                        |  2 +-
 debian/maven.ignoreRules                           |  1 +
 debian/patches/0001-beanutils18-compat.patch       |  4 +--
 debian/patches/0002-disable-jruby-bindings.patch   |  4 +--
 debian/patches/0003-fix-groovy-build.patch         |  2 +-
 debian/patches/0004-disable-jrebel-bindings.patch  |  4 +--
 debian/patches/0007-Remove-use-of-findbugs.patch   | 30 +++++++++++-----------
 .../patches/0008-Drop-use-of-custom-doklet.patch   | 27 +++++++++++++++++++
 debian/patches/series                              |  1 +
 11 files changed, 63 insertions(+), 23 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1a6ecdb..8d366d1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+stapler (1.218-1) unstable; urgency=medium
+
+  * New upstream release:
+    - d/control: Add new BD on libjzlib-java.
+    - d/p/*: Refresh patches.
+    - Drop use of custom doklet during javadoc generation.
+    - d/maven.ignoreRules: Ignore use of stapler adjunct during testing.
+
+ -- James Page <james.page at ubuntu.com>  Tue, 31 Dec 2013 14:22:08 +0000
+
 stapler (1.207-1) unstable; urgency=low
 
   * New upstream release.
diff --git a/debian/control b/debian/control
index ecb7ba8..19b7212 100644
--- a/debian/control
+++ b/debian/control
@@ -29,6 +29,7 @@ Build-Depends-Indep:
  libjenkins-dom4j-java,
  libjenkins-json-java,
  libjetty-java,
+ libjzlib-java,
  liblocalizer-java,
  libmaven-enforcer-plugin-java,
  libmaven-install-plugin-java,
diff --git a/debian/libstapler-java.poms b/debian/libstapler-java.poms
index 5ef7d10..ff4e4f6 100644
--- a/debian/libstapler-java.poms
+++ b/debian/libstapler-java.poms
@@ -17,7 +17,7 @@
 #   --no-usj-versionless: don't install the versionless link in /usr/share/java
 #   --dest-jar=<path>: the destination for the real jar
 #
-pom.xml
+pom.xml --no-parent
 core/pom.xml --java-lib
 jelly/pom.xml --java-lib
 jsp/pom.xml --java-lib
diff --git a/debian/maven.ignoreRules b/debian/maven.ignoreRules
index 1e41054..ef0f798 100644
--- a/debian/maven.ignoreRules
+++ b/debian/maven.ignoreRules
@@ -23,3 +23,4 @@ org.kathrynhuxtable.maven.wagon wagon-gitsite * * * *
 org.apache.maven.plugins maven-site-plugin * * * *
 com.jolira hickory * * * *
 org.kohsuke.stapler stapler * * tests *
+org.kohsuke.stapler stapler-adjunct-jquery * * * test
diff --git a/debian/patches/0001-beanutils18-compat.patch b/debian/patches/0001-beanutils18-compat.patch
index 73ffa5e..bb82647 100644
--- a/debian/patches/0001-beanutils18-compat.patch
+++ b/debian/patches/0001-beanutils18-compat.patch
@@ -7,10 +7,10 @@ Subject: beanutils18-compat
  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
+index c1b8b2a..f6c8c12 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
+@@ -657,7 +657,7 @@ public class RequestImpl extends HttpServletRequestWrapper implements StaplerReq
                  if (converter==null)
                      throw new IllegalArgumentException("Unable to convert to "+type);
  
diff --git a/debian/patches/0002-disable-jruby-bindings.patch b/debian/patches/0002-disable-jruby-bindings.patch
index 9b28cd3..cb44a75 100644
--- a/debian/patches/0002-disable-jruby-bindings.patch
+++ b/debian/patches/0002-disable-jruby-bindings.patch
@@ -7,10 +7,10 @@ Subject: disable-jruby-bindings
  1 file changed, 1 deletion(-)
 
 diff --git a/pom.xml b/pom.xml
-index 81375f2..783cd2c 100644
+index 831a271..e7bf152 100644
 --- a/pom.xml
 +++ b/pom.xml
-@@ -13,7 +13,6 @@
+@@ -18,7 +18,6 @@
      <module>core</module>
      <module>jsp</module>
      <module>jelly</module>
diff --git a/debian/patches/0003-fix-groovy-build.patch b/debian/patches/0003-fix-groovy-build.patch
index 3bec69f..4461416 100644
--- a/debian/patches/0003-fix-groovy-build.patch
+++ b/debian/patches/0003-fix-groovy-build.patch
@@ -7,7 +7,7 @@ Subject: fix-groovy-build
  1 file changed, 5 insertions(+)
 
 diff --git a/groovy/pom.xml b/groovy/pom.xml
-index 3ade703..1451926 100644
+index 6ff3470..8961ecc 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
index 4a9e675..5b584d3 100644
--- a/debian/patches/0004-disable-jrebel-bindings.patch
+++ b/debian/patches/0004-disable-jrebel-bindings.patch
@@ -7,10 +7,10 @@ Subject: disable-jrebel-bindings
  1 file changed, 1 deletion(-)
 
 diff --git a/pom.xml b/pom.xml
-index 783cd2c..8dca04c 100644
+index e7bf152..cc7a09a 100644
 --- a/pom.xml
 +++ b/pom.xml
-@@ -14,7 +14,6 @@
+@@ -19,7 +19,6 @@
      <module>jsp</module>
      <module>jelly</module>
      <module>groovy</module>
diff --git a/debian/patches/0007-Remove-use-of-findbugs.patch b/debian/patches/0007-Remove-use-of-findbugs.patch
index a0574d9..f976154 100644
--- a/debian/patches/0007-Remove-use-of-findbugs.patch
+++ b/debian/patches/0007-Remove-use-of-findbugs.patch
@@ -11,22 +11,22 @@ findbugs is not yet packaged so drop references from codebase.
  4 files changed, 8 insertions(+), 17 deletions(-)
 
 diff --git a/core/pom.xml b/core/pom.xml
-index 957c1c0..cf06f68 100644
+index f163dda..796751a 100644
 --- a/core/pom.xml
 +++ b/core/pom.xml
-@@ -128,12 +128,6 @@
-       <version>1.0.0</version>
+@@ -129,12 +129,6 @@
        <scope>test</scope>
      </dependency>
--    <dependency>
+     <dependency>
 -      <groupId>com.github.stephenc.findbugs</groupId>
 -      <artifactId>findbugs-annotations</artifactId>
 -      <version>1.3.9-1</version>
 -      <scope>provided</scope>
 -    </dependency>
-   </dependencies>
- 
-   <profiles>
+-    <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
@@ -54,7 +54,7 @@ index 8d2724a..c80b222 100644
          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
+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 @@
@@ -62,10 +62,10 @@ index 3cc12d2..884cb9f 100644
  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;
- import org.kohsuke.stapler.export.ExportConfig;
-@@ -125,7 +124,7 @@ public class ResponseImpl extends HttpServletResponseWrapper implements StaplerR
+@@ -128,7 +127,7 @@ public class ResponseImpl extends HttpServletResponseWrapper implements StaplerR
      }
  
      @Override
@@ -74,7 +74,7 @@ index 3cc12d2..884cb9f 100644
          // 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
+@@ -146,13 +145,13 @@ public class ResponseImpl extends HttpServletResponseWrapper implements StaplerR
          super.sendRedirect(base);
      }
  
@@ -90,7 +90,7 @@ index 3cc12d2..884cb9f 100644
          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
+@@ -352,7 +351,7 @@ public class ResponseImpl extends HttpServletResponseWrapper implements StaplerR
      /**
       * Escapes non-ASCII characters.
       */
@@ -100,7 +100,7 @@ index 3cc12d2..884cb9f 100644
              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
+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 @@
@@ -108,10 +108,10 @@ index ff61a67..a29f411 100644
  package org.kohsuke.stapler;
  
 -import edu.umd.cs.findbugs.annotations.NonNull;
+ import net.sf.json.JsonConfig;
  import org.kohsuke.stapler.export.Flavor;
  
- import javax.servlet.ServletException;
-@@ -71,12 +70,12 @@ public interface StaplerResponse extends HttpServletResponse {
+@@ -72,12 +71,12 @@ public interface StaplerResponse extends HttpServletResponse {
       * Works like {@link #sendRedirect(String)} except that this method
       * escapes the URL.
       */
diff --git a/debian/patches/0008-Drop-use-of-custom-doklet.patch b/debian/patches/0008-Drop-use-of-custom-doklet.patch
new file mode 100644
index 0000000..ce9856b
--- /dev/null
+++ b/debian/patches/0008-Drop-use-of-custom-doklet.patch
@@ -0,0 +1,27 @@
+From: James Page <james.page at ubuntu.com>
+Date: Tue, 31 Dec 2013 14:25:01 +0000
+Subject: Drop use of custom doklet
+
+Drop use of custom doklet for javadoc generation.
+---
+ pom.xml | 7 -------
+ 1 file changed, 7 deletions(-)
+
+diff --git a/pom.xml b/pom.xml
+index cc7a09a..3e205ee 100644
+--- a/pom.xml
++++ b/pom.xml
+@@ -172,13 +172,6 @@
+         <artifactId>maven-javadoc-plugin</artifactId>
+         <configuration>
+           <aggregate>true</aggregate>
+-          <doclet>org.kohsuke.doklet.Doklet</doclet>
+-          <linksource>true</linksource>
+-          <docletArtifact>
+-            <groupId>org.kohsuke</groupId>
+-            <artifactId>doklet</artifactId>
+-            <version>1.0</version>
+-          </docletArtifact>
+         </configuration>
+       </plugin>
+     </plugins>
diff --git a/debian/patches/series b/debian/patches/series
index d22700e..521fc78 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,4 @@
 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