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 b39b6fd37 [MAINTENANCE] Fix not usable pax-exam-container-forked
b39b6fd37 is described below
commit b39b6fd371c2b1278b38f90e97ec3447b06850a6
Author: Dominik Przybysz <[email protected]>
AuthorDate: Sun Feb 16 07:48:04 2025 +0100
[MAINTENANCE] Fix not usable pax-exam-container-forked
---
.github/dependabot.yaml | 4 +++-
ejb/openejb-extender-itest/pom.xml | 16 +++++++++++++++-
transaction/transaction-itests/pom.xml | 16 +++++++++++++++-
3 files changed, 33 insertions(+), 3 deletions(-)
diff --git a/.github/dependabot.yaml b/.github/dependabot.yaml
index 75d84a3aa..2ef362d19 100644
--- a/.github/dependabot.yaml
+++ b/.github/dependabot.yaml
@@ -49,4 +49,6 @@ updates:
- dependency-name: "org.ops4j.pax.web:pax-web*"
versions:
- ">=9.0.0" # does not support java 8
-
+ - dependency-name: "org.ops4j.pax.swissbox:pax-swissbox*"
+ versions:
+ - ">1.8.3" # 1.9.0 does not support java 8, but 1.8.4 has SLF4j
dependency which cannot be met
https://github.com/ops4j/org.ops4j.pax.exam/issues/1056
diff --git a/ejb/openejb-extender-itest/pom.xml
b/ejb/openejb-extender-itest/pom.xml
index 49fdba6f3..7807948db 100644
--- a/ejb/openejb-extender-itest/pom.xml
+++ b/ejb/openejb-extender-itest/pom.xml
@@ -93,9 +93,10 @@
<org.apache.servicemix.bundles.wsdl4j-1.6.1.version>4.0-m1</org.apache.servicemix.bundles.wsdl4j-1.6.1.version>
<org.eclipse.osgi.version>3.22.0</org.eclipse.osgi.version>
<org.osgi.enterprise.version>4.2.0</org.osgi.enterprise.version>
- <pax-exam.version>4.13.3</pax-exam.version>
+ <pax-exam.version>4.13.5</pax-exam.version>
<pax-logging-api.version>1.7.2</pax-logging-api.version>
<pax-logging-service.version>1.7.2</pax-logging-service.version>
+ <pax-swissbox.version>1.8.3</pax-swissbox.version>
<pax-url-aether.version>2.6.16</pax-url-aether.version>
<scannotation.version>1.0.2_1</scannotation.version>
<xbeansVersion>3.8</xbeansVersion>
@@ -165,6 +166,19 @@
<version>${pax-url-aether.version}</version>
<scope>test</scope>
</dependency>
+ <!-- Explicit dependency for swissbox to fix
https://github.com/ops4j/org.ops4j.pax.exam/issues/1124 -->
+ <dependency>
+ <groupId>org.ops4j.pax.swissbox</groupId>
+ <artifactId>pax-swissbox-framework</artifactId>
+ <version>${pax-swissbox.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.ops4j.pax.swissbox</groupId>
+ <artifactId>pax-swissbox-tracker</artifactId>
+ <version>${pax-swissbox.version}</version>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>org.apache.aries</groupId>
diff --git a/transaction/transaction-itests/pom.xml
b/transaction/transaction-itests/pom.xml
index fdf53f89b..4232dff73 100644
--- a/transaction/transaction-itests/pom.xml
+++ b/transaction/transaction-itests/pom.xml
@@ -43,7 +43,7 @@
<asm.version>5.0.3</asm.version>
<cdi-api.version>1.2</cdi-api.version>
<depends-maven-plugin.version>1.5.0</depends-maven-plugin.version>
- <exam.version>4.13.3</exam.version>
+ <exam.version>4.13.5</exam.version>
<geronimo-connector.version>3.1.1</geronimo-connector.version>
<geronimo-j2ee-connector_1.6_spec.version>1.0</geronimo-j2ee-connector_1.6_spec.version>
<geronimo-validation_1.0_spec.version>1.1</geronimo-validation_1.0_spec.version>
@@ -65,6 +65,7 @@
<org.apache.servicemix.bundles.javax-inject.version>1_2</org.apache.servicemix.bundles.javax-inject.version>
<org.eclipse.osgi.version>3.22.0</org.eclipse.osgi.version>
<org.osgi.core.version>6.0.0</org.osgi.core.version>
+ <pax-swissbox.version>1.8.3</pax-swissbox.version>
<slf4j-api.version>1.7.7</slf4j-api.version>
<tinybundles.version>2.0.0</tinybundles.version>
<url.version>2.6.16</url.version>
@@ -255,6 +256,19 @@
<artifactId>tinybundles</artifactId>
<version>${tinybundles.version}</version>
</dependency>
+ <!-- Explicit dependency for swissbox to fix
https://github.com/ops4j/org.ops4j.pax.exam/issues/1124 -->
+ <dependency>
+ <groupId>org.ops4j.pax.swissbox</groupId>
+ <artifactId>pax-swissbox-framework</artifactId>
+ <version>${pax-swissbox.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.ops4j.pax.swissbox</groupId>
+ <artifactId>pax-swissbox-tracker</artifactId>
+ <version>${pax-swissbox.version}</version>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
