[SCM] jenkins-remoting packaging branch, master, updated. debian/2.16+dfsg-1-6-g3381843

James Page james.page at ubuntu.com
Sun Feb 17 17:45:15 UTC 2013


The following commit has been merged in the master branch:
commit 56058346f46e68376a6a47a917e9f7f0a8e5ce1f
Author: James Page <james.page at ubuntu.com>
Date:   Sun Feb 17 17:34:41 2013 +0000

    d/p/remove-findbugs.patch,d/maven.ignoreRules: Drop findbugs annotations as not packaged.

diff --git a/debian/changelog b/debian/changelog
index e6dbeea..ecba452 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ jenkins-remoting (2.22+dfsg-1~exp1) experimental; urgency=low
 
   * New upstream release.
     - Refreshed patches.
+    - d/p/remove-findbugs.patch,d/maven.ignoreRules: Drop findbugs
+      annotations as not packaged.
   * d/control: Bumped Standards-Version: 3.9.4, no changes.
   * d/control: Dropped DM-Upload-Allowed.
 
diff --git a/debian/maven.ignoreRules b/debian/maven.ignoreRules
index 23ca030..36e1b4c 100644
--- a/debian/maven.ignoreRules
+++ b/debian/maven.ignoreRules
@@ -19,3 +19,4 @@ org.apache.maven.plugins maven-pmd-plugin * * * *
 org.apache.maven.plugins maven-release-plugin * * * *
 org.codehaus.mojo build-helper-maven-plugin * * * *
 org.codehaus.mojo findbugs-maven-plugin * * * *
+com.github.stephenc.findbugs findbugs-annotations * * * *
diff --git a/debian/patches/remove-findbugs.patch b/debian/patches/remove-findbugs.patch
new file mode 100644
index 0000000..ea10c5f
--- /dev/null
+++ b/debian/patches/remove-findbugs.patch
@@ -0,0 +1,22 @@
+Description: Drop findbugs annotations as not packaged
+Author: James Page <james.page at ubuntu.com>
+Forwarded: not-needed
+
+--- a/src/main/java/hudson/remoting/Channel.java
++++ b/src/main/java/hudson/remoting/Channel.java
+@@ -23,7 +23,6 @@
+  */
+ package hudson.remoting;
+ 
+-import edu.umd.cs.findbugs.annotations.SuppressWarnings;
+ import hudson.remoting.CommandTransport.CommandReceiver;
+ import hudson.remoting.ExportTable.ExportList;
+ import hudson.remoting.PipeWindow.Key;
+@@ -715,7 +714,6 @@ public class Channel implements VirtualC
+      *      The error that caused the connection to be aborted. Never null.
+      */
+     @java.lang.SuppressWarnings("ToArrayCallWithZeroLengthArrayArgument")
+-    @SuppressWarnings("ITA_INEFFICIENT_TO_ARRAY") // intentionally; race condition on listeners otherwise
+     protected void terminate(IOException e) {
+         try {
+             synchronized (this) {
diff --git a/debian/patches/series b/debian/patches/series
index 8e19061..89c307d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 asm3-upgrade.patch
 sign-jar.patch
+remove-findbugs.patch

-- 
jenkins-remoting packaging



More information about the pkg-java-commits mailing list