Skip to content

Commit 925b1b2

Browse files
authored
Merge branch 'master' into dependabot/github_actions/actions/checkout-5
2 parents 2c84f5c + f4d8971 commit 925b1b2

3 files changed

Lines changed: 4 additions & 3 deletions

File tree

src/main/java/q3769/maven/plugins/semver/mojos/CalendarNormalVersionIncrementer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ public static Version calendarIncrement(Version original, NormalVersion selected
6060
}
6161
}
6262
throw new IllegalArgumentException(String.format(
63-
"%s version %s in POM semver %s is not supported for calendar style increment - it has to be older than current date in UTC zone",
63+
"%s version %s in original semver %s is not supported for calendar style increment - it has to be older than current date in UTC zone",
6464
selectedNormalVersion, selectedNormalVersionNumber, original));
6565
}
6666

src/main/java/q3769/maven/plugins/semver/mojos/UpdatePreRelease.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ protected Version doSetLabel(Version version, String label) throws MojoFailureEx
5252
try {
5353
return version.nextPreReleaseVersion(label);
5454
} catch (Exception e) {
55-
getLog().error(String.format("Failed to set pre-release label for %s", version), e);
55+
getLog().error(String.format("Failed to set pre-release label: %s", label), e);
5656
throw new MojoFailureException(e);
5757
}
5858
}

src/test/java/q3769/maven/plugins/semver/mojos/UpdatePreReleaseTest.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,8 @@ void throwsExceptionWhenSettingInvalidLabel() {
6969
.willThrow(new IllegalStateException("Invalid label"));
7070

7171
MojoFailureException exception = assertThrows(
72-
MojoFailureException.class, () -> updatePreRelease.setLabel(version, "invalid"));
72+
MojoFailureException.class,
73+
() -> updatePreRelease.setLabel(version, "test-invalid-label"));
7374

7475
assertThat(exception.getCause())
7576
.isInstanceOf(IllegalStateException.class)

0 commit comments

Comments
 (0)