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/16 15:42:02 UTC
[sling-org-apache-sling-committer-cli] 06/21: SLING-8311 -
Investigate creating a Sling CLI tool for development task automation
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-committer-cli.git
commit 7675184c579148b7d12a11b9f256c53f558f4204
Author: Robert Munteanu <ro...@apache.org>
AuthorDate: Tue Mar 19 16:21:26 2019 +0100
SLING-8311 - Investigate creating a Sling CLI tool for development task automation
Fix local site update diff generation.
---
.../java/org/apache/sling/cli/impl/release/ReleaseVersion.java | 7 ++++++-
.../org/apache/sling/cli/impl/release/UpdateLocalSiteCommand.java | 6 ++----
.../java/org/apache/sling/cli/impl/release/ReleaseVersionTest.java | 1 +
3 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/src/main/java/org/apache/sling/cli/impl/release/ReleaseVersion.java b/src/main/java/org/apache/sling/cli/impl/release/ReleaseVersion.java
index b629e19..0f0ef96 100644
--- a/src/main/java/org/apache/sling/cli/impl/release/ReleaseVersion.java
+++ b/src/main/java/org/apache/sling/cli/impl/release/ReleaseVersion.java
@@ -27,12 +27,14 @@ public final class ReleaseVersion {
rel.name = rel.fullName
.replace("Apache Sling ", ""); // Apache Sling prefix
rel.version = rel.fullName.substring(rel.fullName.lastIndexOf(' ') + 1);
+ rel.component = rel.name.substring(0, rel.name.lastIndexOf(' '));
return rel;
}
private String fullName;
private String name;
+ private String component;
private String version;
private ReleaseVersion() {
@@ -50,5 +52,8 @@ public final class ReleaseVersion {
public String getVersion() {
return version;
}
-
+
+ public String getComponent() {
+ return component;
+ }
}
diff --git a/src/main/java/org/apache/sling/cli/impl/release/UpdateLocalSiteCommand.java b/src/main/java/org/apache/sling/cli/impl/release/UpdateLocalSiteCommand.java
index 10e836a..613afe0 100644
--- a/src/main/java/org/apache/sling/cli/impl/release/UpdateLocalSiteCommand.java
+++ b/src/main/java/org/apache/sling/cli/impl/release/UpdateLocalSiteCommand.java
@@ -21,8 +21,6 @@ import java.io.IOException;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.time.LocalDateTime;
-import java.time.format.DateTimeFormatter;
-import java.util.Locale;
import org.apache.sling.cli.impl.Command;
import org.apache.sling.cli.impl.jbake.JBakeContentUpdater;
@@ -66,8 +64,8 @@ public class UpdateLocalSiteCommand implements Command {
Path templatePath = Paths.get(GIT_CHECKOUT, "src", "main", "jbake", "templates", "downloads.tpl");
Path releasesPath = Paths.get(GIT_CHECKOUT, "src", "main", "jbake", "content", "releases.md");
- updater.updateDownloads(templatePath, releaseVersion.getName(), releaseVersion.getVersion());
- updater.updateReleases(releasesPath, releaseVersion.getName(), releaseVersion.getVersion(), LocalDateTime.now());
+ updater.updateDownloads(templatePath, releaseVersion.getComponent(), releaseVersion.getVersion());
+ updater.updateReleases(releasesPath, releaseVersion.getComponent(), releaseVersion.getVersion(), LocalDateTime.now());
git.diff()
.setOutputStream(System.out)
diff --git a/src/test/java/org/apache/sling/cli/impl/release/ReleaseVersionTest.java b/src/test/java/org/apache/sling/cli/impl/release/ReleaseVersionTest.java
index 90ed3e5..fc63a5f 100644
--- a/src/test/java/org/apache/sling/cli/impl/release/ReleaseVersionTest.java
+++ b/src/test/java/org/apache/sling/cli/impl/release/ReleaseVersionTest.java
@@ -30,5 +30,6 @@ public class ReleaseVersionTest {
assertEquals("Resource Merger 1.3.10", rel.getName());
assertEquals("Apache Sling Resource Merger 1.3.10", rel.getFullName());
assertEquals("1.3.10", rel.getVersion());
+ assertEquals("Resource Merger", rel.getComponent());
}
}