Skip to content

Commit 61e85c8

Browse files
authored
Merge pull request #1357 from jonesbusy/feature/do-not-include-java-11
Do not include Java 11 in UpgradeToRecommendCoreVersion title
2 parents 377d195 + 9068a26 commit 61e85c8

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

plugin-modernizer-core/src/main/jte/pr-body-UpgradeToRecommendCoreVersion.jte

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ This means your plugin POM was already using the `${plugin.getMetadata().getJenk
2929
For security reasons, the Jenkins infrastructure does not execute Jenkinsfiles proposed in pull requests.
3030
Instead, it builds the code using the Jenkinsfile from the default branch.
3131

32-
In this case, the existing Jenkinsfile specifies Java 8, not Java 11, which is causing the check to fail.
32+
In this case, the existing Jenkinsfile specifies Java 8, not Java 17, which is causing the check to fail.
3333
To resolve this,
3434
a maintainer can replay the failed build
3535
by substituting the current Jenkinsfile content with our proposed changes using the "replay the build"

plugin-modernizer-core/src/main/jte/pr-title-UpgradeToRecommendCoreVersion.jte

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22
@import io.jenkins.tools.pluginmodernizer.core.model.Recipe
33
@param Plugin plugin
44
@param Recipe recipe
5-
chore(pom): Use recommended core version ${plugin.getMetadata().getJenkinsVersion()}, and Java 11
5+
chore(pom): Use recommended core version ${plugin.getMetadata().getJenkinsVersion()}

plugin-modernizer-core/src/test/java/io/jenkins/tools/pluginmodernizer/core/utils/TemplateUtilsTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,7 @@ public void testFriendlyPrTitleUpgradeToRecommendCoreVersion() {
238238
String result = TemplateUtils.renderPullRequestTitle(plugin, recipe);
239239

240240
// Assert
241-
assertEquals("chore(pom): Use recommended core version 2.452.4, and Java 11", result);
241+
assertEquals("chore(pom): Use recommended core version 2.452.4", result);
242242
}
243243

244244
@Test

0 commit comments

Comments
 (0)