You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ss...@apache.org on 2025/11/28 08:43:28 UTC
(sling-launchpad-comparator) branch feature/rename-starter created (now 67739bb)
This is an automated email from the ASF dual-hosted git repository.
sseifert pushed a change to branch feature/rename-starter
in repository https://gitbox.apache.org/repos/asf/sling-launchpad-comparator.git
at 67739bb Rename to Starter Comparator
This branch includes the following new commits:
new 67739bb Rename to Starter Comparator
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
(sling-launchpad-comparator) 01/01: Rename to Starter Comparator
Posted by ss...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
sseifert pushed a commit to branch feature/rename-starter
in repository https://gitbox.apache.org/repos/asf/sling-launchpad-comparator.git
commit 67739bbf268b8f0e05edd2f2c5fff5e1349f9523
Author: Stefan Seifert <st...@users.noreply.github.com>
AuthorDate: Fri Nov 28 09:43:18 2025 +0100
Rename to Starter Comparator
---
README.md | 10 ++++----
pom.xml | 8 +++---
.../org/apache/sling/tooling/{lc => sc}/Main.java | 4 +--
.../StarterComparer.java} | 29 +++++++++++-----------
.../tooling/{lc => sc}/aether/AetherSetup.java | 2 +-
.../tooling/{lc => sc}/aether/ArtifactKey.java | 2 +-
.../sling/tooling/{lc => sc}/aether/Artifacts.java | 4 +--
.../tooling/{lc => sc}/aether/VersionChange.java | 2 +-
.../tooling/{lc => sc}/git/GitChangeLogFinder.java | 2 +-
.../sling/tooling/{lc => sc}/jira/Fields.java | 2 +-
.../sling/tooling/{lc => sc}/jira/Issue.java | 2 +-
.../sling/tooling/{lc => sc}/jira/IssueFinder.java | 2 +-
.../sling/tooling/{lc => sc}/jira/IssueType.java | 2 +-
.../sling/tooling/{lc => sc}/jira/Response.java | 2 +-
.../sling/tooling/{lc => sc}/ArtifactsTest.java | 12 ++++-----
15 files changed, 42 insertions(+), 43 deletions(-)
diff --git a/README.md b/README.md
index ff58788..e6b6ef4 100644
--- a/README.md
+++ b/README.md
@@ -1,12 +1,12 @@
[](https://sling.apache.org)
- [](https://ci-builds.apache.org/job/Sling/job/modules/job/sling-launchpad-comparator/job/master/) [](https://ci-builds.apache.org/job/Sling/job/modules/job/sling-launchpad-comparator/job/master/test/?width= [...]
+ [](https://ci-builds.apache.org/job/Sling/job/modules/job/sling-starter-comparator/job/master/) [](https://ci-builds.apache.org/job/Sling/job/modules/job/sling-starter-comparator/job/master/test/?width=800&heig [...]
-# Apache Sling Launchpad Comparator
+# Apache Sling Starter Comparator
This module is part of the [Apache Sling](https://sling.apache.org) project.
-Command line utility which helps with comparing the artifacts contained by two launchpad/starter instances.
+Command line utility which helps with comparing the artifacts contained by two starter instances.
## Usage
@@ -19,12 +19,12 @@ checkout:
Afterwards build and run this project
mvn clean package
- java -jar target/launchpad-comparator-1.0.0-SNAPSHOT.jar 12 13-SNAPSHOT
+ java -jar target/starter-comparator-1.0.0-SNAPSHOT.jar 12 13-SNAPSHOT
If you want to output the result in markdown instead of plain text, use
mvn clean package
- java -jar target/launchpad-comparator-1.0.0-SNAPSHOT.jar 12 13-SNAPSHOT markdown
+ java -jar target/starter-comparator-1.0.0-SNAPSHOT.jar 12 13-SNAPSHOT markdown
The report will list:
diff --git a/pom.xml b/pom.xml
index 0ab5623..0e5e144 100644
--- a/pom.xml
+++ b/pom.xml
@@ -18,10 +18,10 @@
<relativePath />
</parent>
<groupId>org.apache.sling.tooling</groupId>
- <artifactId>launchpad-comparator</artifactId>
+ <artifactId>starter-comparator</artifactId>
<version>1.0.0-SNAPSHOT</version>
- <name>Apache Sling Launchpad Comparator</name>
- <description>Command line utility which helps with comparing the artifacts contained by two launchpad instances.</description>
+ <name>Apache Sling Starter Comparator</name>
+ <description>Command line utility which helps with comparing the artifacts contained by two starter instances.</description>
<properties>
<sling.java.version>11</sling.java.version>
@@ -166,7 +166,7 @@
<configuration>
<transformers>
<transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
- <mainClass>org.apache.sling.tooling.lc.Main</mainClass>
+ <mainClass>org.apache.sling.tooling.sc.Main</mainClass>
</transformer>
</transformers>
<!-- Don't propagate signatures from signed jars -->
diff --git a/src/main/java/org/apache/sling/tooling/lc/Main.java b/src/main/java/org/apache/sling/tooling/sc/Main.java
similarity index 91%
rename from src/main/java/org/apache/sling/tooling/lc/Main.java
rename to src/main/java/org/apache/sling/tooling/sc/Main.java
index 6f48cbc..eda145f 100644
--- a/src/main/java/org/apache/sling/tooling/lc/Main.java
+++ b/src/main/java/org/apache/sling/tooling/sc/Main.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.tooling.lc;
+package org.apache.sling.tooling.sc;
public class Main {
@@ -33,6 +33,6 @@ public class Main {
output = args[2];
}
- new LaunchpadComparer(firstVersion, secondVersion, output, "..").run();
+ new StarterComparer(firstVersion, secondVersion, output, "..").run();
}
}
diff --git a/src/main/java/org/apache/sling/tooling/lc/LaunchpadComparer.java b/src/main/java/org/apache/sling/tooling/sc/StarterComparer.java
similarity index 87%
rename from src/main/java/org/apache/sling/tooling/lc/LaunchpadComparer.java
rename to src/main/java/org/apache/sling/tooling/sc/StarterComparer.java
index 43d02fd..e94634d 100644
--- a/src/main/java/org/apache/sling/tooling/lc/LaunchpadComparer.java
+++ b/src/main/java/org/apache/sling/tooling/sc/StarterComparer.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.tooling.lc;
+package org.apache.sling.tooling.sc;
import java.io.BufferedReader;
import java.io.File;
@@ -35,16 +35,16 @@ import com.google.common.collect.Sets;
import org.apache.sling.feature.Artifact;
import org.apache.sling.feature.Feature;
import org.apache.sling.feature.io.json.FeatureJSONReader;
-import org.apache.sling.tooling.lc.aether.AetherSetup;
-import org.apache.sling.tooling.lc.aether.ArtifactKey;
-import org.apache.sling.tooling.lc.aether.Artifacts;
-import org.apache.sling.tooling.lc.aether.VersionChange;
-import org.apache.sling.tooling.lc.git.GitChangeLogFinder;
-import org.apache.sling.tooling.lc.jira.Issue;
-import org.apache.sling.tooling.lc.jira.IssueFinder;
+import org.apache.sling.tooling.sc.aether.AetherSetup;
+import org.apache.sling.tooling.sc.aether.ArtifactKey;
+import org.apache.sling.tooling.sc.aether.Artifacts;
+import org.apache.sling.tooling.sc.aether.VersionChange;
+import org.apache.sling.tooling.sc.git.GitChangeLogFinder;
+import org.apache.sling.tooling.sc.jira.Issue;
+import org.apache.sling.tooling.sc.jira.IssueFinder;
import org.eclipse.jgit.api.errors.GitAPIException;
-public class LaunchpadComparer {
+public class StarterComparer {
private static final Pattern JIRA_KEY_PATTERN = Pattern.compile("^(SLING-\\d+).*");
@@ -53,7 +53,7 @@ public class LaunchpadComparer {
private final String output;
private final String slingRepoCheckout;
- public LaunchpadComparer(String firstVersion, String secondVersion, String output, String slingRepoCheckout) {
+ public StarterComparer(String firstVersion, String secondVersion, String output, String slingRepoCheckout) {
this.firstVersion = firstVersion;
this.secondVersion = secondVersion;
this.output = output;
@@ -66,14 +66,13 @@ public class LaunchpadComparer {
public void run() throws Exception {
- System.out.format(
- "Computing differences between Launchpad versions %s and %s...%n", firstVersion, secondVersion);
+ System.out.format("Computing differences between Starter versions %s and %s...%n", firstVersion, secondVersion);
// 1. download artifacts
AetherSetup aether = new AetherSetup();
- File fromFile = aether.download(Artifacts.launchpadCoordinates(firstVersion));
- File toFile = aether.download(Artifacts.launchpadCoordinates(secondVersion));
+ File fromFile = aether.download(Artifacts.starterCoordinates(firstVersion));
+ File toFile = aether.download(Artifacts.starterCoordinates(secondVersion));
// 2. parse artifact definitions
Map<ArtifactKey, Artifact> from = readArtifactsFromOsgiFeature(fromFile);
@@ -159,7 +158,7 @@ public class LaunchpadComparer {
List<String> issueKeys =
git.getChanges(artifact.getArtifactId(), versionChange.getFrom(), versionChange.getTo()).stream()
.map(m -> m.split(System.lineSeparator())[0])
- .map(LaunchpadComparer::toJiraKey)
+ .map(StarterComparer::toJiraKey)
.filter(k -> k != null)
.collect(Collectors.toList());
diff --git a/src/main/java/org/apache/sling/tooling/lc/aether/AetherSetup.java b/src/main/java/org/apache/sling/tooling/sc/aether/AetherSetup.java
similarity index 98%
rename from src/main/java/org/apache/sling/tooling/lc/aether/AetherSetup.java
rename to src/main/java/org/apache/sling/tooling/sc/aether/AetherSetup.java
index 277d6ce..478e045 100644
--- a/src/main/java/org/apache/sling/tooling/lc/aether/AetherSetup.java
+++ b/src/main/java/org/apache/sling/tooling/sc/aether/AetherSetup.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.tooling.lc.aether;
+package org.apache.sling.tooling.sc.aether;
import java.io.File;
import java.util.Arrays;
diff --git a/src/main/java/org/apache/sling/tooling/lc/aether/ArtifactKey.java b/src/main/java/org/apache/sling/tooling/sc/aether/ArtifactKey.java
similarity index 98%
rename from src/main/java/org/apache/sling/tooling/lc/aether/ArtifactKey.java
rename to src/main/java/org/apache/sling/tooling/sc/aether/ArtifactKey.java
index 833a052..81ddc53 100644
--- a/src/main/java/org/apache/sling/tooling/lc/aether/ArtifactKey.java
+++ b/src/main/java/org/apache/sling/tooling/sc/aether/ArtifactKey.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.tooling.lc.aether;
+package org.apache.sling.tooling.sc.aether;
import java.util.Objects;
diff --git a/src/main/java/org/apache/sling/tooling/lc/aether/Artifacts.java b/src/main/java/org/apache/sling/tooling/sc/aether/Artifacts.java
similarity index 92%
rename from src/main/java/org/apache/sling/tooling/lc/aether/Artifacts.java
rename to src/main/java/org/apache/sling/tooling/sc/aether/Artifacts.java
index 7c991ec..b62b00a 100644
--- a/src/main/java/org/apache/sling/tooling/lc/aether/Artifacts.java
+++ b/src/main/java/org/apache/sling/tooling/sc/aether/Artifacts.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.tooling.lc.aether;
+package org.apache.sling.tooling.sc.aether;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@@ -25,7 +25,7 @@ public class Artifacts {
private static final Pattern VERSION_NUMBER = Pattern.compile("^(\\d+)(-SNAPSHOT)?");
- public static final String launchpadCoordinates(String version) {
+ public static final String starterCoordinates(String version) {
Matcher versionMatcher = VERSION_NUMBER.matcher(version);
diff --git a/src/main/java/org/apache/sling/tooling/lc/aether/VersionChange.java b/src/main/java/org/apache/sling/tooling/sc/aether/VersionChange.java
similarity index 96%
rename from src/main/java/org/apache/sling/tooling/lc/aether/VersionChange.java
rename to src/main/java/org/apache/sling/tooling/sc/aether/VersionChange.java
index 764278c..b5d9c41 100644
--- a/src/main/java/org/apache/sling/tooling/lc/aether/VersionChange.java
+++ b/src/main/java/org/apache/sling/tooling/sc/aether/VersionChange.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.tooling.lc.aether;
+package org.apache.sling.tooling.sc.aether;
public class VersionChange {
diff --git a/src/main/java/org/apache/sling/tooling/lc/git/GitChangeLogFinder.java b/src/main/java/org/apache/sling/tooling/sc/git/GitChangeLogFinder.java
similarity index 98%
rename from src/main/java/org/apache/sling/tooling/lc/git/GitChangeLogFinder.java
rename to src/main/java/org/apache/sling/tooling/sc/git/GitChangeLogFinder.java
index 31e6098..f90b670 100644
--- a/src/main/java/org/apache/sling/tooling/lc/git/GitChangeLogFinder.java
+++ b/src/main/java/org/apache/sling/tooling/sc/git/GitChangeLogFinder.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.tooling.lc.git;
+package org.apache.sling.tooling.sc.git;
import java.io.IOException;
import java.nio.file.Path;
diff --git a/src/main/java/org/apache/sling/tooling/lc/jira/Fields.java b/src/main/java/org/apache/sling/tooling/sc/jira/Fields.java
similarity index 96%
rename from src/main/java/org/apache/sling/tooling/lc/jira/Fields.java
rename to src/main/java/org/apache/sling/tooling/sc/jira/Fields.java
index cd38141..1a1c24b 100644
--- a/src/main/java/org/apache/sling/tooling/lc/jira/Fields.java
+++ b/src/main/java/org/apache/sling/tooling/sc/jira/Fields.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.tooling.lc.jira;
+package org.apache.sling.tooling.sc.jira;
public class Fields {
diff --git a/src/main/java/org/apache/sling/tooling/lc/jira/Issue.java b/src/main/java/org/apache/sling/tooling/sc/jira/Issue.java
similarity index 98%
rename from src/main/java/org/apache/sling/tooling/lc/jira/Issue.java
rename to src/main/java/org/apache/sling/tooling/sc/jira/Issue.java
index 00405c8..dd2c859 100644
--- a/src/main/java/org/apache/sling/tooling/lc/jira/Issue.java
+++ b/src/main/java/org/apache/sling/tooling/sc/jira/Issue.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.tooling.lc.jira;
+package org.apache.sling.tooling.sc.jira;
import java.util.Objects;
import java.util.regex.Matcher;
diff --git a/src/main/java/org/apache/sling/tooling/lc/jira/IssueFinder.java b/src/main/java/org/apache/sling/tooling/sc/jira/IssueFinder.java
similarity index 98%
rename from src/main/java/org/apache/sling/tooling/lc/jira/IssueFinder.java
rename to src/main/java/org/apache/sling/tooling/sc/jira/IssueFinder.java
index ef9d473..2bc3918 100644
--- a/src/main/java/org/apache/sling/tooling/lc/jira/IssueFinder.java
+++ b/src/main/java/org/apache/sling/tooling/sc/jira/IssueFinder.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.tooling.lc.jira;
+package org.apache.sling.tooling.sc.jira;
import java.io.IOException;
import java.io.InputStreamReader;
diff --git a/src/main/java/org/apache/sling/tooling/lc/jira/IssueType.java b/src/main/java/org/apache/sling/tooling/sc/jira/IssueType.java
similarity index 95%
rename from src/main/java/org/apache/sling/tooling/lc/jira/IssueType.java
rename to src/main/java/org/apache/sling/tooling/sc/jira/IssueType.java
index c96ef55..099599d 100644
--- a/src/main/java/org/apache/sling/tooling/lc/jira/IssueType.java
+++ b/src/main/java/org/apache/sling/tooling/sc/jira/IssueType.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.tooling.lc.jira;
+package org.apache.sling.tooling.sc.jira;
public class IssueType {
diff --git a/src/main/java/org/apache/sling/tooling/lc/jira/Response.java b/src/main/java/org/apache/sling/tooling/sc/jira/Response.java
similarity index 96%
rename from src/main/java/org/apache/sling/tooling/lc/jira/Response.java
rename to src/main/java/org/apache/sling/tooling/sc/jira/Response.java
index 75b70eb..631c6b7 100644
--- a/src/main/java/org/apache/sling/tooling/lc/jira/Response.java
+++ b/src/main/java/org/apache/sling/tooling/sc/jira/Response.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.tooling.lc.jira;
+package org.apache.sling.tooling.sc.jira;
import java.util.List;
diff --git a/src/test/java/org/apache/sling/tooling/lc/ArtifactsTest.java b/src/test/java/org/apache/sling/tooling/sc/ArtifactsTest.java
similarity index 81%
rename from src/test/java/org/apache/sling/tooling/lc/ArtifactsTest.java
rename to src/test/java/org/apache/sling/tooling/sc/ArtifactsTest.java
index d8ec957..c0c6b7c 100644
--- a/src/test/java/org/apache/sling/tooling/lc/ArtifactsTest.java
+++ b/src/test/java/org/apache/sling/tooling/sc/ArtifactsTest.java
@@ -16,29 +16,29 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.tooling.lc;
+package org.apache.sling.tooling.sc;
import org.junit.Test;
-import static org.apache.sling.tooling.lc.aether.Artifacts.launchpadCoordinates;
+import static org.apache.sling.tooling.sc.aether.Artifacts.starterCoordinates;
import static org.hamcrest.CoreMatchers.equalTo;
import static org.hamcrest.MatcherAssert.assertThat;
public class ArtifactsTest {
@Test
- public void launchpadV12() {
+ public void starterV12() {
assertThat(
- launchpadCoordinates("12"),
+ starterCoordinates("12"),
equalTo("org.apache.sling:org.apache.sling.starter:slingosgifeature:oak_tar:12"));
}
@Test
- public void launchpadV13Snapshot() {
+ public void starterV13Snapshot() {
assertThat(
- launchpadCoordinates("13-SNAPSHOT"),
+ starterCoordinates("13-SNAPSHOT"),
equalTo("org.apache.sling:org.apache.sling.starter:slingosgifeature:oak_tar:13-SNAPSHOT"));
}
}