Skip to content

Commit 0ec898e

Browse files
dwnusbaumdwnusbaum
authored
Merge pull request #100 from dwnusbaum/dependency-updates
Update minimum core version, parent POM, and dependencies
2 parents d12dd07 + 95b29f6 commit 0ec898e

File tree

4 files changed

+21
-57
lines changed

4 files changed

+21
-57
lines changed

‎Jenkinsfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
buildPlugin()
1+
buildPlugin(useAci: true)

‎pom.xml‎

Lines changed: 17 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ THE SOFTWARE.
2828
<parent>
2929
<groupId>org.jenkins-ci.plugins</groupId>
3030
<artifactId>plugin</artifactId>
31-
<version>3.54</version>
31+
<version>4.4</version>
3232
<relativePath />
3333
</parent>
3434
<groupId>org.jenkins-ci.plugins.workflow</groupId>
@@ -66,127 +66,111 @@ THE SOFTWARE.
6666
<revision>2.22</revision>
6767
<changelist>-SNAPSHOT</changelist>
6868
<java.level>8</java.level>
69-
<jenkins.version>2.138.4</jenkins.version>
70-
<scm-api.version>2.6.3</scm-api.version>
69+
<jenkins.version>2.176.4</jenkins.version>
7170
<no-test-jar>false</no-test-jar>
72-
<workflow-step-api.version>2.13</workflow-step-api.version>
73-
<workflow-support.version>2.17</workflow-support.version>
74-
<workflow-cps.version>2.53</workflow-cps.version>
75-
<git-plugin.version>3.9.1</git-plugin.version>
71+
<workflow-job-plugin.version>2.39</workflow-job-plugin.version> <!-- TODO: Remove after https://github.com/jenkinsci/bom/pull/264 is released. -->
7672
<subversion-plugin.version>2.13.0</subversion-plugin.version>
7773
</properties>
74+
<dependencyManagement>
75+
<dependencies>
76+
<dependency>
77+
<groupId>io.jenkins.tools.bom</groupId>
78+
<artifactId>bom-2.176.x</artifactId>
79+
<version>11</version>
80+
<scope>import</scope>
81+
<type>pom</type>
82+
</dependency>
83+
</dependencies>
84+
</dependencyManagement>
7885
<dependencies>
7986
<dependency>
8087
<groupId>org.jenkins-ci.plugins.workflow</groupId>
8188
<artifactId>workflow-step-api</artifactId>
82-
<version>${workflow-step-api.version}</version>
8389
</dependency>
8490
<dependency>
8591
<groupId>org.jenkins-ci.plugins.workflow</groupId>
8692
<artifactId>workflow-job</artifactId>
87-
<version>2.21</version>
93+
<version>${workflow-job-plugin.version}</version>
8894
</dependency>
8995
<dependency>
9096
<groupId>org.jenkins-ci.plugins.workflow</groupId>
9197
<artifactId>workflow-support</artifactId>
92-
<version>${workflow-support.version}</version>
9398
</dependency>
9499
<dependency>
95100
<groupId>org.jenkins-ci.plugins</groupId>
96101
<artifactId>structs</artifactId>
97-
<version>1.17</version>
98102
</dependency>
99103
<dependency>
100104
<groupId>org.jenkins-ci.plugins.workflow</groupId>
101105
<artifactId>workflow-cps</artifactId>
102-
<version>${workflow-cps.version}</version>
103106
</dependency>
104107
<dependency>
105108
<groupId>org.jenkins-ci.plugins</groupId>
106109
<artifactId>scm-api</artifactId>
107-
<version>${scm-api.version}</version>
108110
</dependency>
109111
<dependency>
110112
<groupId>org.jenkins-ci.plugins</groupId>
111113
<artifactId>branch-api</artifactId>
112-
<version>2.0.21</version>
113114
</dependency>
114115
<dependency>
115116
<groupId>org.jenkins-ci.plugins</groupId>
116117
<artifactId>cloudbees-folder</artifactId>
117-
<version>6.1.2</version>
118118
</dependency>
119119
<dependency>
120120
<groupId>org.jenkins-ci.plugins.workflow</groupId>
121121
<artifactId>workflow-api</artifactId>
122-
<version>2.27</version>
123122
</dependency>
124123
<dependency>
125124
<groupId>org.jenkins-ci.plugins.workflow</groupId>
126125
<artifactId>workflow-scm-step</artifactId>
127-
<version>2.7</version>
128126
</dependency>
129127
<dependency>
130128
<groupId>org.jenkins-ci.plugins</groupId>
131129
<artifactId>script-security</artifactId>
132-
<version>1.42</version>
133130
</dependency>
134131
<dependency>
135132
<groupId>org.jenkins-ci.plugins</groupId>
136133
<artifactId>scm-api</artifactId>
137-
<version>${scm-api.version}</version>
138134
<classifier>tests</classifier>
139135
<scope>test</scope>
140136
</dependency>
141137
<dependency>
142138
<groupId>org.jenkins-ci.plugins.workflow</groupId>
143139
<artifactId>workflow-basic-steps</artifactId>
144-
<version>2.3</version>
145140
<scope>test</scope>
146141
</dependency>
147142
<dependency>
148143
<groupId>org.jenkins-ci.plugins.workflow</groupId>
149144
<artifactId>workflow-durable-task-step</artifactId>
150-
<version>2.5</version>
151145
<scope>test</scope>
152146
</dependency>
153147
<dependency>
154148
<groupId>org.jenkins-ci.plugins.workflow</groupId>
155149
<artifactId>workflow-cps-global-lib</artifactId>
156-
<version>2.4</version>
150+
<version>2.17</version> <!-- TODO: Remove after https://github.com/jenkinsci/bom/pull/278 is released. -->
157151
<scope>test</scope>
158-
<exclusions>
159-
<exclusion>
160-
<groupId>org.jenkins-ci.plugins</groupId>
161-
<artifactId>git-client</artifactId>
162-
</exclusion>
163-
</exclusions>
164152
</dependency>
165153
<dependency>
166154
<groupId>org.jenkins-ci.plugins.workflow</groupId>
167155
<artifactId>workflow-step-api</artifactId>
168-
<version>${workflow-step-api.version}</version>
169156
<classifier>tests</classifier>
170157
<scope>test</scope>
171158
</dependency>
172159
<dependency>
173160
<groupId>org.jenkins-ci.plugins.workflow</groupId>
174161
<artifactId>workflow-support</artifactId>
175-
<version>${workflow-support.version}</version>
176162
<classifier>tests</classifier>
177163
<scope>test</scope>
178164
</dependency>
179165
<dependency>
180166
<groupId>org.jenkins-ci.plugins.workflow</groupId>
181167
<artifactId>workflow-cps</artifactId>
182-
<version>${workflow-cps.version}</version>
183168
<classifier>tests</classifier>
184169
<scope>test</scope>
185170
</dependency>
186171
<dependency>
187172
<groupId>org.jenkins-ci.plugins</groupId>
188173
<artifactId>git</artifactId>
189-
<version>${git-plugin.version}</version>
190174
<scope>test</scope>
191175
<exclusions>
192176
<exclusion>
@@ -208,7 +192,6 @@ THE SOFTWARE.
208192
<dependency>
209193
<groupId>org.jenkins-ci.plugins</groupId>
210194
<artifactId>git</artifactId>
211-
<version>${git-plugin.version}</version>
212195
<classifier>tests</classifier>
213196
<scope>test</scope>
214197
<exclusions>
@@ -238,7 +221,7 @@ THE SOFTWARE.
238221
<dependency>
239222
<groupId>org.jenkins-ci.plugins.workflow</groupId>
240223
<artifactId>workflow-job</artifactId>
241-
<version>2.20</version>
224+
<version>${workflow-job-plugin.version}</version>
242225
<classifier>tests</classifier>
243226
<scope>test</scope>
244227
</dependency>
@@ -248,40 +231,19 @@ THE SOFTWARE.
248231
<version>2.2</version>
249232
<scope>test</scope>
250233
</dependency>
251-
<dependency>
252-
<groupId>org.jenkins-ci.modules</groupId>
253-
<artifactId>sshd</artifactId>
254-
<version>2.4</version>
255-
<scope>test</scope><!-- from git-server via workflow-cps-global-lib and otherwise unavailable during tests -->
256-
</dependency>
257-
<dependency>
258-
<groupId>org.jenkins-ci.modules</groupId>
259-
<artifactId>instance-identity</artifactId>
260-
<version>2.2</version>
261-
<scope>test</scope>
262-
</dependency>
263-
<dependency>
264-
<groupId>org.jenkins-ci.modules</groupId>
265-
<artifactId>ssh-cli-auth</artifactId>
266-
<version>1.4</version>
267-
<scope>test</scope>
268-
</dependency>
269234
<dependency>
270235
<groupId>org.jenkins-ci.plugins</groupId>
271236
<artifactId>credentials</artifactId>
272-
<version>2.1.16</version>
273237
<scope>test</scope>
274238
</dependency>
275239
<dependency>
276240
<groupId>org.jenkins-ci.plugins</groupId>
277241
<artifactId>mailer</artifactId>
278-
<version>1.18</version>
279242
<scope>test</scope>
280243
</dependency>
281244
<dependency>
282245
<groupId>org.jenkins-ci.plugins</groupId>
283246
<artifactId>junit</artifactId>
284-
<version>1.6</version>
285247
<scope>test</scope>
286248
</dependency>
287249
</dependencies>

‎src/main/java/org/jenkinsci/plugins/workflow/multibranch/SCMVar.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@
9797
} else {
9898
SCMHead head = branch.getHead();
9999
FlowExecutionOwner owner = ((WorkflowRun) build).asFlowExecutionOwner();
100-
TaskListener listener = owner != null ? owner.getListener() : TaskListener.NULL;
100+
TaskListener listener = owner.getListener();
101101
tip = scmSource.fetch(head, listener);
102102
if (tip == null) {
103103
throw new AbortException("Could not determine exact tip revision of " + branch.getName());

‎src/test/java/org/jenkinsci/plugins/workflow/multibranch/JobPropertyStepTest.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -253,8 +253,10 @@ public void testChoiceParameterSnippetizer() throws Exception {
253253
r.waitUntilNoActivity(); // #1 built automatically
254254
assertEquals(1, p.getBuilds().size());
255255
r.assertBuildStatusSuccess(p.scheduleBuild2(0)); // #2
256+
Thread.sleep(500L); // WorkflowRun performs log rotation asynchronously.
256257
assertEquals(1, p.getBuilds().size());
257258
r.assertBuildStatusSuccess(p.scheduleBuild2(0)); // #3
259+
Thread.sleep(500L); // WorkflowRun performs log rotation asynchronously.
258260
assertEquals(1, p.getBuilds().size());
259261
WorkflowRun b3 = p.getLastBuild();
260262
assertEquals(3, b3.getNumber());

0 commit comments

Comments
 (0)