Skip to content

chore: bump tinybundles related things too when upgrade to 4.0.0 #1575

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
He-Pin merged 2 commits into from
Dec 8, 2024
Merged

chore: bump tinybundles related things too when upgrade to 4.0.0 #1575

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4190f74
Update tinybundles to 4.0.0
scala-steward-asf[bot] Dec 8, 2024
6fb1e86
chore: bump tinybundles related things too when upgrade to 4.0.0
He-Pin Dec 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions osgi/src/test/scala/org/apache/pekko/osgi/PojoSRTestSupport.scala
View file
Open in desktop
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
View file
Open in desktop
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
Loading