← Back to branch summary

~ubuntu-branches/ubuntu/trusty/jenkins/trusty

« back to all changes in this revision

Viewing changes to core/src/main/resources/hudson/slaves/CommandLauncher/help-command.html

  • Committer: Package Import Robot
  • Author(s): James Page
  • Date: 2013-08-13 12:35:19 UTC
  • mfrom: (1.1.13)
  • Revision ID: package-import@ubuntu.com-20130813123519-tizgfxcr70trl7r0
Tags: 1.509.2+dfsg-1
http://bugs.debian.org/706725
http://bugs.debian.org/701163
http://bugs.debian.org/704848
* New upstream release (Closes: #706725):
  - d/control: Update versioned BD's:
    * jenkins-executable-war >= 1.28.
    * jenkins-instance-identity >= 1.3.
    * libjenkins-remoting-java >= 2.23.
    * libjenkins-winstone-java >= 0.9.10-jenkins-44.
    * libstapler-java >= 1.207.
    * libjenkins-json-java >= 2.4-jenkins-1.
    * libstapler-adjunct-timeline-java >= 1.4.
    * libstapler-adjunct-codemirror-java >= 1.2.
    * libmaven-hpi-plugin-java >= 1.93.
    * libjenkins-xstream-java >= 1.4.4-jenkins-3.
  - d/maven.rules: Map to older version of animal-sniffer-maven-plugin.
  - Add patch for compatibility with guava >= 0.14.
  - Add patch to exclude asm4 dependency via jnr-posix.
  - 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.
* 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 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.

Show diffs side-by-side

added added

removed removed

Lines of Context:
core/src/main/resources/hudson/slaves/CommandLauncher/help-command.html
2
2
  Command to be used to launch a slave agent program, which controls the slave
3
3
  computer and communicates with the master. Jenkins assumes that
4
4
  the executed program launches the <tt>slave.jar</tt> program on the correct
5
 
    slave machine.
 
5
  slave machine.
6
6
 
7
7
  <p>
8
8
  A copy of <tt>slave.jar</tt> can be downloaded from <a href="${rootURL}/jnlpJars/slave.jar"><tt>here</tt></a>.
14
14
  However, it is often a good idea to write a small shell script, like the following, on a slave
15
15
  so that you can control the location of Java and/or slave.jar, as well as set up any
16
16
  environment variables specific to this slave node, such as PATH.
17
 
  
 
17
 
18
18
<pre>
19
19
#!/bin/sh
20
20
exec java -jar ~/bin/slave.jar
26
26
  "java -jar ~/bin/slave.jar" eventually.
27
27
 
28
28
  <p>
29
 
  In a larger deployment, It is also worth considering to load <tt>slave.jar</tt> from
 
29
  In a larger deployment, it is also worth considering to load <tt>slave.jar</tt> from
30
30
  a NFS-mounted common location, so that you don't have to update this file every time
31
31
  you update Jenkins.
32
32