Skip to content

Commit

Permalink
chore: bump tinybundles related things too when upgrade to 4.0.0 (#1575)
Browse files Browse the repository at this point in the history
* 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>
  • Loading branch information
He-Pin and scala-steward-asf[bot] authored Dec 8, 2024
1 parent 5a76a17 commit 11d7bc4
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 5 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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
}

Expand All @@ -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
}

Expand Down
10 changes: 9 additions & 1 deletion project/Dependencies.scala
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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)

Expand Down

0 comments on commit 11d7bc4

Please sign in to comment.