← Back to branch summary

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

« back to all changes in this revision

Viewing changes to debian/maven.rules

  • 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:
debian/maven.rules
20
20
commons-collections commons-collections jar s/3\..*/3.x/ * *
21
21
commons-httpclient commons-httpclient jar s/3\..*/3.x/ * *
22
22
junit s/junit-dep/junit/ * s/.*/4.x/ * *
 
23
junit junit * s/.*/4.x/ * *
23
24
# Map onto exact version during build process
24
 
org.jenkins-ci.main * * s/1\..*/1.480.3/ * *
 
25
org.jenkins-ci.main * * s/1\..*/1.509.2/ * *
25
26
# Handle plugin package
26
 
org.kohsuke access-modifier-annotation jar s/.*/1.0/ * *
27
 
org.kohsuke access-modifier-checker *  s/.*/1.0/ * *
 
27
org.kohsuke access-modifier-annotation jar s/.*/1.4/ * *
 
28
org.kohsuke access-modifier-checker *  s/.*/1.4/ * *
28
29
# 3.x is needed due to later versions of some deps in Debian
29
30
# Patch to be submitted back upstream.
30
31
asm * * s/2\..*/3.x/ * *
55
56
javax.servlet jstl * s/1\.1\..*/1.1/ * *
56
57
# Remap for rename jna->jnr in Debian
57
58
org.jruby.ext.posix s/jna-posix/jnr-posix/ * s/.*/debian/ * *
58
 
# Remap for later version of animal sniffer
59
 
s/org.jvnet/org.codehaus.mojo/ s/animal-sniffer-annotation/animal-sniffer-annotations/ jar s/.*/debian/ * *
60
59
# Update to servlet2.5
61
60
javax.servlet servlet-api * s/.*/2.5/ * *
62
61
# Updates for 1.424.6