From 26aeb669571d2f0f14fd6938b0ca406d808834cf Mon Sep 17 00:00:00 2001 From: Stefan Bischof Date: Thu, 23 Oct 2025 19:20:01 +0200 Subject: [PATCH] adjust to new parent pom Signed-off-by: Stefan Bischof --- osgi.framework/play.bndrun | 6 +++--- osgi.framework/test.bndrun | 6 +++--- osgi.service.jakartars/pom.xml | 1 + pom.xml | 24 ++++++++++++++++++++++++ util/pom.xml | 1 + 5 files changed, 32 insertions(+), 6 deletions(-) diff --git a/osgi.framework/play.bndrun b/osgi.framework/play.bndrun index 6436550..d7b46f3 100644 --- a/osgi.framework/play.bndrun +++ b/osgi.framework/play.bndrun @@ -13,12 +13,12 @@ org.eclipse.osgi-technology.command.util;version='[0.0.1,0.0.2)',\ org.opentest4j;version='[1.3.0,1.3.1)',\ org.eclipse.osgi-technology.console.plain;version='[0.0.1,0.0.2)',\ - assertj-core;version='[3.26.0,3.26.1)',\ junit-jupiter-params;version='[5.11.1,5.11.2)',\ junit-platform-engine;version='[1.11.1,1.11.2)',\ - net.bytebuddy.byte-buddy;version='[1.15.3,1.15.4)',\ org.eclipse.osgi-technology.command.osgi.framework;version='[0.0.1,0.0.2)',\ org.eclipse.osgi-technology.command.osgi.framework-tests;version='[0.0.1,0.0.2)',\ org.osgi.test.common;version='[1.3.0,1.3.1)',\ - org.osgi.test.junit5;version='[1.3.0,1.3.1)' + org.osgi.test.junit5;version='[1.3.0,1.3.1)',\ + assertj-core;version='[3.27.6,3.27.7)',\ + net.bytebuddy.byte-buddy;version='[1.17.7,1.17.8)' -runee: JavaSE-17 \ No newline at end of file diff --git a/osgi.framework/test.bndrun b/osgi.framework/test.bndrun index a12a44b..05b7135 100644 --- a/osgi.framework/test.bndrun +++ b/osgi.framework/test.bndrun @@ -9,14 +9,12 @@ -tester: biz.aQute.tester.junit-platform -resolve.effective: active; skip:='org.apache.felix.gogo' -runbundles: \ - assertj-core;version='[3.26.0,3.26.1)',\ junit-jupiter-api;version='[5.11.1,5.11.2)',\ junit-jupiter-engine;version='[5.11.1,5.11.2)',\ junit-jupiter-params;version='[5.11.1,5.11.2)',\ junit-platform-commons;version='[1.11.1,1.11.2)',\ junit-platform-engine;version='[1.11.1,1.11.2)',\ junit-platform-launcher;version='[1.11.1,1.11.2)',\ - net.bytebuddy.byte-buddy;version='[1.15.3,1.15.4)',\ org.apache.felix.gogo.runtime;version='[1.1.6,1.1.7)',\ org.eclipse.osgi-technology.command.osgi.framework;version='[0.0.1,0.0.2)',\ org.eclipse.osgi-technology.command.osgi.framework-tests;version='[0.0.1,0.0.2)',\ @@ -24,4 +22,6 @@ org.opentest4j;version='[1.3.0,1.3.1)',\ org.osgi.test.common;version='[1.3.0,1.3.1)',\ org.osgi.test.junit5;version='[1.3.0,1.3.1)',\ - org.eclipse.osgi-technology.command.converter.bundle;version='[0.0.1,0.0.2)' \ No newline at end of file + org.eclipse.osgi-technology.command.converter.bundle;version='[0.0.1,0.0.2)',\ + assertj-core;version='[3.27.6,3.27.7)',\ + net.bytebuddy.byte-buddy;version='[1.17.7,1.17.8)' \ No newline at end of file diff --git a/osgi.service.jakartars/pom.xml b/osgi.service.jakartars/pom.xml index 8618536..fcf400e 100644 --- a/osgi.service.jakartars/pom.xml +++ b/osgi.service.jakartars/pom.xml @@ -102,6 +102,7 @@ org.osgi org.osgi.annotation.versioning 1.1.2 + compile org.eclipse.osgi-technology.command diff --git a/pom.xml b/pom.xml index d22e25e..dc15dae 100644 --- a/pom.xml +++ b/pom.xml @@ -146,6 +146,12 @@ ${osgi.annotation.version} provided + + org.osgi + org.osgi.annotation.bundle + 2.0.0 + provided + org.osgi org.osgi.framework @@ -197,6 +203,13 @@ ${felix.framework.version} runtime + + + org.apache.felix + org.apache.felix.gogo.runtime + compile + 1.1.6 + @@ -260,6 +273,12 @@ test + + org.assertj + assertj-core + 3.27.6 + test + org.apache.felix @@ -327,6 +346,11 @@ org.mockito mockito-junit-jupiter + + org.assertj + assertj-core + test + diff --git a/util/pom.xml b/util/pom.xml index 19ba04c..43fff8d 100644 --- a/util/pom.xml +++ b/util/pom.xml @@ -88,6 +88,7 @@ org.osgi org.osgi.annotation.bundle + provided