This is an automated email from the ASF dual-hosted git repository.
veithen pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ws-axiom.git
The following commit(s) were added to refs/heads/master by this push:
new 551f13091 Update Pax Exam
551f13091 is described below
commit 551f130919dc5c5ccbe2768d352e9e33e2b7dd7a
Author: Andreas Veithen <[email protected]>
AuthorDate: Sun Dec 8 23:16:37 2024 +0000
Update Pax Exam
---
pom.xml | 2 +-
systests/osgi-tests/pom.xml | 8 +++++++-
.../test/java/org/apache/axiom/test/UsesConstraintsTest.java | 10 +++++-----
3 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/pom.xml b/pom.xml
index 62985fbd6..b541ec817 100644
--- a/pom.xml
+++ b/pom.xml
@@ -284,7 +284,7 @@
<shade.plugin.version>3.6.0</shade.plugin.version>
<spring.version>5.3.39</spring.version>
<springws.version>3.1.3</springws.version>
- <exam.version>4.13.5</exam.version>
+ <exam.version>4.14.0</exam.version>
<slf4j.version>1.7.36</slf4j.version>
<jetty.version>10.0.24</jetty.version>
<log4j.version>2.24.2</log4j.version>
diff --git a/systests/osgi-tests/pom.xml b/systests/osgi-tests/pom.xml
index 3d05f0e43..3d44fc02a 100644
--- a/systests/osgi-tests/pom.xml
+++ b/systests/osgi-tests/pom.xml
@@ -139,7 +139,13 @@
<dependency>
<groupId>org.ops4j.pax.tinybundles</groupId>
<artifactId>tinybundles</artifactId>
- <version>2.1.1</version>
+ <version>4.0.0</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>biz.aQute.bnd</groupId>
+ <artifactId>biz.aQute.bndlib</artifactId>
+ <version>6.4.1</version>
<scope>test</scope>
</dependency>
</dependencies>
diff --git
a/systests/osgi-tests/src/test/java/org/apache/axiom/test/UsesConstraintsTest.java
b/systests/osgi-tests/src/test/java/org/apache/axiom/test/UsesConstraintsTest.java
index 5c6c30739..57528eff5 100644
---
a/systests/osgi-tests/src/test/java/org/apache/axiom/test/UsesConstraintsTest.java
+++
b/systests/osgi-tests/src/test/java/org/apache/axiom/test/UsesConstraintsTest.java
@@ -20,7 +20,7 @@ package org.apache.axiom.test;
import static org.assertj.core.api.Assertions.assertThat;
import static org.ops4j.pax.exam.CoreOptions.streamBundle;
-import static org.ops4j.pax.tinybundles.core.TinyBundles.bundle;
+import static org.ops4j.pax.tinybundles.TinyBundles.bundle;
import static org.osgi.framework.Constants.BUNDLE_SYMBOLICNAME;
import static org.osgi.framework.Constants.FRAMEWORK_STORAGE;
import static org.osgi.framework.Constants.FRAMEWORK_STORAGE_CLEAN;
@@ -126,8 +126,8 @@ public class UsesConstraintsTest {
bundles.add(
context.installBundle(
streamBundle(
- bundle().set(BUNDLE_SYMBOLICNAME,
"testbundle1")
- .set(
+
bundle().setHeader(BUNDLE_SYMBOLICNAME, "testbundle1")
+ .setHeader(
IMPORT_PACKAGE,
"org.apache.axiom.om,
javax.xml.stream; version=1.0")
.build())
@@ -137,8 +137,8 @@ public class UsesConstraintsTest {
bundles.add(
context.installBundle(
streamBundle(
- bundle().set(BUNDLE_SYMBOLICNAME,
"testbundle2")
- .set(
+
bundle().setHeader(BUNDLE_SYMBOLICNAME, "testbundle2")
+ .setHeader(
IMPORT_PACKAGE,
"org.apache.axiom.om,
javax.xml.stream; version=\"[0.0.0,1.0)\"")
.build())
