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

« back to all changes in this revision

Viewing changes to debian/patches/build/use-stock-asm3.patch

  • 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:
1
 
Description: Upstream use a remapped version of asm3 to ensure
2
 
 that it does not conflict with asm2 elsewhere in the Jenkins
3
 
 dependency tree.
4
 
 .
5
 
 In Debian/Ubuntu we have a consistent version in the tree (unlike
6
 
 upstream) so we don't need todo this.
7
 
Author: James Page <james.page@ubuntu.com>
8
 
Forwarded: not-needed
9
 
 
10
 
--- a/core/src/main/java/hudson/util/SubClassGenerator.java
11
 
+++ b/core/src/main/java/hudson/util/SubClassGenerator.java
12
 
@@ -25,13 +25,13 @@ package hudson.util;
13
 
 
14
 
 import hudson.PluginManager.UberClassLoader;
15
 
 import jenkins.model.Jenkins;
16
 
-import org.kohsuke.asm3.ClassWriter;
17
 
-import org.kohsuke.asm3.MethodVisitor;
18
 
-import org.kohsuke.asm3.Type;
19
 
+import org.objectweb.asm.ClassWriter;
20
 
+import org.objectweb.asm.MethodVisitor;
21
 
+import org.objectweb.asm.Type;
22
 
 
23
 
 import java.lang.reflect.Constructor;
24
 
 
25
 
-import static org.kohsuke.asm3.Opcodes.*;
26
 
+import static org.objectweb.asm.Opcodes.*;
27
 
 
28
 
 /**
29
 
  * Generates a new class that just defines constructors into the super types.
30
 
--- a/core/pom.xml
31
 
+++ b/core/pom.xml
32
 
@@ -584,6 +584,13 @@ THE SOFTWARE.
33
 
     </dependency>
34
 
 
35
 
     <dependency>
36
 
+      <!-- with this, stapler can load parameter names from the debug info -->
37
 
+      <groupId>asm</groupId>
38
 
+      <artifactId>asm-commons</artifactId>
39
 
+      <version>2.2.3</version>
40
 
+    </dependency>
41
 
+
42
 
+    <dependency>
43
 
       <groupId>org.kohsuke</groupId>
44
 
       <artifactId>access-modifier-annotation</artifactId>
45
 
       <version>1.0</version>