Skip to content

Commit

Permalink
Pipeline compatibility fixes.
Browse files Browse the repository at this point in the history 
This requires xtrigger-lib 0.44-SNAPSHOT, until such time as 0.44 is
released.  Multiple fixes, mostly involving annotations on classes and
an update to the latest Jenkins LTS version as a dependency.
  • Loading branch information
@TonyNoble
TonyNoble committed Jul 20, 2019
1 parent 729f5c2 commit 82f9e6c
Show file tree
Hide file tree
Showing 12 changed files with 395 additions and 243 deletions.
309 changes: 170 additions & 139 deletions pom.xml
View file
@@ -1,142 +1,173 @@
<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>2.37</version>
</parent>

<artifactId>urltrigger</artifactId>
<packaging>hpi</packaging>
<name>Jenkins URLTrigger Plug-in</name>
<version>0.46-SNAPSHOT</version>
<url>http://wiki.jenkins-ci.org/display/JENKINS/URLTrigger+Plugin</url>

<licenses>
<license>
<name>MIT license</name>
<comments>All source code is under the MIT license.</comments>
</license>
</licenses>

<developers>
<developer>
<id>gbois</id>
<name>Gregory Boissinot</name>
<timezone>+1</timezone>
</developer>
</developers>

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.source>1.6</maven.compiler.source>
<maven.compiler.target>1.6</maven.compiler.target>
<xtrigger.lib.version>0.33</xtrigger.lib.version>
<jersey.client.version>1.9.1</jersey.client.version>
<json.path.version>0.5.5</json.path.version>
<jackson.mapper.as1.version>1.8.3</jackson.mapper.as1.version>
<junit.version>4.12</junit.version>
<mockito.version>1.8.5</mockito.version>
</properties>

<scm>
<connection>scm:git:git://github.com/jenkinsci/urltrigger-plugin.git</connection>
<developerConnection>scm:git:git@github.com:jenkinsci/urltrigger-plugin.git</developerConnection>
<tag>HEAD</tag>
</scm>

<distributionManagement>
<repository>
<id>maven.jenkins-ci.org</id>
<url>https://repo.jenkins-ci.org/releases/</url>
</repository>
<snapshotRepository>
<id>maven.jenkins-ci.org</id>
<url>https://repo.jenkins-ci.org/snapshots/</url>
</snapshotRepository>
</distributionManagement>

<dependencies>

<dependency>
<groupId>org.jenkins-ci.lib</groupId>
<artifactId>xtrigger-lib</artifactId>
<version>${xtrigger.lib.version}</version>
</dependency>

<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>matrix-project</artifactId>
<version>1.3</version>
</dependency>

<dependency>
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-client</artifactId>
<version>${jersey.client.version}</version>
</dependency>

<dependency>
<groupId>com.sun.jersey.contribs</groupId>
<artifactId>jersey-apache-client</artifactId>
<version>${jersey.client.version}</version>
</dependency>

<dependency>
<groupId>com.jayway.jsonpath</groupId>
<artifactId>json-path</artifactId>
<version>${json.path.version}</version>
</dependency>

<dependency>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-mapper-asl</artifactId>
<version>${jackson.mapper.as1.version}</version>
</dependency>

<dependency>
<groupId>commons-net</groupId>
<artifactId>commons-net</artifactId>
<version>3.2</version>
</dependency>

<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
<version>2.6</version>
</dependency>

<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>${junit.version}</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-all</artifactId>
<version>${mockito.version}</version>
<scope>test</scope>
</dependency>

</dependencies>

<repositories>
<repository>
<id>repo.jenkins-ci.org</id>
<name>Jenkins Repository</name>
<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>
<?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>3.47</version>
</parent>

<artifactId>urltrigger</artifactId>
<packaging>hpi</packaging>
<name>Jenkins URLTrigger Plug-in</name>
<version>0.46-SNAPSHOT</version>
<url>http://wiki.jenkins-ci.org/display/JENKINS/URLTrigger+Plugin</url>

<licenses>
<license>
<name>MIT license</name>
<comments>All source code is under the MIT license.</comments>
</license>
</licenses>

<developers>
<developer>
<id>gbois</id>
<name>Gregory Boissinot</name>
<timezone>+1</timezone>
</developer>
</developers>

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
<java.version>1.8.0</java.version>
<java.level>8</java.level>
<xtrigger.lib.version>0.34-SNAPSHOT</xtrigger.lib.version>
<jersey.client.version>1.19.4</jersey.client.version>
<json.path.version>0.5.5</json.path.version>
<jackson.mapper.as1.version>1.8.3</jackson.mapper.as1.version>
<junit.version>4.12</junit.version>
<mockito.version>1.8.5</mockito.version>
<jenkins.version>2.176</jenkins.version>
</properties>

<scm>
<connection>scm:git:git://github.com/jenkinsci/urltrigger-plugin.git</connection>
<developerConnection>scm:git:git@github.com:jenkinsci/urltrigger-plugin.git</developerConnection>
<tag>HEAD</tag>
</scm>

<distributionManagement>
<repository>
<id>maven.jenkins-ci.org</id>
<url>https://repo.jenkins-ci.org/releases/</url>
</repository>
<snapshotRepository>
<id>maven.jenkins-ci.org</id>
<url>https://repo.jenkins-ci.org/snapshots/</url>
</snapshotRepository>
</distributionManagement>

<dependencies>

<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>structs</artifactId>
<version>1.5</version>
</dependency>


<dependency>
<groupId>org.jenkins-ci.lib</groupId>
<artifactId>xtrigger-lib</artifactId>
<version>${xtrigger.lib.version}</version>
</dependency>

<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>matrix-project</artifactId>
<version>1.3</version>
</dependency>

<dependency>
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-client</artifactId>
<version>${jersey.client.version}</version>
</dependency>

<dependency>
<groupId>com.sun.jersey.contribs</groupId>
<artifactId>jersey-apache-client</artifactId>
<version>${jersey.client.version}</version>
</dependency>

<dependency>
<groupId>commons-httpclient</groupId>
<artifactId>commons-httpclient</artifactId>
<version>3.1-jenkins-1</version>
</dependency>

<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
<version>1.9</version>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins.workflow</groupId>
<artifactId>workflow-job</artifactId>
<version>2.15</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>com.jayway.jsonpath</groupId>
<artifactId>json-path</artifactId>
<version>${json.path.version}</version>
</dependency>

<dependency>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-mapper-asl</artifactId>
<version>${jackson.mapper.as1.version}</version>
</dependency>

<dependency>
<groupId>commons-net</groupId>
<artifactId>commons-net</artifactId>
<version>3.6</version>
</dependency>

<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
<version>2.6</version>
</dependency>

<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>${junit.version}</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-all</artifactId>
<version>${mockito.version}</version>
<scope>test</scope>
</dependency>

</dependencies>

<repositories>
<repository>
<id>repo.jenkins-ci.org</id>
<name>Jenkins Repository</name>
<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>

Expand Down

0 comments on commit 82f9e6c

Please sign in to comment.