Skip to content

Commit 9defc44

Browse files
authored
Merge branch 'master' into rename-configuration-to-configure
2 parents 6152fb5 + b211e71 commit 9defc44

File tree

3 files changed

+10
-6
lines changed

3 files changed

+10
-6
lines changed

Jenkinsfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@ https://github.com/jenkins-infra/pipeline-library/
77
buildPlugin(
88
useContainerAgent: true, // Set to `false` if you need to use Docker for containerized tests
99
configurations: [
10-
[platform: 'linux', jdk: 21],
11-
[platform: 'windows', jdk: 17],
10+
[platform: 'linux', jdk: 25],
11+
[platform: 'windows', jdk: 21],
1212
])

pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>org.jenkins-ci.plugins</groupId>
77
<artifactId>plugin</artifactId>
8-
<version>5.27</version>
8+
<version>5.28</version>
99
<relativePath/>
1010
</parent>
1111

@@ -60,7 +60,7 @@
6060
<dependency>
6161
<groupId>io.jenkins.tools.bom</groupId>
6262
<artifactId>bom-${jenkins.baseline}.x</artifactId>
63-
<version>5543.vfd758c7c868d</version>
63+
<version>5659.vecf9e2dc5a_ed</version>
6464
<scope>import</scope>
6565
<type>pom</type>
6666
</dependency>

src/main/java/com/cloudbees/hudson/plugins/folder/ChildLoader.java

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,8 +91,12 @@ public <V extends TopLevelItem> V loadItem(AbstractFolder<V> parent, File subdir
9191
item.onLoad(parent, name);
9292
return item;
9393
} catch (Exception e) {
94-
LOGGER.warning(() -> "could not load " + subdir + " due to " + e);
95-
LOGGER.log(Level.FINE, null, e);
94+
if (e instanceof FileNotFoundException && !LOGGER.isLoggable(Level.FINE)) {
95+
// commonplace error from missing config.xml, avoid log spam unless FINE is enabled anyway
96+
LOGGER.warning(() -> "could not load " + subdir + " due to " + e);
97+
} else {
98+
LOGGER.log(Level.WARNING, "could not load " + subdir, e);
99+
}
96100
return null;
97101
}
98102
}

0 commit comments

Comments
 (0)