Skip to content

Commit ef7e12b

Browse files
groldanaaime
authored andcommitted
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
1 parent de5117f commit ef7e12b

File tree

3 files changed

+16
-24
lines changed

3 files changed

+16
-24
lines changed

geowebcache/azureblob/pom.xml

Lines changed: 6 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -11,42 +11,26 @@
1111
<groupId>org.geowebcache</groupId>
1212
<artifactId>gwc-azure-blob</artifactId>
1313

14-
<properties>
15-
<!-- Same sdk version as imageio-ext's cog-ragengereader-azure for GeoSever compatibility -->
16-
<azure.version>12.27.1</azure.version>
17-
</properties>
18-
19-
<dependencyManagement>
20-
<dependencies>
21-
<dependency>
22-
<!--
23-
Use the same netty version as imageio-ext's cog-ragengereader-s3 and cog-rangereader-azure
24-
See https://github.com/geosolutions-it/imageio-ext/pull/312
25-
-->
26-
<groupId>io.netty</groupId>
27-
<artifactId>netty-bom</artifactId>
28-
<version>4.1.113.Final</version>
29-
<type>pom</type>
30-
<scope>import</scope>
31-
</dependency>
32-
</dependencies>
33-
</dependencyManagement>
3414
<dependencies>
3515
<dependency>
3616
<groupId>org.geowebcache</groupId>
3717
<artifactId>gwc-core</artifactId>
3818
<version>${project.version}</version>
3919
</dependency>
4020

21+
<!-- Azure SDK versions and Netty exclusions managed by cloud-dependencies-bom -->
4122
<dependency>
4223
<groupId>com.azure</groupId>
4324
<artifactId>azure-storage-blob</artifactId>
44-
<version>${azure.version}</version>
4525
</dependency>
4626
<dependency>
4727
<groupId>com.azure</groupId>
4828
<artifactId>azure-storage-blob-batch</artifactId>
49-
<version>${azure.version}</version>
29+
</dependency>
30+
<!-- JDK HttpClient replaces Netty as HTTP transport (Netty excluded by cloud-dependencies-bom) -->
31+
<dependency>
32+
<groupId>com.azure</groupId>
33+
<artifactId>azure-core-http-jdk-httpclient</artifactId>
5034
</dependency>
5135

5236
<dependency>

geowebcache/gcsblob/pom.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
<name>Google Cloud Storage blob store</name>
1111

1212
<properties>
13-
<google-cloud-storage.version>2.55.0</google-cloud-storage.version>
1413
<testcontainers-fake-gcs-server.version>0.2.0</testcontainers-fake-gcs-server.version>
1514
</properties>
1615

@@ -30,10 +29,10 @@
3029
<artifactId>gwc-core</artifactId>
3130
<version>${project.version}</version>
3231
</dependency>
32+
<!-- Version managed by cloud-dependencies-bom (via google-cloud-storage-bom import) -->
3333
<dependency>
3434
<groupId>com.google.cloud</groupId>
3535
<artifactId>google-cloud-storage</artifactId>
36-
<version>${google-cloud-storage.version}</version>
3736
</dependency>
3837

3938
<dependency>

geowebcache/pom.xml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@
5555
<spring.version>7.0.2</spring.version>
5656
<spring.security.version>7.0.2</spring.security.version>
5757
<xstream.version>1.4.21</xstream.version>
58+
<cloud-dependencies-bom.version>1.0.1</cloud-dependencies-bom.version>
5859
<commons-codec.version>1.18.0</commons-codec.version>
5960
<commons-fileupload.version>2.0.0-M4</commons-fileupload.version>
6061
<hamcrest.version>3.0</hamcrest.version>
@@ -120,6 +121,14 @@
120121
<type>pom</type>
121122
<scope>import</scope>
122123
</dependency>
124+
<!-- Cloud SDK dependency management (Azure, GCS, AWS SDK v2) with Netty exclusions -->
125+
<dependency>
126+
<groupId>io.tileverse</groupId>
127+
<artifactId>cloud-dependencies-bom</artifactId>
128+
<version>${cloud-dependencies-bom.version}</version>
129+
<type>pom</type>
130+
<scope>import</scope>
131+
</dependency>
123132
<dependency>
124133
<groupId>org.geowebcache</groupId>
125134
<artifactId>gwc-core</artifactId>

0 commit comments

Comments
 (0)