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

« back to all changes in this revision

Viewing changes to core/src/main/resources/jenkins/model/Jenkins/configure.jelly

  • 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
* 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:
53
53
      </f:entry>
54
54
 
55
55
      <!-- global configuration from everyone -->
56
 
      <j:forEach var="descriptor" items="${h.getSortedDescriptorsForGlobalConfig()}">
 
56
      <j:forEach var="descriptor" items="${h.getSortedDescriptorsForGlobalConfigUnclassified()}">
57
57
        <j:set var="instance" value="${descriptor}" /><!-- this makes the <f:textbox field=.../> work -->
58
58
        <f:rowSet name="${descriptor.jsonSafeClassName}">
59
59
          <st:include page="${descriptor.globalConfigPage}" from="${descriptor}" />
60
60
        </f:rowSet>
61
61
      </j:forEach>
62
62
 
63
 
      <f:block>
64
 
        <div id="bottom-sticker" >
65
 
          <div class="bottom-sticker-inner">
66
 
            <f:submit value="${%Save}" />
67
 
            <f:apply />
68
 
          </div>
69
 
        </div>
70
 
      </f:block>
 
63
      <f:bottomButtonBar>
 
64
        <f:submit value="${%Save}" />
 
65
        <f:apply />
 
66
      </f:bottomButtonBar>
71
67
    </f:form>
72
68
  </l:main-panel>
73
69
</l:layout>