From 8e7e48f44b804b98300ea85f225fc34939e9a2f1 Mon Sep 17 00:00:00 2001
From: Gabriel Roldan <gabriel.roldan@camptocamp.com>
Date: Thu, 19 Feb 2026 23:29:00 -0300
Subject: [PATCH 1/3] Import cloud-dependencies-bom for Azure, AWS, and GCS
 version management

Replace per-module SDK version properties and Netty BOM workarounds with
io.tileverse:cloud-dependencies-bom, which centrally manages cloud SDK
versions, Netty exclusions, and dependency convergence.

Removes local azure.version and google-cloud-storage.version properties.
Adds azure-core-http-jdk-httpclient as the Netty-free HTTP transport.

See https://github.com/tileverse-io/cloud-dependencies-bom

(cherry picked from commit ef7e12b142d1e37e62db8646c4960d3a46a890bc)
---
 geowebcache/azureblob/pom.xml | 28 ++++++----------------------
 geowebcache/gcsblob/pom.xml   |  3 +--
 geowebcache/pom.xml           |  9 +++++++++
 3 files changed, 16 insertions(+), 24 deletions(-)

diff --git a/geowebcache/azureblob/pom.xml b/geowebcache/azureblob/pom.xml
index feb4eb0837..5c6c576c4a 100644
--- a/geowebcache/azureblob/pom.xml
+++ b/geowebcache/azureblob/pom.xml
@@ -11,26 +11,6 @@
   <groupId>org.geowebcache</groupId>
   <artifactId>gwc-azure-blob</artifactId>
 
-  <properties>
-    <!-- Same sdk version as imageio-ext's cog-ragengereader-azure for GeoSever compatibility -->
-    <azure.version>12.27.1</azure.version>
-  </properties>
-
-  <dependencyManagement>
-    <dependencies>
-      <dependency>
-        <!--
-            Use the same netty version as imageio-ext's cog-ragengereader-s3 and cog-rangereader-azure
-            See https://github.com/geosolutions-it/imageio-ext/pull/312
-        -->
-        <groupId>io.netty</groupId>
-        <artifactId>netty-bom</artifactId>
-        <version>4.1.113.Final</version>
-        <type>pom</type>
-        <scope>import</scope>
-      </dependency>
-    </dependencies>
-  </dependencyManagement>
   <dependencies>
     <dependency>
       <groupId>org.geowebcache</groupId>
@@ -38,15 +18,19 @@
       <version>${project.version}</version>
     </dependency>
 
+    <!-- Azure SDK versions and Netty exclusions managed by cloud-dependencies-bom -->
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-storage-blob</artifactId>
-      <version>${azure.version}</version>
     </dependency>
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-storage-blob-batch</artifactId>
-      <version>${azure.version}</version>
+    </dependency>
+    <!-- JDK HttpClient replaces Netty as HTTP transport (Netty excluded by cloud-dependencies-bom) -->
+    <dependency>
+      <groupId>com.azure</groupId>
+      <artifactId>azure-core-http-jdk-httpclient</artifactId>
     </dependency>
 
     <dependency>
diff --git a/geowebcache/gcsblob/pom.xml b/geowebcache/gcsblob/pom.xml
index 61d6d4316d..01ebf0b0bf 100644
--- a/geowebcache/gcsblob/pom.xml
+++ b/geowebcache/gcsblob/pom.xml
@@ -10,7 +10,6 @@
   <name>Google Cloud Storage blob store</name>
 
   <properties>
-    <google-cloud-storage.version>2.55.0</google-cloud-storage.version>
     <testcontainers-fake-gcs-server.version>0.2.0</testcontainers-fake-gcs-server.version>
   </properties>
 
@@ -30,10 +29,10 @@
       <artifactId>gwc-core</artifactId>
       <version>${project.version}</version>
     </dependency>
+    <!-- Version managed by cloud-dependencies-bom (via google-cloud-storage-bom import) -->
     <dependency>
       <groupId>com.google.cloud</groupId>
       <artifactId>google-cloud-storage</artifactId>
-      <version>${google-cloud-storage.version}</version>
     </dependency>
 
     <dependency>
diff --git a/geowebcache/pom.xml b/geowebcache/pom.xml
index 4862143611..9833b532c4 100644
--- a/geowebcache/pom.xml
+++ b/geowebcache/pom.xml
@@ -55,6 +55,7 @@
     <spring.version>5.3.39</spring.version>
     <spring.security.version>5.7.13</spring.security.version>
     <xstream.version>1.4.21</xstream.version>
+    <cloud-dependencies-bom.version>1.0.1</cloud-dependencies-bom.version>
     <commons-codec.version>1.18.0</commons-codec.version>
     <commons-fileupload.version>1.6.0</commons-fileupload.version>
     <hamcrest.version>3.0</hamcrest.version>
@@ -120,6 +121,14 @@
         <type>pom</type>
         <scope>import</scope>
       </dependency>
+      <!-- Cloud SDK dependency management (Azure, GCS, AWS SDK v2) with Netty exclusions -->
+      <dependency>
+        <groupId>io.tileverse</groupId>
+        <artifactId>cloud-dependencies-bom</artifactId>
+        <version>${cloud-dependencies-bom.version}</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
       <dependency>
         <groupId>org.geowebcache</groupId>
         <artifactId>gwc-core</artifactId>

From f71c0b3dbf8815101689645f6d0a95e8fcabf426 Mon Sep 17 00:00:00 2001
From: Andrea Aime <andrea.aime@gmail.com>
Date: Wed, 15 Apr 2026 18:25:17 +0200
Subject: [PATCH 2/3] Updating cloud dependency bom to 1.0.2

(cherry picked from commit 2108e22986810a7bcbae30908415bf9e04db287c)
---
 geowebcache/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/geowebcache/pom.xml b/geowebcache/pom.xml
index 9833b532c4..efdc5eb3d7 100644
--- a/geowebcache/pom.xml
+++ b/geowebcache/pom.xml
@@ -55,7 +55,7 @@
     <spring.version>5.3.39</spring.version>
     <spring.security.version>5.7.13</spring.security.version>
     <xstream.version>1.4.21</xstream.version>
-    <cloud-dependencies-bom.version>1.0.1</cloud-dependencies-bom.version>
+    <cloud-dependencies-bom.version>1.0.2</cloud-dependencies-bom.version>
     <commons-codec.version>1.18.0</commons-codec.version>
     <commons-fileupload.version>1.6.0</commons-fileupload.version>
     <hamcrest.version>3.0</hamcrest.version>

From c814f15578fffcd62ef1970f91f442eee6b0980e Mon Sep 17 00:00:00 2001
From: Gabriel Roldan <gabriel.roldan@camptocamp.com>
Date: Fri, 11 Sep 2026 10:08:03 -0300
Subject: [PATCH 3/3] Upgrade cloud-dependencies-bom to 1.1.0

Upgrades cloud storage SDK dependencies:

- AWS SDK 2.41.32 -> 2.54.16
- Azure SDK BOM 1.3.3 -> 1.3.8 (azure-storage-blob 12.32.0 -> 12.35.0)
- google-cloud-storage 2.67.0 -> 2.73.0

See
- https://github.com/tileverse-io/cloud-dependencies-bom/pull/10

(cherry picked from commit 8b9a6b07849f27b433a0b9b34c43462757ec5322)
---
 geowebcache/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/geowebcache/pom.xml b/geowebcache/pom.xml
index efdc5eb3d7..8824238e89 100644
--- a/geowebcache/pom.xml
+++ b/geowebcache/pom.xml
@@ -55,7 +55,7 @@
     <spring.version>5.3.39</spring.version>
     <spring.security.version>5.7.13</spring.security.version>
     <xstream.version>1.4.21</xstream.version>
-    <cloud-dependencies-bom.version>1.0.2</cloud-dependencies-bom.version>
+    <cloud-dependencies-bom.version>1.1.0</cloud-dependencies-bom.version>
     <commons-codec.version>1.18.0</commons-codec.version>
     <commons-fileupload.version>1.6.0</commons-fileupload.version>
     <hamcrest.version>3.0</hamcrest.version>