Skip to content

Commit

Permalink
Merge branch 'master' into JENKINS-28697-aborted-job
Browse files Browse the repository at this point in the history
  • Loading branch information
Marcin Zajaczkowski committed Mar 17, 2016
2 parents 8d618fa + 63984a8 commit 3c0f541
Show file tree
Hide file tree
Showing 15 changed files with 1,200 additions and 184 deletions.
254 changes: 174 additions & 80 deletions pom.xml
View file
@@ -1,89 +1,183 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>plugin</artifactId>
<version>1.424</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>plugin</artifactId>
<version>1.424</version>
</parent>

<artifactId>rundeck</artifactId>
<version>3.5-SNAPSHOT</version>
<packaging>hpi</packaging>
<artifactId>rundeck</artifactId>
<version>3.5.3-SNAPSHOT</version>
<packaging>hpi</packaging>

<name>Jenkins Rundeck plugin</name>
<description>Jenkins plugin for Rundeck integration : trigger, notifier and option provider.</description>
<url>http://wiki.jenkins-ci.org/display/JENKINS/RunDeck+Plugin</url>
<scm>
<url>https://github.com/jenkinsci/rundeck-plugin</url>
<connection>scm:git:git://github.com/jenkinsci/rundeck-plugin.git</connection>
<developerConnection>scm:git:git@github.com:jenkinsci/rundeck-plugin.git</developerConnection>
</scm>
<name>Jenkins Rundeck plugin</name>
<description>Jenkins plugin for Rundeck integration : trigger, notifier and option provider.</description>
<url>http://wiki.jenkins-ci.org/display/JENKINS/RunDeck+Plugin</url>
<scm>
<url>https://github.com/jenkinsci/rundeck-plugin</url>
<connection>scm:git:git://github.com/jenkinsci/rundeck-plugin.git</connection>
<developerConnection>scm:git:git@github.com:jenkinsci/rundeck-plugin.git</developerConnection>
</scm>

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>

<developers>
<developer>
<id>vbehar</id>
<name>Vincent Behar</name>
</developer>
<developer>
<id>gschueler</id>
<name>Greg Schueler</name>
<email>greg@simplifyops.com</email>
</developer>
</developers>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>

<build>
<plugins>
<plugin>
<groupId>org.jenkins-ci.tools</groupId>
<artifactId>maven-hpi-plugin</artifactId>
<extensions>true</extensions>
<configuration>
<compatibleSinceVersion>2.0</compatibleSinceVersion>
</configuration>
</plugin>
</plugins>
</build>
<developers>
<developer>
<id>vbehar</id>
<name>Vincent Behar</name>
</developer>
<developer>
<id>gschueler</id>
<name>Greg Schueler</name>
<email>greg@simplifyops.com</email>
</developer>
</developers>

<dependencies>
<dependency>
<groupId>org.rundeck</groupId>
<artifactId>rundeck-api-java-client</artifactId>
<version>12.0</version>
</dependency>
<!-- overwrite the xalan version of rundeck api by the version used in jenkins -->
<dependency>
<groupId>xalan</groupId>
<artifactId>xalan</artifactId>
<version>2.7.1</version>
</dependency>
<dependency>
<groupId>xalan</groupId>
<artifactId>serializer</artifactId>
<version>2.7.1</version>
</dependency>
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
<version>2.6</version>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.jenkins-ci.tools</groupId>
<artifactId>maven-hpi-plugin</artifactId>
<extensions>true</extensions>
<configuration>
<compatibleSinceVersion>2.0</compatibleSinceVersion>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>
<additionalparam>-Xdoclint:none</additionalparam>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.19</version>
<configuration>
<forkCount>1</forkCount>
<reuseForks>false</reuseForks>
</configuration>
</plugin>
</plugins>
<pluginManagement>
<plugins>
<!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself. -->
<plugin>
<groupId>org.eclipse.m2e</groupId>
<artifactId>lifecycle-mapping</artifactId>
<version>1.0.0</version>
<configuration>
<lifecycleMappingMetadata>
<pluginExecutions>
<pluginExecution>
<pluginExecutionFilter>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<versionRange>[1.0,)</versionRange>
<goals>
<goal>display-info</goal>
</goals>
</pluginExecutionFilter>
<action>
<ignore />
</action>
</pluginExecution>
<pluginExecution>
<pluginExecutionFilter>
<groupId>org.codehaus.gmaven</groupId>
<artifactId>gmaven-plugin</artifactId>
<versionRange>[1.3,)</versionRange>
<goals>
<goal>generateTestStubs</goal>
<goal>testCompile</goal>
</goals>
</pluginExecutionFilter>
<action>
<ignore />
</action>
</pluginExecution>
<pluginExecution>
<pluginExecutionFilter>
<groupId>org.jenkins-ci.tools</groupId>
<artifactId>maven-hpi-plugin</artifactId>
<versionRange>[1.74,)</versionRange>
<goals>
<goal>insert-test</goal>
<goal>resolve-test-dependencies</goal>
<goal>test-hpl</goal>
<goal>validate</goal>
</goals>
</pluginExecutionFilter>
<action>
<ignore />
</action>
</pluginExecution>
<pluginExecution>
<pluginExecutionFilter>
<groupId>org.jvnet.localizer</groupId>
<artifactId>maven-localizer-plugin</artifactId>
<versionRange>[1.12,)</versionRange>
<goals>
<goal>generate</goal>
</goals>
</pluginExecutionFilter>
<action>
<ignore />
</action>
</pluginExecution>
</pluginExecutions>
</lifecycleMappingMetadata>
</configuration>
</plugin>
</plugins>
</pluginManagement>
</build>

<!-- get every artifact through repo.jenkins-ci.org, which proxies all the artifacts that we need -->
<repositories>
<repository>
<id>repo.jenkins-ci.org</id>
<url>http://repo.jenkins-ci.org/public/</url>
</repository>
</repositories>
<pluginRepositories>
<pluginRepository>
<id>repo.jenkins-ci.org</id>
<url>http://repo.jenkins-ci.org/public/</url>
</pluginRepository>
</pluginRepositories>
<dependencies>
<dependency>
<groupId>org.rundeck</groupId>
<artifactId>rundeck-api-java-client</artifactId>
<version>12.0</version>
</dependency>
<!-- overwrite the xalan version of rundeck api by the version used in jenkins -->
<dependency>
<groupId>xalan</groupId>
<artifactId>xalan</artifactId>
<version>2.7.1</version>
</dependency>
<dependency>
<groupId>xalan</groupId>
<artifactId>serializer</artifactId>
<version>2.7.1</version>
</dependency>
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
<version>2.6</version>
</dependency>
<dependency>
<groupId>org.jmockit</groupId>
<artifactId>jmockit</artifactId>
<version>1.17</version>
<scope>test</scope>
</dependency>
</dependencies>

<!-- get every artifact through repo.jenkins-ci.org, which proxies all the artifacts that we need -->
<repositories>
<repository>
<id>repo.jenkins-ci.org</id>
<url>http://repo.jenkins-ci.org/public/</url>
</repository>
</repositories>
<pluginRepositories>
<pluginRepository>
<id>repo.jenkins-ci.org</id>
<url>http://repo.jenkins-ci.org/public/</url>
</pluginRepository>
</pluginRepositories>
</project>
2 changes: 1 addition & 1 deletion src/main/java/org/jenkinsci/plugins/rundeck/OptionProvider.java
View file
Expand Up @@ -113,7 +113,7 @@ public void doBuild(StaplerRequest request, StaplerResponse response) throws IOE
for (Run<?, ?> build : builds) {
Artifact artifact = findArtifact(artifactName, artifactPattern, build);
if (artifact != null) {
String buildName = "#" + build.getNumber() + " - " + build.getTimestampString2();
String buildName = build.getDisplayName();
options.add(new Option(buildName, buildArtifactUrl(build, artifact)));
}

Expand Down

0 comments on commit 3c0f541

Please sign in to comment.