diff --git a/activemq-amqp/pom.xml b/activemq-amqp/pom.xml
index c764f11c73..8b43b96f5b 100644
--- a/activemq-amqp/pom.xml
+++ b/activemq-amqp/pom.xml
@@ -77,10 +77,13 @@
test
-
- org.eclipse.jetty.aggregate
- jetty-all
- uber
+ org.eclipse.jetty
+ jetty-server
+ test
+
+
+ org.eclipse.jetty
+ jetty-jndi
test
diff --git a/activemq-http/pom.xml b/activemq-http/pom.xml
index 8b66104744..9f5127677f 100644
--- a/activemq-http/pom.xml
+++ b/activemq-http/pom.xml
@@ -57,9 +57,16 @@
slf4j-api
- org.eclipse.jetty.aggregate
- jetty-all
- uber
+ org.eclipse.jetty
+ jetty-server
+
+
+ org.eclipse.jetty
+ jetty-xml
+
+
+ org.eclipse.jetty
+ jetty-webapp
org.apache.httpcomponents
diff --git a/activemq-web-console/pom.xml b/activemq-web-console/pom.xml
index 9872c9004f..0901d6f9bc 100644
--- a/activemq-web-console/pom.xml
+++ b/activemq-web-console/pom.xml
@@ -248,9 +248,8 @@
- org.eclipse.jetty.aggregate
- jetty-all
- uber
+ org.eclipse.jetty
+ jetty-server
test
diff --git a/activemq-web-demo/pom.xml b/activemq-web-demo/pom.xml
index 9263f1153a..4ee5a184b5 100644
--- a/activemq-web-demo/pom.xml
+++ b/activemq-web-demo/pom.xml
@@ -198,9 +198,8 @@
- org.eclipse.jetty.aggregate
- jetty-all
- uber
+ org.eclipse.jetty
+ jetty-server
test
diff --git a/activemq-web/pom.xml b/activemq-web/pom.xml
index 454f283846..984f9bb94d 100644
--- a/activemq-web/pom.xml
+++ b/activemq-web/pom.xml
@@ -82,9 +82,8 @@
provided
- org.eclipse.jetty.aggregate
- jetty-all
- uber
+ org.eclipse.jetty
+ jetty-server
provided
diff --git a/assembly/pom.xml b/assembly/pom.xml
index e4a0810d49..941e6f5954 100644
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -314,9 +314,12 @@
jettison
- org.eclipse.jetty.aggregate
- jetty-all
- uber
+ org.eclipse.jetty
+ jetty-server
+
+
+ org.eclipse.jetty
+ jetty-rewrite
diff --git a/assembly/src/main/descriptors/common-bin.xml b/assembly/src/main/descriptors/common-bin.xml
index 2d259b9835..ffe1b8f1ff 100644
--- a/assembly/src/main/descriptors/common-bin.xml
+++ b/assembly/src/main/descriptors/common-bin.xml
@@ -249,7 +249,21 @@
org.springframework:spring-web
org.springframework:spring-webmvc
- org.eclipse.jetty.aggregate:jetty-all
+ org.eclipse.jetty:jetty-annotations
+ org.eclipse.jetty:jetty-server
+ org.eclipse.jetty:jetty-xml
+ org.eclipse.jetty:jetty-webapp
+ org.eclipse.jetty:jetty-util
+ org.eclipse.jetty:jetty-http
+ org.eclipse.jetty:jetty-io
+ org.eclipse.jetty:jetty-plus
+ org.eclipse.jetty:jetty-servlet
+ org.eclipse.jetty:jetty-security
+ org.eclipse.jetty:jetty-rewrite
+ org.eclipse.jetty.websocket:websocket-api
+ org.eclipse.jetty.websocket:websocket-common
+ org.eclipse.jetty.websocket:websocket-server
+ org.eclipse.jetty.websocket:websocket-servlet
org.eclipse.jetty.orbit:javax.security.auth.message
org.apache.tomcat:tomcat-servlet-api
org.apache.tomcat:tomcat-websocket-api
diff --git a/pom.xml b/pom.xml
index d44c0d6a30..e06fb2ec76 100644
--- a/pom.xml
+++ b/pom.xml
@@ -70,7 +70,7 @@
2.13.1
1.9.3
2.2.11_1
- 9.4.43.v20210629
+ 9.4.45.v20220203
${jetty9-version}
3.4.1
9.0.48
@@ -952,39 +952,14 @@
${xpp3-version}
-
org.eclipse.jetty
- apache-jsp
- ${jetty-version}
-
-
- org.eclipse.jetty
- apache-jstl
+ jetty-bom
${jetty-version}
+ pom
+ import
-
- org.eclipse.jetty.aggregate
- jetty-all
- ${jetty-version}
- uber
-
-
- javax.servlet
- javax.servlet-api
-
-
- javax.websocket
- javax.websocket-api
-
-
-
-
- org.eclipse.jetty.websocket
- websocket-server
- ${jetty-version}
-
org.apache.httpcomponents
httpclient