You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ol...@apache.org on 2025/03/28 14:10:22 UTC
(sling-org-apache-sling-testing-paxexam) branch 4.1 updated: SLING-12603 Switch to framework extension in SPI Fly Option
This is an automated email from the ASF dual-hosted git repository.
olli pushed a commit to branch 4.1
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-paxexam.git
The following commit(s) were added to refs/heads/4.1 by this push:
new 2946d72 SLING-12603 Switch to framework extension in SPI Fly Option
2946d72 is described below
commit 2946d72051afd64ca9d06cba4bfe9a9a9d3bb9e0
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Fri Mar 28 15:08:57 2025 +0100
SLING-12603 Switch to framework extension in SPI Fly Option
- adjust option
- remove obsolete bundle versions
---
src/main/java/org/apache/sling/testing/paxexam/SlingOptions.java | 8 +-------
.../org/apache/sling/testing/paxexam/SlingVersionResolver.java | 7 +------
src/main/resources/templates/SlingOptions.hbs | 8 +-------
src/main/resources/templates/SlingVersionResolver.hbs | 7 +------
4 files changed, 4 insertions(+), 26 deletions(-)
diff --git a/src/main/java/org/apache/sling/testing/paxexam/SlingOptions.java b/src/main/java/org/apache/sling/testing/paxexam/SlingOptions.java
index 2d11e9a..bf97bfe 100644
--- a/src/main/java/org/apache/sling/testing/paxexam/SlingOptions.java
+++ b/src/main/java/org/apache/sling/testing/paxexam/SlingOptions.java
@@ -159,13 +159,7 @@ public final class SlingOptions {
public static ModifiableCompositeOption spifly() {
return composite(
- mavenBundle().groupId("org.apache.aries").artifactId("org.apache.aries.util").version(versionResolver),
- mavenBundle().groupId("org.apache.aries.spifly").artifactId("org.apache.aries.spifly.dynamic.bundle").version(versionResolver),
- mavenBundle().groupId("org.ow2.asm").artifactId("asm").version(versionResolver),
- mavenBundle().groupId("org.ow2.asm").artifactId("asm-analysis").version(versionResolver),
- mavenBundle().groupId("org.ow2.asm").artifactId("asm-commons").version(versionResolver),
- mavenBundle().groupId("org.ow2.asm").artifactId("asm-util").version(versionResolver),
- mavenBundle().groupId("org.ow2.asm").artifactId("asm-tree").version(versionResolver)
+ mavenBundle().groupId("org.apache.aries.spifly").artifactId("org.apache.aries.spifly.dynamic.framework.extension").version(versionResolver)
);
}
diff --git a/src/main/java/org/apache/sling/testing/paxexam/SlingVersionResolver.java b/src/main/java/org/apache/sling/testing/paxexam/SlingVersionResolver.java
index 21d4920..8203cde 100644
--- a/src/main/java/org/apache/sling/testing/paxexam/SlingVersionResolver.java
+++ b/src/main/java/org/apache/sling/testing/paxexam/SlingVersionResolver.java
@@ -54,7 +54,7 @@ public class SlingVersionResolver implements VersionResolver {
versions.put("org.apache.aries.jmx:org.apache.aries.jmx.api", "1.1.5");
versions.put("org.apache.aries.jmx:org.apache.aries.jmx.core", "1.1.8");
versions.put("org.apache.aries.jmx:org.apache.aries.jmx.whiteboard", "1.2.0");
- versions.put("org.apache.aries.spifly:org.apache.aries.spifly.dynamic.bundle", "1.3.6");
+ versions.put("org.apache.aries.spifly:org.apache.aries.spifly.dynamic.framework.extension", "1.3.7");
versions.put("org.apache.commons:commons-lang3", "3.12.0");
versions.put("org.apache.httpcomponents:httpclient-osgi", "4.5.14");
versions.put("org.apache.httpcomponents:httpcore-osgi", "4.4.16");
@@ -98,11 +98,6 @@ public class SlingVersionResolver implements VersionResolver {
versions.put("org.osgi:org.osgi.service.repository", "1.1.0");
versions.put("org.osgi:org.osgi.util.function", "1.2.0");
versions.put("org.osgi:org.osgi.util.promise", "1.3.0");
- versions.put("org.ow2.asm:asm", "9.4");
- versions.put("org.ow2.asm:asm-analysis", "9.4");
- versions.put("org.ow2.asm:asm-commons", "9.4");
- versions.put("org.ow2.asm:asm-util", "9.4");
- versions.put("org.ow2.asm:asm-tree", "9.4");
versions.put("org.rnorth.duct-tape:duct-tape", "1.0.8");
versions.put("org.slf4j:slf4j-api", "1.7.36");
versions.put("org.slf4j:slf4j-simple", "1.7.36");
diff --git a/src/main/resources/templates/SlingOptions.hbs b/src/main/resources/templates/SlingOptions.hbs
index 059e38c..ffb71ff 100644
--- a/src/main/resources/templates/SlingOptions.hbs
+++ b/src/main/resources/templates/SlingOptions.hbs
@@ -159,13 +159,7 @@ public final class SlingOptions {
public static ModifiableCompositeOption spifly() {
return composite(
- mavenBundle().groupId("org.apache.aries").artifactId("org.apache.aries.util").version(versionResolver),
- mavenBundle().groupId("org.apache.aries.spifly").artifactId("org.apache.aries.spifly.dynamic.bundle").version(versionResolver),
- mavenBundle().groupId("org.ow2.asm").artifactId("asm").version(versionResolver),
- mavenBundle().groupId("org.ow2.asm").artifactId("asm-analysis").version(versionResolver),
- mavenBundle().groupId("org.ow2.asm").artifactId("asm-commons").version(versionResolver),
- mavenBundle().groupId("org.ow2.asm").artifactId("asm-util").version(versionResolver),
- mavenBundle().groupId("org.ow2.asm").artifactId("asm-tree").version(versionResolver)
+ mavenBundle().groupId("org.apache.aries.spifly").artifactId("org.apache.aries.spifly.dynamic.framework.extension").version(versionResolver)
);
}
diff --git a/src/main/resources/templates/SlingVersionResolver.hbs b/src/main/resources/templates/SlingVersionResolver.hbs
index e17bdff..332b22d 100644
--- a/src/main/resources/templates/SlingVersionResolver.hbs
+++ b/src/main/resources/templates/SlingVersionResolver.hbs
@@ -54,7 +54,7 @@ public class SlingVersionResolver implements VersionResolver {
versions.put("org.apache.aries.jmx:org.apache.aries.jmx.api", "1.1.5");
versions.put("org.apache.aries.jmx:org.apache.aries.jmx.core", "1.1.8");
versions.put("org.apache.aries.jmx:org.apache.aries.jmx.whiteboard", "1.2.0");
- versions.put("org.apache.aries.spifly:org.apache.aries.spifly.dynamic.bundle", "1.3.6");
+ versions.put("org.apache.aries.spifly:org.apache.aries.spifly.dynamic.framework.extension", "1.3.7");
versions.put("org.apache.commons:commons-lang3", "3.12.0");
versions.put("org.apache.httpcomponents:httpclient-osgi", "4.5.14");
versions.put("org.apache.httpcomponents:httpcore-osgi", "4.4.16");
@@ -98,11 +98,6 @@ public class SlingVersionResolver implements VersionResolver {
versions.put("org.osgi:org.osgi.service.repository", "1.1.0");
versions.put("org.osgi:org.osgi.util.function", "1.2.0");
versions.put("org.osgi:org.osgi.util.promise", "1.3.0");
- versions.put("org.ow2.asm:asm", "9.4");
- versions.put("org.ow2.asm:asm-analysis", "9.4");
- versions.put("org.ow2.asm:asm-commons", "9.4");
- versions.put("org.ow2.asm:asm-util", "9.4");
- versions.put("org.ow2.asm:asm-tree", "9.4");
versions.put("org.rnorth.duct-tape:duct-tape", "1.0.8");
versions.put("org.slf4j:slf4j-api", "1.7.36");
versions.put("org.slf4j:slf4j-simple", "1.7.36");