Skip to content

Commit 2320008

Browse files
Bump io.jenkins.tools.bom:bom-2.479.x from 3944.v1a_e4f8b_452db_ to 4228.v0a_71308d905b_ (#145)
1 parent d43f488 commit 2320008

File tree

2 files changed

+9
-21
lines changed

2 files changed

+9
-21
lines changed

pom.xml

Lines changed: 2 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -23,23 +23,6 @@
2323
</license>
2424
</licenses>
2525

26-
<developers>
27-
<developer>
28-
<id>markewaite</id>
29-
<name>Mark Waite</name>
30-
<email>mark.earl.waite@gmail.com</email>
31-
</developer>
32-
<developer>
33-
<id>klimas7</id>
34-
<name>Boguslaw Klimas</name>
35-
<email>klimas7@gmail.com</email>
36-
</developer>
37-
<developer>
38-
<id>lukanus</id>
39-
<name>Lukasz Milkowski</name>
40-
</developer>
41-
</developers>
42-
4326
<scm>
4427
<connection>scm:git:https://github.com/${gitHubRepo}.git</connection>
4528
<developerConnection>scm:git:git@github.com:${gitHubRepo}.git</developerConnection>
@@ -52,7 +35,7 @@
5235
<changelist>-SNAPSHOT</changelist>
5336
<!-- Baseline Jenkins version you use to build and test the plugin. Users must have this version or newer to run. -->
5437
<jenkins.baseline>2.479</jenkins.baseline>
55-
<jenkins.version>${jenkins.baseline}.1</jenkins.version>
38+
<jenkins.version>${jenkins.baseline}.3</jenkins.version>
5639
<gitHubRepo>jenkinsci/${project.artifactId}-plugin</gitHubRepo>
5740
<spotless.check.skip>false</spotless.check.skip>
5841
</properties>
@@ -62,7 +45,7 @@
6245
<dependency>
6346
<groupId>io.jenkins.tools.bom</groupId>
6447
<artifactId>bom-${jenkins.baseline}.x</artifactId>
65-
<version>3944.v1a_e4f8b_452db_</version>
48+
<version>4228.v0a_71308d905b_</version>
6649
<type>pom</type>
6750
<scope>import</scope>
6851
</dependency>

src/test/java/net/uaznia/lukanus/hudson/plugins/gitparameter/GitParameterDefinitionTest.java

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -398,8 +398,13 @@ public void testDoFillValueItems_listRevisions() throws Exception {
398398
assertNotNull(build);
399399
ItemsErrorModel items = def.getDescriptor().doFillValueItems(project, def.getName());
400400
assertTrue(isListBoxItem(items, "00a8385cba1e4e32cf823775e2b3dbe5eb27931d"));
401-
assertTrue(isListBoxItemName(
402-
items, "00a8385c 2011-10-30 17:11 Łukasz Miłkowski <lukanus@uaznia.net> initial readme"));
401+
if (!Functions.isWindows() || System.getenv("CI") == null) {
402+
// Windows agents on AWS ci.jenkins.io changed character set configuration compared to Azure
403+
// Only test when not on Windows and not on a CI configuration
404+
// TODO: Remove conditional when AWS ci.jenkins.io agent character set config is updated
405+
assertTrue(isListBoxItemName(
406+
items, "00a8385c 2011-10-30 17:11 Łukasz Miłkowski <lukanus@uaznia.net> initial readme"));
407+
}
403408
}
404409

405410
@Test

0 commit comments

Comments
 (0)