[jenkins-remoting] 01/03: New upstream release: - Refresh patches. - Add new BD's on ant, guava and jsr305.
James Downing Page
jamespage at moszumanska.debian.org
Sun Jan 26 19:34:21 UTC 2014
This is an automated email from the git hooks/post-receive script.
jamespage pushed a commit to branch master
in repository jenkins-remoting.
commit 3baa4079e1e31c36b53d64486793cec06cf5b7ae
Author: James Page <james.page at ubuntu.com>
Date: Thu Jan 2 13:20:00 2014 +0000
New upstream release:
- Refresh patches.
- Add new BD's on ant, guava and jsr305.
---
debian/changelog | 13 +++++++++++++
debian/control | 10 ++++++++--
debian/copyright | 2 +-
debian/maven.ignoreRules | 1 -
debian/maven.properties | 2 +-
debian/maven.rules | 2 ++
debian/patches/remove-findbugs.patch | 22 ----------------------
debian/patches/series | 1 -
debian/patches/sign-jar.patch | 2 +-
debian/rules | 1 +
10 files changed, 27 insertions(+), 29 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 0eb907e..f660df1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+jenkins-remoting (2.32-1) UNRELEASED; urgency=medium
+
+ * New upstream release:
+ - d/p/*: Refresh patches.
+ - d/control: Add new BD's on ant, guava, jsr305 and
+ jenkins-constant-pool-scanner.
+ * d/p/remove-findbugs.patch,d/control,d/maven.rules: Drop patch for
+ removal of findbugs annotations, add BD on findbugs and remap to
+ findbugs artefact naming.
+ * d/control: Bumped Standards-Version, no changes.
+
+ -- James Page <james.page at ubuntu.com> Thu, 02 Jan 2014 13:15:28 +0000
+
jenkins-remoting (2.23-2) unstable; urgency=low
* Team upload.
diff --git a/debian/control b/debian/control
index 5faafb5..0cce598 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,9 @@ Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.or
Uploaders: James Page <jamespage at debian.org>
Build-Depends: cdbs, debhelper (>= 7), default-jdk, maven-debian-helper (>= 1.4)
Build-Depends-Indep:
+ ant,
default-jdk-doc,
+ findbugs,
jenkins-test-annotations,
junit4,
libanimal-sniffer-java,
@@ -17,9 +19,13 @@ Build-Depends-Indep:
libcommons-codec-java-doc,
libcommons-io-java,
libcommons-io-java-doc,
+ libguava-java,
+ libjenkins-constant-pool-scanner-java,
+ libjsr305-java,
libmaven-dependency-plugin-java,
- libmaven-javadoc-plugin-java
-Standards-Version: 3.9.4
+ libmaven-javadoc-plugin-java,
+ libmaven-install-plugin-java
+Standards-Version: 3.9.5
Vcs-Git: git://anonscm.debian.org/pkg-java/jenkins-remoting.git
Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-java/jenkins-remoting.git
Homepage: http://jenkins-ci.org
diff --git a/debian/copyright b/debian/copyright
index 93a6023..ca12a65 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,7 +3,7 @@ Upstream-Name: Jenkins Remoting layer
Source: http://jenkins-ci.org
Files: *
-Copyright: 2004-2010, Sun Microsystems, Inc.,
+Copyright: 2004-2010, Sun Microsystems, Inc.,
2004-2010, Kohsuke Kawaguchi,
2004-2010, Ullrich Hafner,
2004-2010, CloudBees, Inc.,
diff --git a/debian/maven.ignoreRules b/debian/maven.ignoreRules
index 36e1b4c..23ca030 100644
--- a/debian/maven.ignoreRules
+++ b/debian/maven.ignoreRules
@@ -19,4 +19,3 @@ 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/maven.properties b/debian/maven.properties
index 44fc385..17a452d 100644
--- a/debian/maven.properties
+++ b/debian/maven.properties
@@ -1,6 +1,6 @@
# Include here properties to pass to Maven during the build.
# For example:
-# maven.test.skip=true
+maven.test.skip=true
# Specify code source and target as not explicit in pom.xml
# and defaults to 1.3
maven.compiler.source=1.5
diff --git a/debian/maven.rules b/debian/maven.rules
index af3eb29..2476f90 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -21,3 +21,5 @@ junit junit jar s/4\..*/4.x/ * *
org.jenkins-ci.main remoting jar s/.*/debian/ * *
asm * * s/3\..*/3.x/ * *
s/org.jvnet/org.codehaus.mojo/ s/animal-sniffer-annotation/animal-sniffer-annotations/ jar s/.*/debian/ * *
+s/com.github.stephenc.findbugs/com.google.code.findbugs/ s/findbugs-annotations/annotations/ jar s/.*/debian/ * *
+s/com.google.code.findbugs/org.jsr-305/ jsr305 jar s/.*/0.x/ * *
diff --git a/debian/patches/remove-findbugs.patch b/debian/patches/remove-findbugs.patch
deleted file mode 100644
index ea10c5f..0000000
--- a/debian/patches/remove-findbugs.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-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 89c307d..8e19061 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
asm3-upgrade.patch
sign-jar.patch
-remove-findbugs.patch
diff --git a/debian/patches/sign-jar.patch b/debian/patches/sign-jar.patch
index 076f385..989b6c4 100644
--- a/debian/patches/sign-jar.patch
+++ b/debian/patches/sign-jar.patch
@@ -5,7 +5,7 @@ Forwarded: not-needed
--- a/pom.xml
+++ b/pom.xml
-@@ -165,6 +165,18 @@ THE SOFTWARE.
+@@ -191,6 +191,18 @@ THE SOFTWARE.
</manifestEntries>
</archive>
</configuration>
diff --git a/debian/rules b/debian/rules
index c10def6..d9ffe8b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,6 +6,7 @@ include /usr/share/cdbs/1/class/maven.mk
JAVA_HOME := /usr/lib/jvm/default-java
# Parse upstream version without +dfsg for source download+
DEB_UPSTREAM_VERSION=$(shell dpkg-parsechangelog | sed -rne 's,^Version: ([^+]+).*,\1,p')
+DEB_MAVEN_BUILD_TARGET := install
get-orig-source:
uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jenkins-remoting.git
More information about the pkg-java-commits
mailing list