You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ro...@apache.org on 2019/04/24 12:31:55 UTC
[sling-org-apache-sling-committer-cli] 26/44: SLING-8366 - Releases
of the form 'Apache Sling Foo RC' are not properly parsed
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch feature/SLING-8337
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-committer-cli.git
commit 63499a0a606524459795b943bff67d153b6882cb
Author: Radu Cotescu <ra...@apache.org>
AuthorDate: Fri Apr 19 14:59:56 2019 +0200
SLING-8366 - Releases of the form 'Apache Sling Foo RC' are not properly parsed
* allow RC values without RC number
---
src/main/java/org/apache/sling/cli/impl/release/Release.java | 2 +-
src/test/java/org/apache/sling/cli/impl/release/ReleaseTest.java | 1 -
2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/src/main/java/org/apache/sling/cli/impl/release/Release.java b/src/main/java/org/apache/sling/cli/impl/release/Release.java
index d75f424..95786b3 100644
--- a/src/main/java/org/apache/sling/cli/impl/release/Release.java
+++ b/src/main/java/org/apache/sling/cli/impl/release/Release.java
@@ -31,7 +31,7 @@ public final class Release {
Group 4: RC status (optional)
*/
private static final Pattern RELEASE_PATTERN = Pattern.compile("^\\h*(Apache Sling\\h*)?([()a-zA-Z0-9\\-.\\h]+)\\h([0-9\\-.]+)" +
- "\\h?(RC[0-9.]+)?\\h*$");
+ "\\h?(RC[0-9.]*)?\\h*$");
public static List<Release> fromString(String repositoryDescription) {
diff --git a/src/test/java/org/apache/sling/cli/impl/release/ReleaseTest.java b/src/test/java/org/apache/sling/cli/impl/release/ReleaseTest.java
index fbab0a2..8d16905 100644
--- a/src/test/java/org/apache/sling/cli/impl/release/ReleaseTest.java
+++ b/src/test/java/org/apache/sling/cli/impl/release/ReleaseTest.java
@@ -64,7 +64,6 @@ public class ReleaseTest {
}
@Test
- @Ignore("Broken after refactoring, needs separate issue")
public void releaseWithRCSuffixOnly() {
List<Release> releases = Release.fromString("Apache Sling Resource Resolver 1.6.12 RC");