[jenkins] 30/32: De-duplicate jars between libjenkins-java and jenkins-external-job-monitor Wait longer for jenkins to stop during restarts (Closes: #704848)
James Downing Page
jamespage at alioth.debian.org
Tue Aug 13 11:46:58 UTC 2013
This is an automated email from the git hooks/post-receive script.
jamespage pushed a commit to branch master
in repository jenkins.
commit 4e8909c45d4a08f491de955d7212bdc342b083fb
Author: James Page <james.page at ubuntu.com>
Date: Tue Aug 13 09:18:32 2013 +0100
De-duplicate jars between libjenkins-java and jenkins-external-job-monitor
Wait longer for jenkins to stop during restarts (Closes: #704848)
---
debian/changelog | 11 ++++-
debian/control | 10 +----
debian/jenkins-external-job-monitor.install | 1 -
debian/jenkins-external-job-monitor.links | 1 +
debian/jenkins.init | 59 +++++++++++++++------------
debian/libjenkins-java.poms | 2 +-
debian/rules | 7 ----
7 files changed, 48 insertions(+), 43 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index e367277..17e86e1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,7 +18,16 @@ jenkins (1.509.2+dfsg-1) UNRELEASED; urgency=low
- Fixes the following security vulnerabilities:
CVE-2013-2034, CVE-2013-2033, CVE-2013-2034, CVE-2013-1808
* d/patches/*: Switch to using git patch-queue for managing patches.
- * d/rules: Enable xz compression.
+ * De-duplicate jars between libjenkins-java and jenkins-external-job-monitor
+ (Closes: #701163):
+ - d/control: Add dependency between jenkins-external-job-monitor ->
+ libjenkins-java.
+ - d/rules: Drop installation of jenkins-core.jar in
+ jenkins-external-job-monitor
+ - d/jenkins-external-job-monitor.{links,install}: Link to jenkins-core
+ in /usr/share/java instead of included version.
+ * Wait longer for jenkins to stop during restarts (Closes: #704848):
+ - d/jenkins.init: Re-sync init script from upstream codebase.
-- James Page <james.page at ubuntu.com> Sun, 11 Aug 2013 10:44:19 +0100
diff --git a/debian/control b/debian/control
index 5b25350..2ccf5a9 100644
--- a/debian/control
+++ b/debian/control
@@ -163,7 +163,7 @@ Description: Jenkins Plugin Parent Maven POM
Package: jenkins-common
Architecture: all
Depends:
- libjenkins-remoting-java (>= 2.22),
+ libjenkins-remoting-java (>= 2.23),
libjffi-java,
libjna-java,
libjnr-posix-java,
@@ -256,14 +256,8 @@ Description: Jenkins slave node helper
Package: jenkins-external-job-monitor
Architecture: all
Depends:
- ant,
default-jre-headless | java6-runtime-headless,
- libcommons-io-java (>= 2.4),
- libcommons-lang-java,
- libjenkins-remoting-java (>= 2.22),
- libjenkins-xstream-java,
- libjffi-java,
- libjnr-posix-java,
+ libjenkins-java (= ${binary:Version}),
${misc:Depends}
Description: Jenkins CI external job monitoring
Jenkins monitors executions of repeated jobs, such as building a software
diff --git a/debian/jenkins-external-job-monitor.install b/debian/jenkins-external-job-monitor.install
index 6849f85..691ebb0 100644
--- a/debian/jenkins-external-job-monitor.install
+++ b/debian/jenkins-external-job-monitor.install
@@ -1,3 +1,2 @@
-core/target/jenkins-core-*.jar usr/share/jenkins/external-job-monitor/java
debian/bin/jenkins-monitor-job usr/bin
debian/etc/external-job-monitor.conf etc/jenkins
diff --git a/debian/jenkins-external-job-monitor.links b/debian/jenkins-external-job-monitor.links
index 1731891..b7a2e34 100644
--- a/debian/jenkins-external-job-monitor.links
+++ b/debian/jenkins-external-job-monitor.links
@@ -6,3 +6,4 @@
/usr/share/java/jenkins-xstream.jar /usr/share/jenkins/external-job-monitor/java/xstream-debian.jar
/usr/share/java/commons-io.jar /usr/share/jenkins/external-job-monitor/java/commons-io-debian.jar
/usr/share/java/jenkins-remoting.jar /usr/share/jenkins/external-job-monitor/java/remoting-debian.jar
+/usr/share/java/jenkins-core.jar /usr/share/jenkins/external-job-monitor/java/jenkins-core.jar
diff --git a/debian/jenkins.init b/debian/jenkins.init
index 64f7cbb..b2258b6 100644
--- a/debian/jenkins.init
+++ b/debian/jenkins.init
@@ -28,10 +28,10 @@ DAEMON_ARGS="--name=$NAME --inherit --env=JENKINS_HOME=$JENKINS_HOME --output=$J
SU=/bin/su
# Exit if the package is not installed
-[ -x "$DAEMON" ] || exit 0
+[ -x "$DAEMON" ] || (echo "daemon package not installed" && exit 0)
# Exit if not supposed to run standalone
-[ "$RUN_STANDALONE" = "false" ] && exit 0
+[ "$RUN_STANDALONE" = "false" ] && echo "Not configured to run standalone" && exit 0
# load environments
if [ -r /etc/default/locale ]; then
@@ -42,7 +42,8 @@ elif [ -r /etc/environment ]; then
export LANG LANGUAGE
fi
-VERBOSE=no
+# Load the VERBOSE setting and other rcS variables
+. /lib/init/vars.sh
# Define LSB log_* functions.
# Depend on lsb-base (>= 3.0-6) to ensure that this file is present.
@@ -146,7 +147,7 @@ do_stop()
0)
$DAEMON $DAEMON_ARGS --stop || return 2
# wait for the process to really terminate
- for n in 1 2 3 4 5; do
+ for n in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20; do
sleep 1
$DAEMON $DAEMON_ARGS --running || break
done
@@ -204,27 +205,35 @@ case "$1" in
esac
;;
status)
- get_daemon_status
- case "$?" in
- 0) echo "$DESC is running with the pid `cat $PIDFILE`";;
- *)
- get_running
- procs=$?
- if [ $procs -eq 0 ]; then
- echo -n "$DESC is not running"
- if [ -f $PIDFILE ]; then
- echo ", but the pidfile ($PIDFILE) still exists"
- else
- echo
- fi
-
- else
- echo "$procs instances of jenkins are running at the moment"
- echo "but the pidfile $PIDFILE is missing"
- fi
- ;;
- esac
- ;;
+ get_daemon_status
+ case "$?" in
+ 0)
+ echo "$DESC is running with the pid `cat $PIDFILE`"
+ rc=0
+ ;;
+ *)
+ get_running
+ procs=$?
+ if [ $procs -eq 0 ]; then
+ echo -n "$DESC is not running"
+ if [ -f $PIDFILE ]; then
+ echo ", but the pidfile ($PIDFILE) still exists"
+ rc=1
+ else
+ echo
+ rc=3
+ fi
+
+ else
+ echo "$procs instances of jenkins are running at the moment"
+ echo "but the pidfile $PIDFILE is missing"
+ rc=0
+ fi
+
+ exit $rc
+ ;;
+ esac
+ ;;
*)
echo "Usage: $SCRIPTNAME {start|stop|status|restart|force-reload}" >&2
exit 3
diff --git a/debian/libjenkins-java.poms b/debian/libjenkins-java.poms
index 341d66f..9d68efa 100644
--- a/debian/libjenkins-java.poms
+++ b/debian/libjenkins-java.poms
@@ -24,6 +24,6 @@
# temporarily for certain artifacts such as Javadoc jars.
#
pom.xml --has-package-version --no-parent
-core/pom.xml --has-package-version
+core/pom.xml --has-package-version --java-lib
war/pom.xml --has-package-version
cli/pom.xml --has-package-version
diff --git a/debian/rules b/debian/rules
index 2da860f..fb12ff2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,8 +11,6 @@ DEB_UPSTREAM_VERSION=$(shell dpkg-parsechangelog | sed -rne 's,^Version: ([^+]+)
DEB_MAVEN_BUILD_TARGET := install
DEB_MAVEN_ARGS := -e -Dbuild.version="$(DEB_UPSTREAM_VERSION)"
DEB_MAVEN_INSTALL_TO_USJ := false
-# Enable xz compression
-DEB_DH_BUILDDEB_ARGS ?= -u-Zxz
# Debian package version use daemon to control jenkins processes
# Ubuntu does not need this - managed by upstart
@@ -39,11 +37,6 @@ binary-post-install/jenkins-cli::
jh_classpath -pjenkins-cli
jh_manifest -pjenkins-cli
-# Create handy links for script wrapper
-binary-post-install/jenkins-external-job-monitor::
- dh_link -pjenkins-external-job-monitor usr/share/jenkins/external-job-monitor/java/jenkins-core-$(DEB_UPSTREAM_VERSION).jar \
- usr/share/jenkins/external-job-monitor/java/jenkins-core.jar
-
# Install POM files directly
binary-post-install/libjenkins-java::
mh_installpoms -plibjenkins-java
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jenkins.git
More information about the pkg-java-commits
mailing list