This is an automated email from the ASF dual-hosted git repository.
alien11689 pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/aries.git
The following commit(s) were added to refs/heads/trunk by this push:
new 7d24a742d [MAINTENANCE] Update osgi runtime in blueprint itests
7d24a742d is described below
commit 7d24a742d6a92cc2498547eeac5663407937549c
Author: Dominik Przybysz <[email protected]>
AuthorDate: Sun Feb 16 20:05:20 2025 +0100
[MAINTENANCE] Update osgi runtime in blueprint itests
---
.github/workflows/blueprint.yml | 12 ++++++++
blueprint/blueprint-bundle/pom.xml | 25 +++++++++++++---
blueprint/blueprint-core/pom.xml | 24 +++++++++++++--
blueprint/blueprint-repository/pom.xml | 21 +++++++++++--
blueprint/itests/blueprint-itests/pom.xml | 34 +++++++++++++++++-----
.../itests/AbstractBlueprintIntegrationTest.java | 4 +--
.../org/apache/aries/blueprint/itests/Helper.java | 5 ++--
7 files changed, 102 insertions(+), 23 deletions(-)
diff --git a/.github/workflows/blueprint.yml b/.github/workflows/blueprint.yml
index a0ee1528e..2814620e2 100644
--- a/.github/workflows/blueprint.yml
+++ b/.github/workflows/blueprint.yml
@@ -17,6 +17,9 @@ on:
paths:
- parent/**
- testsupport/**
+ - proxy/**
+ - util/**
+ - quiesce/**
- blueprint/**
- .github/workflows/blueprint.yml
push:
@@ -50,6 +53,15 @@ jobs:
- name: Build testsupport
shell: bash
run: mvn -U -e -B -ntp clean install -f testsupport
+ - name: Build proxy
+ shell: bash
+ run: mvn -U -e -B -ntp clean install -f proxy
+ - name: Build util
+ shell: bash
+ run: mvn -U -e -B -ntp clean install -f util
+ - name: Build quiesce
+ shell: bash
+ run: mvn -U -e -B -ntp clean install -f quiesce
- name: Build blueprint
shell: bash
run: mvn -U -e -B -ntp clean install -f blueprint
diff --git a/blueprint/blueprint-bundle/pom.xml
b/blueprint/blueprint-bundle/pom.xml
index f1de6c4e1..869e9581d 100644
--- a/blueprint/blueprint-bundle/pom.xml
+++ b/blueprint/blueprint-bundle/pom.xml
@@ -104,7 +104,7 @@
</aries.osgi.failok>
<lastReleaseVersion>1.1.0</lastReleaseVersion>
- <asm-debug-all.version>5.0.3</asm-debug-all.version>
+ <asm.version>9.7.1</asm.version>
<blueprint.api.version>${blueprint.api.dev.version}</blueprint.api.version>
<blueprint.authz.version>${blueprint.authz.dev.version}</blueprint.authz.version>
<blueprint.cm.version>${blueprint.cm.dev.version}</blueprint.cm.version>
@@ -152,10 +152,27 @@
</dependency>
<dependency>
<groupId>org.ow2.asm</groupId>
- <artifactId>asm-debug-all</artifactId>
- <version>${asm-debug-all.version}</version>
+ <artifactId>asm</artifactId>
+ <version>${asm.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.ow2.asm</groupId>
+ <artifactId>asm-commons</artifactId>
+ <version>${asm.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.ow2.asm</groupId>
+ <artifactId>asm-tree</artifactId>
+ <version>${asm.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.ow2.asm</groupId>
+ <artifactId>asm-analysis</artifactId>
+ <version>${asm.version}</version>
<scope>test</scope>
- <optional>true</optional>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
diff --git a/blueprint/blueprint-core/pom.xml b/blueprint/blueprint-core/pom.xml
index 52d559dd3..1cc5b9953 100644
--- a/blueprint/blueprint-core/pom.xml
+++ b/blueprint/blueprint-core/pom.xml
@@ -95,7 +95,7 @@
</aries.osgi.include.resource>
<lastReleaseVersion>1.6.0</lastReleaseVersion>
- <asm-debug-all.version>5.0.3</asm-debug-all.version>
+ <asm.version>9.7.1</asm.version>
<blueprint.annotation.api.version>1.0.1</blueprint.annotation.api.version>
<blueprint.api.version>1.0.1</blueprint.api.version>
<blueprint.parser.version>1.6.0</blueprint.parser.version>
@@ -179,9 +179,27 @@
</dependency>
<dependency>
<groupId>org.ow2.asm</groupId>
- <artifactId>asm-debug-all</artifactId>
+ <artifactId>asm</artifactId>
+ <version>${asm.version}</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.ow2.asm</groupId>
+ <artifactId>asm-commons</artifactId>
+ <version>${asm.version}</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.ow2.asm</groupId>
+ <artifactId>asm-tree</artifactId>
+ <version>${asm.version}</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.ow2.asm</groupId>
+ <artifactId>asm-analysis</artifactId>
+ <version>${asm.version}</version>
<optional>true</optional>
- <version>${asm-debug-all.version}</version>
</dependency>
<dependency>
<groupId>org.apache.aries.quiesce</groupId>
diff --git a/blueprint/blueprint-repository/pom.xml
b/blueprint/blueprint-repository/pom.xml
index ac660474f..619139b61 100644
--- a/blueprint/blueprint-repository/pom.xml
+++ b/blueprint/blueprint-repository/pom.xml
@@ -35,7 +35,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<local.index.policy>ALLOWED</local.index.policy>
- <asm-all.version>5.0.4</asm-all.version>
+ <asm.version>9.7.1</asm.version>
<blueprint.api.version>1.0.1</blueprint.api.version>
<blueprint.cm.version>1.0.9</blueprint.cm.version>
<blueprint.core.version>1.5.0</blueprint.core.version>
@@ -88,8 +88,23 @@
<!-- Aries PROXY -->
<dependency>
<groupId>org.ow2.asm</groupId>
- <artifactId>asm-all</artifactId>
- <version>${asm-all.version}</version>
+ <artifactId>asm</artifactId>
+ <version>${asm.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.ow2.asm</groupId>
+ <artifactId>asm-commons</artifactId>
+ <version>${asm.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.ow2.asm</groupId>
+ <artifactId>asm-tree</artifactId>
+ <version>${asm.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.ow2.asm</groupId>
+ <artifactId>asm-analysis</artifactId>
+ <version>${asm.version}</version>
</dependency>
<dependency>
<groupId>org.apache.aries</groupId>
diff --git a/blueprint/itests/blueprint-itests/pom.xml
b/blueprint/itests/blueprint-itests/pom.xml
index c5cb99993..0310e673f 100644
--- a/blueprint/itests/blueprint-itests/pom.xml
+++ b/blueprint/itests/blueprint-itests/pom.xml
@@ -42,7 +42,7 @@
</scm>
<properties>
- <asm-debug-all.version>5.0.3</asm-debug-all.version>
+ <asm.version>9.7.1</asm.version>
<blueprint.api.version>${blueprint.api.dev.version}</blueprint.api.version>
<blueprint.authz.version>${blueprint.authz.dev.version}</blueprint.authz.version>
<blueprint.cm.version>${blueprint.cm.dev.version}</blueprint.cm.version>
@@ -56,8 +56,8 @@
<commons-jexl.version>2.1.1</commons-jexl.version>
<depends-maven-plugin.version>1.5.0</depends-maven-plugin.version>
<maven-surefire-plugin.version>3.5.2</maven-surefire-plugin.version>
- <org.apache.aries.proxy.version>1.1.0</org.apache.aries.proxy.version>
-
<org.apache.aries.quiesce.api.version>1.0.0</org.apache.aries.quiesce.api.version>
+
<org.apache.aries.proxy.version>1.1.15-SNAPSHOT</org.apache.aries.proxy.version>
+
<org.apache.aries.quiesce.api.version>1.0.1-SNAPSHOT</org.apache.aries.quiesce.api.version>
<org.apache.aries.testsupport.unit.version>2.0.0-SNAPSHOT</org.apache.aries.testsupport.unit.version>
<org.apache.felix.configadmin.version>1.8.0</org.apache.felix.configadmin.version>
<org.apache.servicemix.bundles.aopalliance.version>1.0_6</org.apache.servicemix.bundles.aopalliance.version>
@@ -67,7 +67,7 @@
<pax-tinybundles.version>2.0.0</pax-tinybundles.version>
<pax-url.version>2.6.16</pax-url.version>
<slf4j.version>1.7.7</slf4j.version>
- <xbean.version>4.5</xbean.version>
+ <xbean.version>4.26</xbean.version>
</properties>
<dependencies>
@@ -276,13 +276,31 @@
</dependency>
<dependency>
<groupId>org.ow2.asm</groupId>
- <artifactId>asm-debug-all</artifactId>
+ <artifactId>asm</artifactId>
+ <version>${asm.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.ow2.asm</groupId>
+ <artifactId>asm-commons</artifactId>
+ <version>${asm.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.ow2.asm</groupId>
+ <artifactId>asm-tree</artifactId>
+ <version>${asm.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.ow2.asm</groupId>
+ <artifactId>asm-analysis</artifactId>
+ <version>${asm.version}</version>
<scope>test</scope>
- <version>${asm-debug-all.version}</version>
</dependency>
<dependency>
<groupId>org.apache.xbean</groupId>
- <artifactId>xbean-asm5-shaded</artifactId>
+ <artifactId>xbean-asm9-shaded</artifactId>
<version>${xbean.version}</version>
</dependency>
<dependency>
@@ -292,7 +310,7 @@
</dependency>
<dependency>
<groupId>org.apache.xbean</groupId>
- <artifactId>xbean-finder</artifactId>
+ <artifactId>xbean-finder-shaded</artifactId>
<version>${xbean.version}</version>
</dependency>
<dependency>
diff --git
a/blueprint/itests/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/AbstractBlueprintIntegrationTest.java
b/blueprint/itests/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/AbstractBlueprintIntegrationTest.java
index a6bdfa57d..ea5ad4e22 100644
---
a/blueprint/itests/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/AbstractBlueprintIntegrationTest.java
+++
b/blueprint/itests/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/AbstractBlueprintIntegrationTest.java
@@ -65,8 +65,8 @@ public abstract class AbstractBlueprintIntegrationTest
extends AbstractIntegrati
return composite(
junitBundles(),
setPaxExamLogLevel("INFO"),
- mvnBundle("org.ops4j.pax.logging", "pax-logging-api"),
- mvnBundle("org.ops4j.pax.logging", "pax-logging-service"),
+ addPaxLoggingBundles(),
+ addAsmBundles(),
configurePaxUrlLocalMavenRepoIfNeeded(),
systemProperty("pax.exam.osgi.unresolved.fail").value("true")
);
diff --git
a/blueprint/itests/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/Helper.java
b/blueprint/itests/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/Helper.java
index 6c1753d33..ba6982afa 100644
---
a/blueprint/itests/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/Helper.java
+++
b/blueprint/itests/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/Helper.java
@@ -62,16 +62,15 @@ public class Helper {
public static Option blueprintBundles(boolean startBlueprint) {
return composite(
- mvnBundle("org.ow2.asm", "asm-debug-all"),
mvnBundle("org.apache.felix", "org.apache.felix.configadmin"),
mvnBundle("org.ops4j.pax.url", "pax-url-aether"),
mvnBundle("org.apache.aries.testsupport",
"org.apache.aries.testsupport.unit"),
mvnBundle("org.apache.aries.proxy", "org.apache.aries.proxy"),
mvnBundle("org.apache.commons", "commons-jexl"),
mvnBundle("org.apache.aries.blueprint",
"org.apache.aries.blueprint.jexl.evaluator"),
- mvnBundle("org.apache.xbean", "xbean-asm5-shaded"),
+ mvnBundle("org.apache.xbean", "xbean-asm9-shaded"),
mvnBundle("org.apache.xbean", "xbean-bundleutils"),
- mvnBundle("org.apache.xbean", "xbean-finder"),
+ mvnBundle("org.apache.xbean", "xbean-finder-shaded"),
mvnBundle("org.apache.aries.quiesce",
"org.apache.aries.quiesce.api", startBlueprint),
mvnBundle("org.apache.aries.blueprint",
"org.apache.aries.blueprint.api", startBlueprint),
mvnBundle("org.apache.aries.blueprint",
"org.apache.aries.blueprint.core", startBlueprint),
