This is an automated email from the ASF dual-hosted git repository. vy pushed a commit to branch mvn-site-simplified in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit a585288beb377ca6c9894551c016f76b4bd4619c Author: Volkan Yazıcı <[email protected]> AuthorDate: Mon Nov 28 11:59:31 2022 +0100 LOG4J2-3628 Allow SNAPSHOT versions in releaser. --- .../java/org/apache/logging/log4j/internal/util/PomUtils.java | 7 ++++--- .../logging/log4j/internal/util/changelog/ChangelogFiles.java | 9 ++++++--- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/log4j-internal-util/src/main/java/org/apache/logging/log4j/internal/util/PomUtils.java b/log4j-internal-util/src/main/java/org/apache/logging/log4j/internal/util/PomUtils.java index a12473a17a..4a904ce5de 100644 --- a/log4j-internal-util/src/main/java/org/apache/logging/log4j/internal/util/PomUtils.java +++ b/log4j-internal-util/src/main/java/org/apache/logging/log4j/internal/util/PomUtils.java @@ -25,6 +25,8 @@ import static org.apache.logging.log4j.internal.util.StringUtils.trimNullable; public final class PomUtils { + public static final String VERSION_PATTERN = "^\\d+\\.\\d+.\\d+(-SNAPSHOT)?$"; + private PomUtils() {} public static int readRootPomVersionMajor(final Path projectRootDirectory) { @@ -40,10 +42,9 @@ public final class PomUtils { if (isBlank(version)) { throw XmlReader.failureAtXmlNode(versionElement, "blank `version`"); } - final String versionPattern = "^\\d+\\.\\d+.\\d+(-SNAPSHOT)?$"; - if (!version.matches(versionPattern)) { + if (!version.matches(VERSION_PATTERN)) { throw XmlReader.failureAtXmlNode( - versionElement, "`version` doesnt' match the expected pattern `%s`: `%s`", versionPattern, version); + versionElement, "`version` doesnt' match the expected `%s` pattern: `%s`", VERSION_PATTERN, version); } return version; } diff --git a/log4j-internal-util/src/main/java/org/apache/logging/log4j/internal/util/changelog/ChangelogFiles.java b/log4j-internal-util/src/main/java/org/apache/logging/log4j/internal/util/changelog/ChangelogFiles.java index 3ea010415b..d0131d58bc 100644 --- a/log4j-internal-util/src/main/java/org/apache/logging/log4j/internal/util/changelog/ChangelogFiles.java +++ b/log4j-internal-util/src/main/java/org/apache/logging/log4j/internal/util/changelog/ChangelogFiles.java @@ -16,6 +16,8 @@ */ package org.apache.logging.log4j.internal.util.changelog; +import org.apache.logging.log4j.internal.util.PomUtils; + import java.io.IOException; import java.io.UncheckedIOException; import java.nio.file.Files; @@ -63,12 +65,13 @@ public final class ChangelogFiles { final String releaseVersion) { if (!releaseDate.matches("^\\d{8}$")) { final String message = String.format( - "was expecting release date to be formatted as `YYYYmmdd`, found: `%s`", releaseDate); + "release date doesn't match the expected `YYYYmmdd` pattern: `%s`", releaseDate); throw new IllegalArgumentException(message); } - if (!releaseVersion.matches("^\\d+\\.\\d+\\.\\d+$")) { + if (!releaseVersion.matches(PomUtils.VERSION_PATTERN)) { final String message = String.format( - "was expecting release version to be formatted as `0.1.2`, found: `%s`", releaseVersion); + "release version doesn't match the expected `%s` pattern: `%s`", + PomUtils.VERSION_PATTERN, releaseVersion); throw new IllegalArgumentException(message); } final String releaseDirectoryName = String.format("%s-%s", releaseDate, releaseVersion);
