Skip to content

Commit 35b0234

Browse files
committed
Merge branch 'incrementals' into UTF-8-JENKINS-31096
2 parents 0dcf951 + 90d1016 commit 35b0234

File tree

3 files changed

+18
-7
lines changed

3 files changed

+18
-7
lines changed

.mvn/extensions.xml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
<extensions xmlns="http://maven.apache.org/EXTENSIONS/1.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/EXTENSIONS/1.0.0 http://maven.apache.org/xsd/core-extensions-1.0.0.xsd">
2+
<extension>
3+
<groupId>io.jenkins.tools.incrementals</groupId>
4+
<artifactId>git-changelist-maven-extension</artifactId>
5+
<version>1.0-beta-3</version>
6+
</extension>
7+
</extensions>

.mvn/maven.config

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
-Pconsume-incrementals
2+
-Pmight-produce-incrementals

pom.xml

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,12 @@
2828
<parent>
2929
<groupId>org.jenkins-ci.plugins</groupId>
3030
<artifactId>plugin</artifactId>
31-
<version>3.4</version>
31+
<version>3.14</version>
3232
<relativePath />
3333
</parent>
3434
<groupId>org.jenkins-ci.plugins.workflow</groupId>
3535
<artifactId>workflow-durable-task-step</artifactId>
36-
<version>2.20-SNAPSHOT</version>
36+
<version>${revision}${changelist}</version>
3737
<packaging>hpi</packaging>
3838
<name>Pipeline: Nodes and Processes</name>
3939
<url>https://wiki.jenkins.io/display/JENKINS/Pipeline+Nodes+and+Processes+Plugin</url>
@@ -47,8 +47,8 @@
4747
<connection>scm:git:git://github.com/jenkinsci/${project.artifactId}-plugin.git</connection>
4848
<developerConnection>scm:git:[email protected]:jenkinsci/${project.artifactId}-plugin.git</developerConnection>
4949
<url>https://github.com/jenkinsci/${project.artifactId}-plugin</url>
50-
<tag>HEAD</tag>
51-
</scm>
50+
<tag>${scmTag}</tag>
51+
</scm>
5252
<repositories>
5353
<repository>
5454
<id>repo.jenkins-ci.org</id>
@@ -62,10 +62,12 @@
6262
</pluginRepository>
6363
</pluginRepositories>
6464
<properties>
65+
<revision>2.20</revision>
66+
<changelist>-SNAPSHOT</changelist>
6567
<jenkins.version>2.73.3</jenkins.version>
6668
<java.level>8</java.level>
6769
<workflow-step-api-plugin.version>2.13</workflow-step-api-plugin.version>
68-
<workflow-support-plugin.version>2.19-20180209.204154-1</workflow-support-plugin.version> <!-- TODO https://github.com/jenkinsci/workflow-support-plugin/pull/56 -->
70+
<workflow-support-plugin.version>2.19-rc287.918f5958551d</workflow-support-plugin.version> <!-- TODO https://github.com/jenkinsci/workflow-support-plugin/pull/56 -->
6971
</properties>
7072
<dependencies>
7173
<dependency>
@@ -76,7 +78,7 @@
7678
<dependency>
7779
<groupId>org.jenkins-ci.plugins</groupId>
7880
<artifactId>durable-task</artifactId>
79-
<version>1.19-20180219.185547-1</version> <!-- TODO https://github.com/jenkinsci/durable-task-plugin/pull/61 -->
81+
<version>1.23-rc125.7208013b9494</version> <!-- TODO https://github.com/jenkinsci/durable-task-plugin/pull/61 -->
8082
</dependency>
8183
<dependency>
8284
<groupId>org.jenkins-ci.plugins.workflow</groupId>
@@ -97,7 +99,7 @@
9799
<dependency>
98100
<groupId>org.jenkins-ci.plugins.workflow</groupId>
99101
<artifactId>workflow-job</artifactId>
100-
<version>2.18-20180209.215341-1</version> <!-- TODO https://github.com/jenkinsci/workflow-job-plugin/pull/89 -->
102+
<version>2.22-rc329.5cb884ef714a</version> <!-- TODO https://github.com/jenkinsci/workflow-job-plugin/pull/89 -->
101103
<scope>test</scope>
102104
</dependency>
103105
<dependency>

0 commit comments

Comments
 (0)