Skip to content

Commit 42ca358

Browse files
bguerinbguerin
authored
chore: update to 2.319.x LTS baseline (jenkinsci#494)
1 parent 36b97aa commit 42ca358

8 files changed

+37
-37
lines changed

‎jenkins-plugin/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
<dependencies>
4747
<dependency>
4848
<groupId>io.jenkins.tools.bom</groupId>
49-
<artifactId>bom-2.303.x</artifactId>
49+
<artifactId>bom-2.319.x</artifactId>
5050
<version>${jenkins-tools-bom.version}</version>
5151
<type>pom</type>
5252
<scope>import</scope>

‎jenkins-plugin/src/test/java/org/jenkinsci/plugins/pipeline/maven/DependencyFingerprintPublisherTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ public void verify_fingerprinting_of_dependencies() throws Exception {
2828

2929
loadMonoDependencyMavenProjectInGitRepo(this.gitRepoRule);
3030

31-
String pipelineScript = "node('master') {\n" +
31+
String pipelineScript = "node() {\n" +
3232
" git($/" + gitRepoRule.toString() + "/$)\n" +
3333
" withMaven(options:[dependenciesFingerprintPublisher(includeReleaseVersions:true)]) {\n" +
3434
" sh 'mvn package'\n" +

‎jenkins-plugin/src/test/java/org/jenkinsci/plugins/pipeline/maven/DependencyGraphTest.java

+12-12
Original file line numberDiff line numberDiff line change
@@ -72,13 +72,13 @@ public void verify_downstream_simple_pipeline_trigger() throws Exception {
7272
System.out.println("downstreamArtifactRepoRule: " + downstreamArtifactRepoRule);
7373
loadMavenWarProjectInGitRepo(this.downstreamArtifactRepoRule);
7474

75-
String mavenJarPipelineScript = "node('master') {\n" +
75+
String mavenJarPipelineScript = "node() {\n" +
7676
" git($/" + gitRepoRule.toString() + "/$)\n" +
7777
" withMaven() {\n" +
7878
" sh 'mvn install'\n" +
7979
" }\n" +
8080
"}";
81-
String mavenWarPipelineScript = "node('master') {\n" +
81+
String mavenWarPipelineScript = "node() {\n" +
8282
" git($/" + downstreamArtifactRepoRule.toString() + "/$)\n" +
8383
" withMaven() {\n" +
8484
" sh 'mvn install'\n" +
@@ -123,7 +123,7 @@ public void verify_downstream_multi_branch_pipeline_trigger() throws Exception {
123123
System.out.println("downstreamArtifactRepoRule: " + downstreamArtifactRepoRule);
124124
loadMavenWarProjectInGitRepo(this.downstreamArtifactRepoRule);
125125

126-
String script = "node('master') {\n" +
126+
String script = "node() {\n" +
127127
" checkout scm\n" +
128128
" withMaven() {\n" +
129129
" sh 'mvn install'\n" +
@@ -188,7 +188,7 @@ public void verify_osgi_bundle_recorded_as_bundle_and_as_jar() throws Exception
188188
loadOsgiBundleProjectInGitRepo(gitRepoRule);
189189

190190

191-
String pipelineScript = "node('master') {\n" +
191+
String pipelineScript = "node() {\n" +
192192
" git($/" + gitRepoRule.toString() + "/$)\n" +
193193
" withMaven() {\n" +
194194
" sh 'mvn package'\n" +
@@ -236,13 +236,13 @@ public void verify_downstream_pipeline_triggered_on_parent_pom_build() throws Ex
236236
System.out.println("downstreamArtifactRepoRule: " + downstreamArtifactRepoRule);
237237
loadMavenWarProjectInGitRepo(this.downstreamArtifactRepoRule);
238238

239-
String mavenJarPipelineScript = "node('master') {\n" +
239+
String mavenJarPipelineScript = "node() {\n" +
240240
" git($/" + gitRepoRule.toString() + "/$)\n" +
241241
" withMaven() {\n" +
242242
" sh 'mvn install'\n" +
243243
" }\n" +
244244
"}";
245-
String mavenWarPipelineScript = "node('master') {\n" +
245+
String mavenWarPipelineScript = "node() {\n" +
246246
" git($/" + downstreamArtifactRepoRule.toString() + "/$)\n" +
247247
" withMaven() {\n" +
248248
" sh 'mvn install'\n" +
@@ -287,13 +287,13 @@ public void verify_nbm_downstream_simple_pipeline_trigger() throws Exception {
287287
System.out.println("downstreamArtifactRepoRule: " + downstreamArtifactRepoRule);
288288
loadNbmBaseMavenProjectInGitRepo(this.downstreamArtifactRepoRule);
289289

290-
String mavenNbmDependencyPipelineScript = "node('master') {\n"
290+
String mavenNbmDependencyPipelineScript = "node() {\n"
291291
+ " git($/" + gitRepoRule.toString() + "/$)\n"
292292
+ " withMaven() {\n"
293293
+ " sh 'mvn install'\n"
294294
+ " }\n"
295295
+ "}";
296-
String mavenNbmBasePipelineScript = "node('master') {\n"
296+
String mavenNbmBasePipelineScript = "node() {\n"
297297
+ " git($/" + downstreamArtifactRepoRule.toString() + "/$)\n"
298298
+ " withMaven() {\n"
299299
+ " sh 'mvn install'\n"
@@ -334,13 +334,13 @@ public void verify_docker_downstream_simple_pipeline_trigger() throws Exception
334334
System.out.println("downstreamArtifactRepoRule: " + downstreamArtifactRepoRule);
335335
loadDockerBaseMavenProjectInGitRepo(this.downstreamArtifactRepoRule);
336336

337-
String mavenDockerDependencyPipelineScript = "node('master') {\n"
337+
String mavenDockerDependencyPipelineScript = "node() {\n"
338338
+ " git($/" + gitRepoRule.toString() + "/$)\n"
339339
+ " withMaven() {\n"
340340
+ " sh 'mvn install'\n"
341341
+ " }\n"
342342
+ "}";
343-
String mavenDockerBasePipelineScript = "node('master') {\n"
343+
String mavenDockerBasePipelineScript = "node() {\n"
344344
+ " git($/" + downstreamArtifactRepoRule.toString() + "/$)\n"
345345
+ " withMaven() {\n"
346346
+ " sh 'mvn install'\n"
@@ -388,13 +388,13 @@ public void verify_deployfile_downstream_simple_pipeline_trigger() throws Except
388388
System.out.println("downstreamArtifactRepoRule: " + downstreamArtifactRepoRule);
389389
loadDeployFileBaseMavenProjectInGitRepo(this.downstreamArtifactRepoRule);
390390

391-
String mavenDeployFileDependencyPipelineScript = "node('master') {\n"
391+
String mavenDeployFileDependencyPipelineScript = "node() {\n"
392392
+ " git($/" + gitRepoRule.toString() + "/$)\n"
393393
+ " withMaven() {\n"
394394
+ " sh 'mvn install deploy:deploy-file@deploy-file'\n"
395395
+ " }\n"
396396
+ "}";
397-
String mavenDeployFileBasePipelineScript = "node('master') {\n"
397+
String mavenDeployFileBasePipelineScript = "node() {\n"
398398
+ " git($/" + downstreamArtifactRepoRule.toString() + "/$)\n"
399399
+ " withMaven() {\n"
400400
+ " sh 'mvn install'\n"

‎jenkins-plugin/src/test/java/org/jenkinsci/plugins/pipeline/maven/WithMavenStepGlobalConfigurationTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ private void maven_build_jar_project_on_master_with_globally_disabled_publisher_
8383

8484
loadMavenJarProjectInGitRepo(this.gitRepoRule);
8585

86-
String pipelineScript = "node('master') {\n" +
86+
String pipelineScript = "node() {\n" +
8787
" git($/" + gitRepoRule.toString() + "/$)\n" +
8888
" withMaven() {\n" +
8989
" sh 'mvn package verify'\n" +
@@ -143,7 +143,7 @@ private void maven_build_jar_project_on_master_with_publisher_configured_both_gl
143143

144144
loadMavenJarProjectInGitRepo(this.gitRepoRule);
145145

146-
String pipelineScript = "node('master') {\n" +
146+
String pipelineScript = "node() {\n" +
147147
" git($/" + gitRepoRule.toString() + "/$)\n" +
148148
" withMaven(options:[" + symbol + "(disabled: true)]) {\n" +
149149
" sh 'mvn package verify'\n" +

‎jenkins-plugin/src/test/java/org/jenkinsci/plugins/pipeline/maven/WithMavenStepOnMasterTest.java

+13-13
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ public void after() {
9494
public void maven_build_on_master_with_specified_maven_installation_succeeds() throws Exception {
9595
loadMavenJarProjectInGitRepo(this.gitRepoRule);
9696

97-
String pipelineScript = "node('master') {\n" +
97+
String pipelineScript = "node() {\n" +
9898
" git($/" + gitRepoRule.toString() + "/$)\n" +
9999
" withMaven(maven: 'apache-maven-3.6.3') {\n" +
100100
" sh 'mvn package'\n" +
@@ -121,7 +121,7 @@ public void maven_build_on_master_with_specified_maven_installation_succeeds() t
121121
public void maven_build_on_master_with_missing_specified_maven_installation_fails() throws Exception {
122122
loadMavenJarProjectInGitRepo(this.gitRepoRule);
123123

124-
String pipelineScript = "node('master') {\n" +
124+
String pipelineScript = "node() {\n" +
125125
" git($/" + gitRepoRule.toString() + "/$)\n" +
126126
" withMaven(maven: 'install-does-not-exist') {\n" +
127127
" sh 'mvn package'\n" +
@@ -137,7 +137,7 @@ public void maven_build_on_master_with_missing_specified_maven_installation_fail
137137
public void maven_build_jar_project_on_master_succeeds() throws Exception {
138138
loadMavenJarProjectInGitRepo(this.gitRepoRule);
139139

140-
String pipelineScript = "node('master') {\n" +
140+
String pipelineScript = "node() {\n" +
141141
" git($/" + gitRepoRule.toString() + "/$)\n" +
142142
" withMaven() {\n" +
143143
" sh 'mvn package verify'\n" +
@@ -187,7 +187,7 @@ public void maven_build_jar_project_on_master_succeeds() throws Exception {
187187
public void maven_build_jar_with_jacoco_succeeds() throws Exception {
188188
loadMavenJarWithJacocoInGitRepo(this.gitRepoRule);
189189

190-
String pipelineScript = "node('master') {\n" +
190+
String pipelineScript = "node() {\n" +
191191
" git($/" + gitRepoRule.toString() + "/$)\n" +
192192
" withMaven() {\n" +
193193
" sh 'mvn package verify'\n" +
@@ -221,7 +221,7 @@ public void maven_build_jar_with_jacoco_succeeds() throws Exception {
221221
public void maven_build_jar_project_with_whitespace_char_in_name() throws Exception {
222222
loadMavenJarProjectInGitRepo(this.gitRepoRule);
223223

224-
String pipelineScript = "node('master') {\n" +
224+
String pipelineScript = "node() {\n" +
225225
" git($/" + gitRepoRule.toString() + "/$)\n" +
226226
" withMaven() {\n" +
227227
" sh 'mvn help:effective-settings'\n" +
@@ -312,7 +312,7 @@ private void maven_build_jar_project_on_master_with_disabled_publisher_param_suc
312312

313313
loadMavenJarProjectInGitRepo(this.gitRepoRule);
314314

315-
String pipelineScript = "node('master') {\n" +
315+
String pipelineScript = "node() {\n" +
316316
" git($/" + gitRepoRule.toString() + "/$)\n" +
317317
" withMaven(options:[" + symbol + "(disabled:" + disabled + ")]) {\n" +
318318
" sh 'mvn package verify'\n" +
@@ -346,7 +346,7 @@ public void maven_build_jar_project_on_master_with_open_task_scanner_config_succ
346346

347347
loadMavenJarProjectInGitRepo(this.gitRepoRule);
348348

349-
String pipelineScript = "node('master') {\n" +
349+
String pipelineScript = "node() {\n" +
350350
" git($/" + gitRepoRule.toString() + "/$)\n" +
351351
" withMaven(options:[openTasksPublisher(" +
352352
" disabled:false, " +
@@ -369,7 +369,7 @@ public void maven_build_jar_project_on_master_with_open_task_scanner_config_succ
369369
public void maven_build_maven_jar_with_flatten_pom_project_on_master_succeeds() throws Exception {
370370
loadMavenJarWithFlattenPomProjectInGitRepo(this.gitRepoRule);
371371

372-
String pipelineScript = "node('master') {\n" +
372+
String pipelineScript = "node() {\n" +
373373
" git($/" + gitRepoRule.toString() + "/$)\n" +
374374
" withMaven() {\n" +
375375
" sh 'mvn package'\n" +
@@ -411,7 +411,7 @@ public void maven_build_maven_jar_with_flatten_pom_project_on_master_succeeds()
411411
public void maven_build_maven_hpi_project_on_master_succeeds() throws Exception {
412412
loadJenkinsPluginProjectInGitRepo(this.gitRepoRule);
413413

414-
String pipelineScript = "node('master') {\n" +
414+
String pipelineScript = "node() {\n" +
415415
" git($/" + gitRepoRule.toString() + "/$)\n" +
416416
" withMaven() {\n" +
417417
" sh 'mvn package'\n" +
@@ -451,7 +451,7 @@ public void maven_build_maven_hpi_project_on_master_succeeds() throws Exception
451451
public void maven_build_maven_plugin_project_on_master_succeeds() throws Exception {
452452
loadMavenPluginProjectInGitRepo(this.gitRepoRule);
453453

454-
String pipelineScript = "node('master') {\n" +
454+
String pipelineScript = "node() {\n" +
455455
" git($/" + gitRepoRule.toString() + "/$)\n" +
456456
" withMaven() {\n" +
457457
" sh 'mvn package'\n" +
@@ -493,7 +493,7 @@ public void maven_build_maven_plugin_project_on_master_succeeds() throws Excepti
493493
public void maven_build_on_master_with_no_generated_jar_succeeds() throws Exception {
494494
loadMavenJarProjectInGitRepo(this.gitRepoRule);
495495

496-
String pipelineScript = "node('master') {\n" +
496+
String pipelineScript = "node() {\n" +
497497
" git($/" + gitRepoRule.toString() + "/$)\n" +
498498
" withMaven() {\n" +
499499
" sh 'mvn test'\n" +
@@ -974,15 +974,15 @@ public void maven_build_test_results_by_stage_and_branch() throws Exception {
974974

975975
String pipelineScript = "stage('first') {\n" +
976976
" parallel(a: {\n" +
977-
" node('master') {\n" +
977+
" node() {\n" +
978978
" git($/" + gitRepoRule.toString() + "/$)\n" +
979979
" withMaven() {\n" +
980980
" sh 'mvn package verify'\n" +
981981
" }\n" +
982982
" }\n" +
983983
" },\n" +
984984
" b: {\n" +
985-
" node('master') {\n" +
985+
" node() {\n" +
986986
" git($/" + gitRepoRule.toString() + "/$)\n" +
987987
" withMaven() {\n" +
988988
" sh 'mvn package verify'\n" +

‎jenkins-plugin/src/test/java/org/jenkinsci/plugins/pipeline/maven/WithMavenStepTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ public void testDisableAllPublishers() throws Exception {
8787
loadMonoDependencyMavenProjectInGitRepo(this.gitRepoRule);
8888

8989
runPipeline(Result.SUCCESS, "" +
90-
"node('master') {\n" +
90+
"node() {\n" +
9191
" git($/" + gitRepoRule.toString() + "/$)\n" +
9292
" withMaven(publisherStrategy: 'EXPLICIT') {\n" +
9393
" sh 'mvn package'\n" +

‎jenkins-plugin/src/test/java/org/jenkinsci/plugins/pipeline/maven/listeners/DownstreamPipelineTriggerRunListenerIntegrationTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ public void setup() throws Exception {
5757
@Test
5858
public void test_infinite_loop() throws Exception {
5959
loadMultiModuleProjectInGitRepo(this.gitRepoRule);
60-
String pipelineScript = "node('master') {\n" +
60+
String pipelineScript = "node() {\n" +
6161
" git($/" + gitRepoRule.toString() + "/$)\n" +
6262
" withMaven() {\n" +
6363
" sh 'mvn install'\n" +

‎pom.xml

+6-6
Original file line numberDiff line numberDiff line change
@@ -93,11 +93,11 @@
9393
<jansi.version>2.4.0</jansi.version>
9494
<java.level>8</java.level>
9595
<jenkins-annotation-indexer.version>1.16</jenkins-annotation-indexer.version>
96-
<jenkins-credentials.version>2.6.1.1</jenkins-credentials.version>
96+
<jenkins-credentials.version>1087.1089.v2f1b_9a_b_040e4</jenkins-credentials.version>
9797
<jenkins-docker-fixtures.version>1.12</jenkins-docker-fixtures.version>
9898
<jenkins-plugin-findbugs.version>5.0.0</jenkins-plugin-findbugs.version>
9999
<jenkins-plugin-flaky-test.version>1.2.2</jenkins-plugin-flaky-test.version>
100-
<jenkins-plugin-folder.version>6.714.v79e858ef76a_2</jenkins-plugin-folder.version>
100+
<jenkins-plugin-folder.version>6.722.v8165b_a_cf25e9</jenkins-plugin-folder.version>
101101
<jenkins-plugin-h2.version>1.4.199</jenkins-plugin-h2.version>
102102
<jenkins-plugin-jacoco.version>3.3.2</jenkins-plugin-jacoco.version>
103103
<jenkins-plugin-jgiven.version>0.15.1</jenkins-plugin-jgiven.version>
@@ -106,13 +106,13 @@
106106
<jenkins-plugin-mysql.version>8.0.16</jenkins-plugin-mysql.version>
107107
<jenkins-plugin-postgresql.version>42.3.3</jenkins-plugin-postgresql.version>
108108
<jenkins-plugin-script-security.version>1138.v8e727069a_025</jenkins-plugin-script-security.version>
109-
<jenkins-plugin-ssh-creds.version>277.v95c2fec1c047</jenkins-plugin-ssh-creds.version>
109+
<jenkins-plugin-ssh-creds.version>277.280.v1e86b_7d0056b_</jenkins-plugin-ssh-creds.version>
110110
<jenkins-plugin-tasks.version>4.53</jenkins-plugin-tasks.version>
111111
<jenkins-plugin-token.version>293.v283932a_0a_b_49</jenkins-plugin-token.version>
112-
<jenkins-plugin-workflow.version>1144.v61c3180fa_03f</jenkins-plugin-workflow.version>
112+
<jenkins-plugin-workflow.version>1153.vb_912c0e47fb_a_</jenkins-plugin-workflow.version>
113113
<jenkins-symbol.version>1.23</jenkins-symbol.version>
114-
<jenkins-tools-bom.version>1500.ve4d05cd32975</jenkins-tools-bom.version>
115-
<jenkins.version>2.303.3</jenkins.version>
114+
<jenkins-tools-bom.version>1554.v77b_8d3b_46a_37</jenkins-tools-bom.version>
115+
<jenkins.version>2.319.3</jenkins.version>
116116
<joda-time.version>2.10.14</joda-time.version>
117117
<junit.version>4.13.2</junit.version>
118118
<maven-compat.version>3.3.9</maven-compat.version>

0 commit comments

Comments
 (0)