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

« back to all changes in this revision

Viewing changes to debian/patches/build/0001-build.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
From: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org>
 
2
Date: Sun, 11 Aug 2013 10:41:38 +0100
 
3
Subject: build
 
4
 
 
5
---
 
6
 core/pom.xml | 10 ++++++++++
 
7
 pom.xml      |  6 ------
 
8
 2 files changed, 10 insertions(+), 6 deletions(-)
 
9
 
 
10
diff --git a/core/pom.xml b/core/pom.xml
 
11
index c72677e..55078a5 100644
 
12
--- a/core/pom.xml
 
13
+++ b/core/pom.xml
 
14
@@ -326,6 +326,16 @@ THE SOFTWARE.
 
15
       <groupId>commons-jelly</groupId>
 
16
       <artifactId>commons-jelly-tags-fmt</artifactId>
 
17
       <version>1.0</version>
 
18
+      <exclusions>
 
19
+        <exclusion>
 
20
+          <groupId>commons-jelly</groupId>
 
21
+          <artifactId>commons-jelly</artifactId>
 
22
+        </exclusion>
 
23
+        <exclusion>
 
24
+          <groupId>commons-jexl</groupId>
 
25
+          <artifactId>commons-jexl</artifactId>
 
26
+        </exclusion>
 
27
+      </exclusions>
 
28
     </dependency>
 
29
     <dependency>
 
30
       <groupId>commons-jelly</groupId>
 
31
diff --git a/pom.xml b/pom.xml
 
32
index 9e32fca..8b43d42 100644
 
33
--- a/pom.xml
 
34
+++ b/pom.xml
 
35
@@ -48,10 +48,7 @@ THE SOFTWARE.
 
36
 
 
37
   <modules>
 
38
     <module>core</module>
 
39
-    <module>maven-plugin</module>
 
40
-    <module>ui-samples-plugin</module>
 
41
     <module>war</module>
 
42
-    <module>test</module>
 
43
     <module>cli</module>
 
44
     <module>plugins</module>
 
45
   </modules>
 
46
@@ -621,9 +618,6 @@ THE SOFTWARE.
 
47
                 <requireJavaVersion>
 
48
                   <version>1.6.0-18</version>
 
49
                 </requireJavaVersion>
 
50
-                <requireMavenVersion>
 
51
-                  <version>3.0</version>
 
52
-                </requireMavenVersion>
 
53
               </rules>
 
54
             </configuration>
 
55
           </execution>