From 3cde816e95bc12100b3f95c4e343df3da2b1d17a Mon Sep 17 00:00:00 2001
From: Alex Osborne <aosborne@nla.gov.au>
Date: Thu, 28 Aug 2025 15:27:10 +0900
Subject: [PATCH] Use jetty BOM to ensure consistent versions

---
 commons/pom.xml |  1 -
 engine/pom.xml  |  3 ---
 modules/pom.xml |  7 -------
 pom.xml         | 14 ++++++++++++++
 4 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/commons/pom.xml b/commons/pom.xml
index 9058195a..a67f4264 100644
--- a/commons/pom.xml
+++ b/commons/pom.xml
@@ -155,7 +155,6 @@
 		<dependency>
 			<groupId>org.eclipse.jetty</groupId>
 			<artifactId>jetty-proxy</artifactId>
-			<version>${jetty.version}</version>
 		</dependency>
 	</dependencies>
 	<build>
diff --git a/engine/pom.xml b/engine/pom.xml
index dbca8379..18946dd7 100644
--- a/engine/pom.xml
+++ b/engine/pom.xml
@@ -23,17 +23,14 @@
 		<dependency>
 			<groupId>org.eclipse.jetty</groupId>
 			<artifactId>jetty-server</artifactId>
-			<version>${jetty.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.eclipse.jetty</groupId>
 			<artifactId>jetty-util</artifactId>
-			<version>${jetty.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.eclipse.jetty.ee10</groupId>
 			<artifactId>jetty-ee10-servlet</artifactId>
-            <version>${jetty.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/modules/pom.xml b/modules/pom.xml
index eb1cf96b..b748d1a3 100644
--- a/modules/pom.xml
+++ b/modules/pom.xml
@@ -41,27 +41,22 @@
 		<dependency>
 			<groupId>org.eclipse.jetty</groupId>
 			<artifactId>jetty-server</artifactId>
-			<version>${jetty.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.eclipse.jetty</groupId>
 			<artifactId>jetty-security</artifactId>
-			<version>${jetty.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.eclipse.jetty</groupId>
 			<artifactId>jetty-client</artifactId>
-			<version>${jetty.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.eclipse.jetty.http2</groupId>
 			<artifactId>jetty-http2-client-transport</artifactId>
-			<version>${jetty.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.eclipse.jetty.http3</groupId>
 			<artifactId>jetty-http3-client-transport</artifactId>
-			<version>${jetty.version}</version>
 			<exclusions>
 				<!-- Don't ship the quiche native library by default as it's very large and Jetty's
 				     HTTP/3 client is marked experimental and not for production use. For users who
@@ -76,13 +71,11 @@
 		<dependency>
 			<groupId>org.eclipse.jetty.ee10</groupId>
 			<artifactId>jetty-ee10-servlet</artifactId>
-			<version>${jetty.version}</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.eclipse.jetty.ee10</groupId>
 			<artifactId>jetty-ee10-proxy</artifactId>
-			<version>${jetty.version}</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
diff --git a/pom.xml b/pom.xml
index fe106eb7..bffd2493 100644
--- a/pom.xml
+++ b/pom.xml
@@ -100,6 +100,20 @@ http://maven.apache.org/guides/mini/guide-m1-m2.html
 				<artifactId>junit-jupiter</artifactId>
 				<version>5.13.4</version>
 			</dependency>
+            <dependency>
+                <groupId>org.eclipse.jetty</groupId>
+                <artifactId>jetty-bom</artifactId>
+                <version>${jetty.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.eclipse.jetty.ee10</groupId>
+                <artifactId>jetty-ee10-bom</artifactId>
+                <version>${jetty.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
 		</dependencies>
 	</dependencyManagement>