This is an automated email from the ASF dual-hosted git repository. amichai pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/aries-rsa.git
commit bc4968acc3ee876092b9d038bd71616bea0c5dff Author: Amichai Rothman <[email protected]> AuthorDate: Wed May 29 14:14:15 2024 +0300 ARIES-2141 Upgrade org.osgi.util.promise to 1.3.0 --- itests/felix/pom.xml | 11 +++++++++++ .../java/org/apache/aries/rsa/itests/felix/RsaTestBase.java | 2 ++ provider/fastbin/pom.xml | 2 +- provider/tcp/pom.xml | 2 +- 4 files changed, 15 insertions(+), 2 deletions(-) diff --git a/itests/felix/pom.xml b/itests/felix/pom.xml index eaf5c936..2c5f3a08 100644 --- a/itests/felix/pom.xml +++ b/itests/felix/pom.xml @@ -51,6 +51,17 @@ <version>2.0.10</version> </dependency> + <dependency> + <groupId>org.osgi</groupId> + <artifactId>org.osgi.util.function</artifactId> + <version>1.2.0</version> + </dependency> + <dependency> + <groupId>org.osgi</groupId> + <artifactId>org.osgi.util.promise</artifactId> + <version>1.3.0</version> + </dependency> + <dependency> <groupId>org.apache.aries.rsa</groupId> <artifactId>org.apache.aries.rsa.core</artifactId> diff --git a/itests/felix/src/test/java/org/apache/aries/rsa/itests/felix/RsaTestBase.java b/itests/felix/src/test/java/org/apache/aries/rsa/itests/felix/RsaTestBase.java index 2a1493ce..c8ad8e83 100644 --- a/itests/felix/src/test/java/org/apache/aries/rsa/itests/felix/RsaTestBase.java +++ b/itests/felix/src/test/java/org/apache/aries/rsa/itests/felix/RsaTestBase.java @@ -127,6 +127,8 @@ public class RsaTestBase { systemProperty("pax.exam.osgi.unresolved.fail").value("true"), systemProperty("org.ops4j.pax.logging.DefaultServiceLog.level").value("INFO"), systemProperty("aries.rsa.hostname").value("localhost"), + mvn("org.osgi", "org.osgi.util.function"), + mvn("org.osgi", "org.osgi.util.promise"), mvn("org.apache.servicemix.bundles", "org.apache.servicemix.bundles.hamcrest"), mvn("org.awaitility", "awaitility"), mvn("org.apache.felix", "org.apache.felix.eventadmin"), diff --git a/provider/fastbin/pom.xml b/provider/fastbin/pom.xml index 36933aa0..363910ae 100644 --- a/provider/fastbin/pom.xml +++ b/provider/fastbin/pom.xml @@ -60,7 +60,7 @@ <dependency> <groupId>org.osgi</groupId> <artifactId>org.osgi.util.promise</artifactId> - <version>1.0.0</version> + <version>1.3.0</version> <optional>true</optional> </dependency> </dependencies> diff --git a/provider/tcp/pom.xml b/provider/tcp/pom.xml index b83df58e..0d1235ad 100644 --- a/provider/tcp/pom.xml +++ b/provider/tcp/pom.xml @@ -45,7 +45,7 @@ <dependency> <groupId>org.osgi</groupId> <artifactId>org.osgi.util.promise</artifactId> - <version>1.0.0</version> + <version>1.3.0</version> </dependency> <dependency> <groupId>org.apache.felix</groupId>
