CB-5981 update spring boot (#64)

* CB-5981 update spring boot * CB-5981 override jetty bom from spring deps * CB-5981 get jetty version from common * CB-5981 update jetty server --------- Co-authored-by: mr-anton-t <42037741+mr-anton-t@users.noreply.github.com>
dbeaver · Dec 13, 2024 · 7b6bd39 · 7b6bd39
1 parent 5c84246
commit 7b6bd39
Showing 1 changed file with 18 additions and 37 deletions.
diff --git a/root/pom.xml b/root/pom.xml
@@ -35,8 +35,8 @@
         <maven.build.timestamp.format>yyyyMMddHHmm</maven.build.timestamp.format>
 
         <spring.boot.plugin.version>3.1.2</spring.boot.plugin.version>
-        <spring.boot.version>3.2.2</spring.boot.version>
-        <jetty.version>12.0.5</jetty.version>
+        <spring.boot.version>3.4.0</spring.boot.version>
+        <jetty.version>12.0.15</jetty.version>
         <clickhouse.jdbc.version>0.6.0-patch2</clickhouse.jdbc.version>
         <google.gson.version>2.11.0</google.gson.version>
         <google.guava.version>33.3.0-jre</google.guava.version>
@@ -78,6 +78,22 @@
                 <artifactId>com.dbeaver.jdbc.api</artifactId>
                 <version>${dbeaver.common.version}</version>
             </dependency>
+            <!-- Jetty Server -->
+            <!-- It must be before spring-boot-dependencies due to priority -->
+            <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>
             <dependency>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-dependencies</artifactId>
@@ -106,41 +122,6 @@
                 <version>${clickhouse.jdbc.version}</version>
                 <classifier>all</classifier>
             </dependency>
-            <dependency>
-                <groupId>org.eclipse.jetty</groupId>
-                <artifactId>jetty-server</artifactId>
-                <version>${jetty.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.eclipse.jetty</groupId>
-                <artifactId>jetty-servlet</artifactId>
-                <version>${jetty.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.eclipse.jetty</groupId>
-                <artifactId>jetty-http</artifactId>
-                <version>${jetty.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.eclipse.jetty</groupId>
-                <artifactId>jetty-io</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-util</artifactId>
-                <version>${jetty.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.eclipse.jetty.ee10</groupId>
-                <artifactId>jetty-ee10-servlet</artifactId>
-                <version>${jetty.version}</version>
-            </dependency>
             <dependency>
                 <groupId>org.apache.commons</groupId>
                 <artifactId>commons-dbcp2</artifactId>