Skip to content

Commit f5cc442

Browse files
TonyNobleTonyNoble
authored
Merge pull request #23 from jenkinsci/pipeline-devel
Pipeline compatibility updates
2 parents 9610911 + bb416a3 commit f5cc442

File tree

23 files changed

+540
-276
lines changed

23 files changed

+540
-276
lines changed

‎Readme.md‎

Lines changed: 74 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,74 @@
1+
# UrlTrigger Plugin
2+
3+
## Declarative Pipeline Syntax
4+
Example:
5+
6+
```groovy
7+
pipeline {
8+
9+
agent any
10+
11+
triggers {
12+
13+
URLTrigger(
14+
cronTabSpec: '* * * * *',
15+
entries: [
16+
URLTriggerEntry(
17+
url: 'http://www.mysite.com/jsoncontent',
18+
username: 'myuser',
19+
password: 'mypassword',
20+
checkETag: false,
21+
checkStatus: true,
22+
statusCode: 403,
23+
checkLastModificationDate: true,
24+
timeout: 200,
25+
requestHeaders: [
26+
RequestHeader( headerName: "Accept" , headerValue: "application/json" )
27+
],
28+
contentTypes: [
29+
JsonContent(
30+
[
31+
JsonContentEntry( jsonPath: 'level1.level2.level3' )
32+
])
33+
]
34+
),
35+
URLTriggerEntry(
36+
url: 'http://www.mysite.com/xmlcontent',
37+
requestHeaders: [
38+
RequestHeader( headerName: "Accept" , headerValue: "application/xml" )
39+
],
40+
contentTypes: [
41+
XMLContent(
42+
[
43+
XMLContentEntry( xPath: 'level1/level2/level3' )
44+
])
45+
]
46+
),
47+
URLTriggerEntry(
48+
url: 'http://www.mysite.com/textcontent',
49+
contentTypes: [
50+
TextContent(
51+
[
52+
TextContentEntry( regEx: "Hello.*" ),
53+
TextContentEntry( regEx: "Goodbye.*" )
54+
])
55+
]
56+
),
57+
URLTriggerEntry(
58+
url: 'http://www.mysite.com/generalcontent',
59+
contentTypes: [
60+
MD5Sum()
61+
]
62+
)
63+
]
64+
)
65+
}
66+
stages {
67+
stage( "Default stage" ) {
68+
steps {
69+
echo "This is a stage"
70+
}
71+
}
72+
}
73+
}
74+
```

‎pom.xml‎

Lines changed: 175 additions & 133 deletions
Original file line numberDiff line numberDiff line change
@@ -1,136 +1,178 @@
1-
<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">
2-
<modelVersion>4.0.0</modelVersion>
3-
4-
<parent>
5-
<groupId>org.jenkins-ci.plugins</groupId>
6-
<artifactId>plugin</artifactId>
7-
<version>1.580.1</version>
8-
</parent>
9-
10-
<artifactId>urltrigger</artifactId>
11-
<packaging>hpi</packaging>
12-
<name>Jenkins URLTrigger Plug-in</name>
13-
<version>0.46-SNAPSHOT</version>
14-
<url>http://wiki.jenkins-ci.org/display/JENKINS/URLTrigger+Plugin</url>
15-
16-
<licenses>
17-
<license>
18-
<name>MIT license</name>
19-
<comments>All source code is under the MIT license.</comments>
20-
</license>
21-
</licenses>
22-
23-
<developers>
24-
<developer>
25-
<id>gbois</id>
26-
<name>Gregory Boissinot</name>
27-
<timezone>+1</timezone>
28-
</developer>
29-
</developers>
30-
31-
<properties>
32-
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
33-
<maven.compiler.source>1.6</maven.compiler.source>
34-
<maven.compiler.target>1.6</maven.compiler.target>
35-
<xtrigger.lib.version>0.33</xtrigger.lib.version>
36-
<jersey.client.version>1.9.1</jersey.client.version>
37-
<json.path.version>0.5.5</json.path.version>
38-
<jackson.mapper.as1.version>1.8.3</jackson.mapper.as1.version>
39-
<junit.version>4.8.2</junit.version>
40-
<mockito.version>1.8.5</mockito.version>
41-
</properties>
42-
43-
<scm>
44-
<connection>scm:git:git://github.com/jenkinsci/urltrigger-plugin.git</connection>
45-
<developerConnection>scm:git:[email protected]:jenkinsci/urltrigger-plugin.git</developerConnection>
46-
<tag>HEAD</tag>
47-
</scm>
48-
49-
<distributionManagement>
50-
<repository>
51-
<id>maven.jenkins-ci.org</id>
52-
<url>https://repo.jenkins-ci.org/releases/</url>
53-
</repository>
54-
<snapshotRepository>
55-
<id>maven.jenkins-ci.org</id>
56-
<url>https://repo.jenkins-ci.org/snapshots/</url>
57-
</snapshotRepository>
58-
</distributionManagement>
59-
60-
<dependencies>
61-
62-
<dependency>
63-
<groupId>org.jenkins-ci.lib</groupId>
64-
<artifactId>xtrigger-lib</artifactId>
65-
<version>${xtrigger.lib.version}</version>
66-
</dependency>
67-
68-
<dependency>
69-
<groupId>org.jenkins-ci.plugins</groupId>
70-
<artifactId>matrix-project</artifactId>
71-
<version>1.3</version>
72-
</dependency>
73-
74-
<dependency>
75-
<groupId>com.sun.jersey</groupId>
76-
<artifactId>jersey-client</artifactId>
77-
<version>${jersey.client.version}</version>
78-
</dependency>
79-
80-
<dependency>
81-
<groupId>com.sun.jersey.contribs</groupId>
82-
<artifactId>jersey-apache-client</artifactId>
83-
<version>${jersey.client.version}</version>
84-
</dependency>
85-
86-
<dependency>
87-
<groupId>com.jayway.jsonpath</groupId>
88-
<artifactId>json-path</artifactId>
89-
<version>${json.path.version}</version>
90-
</dependency>
91-
92-
<dependency>
93-
<groupId>org.codehaus.jackson</groupId>
94-
<artifactId>jackson-mapper-asl</artifactId>
95-
<version>${jackson.mapper.as1.version}</version>
96-
</dependency>
97-
98-
<dependency>
99-
<groupId>commons-net</groupId>
100-
<artifactId>commons-net</artifactId>
101-
<version>3.2</version>
102-
</dependency>
103-
104-
<dependency>
105-
<groupId>junit</groupId>
106-
<artifactId>junit</artifactId>
107-
<version>${junit.version}</version>
108-
<scope>test</scope>
109-
</dependency>
110-
111-
<dependency>
112-
<groupId>org.mockito</groupId>
113-
<artifactId>mockito-all</artifactId>
114-
<version>${mockito.version}</version>
115-
<scope>test</scope>
116-
</dependency>
117-
118-
</dependencies>
119-
120-
<repositories>
121-
<repository>
122-
<id>repo.jenkins-ci.org</id>
123-
<name>Jenkins Repository</name>
124-
<url>http://repo.jenkins-ci.org/public/</url>
125-
</repository>
126-
</repositories>
127-
128-
<pluginRepositories>
129-
<pluginRepository>
130-
<id>repo.jenkins-ci.org</id>
131-
<url>http://repo.jenkins-ci.org/public/</url>
132-
</pluginRepository>
133-
</pluginRepositories>
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<project xmlns="http://maven.apache.org/POM/4.0.0"
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
5+
<modelVersion>4.0.0</modelVersion>
6+
7+
<parent>
8+
<groupId>org.jenkins-ci.plugins</groupId>
9+
<artifactId>plugin</artifactId>
10+
<version>3.47</version>
11+
</parent>
12+
13+
<artifactId>urltrigger</artifactId>
14+
<packaging>hpi</packaging>
15+
<name>Jenkins URLTrigger Plug-in</name>
16+
<version>0.46-SNAPSHOT</version>
17+
<url>http://wiki.jenkins-ci.org/display/JENKINS/URLTrigger+Plugin</url>
18+
19+
<licenses>
20+
<license>
21+
<name>MIT license</name>
22+
<comments>All source code is under the MIT license.</comments>
23+
</license>
24+
</licenses>
25+
26+
<developers>
27+
<developer>
28+
<id>gbois</id>
29+
<name>Gregory Boissinot</name>
30+
<timezone>+1</timezone>
31+
</developer>
32+
<developer>
33+
<id>TonyNoble</id>
34+
<name>Tony Noble</name>
35+
<timezone>+0</timezone>
36+
</developer>
37+
</developers>
38+
39+
<properties>
40+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
41+
<maven.compiler.source>1.8</maven.compiler.source>
42+
<maven.compiler.target>1.8</maven.compiler.target>
43+
<java.version>1.8.0</java.version>
44+
<java.level>8</java.level>
45+
<xtrigger.lib.version>0.34</xtrigger.lib.version>
46+
<jersey.client.version>1.19.4</jersey.client.version>
47+
<json.path.version>0.5.5</json.path.version>
48+
<jackson.mapper.as1.version>1.8.3</jackson.mapper.as1.version>
49+
<junit.version>4.12</junit.version>
50+
<mockito.version>1.8.5</mockito.version>
51+
<jenkins.version>2.176</jenkins.version>
52+
</properties>
53+
54+
<scm>
55+
<connection>scm:git:git://github.com/jenkinsci/urltrigger-plugin.git</connection>
56+
<developerConnection>scm:git:[email protected]:jenkinsci/urltrigger-plugin.git</developerConnection>
57+
<tag>HEAD</tag>
58+
</scm>
59+
60+
<distributionManagement>
61+
<repository>
62+
<id>maven.jenkins-ci.org</id>
63+
<url>https://repo.jenkins-ci.org/releases/</url>
64+
</repository>
65+
<snapshotRepository>
66+
<id>maven.jenkins-ci.org</id>
67+
<url>https://repo.jenkins-ci.org/snapshots/</url>
68+
</snapshotRepository>
69+
</distributionManagement>
70+
71+
<dependencies>
72+
73+
<dependency>
74+
<groupId>org.jenkins-ci.plugins</groupId>
75+
<artifactId>structs</artifactId>
76+
<version>1.5</version>
77+
</dependency>
78+
79+
80+
<dependency>
81+
<groupId>org.jenkins-ci.lib</groupId>
82+
<artifactId>xtrigger-lib</artifactId>
83+
<version>${xtrigger.lib.version}</version>
84+
</dependency>
85+
86+
<dependency>
87+
<groupId>org.jenkins-ci.plugins</groupId>
88+
<artifactId>matrix-project</artifactId>
89+
<version>1.3</version>
90+
</dependency>
91+
92+
<dependency>
93+
<groupId>com.sun.jersey</groupId>
94+
<artifactId>jersey-client</artifactId>
95+
<version>${jersey.client.version}</version>
96+
</dependency>
97+
98+
<dependency>
99+
<groupId>com.sun.jersey.contribs</groupId>
100+
<artifactId>jersey-apache-client</artifactId>
101+
<version>${jersey.client.version}</version>
102+
</dependency>
103+
104+
<dependency>
105+
<groupId>commons-httpclient</groupId>
106+
<artifactId>commons-httpclient</artifactId>
107+
<version>3.1-jenkins-1</version>
108+
</dependency>
109+
110+
<dependency>
111+
<groupId>commons-codec</groupId>
112+
<artifactId>commons-codec</artifactId>
113+
<version>1.9</version>
114+
</dependency>
115+
<dependency>
116+
<groupId>org.jenkins-ci.plugins.workflow</groupId>
117+
<artifactId>workflow-job</artifactId>
118+
<version>2.15</version>
119+
<scope>test</scope>
120+
</dependency>
121+
122+
<dependency>
123+
<groupId>com.jayway.jsonpath</groupId>
124+
<artifactId>json-path</artifactId>
125+
<version>${json.path.version}</version>
126+
</dependency>
127+
128+
<dependency>
129+
<groupId>org.codehaus.jackson</groupId>
130+
<artifactId>jackson-mapper-asl</artifactId>
131+
<version>${jackson.mapper.as1.version}</version>
132+
</dependency>
133+
134+
<dependency>
135+
<groupId>commons-net</groupId>
136+
<artifactId>commons-net</artifactId>
137+
<version>3.6</version>
138+
</dependency>
139+
140+
<dependency>
141+
<groupId>commons-lang</groupId>
142+
<artifactId>commons-lang</artifactId>
143+
<version>2.6</version>
144+
</dependency>
145+
146+
<dependency>
147+
<groupId>junit</groupId>
148+
<artifactId>junit</artifactId>
149+
<version>${junit.version}</version>
150+
<scope>test</scope>
151+
</dependency>
152+
153+
<dependency>
154+
<groupId>org.mockito</groupId>
155+
<artifactId>mockito-all</artifactId>
156+
<version>${mockito.version}</version>
157+
<scope>test</scope>
158+
</dependency>
159+
160+
</dependencies>
161+
162+
<repositories>
163+
<repository>
164+
<id>repo.jenkins-ci.org</id>
165+
<name>Jenkins Repository</name>
166+
<url>http://repo.jenkins-ci.org/public/</url>
167+
</repository>
168+
</repositories>
169+
170+
<pluginRepositories>
171+
<pluginRepository>
172+
<id>repo.jenkins-ci.org</id>
173+
<url>http://repo.jenkins-ci.org/public/</url>
174+
</pluginRepository>
175+
</pluginRepositories>
134176

135177
</project>
136178

0 commit comments

Comments
 (0)