← Back to branch summary

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

« back to all changes in this revision

Viewing changes to maven-plugin/src/main/java/hudson/maven/PluginImpl.java

  • 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:
maven-plugin/src/main/java/hudson/maven/PluginImpl.java
24
24
package hudson.maven;
25
25
 
26
26
import hudson.Plugin;
 
27
import hudson.PluginManager.PluginUpdateMonitor;
 
28
import hudson.init.InitMilestone;
 
29
import hudson.init.Initializer;
27
30
import hudson.model.Items;
28
31
 
29
32
/**
30
33
 * @author huybrechts
 
34
 * @author Dominik Bartholdi (imod)
31
35
 */
32
36
public class PluginImpl extends Plugin {
33
37
    @Override
38
42
        Items.XSTREAM.alias("dependency", ModuleDependency.class);
39
43
        Items.XSTREAM.alias("maven2-module-set", MavenModule.class);  // this was a bug, but now we need to keep it for compatibility
40
44
        Items.XSTREAM.alias("maven2-moduleset", MavenModuleSet.class);
 
45
 
 
46
    }
 
47
    
 
48
    /**
 
49
     * @since 1.491
 
50
     */
 
51
    @Initializer(after=InitMilestone.PLUGINS_STARTED)
 
52
    public static void init(){
 
53
        // inform the admin if there is a version of the config file provider installed which is not compatible 
 
54
        PluginUpdateMonitor.getInstance().ifPluginOlderThenReport("config-file-provider", "2.3", Messages.PluginImpl_updateConfiProvider());        
41
55
    }
42
56
 
43
57
}