From 11d7bc49d9f567f80080218f54e7dec6103387ad Mon Sep 17 00:00:00 2001 From: "He-Pin(kerr)" Date: Sun, 8 Dec 2024 22:57:32 +0800 Subject: [PATCH] chore: bump tinybundles related things too when upgrade to 4.0.0 (#1575) * Update tinybundles to 4.0.0 * chore: bump tinybundles related things too when upgrade to 4.0.0 --------- Co-authored-by: scala-steward-asf[bot] <147768647+scala-steward-asf[bot]@users.noreply.github.com> --- .../org/apache/pekko/osgi/PojoSRTestSupport.scala | 8 ++++---- project/Dependencies.scala | 10 +++++++++- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/osgi/src/test/scala/org/apache/pekko/osgi/PojoSRTestSupport.scala b/osgi/src/test/scala/org/apache/pekko/osgi/PojoSRTestSupport.scala index d7bb7a02fcc..be059fb9c53 100644 --- a/osgi/src/test/scala/org/apache/pekko/osgi/PojoSRTestSupport.scala +++ b/osgi/src/test/scala/org/apache/pekko/osgi/PojoSRTestSupport.scala @@ -127,15 +127,15 @@ object PojoSRTestSupport { */ class BundleDescriptorBuilder(name: String) { - import org.ops4j.pax.tinybundles.core.TinyBundles + import org.ops4j.pax.tinybundles.TinyBundles - val tinybundle = TinyBundles.bundle.set(Constants.BUNDLE_SYMBOLICNAME, name) + val tinybundle = TinyBundles.bundle.setHeader(Constants.BUNDLE_SYMBOLICNAME, name) /** * Add a Blueprint XML file to our test bundle */ def withBlueprintFile(name: String, contents: URL): BundleDescriptorBuilder = { - tinybundle.add("OSGI-INF/blueprint/%s".format(name), contents) + tinybundle.addResource("OSGI-INF/blueprint/%s".format(name), contents) this } @@ -151,7 +151,7 @@ class BundleDescriptorBuilder(name: String) { * Add a Bundle activator to our test bundle */ def withActivator(activator: Class[_ <: BundleActivator]): BundleDescriptorBuilder = { - tinybundle.set(Constants.BUNDLE_ACTIVATOR, activator.getName) + tinybundle.setHeader(Constants.BUNDLE_ACTIVATOR, activator.getName) this } diff --git a/project/Dependencies.scala b/project/Dependencies.scala index ae77aa5bf0c..6bb1d2358b3 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -145,7 +145,11 @@ object Dependencies { val scalatestMockito = "org.scalatestplus" %% "mockito-4-11" % "3.2.18.0" % Test val pojosr = "com.googlecode.pojosr" % "de.kalpatec.pojosr.framework" % "0.2.1" % Test - val tinybundles = "org.ops4j.pax.tinybundles" % "tinybundles" % "3.0.0" % Test + val tinybundles = "org.ops4j.pax.tinybundles" % "tinybundles" % "4.0.0" % Test + val bndlib = "biz.aQute.bnd" % "biz.aQute.bndlib" % "6.4.1" % Test + val `pax-exam` = "org.ops4j.pax.exam" % "pax-exam" % "4.13.3" % Test + val `pax-exam-cm` = "org.ops4j.pax.exam" % "pax-exam-cm" % "4.13.3" % Test + val `pax-exam-container-forked` = "org.ops4j.pax.exam" % "pax-exam-container-forked" % "4.13.3" % Test // in-memory filesystem for file related tests val jimfs = "com.google.jimfs" % "jimfs" % "1.3.0" % Test @@ -342,6 +346,10 @@ object Dependencies { TestDependencies.commonsIo, TestDependencies.pojosr, TestDependencies.tinybundles, + TestDependencies.bndlib, + TestDependencies.`pax-exam`, + TestDependencies.`pax-exam-cm`, + TestDependencies.`pax-exam-container-forked`, TestDependencies.scalatest, TestDependencies.junit)