diff --git a/jetty-osgi/jetty-osgi-boot-jsp/pom.xml b/jetty-osgi/jetty-osgi-boot-jsp/pom.xml
index e7b389449aca..f37b815c26db 100644
--- a/jetty-osgi/jetty-osgi-boot-jsp/pom.xml
+++ b/jetty-osgi/jetty-osgi-boot-jsp/pom.xml
@@ -23,11 +23,11 @@
provided
- org.eclipse.osgi
+ org.eclipse.platform
org.eclipse.osgi
- org.eclipse.osgi
+ org.eclipse.platform
org.eclipse.osgi.services
diff --git a/jetty-osgi/jetty-osgi-boot-warurl/pom.xml b/jetty-osgi/jetty-osgi-boot-warurl/pom.xml
index 68711d1b499c..34ac1ada51ab 100644
--- a/jetty-osgi/jetty-osgi-boot-warurl/pom.xml
+++ b/jetty-osgi/jetty-osgi-boot-warurl/pom.xml
@@ -18,7 +18,7 @@
jetty-util
- org.eclipse.osgi
+ org.eclipse.platform
org.eclipse.osgi
diff --git a/jetty-osgi/jetty-osgi-boot/pom.xml b/jetty-osgi/jetty-osgi-boot/pom.xml
index a71677c60783..9da0d60dd08f 100644
--- a/jetty-osgi/jetty-osgi-boot/pom.xml
+++ b/jetty-osgi/jetty-osgi-boot/pom.xml
@@ -29,11 +29,11 @@
jetty-jmx
- org.eclipse.osgi
+ org.eclipse.platform
org.eclipse.osgi
- org.eclipse.osgi
+ org.eclipse.platform
org.eclipse.osgi.services
@@ -81,7 +81,8 @@
javax.transaction.xa;version="1.1.0";resolution:=optional,
org.objectweb.asm;version="$(version;=;${asm.version})";resolution:=optional,
org.osgi.framework,
- org.osgi.service.cm;version="1.2.0",
+ org.osgi.service.cm;version="1.4.0",
+ org.osgi.service.event;version="1.4.0",
org.osgi.service.packageadmin,
org.osgi.service.startlevel;version="1.0.0",
org.osgi.service.url;version="1.0.0",
diff --git a/jetty-osgi/jetty-osgi-httpservice/pom.xml b/jetty-osgi/jetty-osgi-httpservice/pom.xml
index fbbd0993190e..8a0281ec6709 100644
--- a/jetty-osgi/jetty-osgi-httpservice/pom.xml
+++ b/jetty-osgi/jetty-osgi-httpservice/pom.xml
@@ -25,7 +25,7 @@
servlet
- org.eclipse.osgi
+ org.eclipse.platform
org.eclipse.osgi
provided
diff --git a/jetty-osgi/pom.xml b/jetty-osgi/pom.xml
index 6938f97d0063..44f799430d9b 100644
--- a/jetty-osgi/pom.xml
+++ b/jetty-osgi/pom.xml
@@ -12,8 +12,9 @@
pom
- 3.6.0.v20100517
- 3.2.100.v20100503
+ 3.16.0
+ 3.9.0
+ 3.5.300
1.0.0-v20070606
@@ -134,7 +135,7 @@
${project.version}
- org.eclipse.osgi
+ org.eclipse.platform
org.eclipse.osgi.services
${osgi-services-version}
@@ -151,7 +152,7 @@
- org.eclipse.osgi
+ org.eclipse.platform
org.eclipse.osgi
${osgi-version}
diff --git a/jetty-osgi/test-jetty-osgi-context/pom.xml b/jetty-osgi/test-jetty-osgi-context/pom.xml
index 35cee1f9b047..8b9042b26775 100644
--- a/jetty-osgi/test-jetty-osgi-context/pom.xml
+++ b/jetty-osgi/test-jetty-osgi-context/pom.xml
@@ -18,12 +18,12 @@
${project.version}
- org.eclipse.osgi
+ org.eclipse.platform
org.eclipse.osgi
provided
- org.eclipse.osgi
+ org.eclipse.platform
org.eclipse.osgi.services
provided
diff --git a/jetty-osgi/test-jetty-osgi-server/pom.xml b/jetty-osgi/test-jetty-osgi-server/pom.xml
index 238a56c62ca4..5ac811ed6225 100644
--- a/jetty-osgi/test-jetty-osgi-server/pom.xml
+++ b/jetty-osgi/test-jetty-osgi-server/pom.xml
@@ -18,12 +18,12 @@
${project.version}
- org.eclipse.osgi
+ org.eclipse.platform
org.eclipse.osgi
provided
- org.eclipse.osgi
+ org.eclipse.platform
org.eclipse.osgi.services
provided
diff --git a/jetty-osgi/test-jetty-osgi-webapp/pom.xml b/jetty-osgi/test-jetty-osgi-webapp/pom.xml
index b13056f51573..704d39b62403 100644
--- a/jetty-osgi/test-jetty-osgi-webapp/pom.xml
+++ b/jetty-osgi/test-jetty-osgi-webapp/pom.xml
@@ -18,12 +18,12 @@
jetty-webapp
- org.eclipse.osgi
+ org.eclipse.platform
org.eclipse.osgi
provided
- org.eclipse.osgi
+ org.eclipse.platform
org.eclipse.osgi.services
provided
diff --git a/jetty-osgi/test-jetty-osgi/pom.xml b/jetty-osgi/test-jetty-osgi/pom.xml
index 39f70d5688f6..d9c84977a7d2 100644
--- a/jetty-osgi/test-jetty-osgi/pom.xml
+++ b/jetty-osgi/test-jetty-osgi/pom.xml
@@ -14,7 +14,10 @@
https://download.eclipse.org/jetty/orbit/
target/distribution
4.13.1
- 2.6.1
+ 2.6.2
+ 5.2.0
+ 1.8.3
+ 3.0.0
1.2
@@ -37,17 +40,38 @@
pax-exam-container-forked
${exam.version}
test
+
+
+ biz.aQute.bnd
+ bndlib
+
+
+ org.ops4j.pax.tinybundles
+ tinybundles
+
+
+
+
+ org.ops4j.pax.tinybundles
+ tinybundles
+ ${tinybundles.version}
org.ops4j.pax.swissbox
pax-swissbox-framework
- 1.8.3
+ ${swissbox.version}
test
+
+
+ org.ops4j.base
+ ops4j-base-monitors
+
+
org.ops4j.pax.swissbox
pax-swissbox-tracker
- 1.8.3
+ ${swissbox.version}
test
@@ -71,13 +95,19 @@
org.ops4j.pax.url
pax-url-wrap
- 2.6.1
+ ${url.version}
test
+
+
+ biz.aQute.bnd
+ bndlib
+
+
biz.aQute.bnd
- bndlib
- 2.4.0
+ biz.aQute.bndlib
+ ${bnd.version}
org.osgi
@@ -88,13 +118,19 @@
org.eclipse.platform
org.eclipse.osgi
- 3.16.0
+ ${osgi-version}
test
org.eclipse.platform
org.eclipse.osgi.services
- 3.9.0
+ ${osgi-services-version}
+ test
+
+
+ org.eclipse.platform
+ org.eclipse.osgi.util
+ ${osgi-util-version}
test
@@ -106,11 +142,11 @@
test
- org.eclipse.osgi
+ org.eclipse.platform
org.eclipse.osgi
- org.eclipse.osgi
+ org.eclipse.platform
org.eclipse.osgi.services
@@ -122,11 +158,11 @@
test
- org.eclipse.osgi
+ org.eclipse.platform
org.eclipse.osgi
- org.eclipse.osgi
+ org.eclipse.platform
org.eclipse.osgi.services
@@ -432,6 +468,24 @@
asm-commons
test
+
+ org.ow2.asm
+ asm-tree
+ test
+ ${asm.version}
+
+
+ org.ow2.asm
+ asm-analysis
+ test
+ ${asm.version}
+
+
+ org.ow2.asm
+ asm-util
+ test
+ ${asm.version}
+
org.eclipse.jetty.http2
http2-client
diff --git a/jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiAnnotationParser.java b/jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiAnnotationParser.java
index 688bdc6c5245..478b016d5d18 100644
--- a/jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiAnnotationParser.java
+++ b/jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiAnnotationParser.java
@@ -25,14 +25,12 @@
import java.nio.file.Paths;
import java.util.ArrayList;
import java.util.Collections;
-import java.util.HashMap;
import java.util.concurrent.ConcurrentHashMap;
import javax.inject.Inject;
import aQute.bnd.osgi.Constants;
import org.eclipse.jetty.annotations.ClassInheritanceHandler;
import org.eclipse.jetty.osgi.annotations.AnnotationParser;
-import org.eclipse.jetty.toolchain.test.MavenTestingUtils;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.Configuration;
@@ -46,6 +44,8 @@
import static org.junit.Assert.assertTrue;
import static org.ops4j.pax.exam.CoreOptions.mavenBundle;
+
+
/**
* TestJettyOSGiAnnotationParser
*
@@ -64,8 +64,8 @@ public static Option[] configure()
options.add(TestOSGiUtil.optionalRemoteDebug());
options.add(CoreOptions.junitBundles());
options.addAll(TestOSGiUtil.coreJettyDependencies());
- options.add(mavenBundle().groupId("biz.aQute.bnd").artifactId("bndlib").versionAsInProject().start());
- options.add(mavenBundle().groupId("org.ops4j.pax.tinybundles").artifactId("tinybundles").version("2.1.1").start());
+ options.add(mavenBundle().groupId("biz.aQute.bnd").artifactId("biz.aQute.bndlib").version("3.5.0").start());
+ options.add(mavenBundle().groupId("org.ops4j.pax.tinybundles").artifactId("tinybundles").versionAsInProject().start());
return options.toArray(new Option[options.size()]);
}
diff --git a/jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiBootWithAnnotations.java b/jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiBootWithAnnotations.java
index ba97ba924ce0..c0e31db27575 100644
--- a/jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiBootWithAnnotations.java
+++ b/jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiBootWithAnnotations.java
@@ -18,7 +18,6 @@
package org.eclipse.jetty.osgi.test;
-import java.nio.file.Paths;
import java.util.ArrayList;
import java.util.List;
import javax.inject.Inject;
diff --git a/jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiBootWithJavaxWebSocket.java b/jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiBootWithJavaxWebSocket.java
index 07f85b2dd5a7..67bef8a622ba 100644
--- a/jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiBootWithJavaxWebSocket.java
+++ b/jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiBootWithJavaxWebSocket.java
@@ -93,8 +93,9 @@ public static List