This is an automated email from the ASF dual-hosted git repository. sseifert pushed a commit to branch feature/osgifeature in repository https://gitbox.apache.org/repos/asf/sling-launchpad-comparator.git
commit 7e0217bad16992046d53080b97bb6ea73d6b999f Author: Stefan Seifert <[email protected]> AuthorDate: Mon Dec 16 14:23:54 2024 +0100 Switch to OSGI feature model artifact, drop support for releases <12 --- pom.xml | 1 - .../java/org/apache/sling/tooling/lc/Main.java | 4 ++-- .../sling/tooling/lc/aether/AetherSetup.java | 2 +- .../apache/sling/tooling/lc/aether/Artifacts.java | 10 +------- .../org/apache/sling/tooling/lc/ArtifactsTest.java | 27 ++++++---------------- 5 files changed, 11 insertions(+), 33 deletions(-) diff --git a/pom.xml b/pom.xml index e151876..45f7694 100644 --- a/pom.xml +++ b/pom.xml @@ -139,7 +139,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-shade-plugin</artifactId> - <version>2.4.1</version> <configuration> <transformers> <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer"> diff --git a/src/main/java/org/apache/sling/tooling/lc/Main.java b/src/main/java/org/apache/sling/tooling/lc/Main.java index 0e4be41..a795ca6 100644 --- a/src/main/java/org/apache/sling/tooling/lc/Main.java +++ b/src/main/java/org/apache/sling/tooling/lc/Main.java @@ -22,8 +22,8 @@ public class Main { public static void main(String[] args) throws Exception { - String firstVersion = "8"; - String secondVersion = "9"; + String firstVersion = "12"; + String secondVersion = "13-SNAPSHOT"; if (args.length == 2) { firstVersion = args[0]; secondVersion = args[1]; diff --git a/src/main/java/org/apache/sling/tooling/lc/aether/AetherSetup.java b/src/main/java/org/apache/sling/tooling/lc/aether/AetherSetup.java index 5f0cf9c..277d6ce 100644 --- a/src/main/java/org/apache/sling/tooling/lc/aether/AetherSetup.java +++ b/src/main/java/org/apache/sling/tooling/lc/aether/AetherSetup.java @@ -41,7 +41,7 @@ import org.eclipse.aether.transport.http.HttpTransporterFactory; public class AetherSetup { private final List<RemoteRepository> repos = Arrays.asList( - new RemoteRepository.Builder("central", "default", "http://central.maven.org/maven2/";).build(), + new RemoteRepository.Builder("central", "default", "https://repo1.maven.org/maven2/";).build(), new RemoteRepository.Builder("apache", "default", "https://repository.apache.org/content/groups/snapshots/";) .build()); diff --git a/src/main/java/org/apache/sling/tooling/lc/aether/Artifacts.java b/src/main/java/org/apache/sling/tooling/lc/aether/Artifacts.java index a9c3273..7c991ec 100644 --- a/src/main/java/org/apache/sling/tooling/lc/aether/Artifacts.java +++ b/src/main/java/org/apache/sling/tooling/lc/aether/Artifacts.java @@ -33,15 +33,7 @@ public class Artifacts { throw new IllegalArgumentException("Invalid version " + version); } - int versionNumber = Integer.parseInt(versionMatcher.group(1)); - - // versions 6 and 7 used an XML bundle list - if (versionNumber < 8) { - return "org.apache.sling:org.apache.sling.launchpad:xml:bundlelist:" + version; - } - - String artifactId = versionNumber < 10 ? "org.apache.sling.launchpad" : "org.apache.sling.starter"; // versions 8 and newer use the provisioning model - return "org.apache.sling:" + artifactId + ":txt:slingfeature:" + version; + return "org.apache.sling:org.apache.sling.starter:slingosgifeature:oak_tar:" + version; } } diff --git a/src/test/java/org/apache/sling/tooling/lc/ArtifactsTest.java b/src/test/java/org/apache/sling/tooling/lc/ArtifactsTest.java index 0a82dbb..d8ec957 100644 --- a/src/test/java/org/apache/sling/tooling/lc/ArtifactsTest.java +++ b/src/test/java/org/apache/sling/tooling/lc/ArtifactsTest.java @@ -22,36 +22,23 @@ import org.junit.Test; import static org.apache.sling.tooling.lc.aether.Artifacts.launchpadCoordinates; import static org.hamcrest.CoreMatchers.equalTo; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; public class ArtifactsTest { @Test - public void launchpadV7() { - - assertThat(launchpadCoordinates("7"), equalTo("org.apache.sling:org.apache.sling.launchpad:xml:bundlelist:7")); - } - - @Test - public void launchpadV7Snapshot() { - - assertThat( - launchpadCoordinates("7-SNAPSHOT"), - equalTo("org.apache.sling:org.apache.sling.launchpad:xml:bundlelist:7-SNAPSHOT")); - } - - @Test - public void launchpadV8() { + public void launchpadV12() { assertThat( - launchpadCoordinates("8"), equalTo("org.apache.sling:org.apache.sling.launchpad:txt:slingfeature:8")); + launchpadCoordinates("12"), + equalTo("org.apache.sling:org.apache.sling.starter:slingosgifeature:oak_tar:12")); } @Test - public void launchpadV8Snapshot() { + public void launchpadV13Snapshot() { assertThat( - launchpadCoordinates("8-SNAPSHOT"), - equalTo("org.apache.sling:org.apache.sling.launchpad:txt:slingfeature:8-SNAPSHOT")); + launchpadCoordinates("13-SNAPSHOT"), + equalTo("org.apache.sling:org.apache.sling.starter:slingosgifeature:oak_tar:13-SNAPSHOT")); } }
