From e8ccb96419a3a3a9015e7f7fbafc7511c6fe03fd Mon Sep 17 00:00:00 2001
From: Aleksandr Pavlyuk <a.pavlyuk@vkteam.ru>
Date: Mon, 16 Feb 2026 11:34:58 +0300
Subject: [PATCH 1/2] build: add bom module

---
 CHANGELOG.md                   |   4 +
 pom.xml                        | 113 ++----------------------
 tarantool-java-sdk-bom/pom.xml | 156 +++++++++++++++++++++++++++++++++
 3 files changed, 165 insertions(+), 108 deletions(-)
 create mode 100644 tarantool-java-sdk-bom/pom.xml

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 91096315..a031cabf 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 ## [Unreleased]
 
+### BOM Module
+
+- Add `tarantool-java-sdk-bom` module providing centralized dependency management for all Tarantool Java SDK modules and their dependencies
+
 ### Testcontainers
 
 - Remove dependency on `testcontainers-java-tarantool` library
diff --git a/pom.xml b/pom.xml
index f5b95306..19864d12 100644
--- a/pom.xml
+++ b/pom.xml
@@ -286,115 +286,11 @@
     <dependencies>
       <dependency>
         <groupId>io.tarantool</groupId>
-        <artifactId>tarantool-client</artifactId>
-        <version>2.0.0-SNAPSHOT</version>
+        <artifactId>tarantool-java-sdk-bom</artifactId>
+        <version>${project.version}</version>
+        <type>pom</type>
+        <scope>import</scope>
       </dependency>
-      <dependency>
-        <groupId>io.tarantool</groupId>
-        <artifactId>tarantool-core</artifactId>
-        <version>2.0.0-SNAPSHOT</version>
-      </dependency>
-      <dependency>
-        <groupId>io.tarantool</groupId>
-        <artifactId>tarantool-pooling</artifactId>
-        <version>2.0.0-SNAPSHOT</version>
-      </dependency>
-      <dependency>
-        <groupId>io.tarantool</groupId>
-        <artifactId>tarantool-jackson-mapping</artifactId>
-        <version>2.0.0-SNAPSHOT</version>
-      </dependency>
-      <dependency>
-        <groupId>io.tarantool</groupId>
-        <artifactId>tarantool-schema</artifactId>
-        <version>2.0.0-SNAPSHOT</version>
-      </dependency>
-      <dependency>
-        <groupId>io.tarantool</groupId>
-        <artifactId>tarantool-balancer</artifactId>
-        <version>2.0.0-SNAPSHOT</version>
-      </dependency>
-      <dependency>
-        <groupId>io.tarantool</groupId>
-        <artifactId>tarantool-spring-data</artifactId>
-        <version>2.0.0-SNAPSHOT</version>
-      </dependency>
-      <dependency>
-        <groupId>io.tarantool</groupId>
-        <artifactId>tarantool-spring-data-core</artifactId>
-        <version>2.0.0-SNAPSHOT</version>
-      </dependency>
-      <dependency>
-        <groupId>io.tarantool</groupId>
-        <artifactId>testcontainers</artifactId>
-        <version>2.0.0-SNAPSHOT</version>
-        <scope>test</scope>
-      </dependency>
-      <dependency>
-        <groupId>org.msgpack</groupId>
-        <artifactId>jackson-dataformat-msgpack</artifactId>
-        <version>${msgpack.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.msgpack</groupId>
-        <artifactId>msgpack-core</artifactId>
-        <version>${msgpack.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>com.fasterxml.jackson.core</groupId>
-        <artifactId>jackson-databind</artifactId>
-        <version>${jackson.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>com.fasterxml.jackson.core</groupId>
-        <artifactId>jackson-annotations</artifactId>
-        <version>${jackson.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.slf4j</groupId>
-        <artifactId>slf4j-api</artifactId>
-        <version>${slf4j.api.version}</version>
-      </dependency>
-
-      <!-- Test dependencies -->
-      <dependency>
-        <groupId>ch.qos.logback</groupId>
-        <artifactId>logback-classic</artifactId>
-        <!-- 1.4.x only for jdk > 11 -->
-        <version>1.3.16</version> <!-- 1.4.x only for jdk > 11 -->
-        <!-- 1.4.x only for jdk > 11 -->
-        <scope>test</scope>
-      </dependency>
-      <dependency>
-        <groupId>org.junit.jupiter</groupId>
-        <artifactId>junit-jupiter</artifactId>
-        <version>5.13.4</version>
-        <scope>test</scope>
-      </dependency>
-      <dependency>
-        <groupId>org.testcontainers</groupId>
-        <artifactId>testcontainers-junit-jupiter</artifactId>
-        <version>${testcontainers.version}</version>
-        <scope>test</scope>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.commons</groupId>
-        <artifactId>commons-lang3</artifactId>
-        <version>3.18.0</version>
-      </dependency>
-      <dependency>
-        <groupId>org.projectlombok</groupId>
-        <artifactId>lombok</artifactId>
-        <version>1.18.38</version>
-        <scope>test</scope>
-      </dependency>
-      <dependency>
-        <groupId>com.google.guava</groupId>
-        <artifactId>guava</artifactId>
-        <version>33.4.8-jre</version>
-        <scope>test</scope>
-      </dependency>
-      <!-- End of test dependencies -->
     </dependencies>
   </dependencyManagement>
 
@@ -634,5 +530,6 @@
     <module>jacoco-coverage-aggregate-report</module>
     <module>testcontainers-autogen</module>
     <module>documentation</module>
+    <module>tarantool-java-sdk-bom</module>
   </modules>
 </project>
diff --git a/tarantool-java-sdk-bom/pom.xml b/tarantool-java-sdk-bom/pom.xml
new file mode 100644
index 00000000..0cbd81f4
--- /dev/null
+++ b/tarantool-java-sdk-bom/pom.xml
@@ -0,0 +1,156 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <name>tarantool-java-sdk-bom</name>
+    <description>BOM for tarantool-java-sdk</description>
+    <url>https://tarantool.io</url>
+    <packaging>pom</packaging>
+
+    <groupId>io.tarantool</groupId>
+    <artifactId>tarantool-java-sdk-bom</artifactId>
+    <version>2.0.0-SNAPSHOT</version>
+
+    <properties>
+        <tarantool-java-sdk.version>2.0.0-SNAPSHOT</tarantool-java-sdk.version>
+        <jackson.version>2.18.4</jackson.version>
+        <msgpack.version>0.9.10</msgpack.version>
+        <netty.version>4.2.7.Final</netty.version>
+        <slf4j.api.version>2.0.17</slf4j.api.version>
+        <testcontainers.version>2.0.1</testcontainers.version>
+        <logback.version>1.3.16</logback.version>
+        <junit-jupiter.version>5.13.4</junit-jupiter.version>
+        <commons-lang3.version>3.18.0</commons-lang3.version>
+        <lombok.version>1.18.38</lombok.version>
+        <guava.version>33.4.8-jre</guava.version>
+    </properties>
+
+    <dependencyManagement>
+        <dependencies>
+            <!-- Tarantool Java SDK modules -->
+            <dependency>
+                <groupId>io.tarantool</groupId>
+                <artifactId>tarantool-client</artifactId>
+                <version>${tarantool-java-sdk.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>io.tarantool</groupId>
+                <artifactId>tarantool-core</artifactId>
+                <version>${tarantool-java-sdk.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>io.tarantool</groupId>
+                <artifactId>tarantool-pooling</artifactId>
+                <version>${tarantool-java-sdk.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>io.tarantool</groupId>
+                <artifactId>tarantool-jackson-mapping</artifactId>
+                <version>${tarantool-java-sdk.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>io.tarantool</groupId>
+                <artifactId>tarantool-schema</artifactId>
+                <version>${tarantool-java-sdk.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>io.tarantool</groupId>
+                <artifactId>tarantool-balancer</artifactId>
+                <version>${tarantool-java-sdk.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>io.tarantool</groupId>
+                <artifactId>tarantool-spring-data</artifactId>
+                <version>${tarantool-java-sdk.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>io.tarantool</groupId>
+                <artifactId>tarantool-spring-data-core</artifactId>
+                <version>${tarantool-java-sdk.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>io.tarantool</groupId>
+                <artifactId>testcontainers</artifactId>
+                <version>${tarantool-java-sdk.version}</version>
+                <scope>test</scope>
+            </dependency>
+
+            <!-- Third-party runtime -->
+            <dependency>
+                <groupId>org.msgpack</groupId>
+                <artifactId>jackson-dataformat-msgpack</artifactId>
+                <version>${msgpack.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.msgpack</groupId>
+                <artifactId>msgpack-core</artifactId>
+                <version>${msgpack.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>com.fasterxml.jackson.core</groupId>
+                <artifactId>jackson-databind</artifactId>
+                <version>${jackson.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>com.fasterxml.jackson.core</groupId>
+                <artifactId>jackson-annotations</artifactId>
+                <version>${jackson.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.slf4j</groupId>
+                <artifactId>slf4j-api</artifactId>
+                <version>${slf4j.api.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.commons</groupId>
+                <artifactId>commons-lang3</artifactId>
+                <version>${commons-lang3.version}</version>
+            </dependency>
+
+            <!-- Test dependencies -->
+            <dependency>
+                <groupId>ch.qos.logback</groupId>
+                <artifactId>logback-classic</artifactId>
+                <version>${logback.version}</version>
+                <scope>test</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.junit.jupiter</groupId>
+                <artifactId>junit-jupiter</artifactId>
+                <version>${junit-jupiter.version}</version>
+                <scope>test</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.testcontainers</groupId>
+                <artifactId>testcontainers-junit-jupiter</artifactId>
+                <version>${testcontainers.version}</version>
+                <scope>test</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.projectlombok</groupId>
+                <artifactId>lombok</artifactId>
+                <version>${lombok.version}</version>
+                <scope>test</scope>
+            </dependency>
+            <dependency>
+                <groupId>com.google.guava</groupId>
+                <artifactId>guava</artifactId>
+                <version>${guava.version}</version>
+                <scope>test</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>com.diffplug.spotless</groupId>
+                <artifactId>spotless-maven-plugin</artifactId>
+                <version>2.46.1</version>
+                <configuration>
+                    <skip>true</skip>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>

From 91a2b6d91a62cf46b73089658454ba96c294f792 Mon Sep 17 00:00:00 2001
From: Aleksandr Pavlyuk <a.pavlyuk@vkteam.ru>
Date: Mon, 2 Mar 2026 07:43:46 +0300
Subject: [PATCH 2/2] build: edit poms

---
 .gitignore                     |   3 +
 pom.xml                        |   3 +
 tarantool-core/pom.xml         |   7 --
 tarantool-java-sdk-bom/pom.xml | 153 +++++++++++++++++++++++++++------
 testcontainers-autogen/pom.xml |  11 +--
 testcontainers/pom.xml         |  26 ++++--
 6 files changed, 152 insertions(+), 51 deletions(-)

diff --git a/.gitignore b/.gitignore
index 3ce9a8a1..c4a24b39 100644
--- a/.gitignore
+++ b/.gitignore
@@ -24,3 +24,6 @@ workbench.xmi
 documentation/venv
 documentation/site
 documentation/target
+release.properties
+*.releaseBackup
+*.tag
diff --git a/pom.xml b/pom.xml
index 19864d12..0cf92191 100644
--- a/pom.xml
+++ b/pom.xml
@@ -166,6 +166,9 @@
           <goals>deploy</goals>
           <indentSize>4</indentSize>
           <tagNameFormat>@{project.version}</tagNameFormat>
+          <!-- install (not verify) needed so testcontainers-autogen is in local repo
+               before testcontainers loads it as a jsonschema2pojo plugin dependency -->
+          <preparationGoals>clean install</preparationGoals>
         </configuration>
       </plugin>
       <plugin>
diff --git a/tarantool-core/pom.xml b/tarantool-core/pom.xml
index 873869da..4c5e0c6a 100644
--- a/tarantool-core/pom.xml
+++ b/tarantool-core/pom.xml
@@ -8,7 +8,6 @@
 
   <properties>
     <license.header.file>${project.parent.basedir}/LICENSE_HEADER.txt</license.header.file>
-    <micrometer.version>1.14.12</micrometer.version>
   </properties>
 
   <parent>
@@ -25,22 +24,18 @@
     <dependency>
       <groupId>io.netty</groupId>
       <artifactId>netty-transport</artifactId>
-      <version>${netty.version}</version>
     </dependency>
     <dependency>
       <groupId>io.netty</groupId>
       <artifactId>netty-handler</artifactId>
-      <version>${netty.version}</version>
     </dependency>
     <dependency>
       <groupId>io.netty</groupId>
       <artifactId>netty-codec</artifactId>
-      <version>${netty.version}</version>
     </dependency>
     <dependency>
       <groupId>io.netty</groupId>
       <artifactId>netty-codec-http</artifactId>
-      <version>${netty.version}</version>
     </dependency>
     <dependency>
       <groupId>org.msgpack</groupId>
@@ -49,12 +44,10 @@
     <dependency>
       <groupId>io.micrometer</groupId>
       <artifactId>micrometer-core</artifactId>
-      <version>${micrometer.version}</version>
     </dependency>
     <dependency>
       <groupId>io.micrometer</groupId>
       <artifactId>micrometer-registry-jmx</artifactId>
-      <version>${micrometer.version}</version>
     </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
diff --git a/tarantool-java-sdk-bom/pom.xml b/tarantool-java-sdk-bom/pom.xml
index 0cbd81f4..1fbe126d 100644
--- a/tarantool-java-sdk-bom/pom.xml
+++ b/tarantool-java-sdk-bom/pom.xml
@@ -12,7 +12,6 @@
     <version>2.0.0-SNAPSHOT</version>
 
     <properties>
-        <tarantool-java-sdk.version>2.0.0-SNAPSHOT</tarantool-java-sdk.version>
         <jackson.version>2.18.4</jackson.version>
         <msgpack.version>0.9.10</msgpack.version>
         <netty.version>4.2.7.Final</netty.version>
@@ -23,59 +22,107 @@
         <commons-lang3.version>3.18.0</commons-lang3.version>
         <lombok.version>1.18.38</lombok.version>
         <guava.version>33.4.8-jre</guava.version>
+        <micrometer.version>1.14.12</micrometer.version>
+        <httpclient5.version>5.5</httpclient5.version>
+        <httpcore5.version>5.3.4</httpcore5.version>
+        <jetcd.version>0.8.6</jetcd.version>
+        <grpc.version>1.76.0</grpc.version>
+        <protobuf.version>3.25.8</protobuf.version>
+        <commons-compress.version>1.28.0</commons-compress.version>
+        <commons-codec.version>1.19.0</commons-codec.version>
+        <commons-io.version>2.20.0</commons-io.version>
+        <instancio.version>5.5.1</instancio.version>
+        <jsonschema2pojo.version>1.2.2</jsonschema2pojo.version>
     </properties>
 
     <dependencyManagement>
         <dependencies>
+            <!-- BOM imports — pin versions for entire artifact families to prevent transitive conflicts -->
+            <dependency>
+                <groupId>io.netty</groupId>
+                <artifactId>netty-bom</artifactId>
+                <version>${netty.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+            <dependency>
+                <groupId>com.fasterxml.jackson</groupId>
+                <artifactId>jackson-bom</artifactId>
+                <version>${jackson.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+            <dependency>
+                <groupId>io.micrometer</groupId>
+                <artifactId>micrometer-bom</artifactId>
+                <version>${micrometer.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.testcontainers</groupId>
+                <artifactId>testcontainers-bom</artifactId>
+                <version>${testcontainers.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+            <dependency>
+                <groupId>io.grpc</groupId>
+                <artifactId>grpc-bom</artifactId>
+                <version>${grpc.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+
             <!-- Tarantool Java SDK modules -->
             <dependency>
                 <groupId>io.tarantool</groupId>
                 <artifactId>tarantool-client</artifactId>
-                <version>${tarantool-java-sdk.version}</version>
+                <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>io.tarantool</groupId>
                 <artifactId>tarantool-core</artifactId>
-                <version>${tarantool-java-sdk.version}</version>
+                <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>io.tarantool</groupId>
                 <artifactId>tarantool-pooling</artifactId>
-                <version>${tarantool-java-sdk.version}</version>
+                <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>io.tarantool</groupId>
                 <artifactId>tarantool-jackson-mapping</artifactId>
-                <version>${tarantool-java-sdk.version}</version>
+                <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>io.tarantool</groupId>
                 <artifactId>tarantool-schema</artifactId>
-                <version>${tarantool-java-sdk.version}</version>
+                <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>io.tarantool</groupId>
                 <artifactId>tarantool-balancer</artifactId>
-                <version>${tarantool-java-sdk.version}</version>
+                <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>io.tarantool</groupId>
                 <artifactId>tarantool-spring-data</artifactId>
-                <version>${tarantool-java-sdk.version}</version>
+                <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>io.tarantool</groupId>
                 <artifactId>tarantool-spring-data-core</artifactId>
-                <version>${tarantool-java-sdk.version}</version>
+                <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>io.tarantool</groupId>
                 <artifactId>testcontainers</artifactId>
-                <version>${tarantool-java-sdk.version}</version>
+                <version>${project.version}</version>
                 <scope>test</scope>
             </dependency>
 
-            <!-- Third-party runtime -->
+            <!-- Third-party runtime (not covered by the BOMs above) -->
             <dependency>
                 <groupId>org.msgpack</groupId>
                 <artifactId>jackson-dataformat-msgpack</artifactId>
@@ -86,16 +133,6 @@
                 <artifactId>msgpack-core</artifactId>
                 <version>${msgpack.version}</version>
             </dependency>
-            <dependency>
-                <groupId>com.fasterxml.jackson.core</groupId>
-                <artifactId>jackson-databind</artifactId>
-                <version>${jackson.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>com.fasterxml.jackson.core</groupId>
-                <artifactId>jackson-annotations</artifactId>
-                <version>${jackson.version}</version>
-            </dependency>
             <dependency>
                 <groupId>org.slf4j</groupId>
                 <artifactId>slf4j-api</artifactId>
@@ -107,6 +144,66 @@
                 <version>${commons-lang3.version}</version>
             </dependency>
 
+            <!-- HTTP client -->
+            <dependency>
+                <groupId>org.apache.httpcomponents.client5</groupId>
+                <artifactId>httpclient5</artifactId>
+                <version>${httpclient5.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.httpcomponents.core5</groupId>
+                <artifactId>httpcore5</artifactId>
+                <version>${httpcore5.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.httpcomponents.core5</groupId>
+                <artifactId>httpcore5-h2</artifactId>
+                <version>${httpcore5.version}</version>
+            </dependency>
+
+            <!-- etcd (used by testcontainers module) -->
+            <dependency>
+                <groupId>io.etcd</groupId>
+                <artifactId>jetcd-launcher</artifactId>
+                <version>${jetcd.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>io.etcd</groupId>
+                <artifactId>jetcd-core</artifactId>
+                <version>${jetcd.version}</version>
+            </dependency>
+
+            <!-- Commons -->
+            <dependency>
+                <groupId>commons-io</groupId>
+                <artifactId>commons-io</artifactId>
+                <version>${commons-io.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.commons</groupId>
+                <artifactId>commons-compress</artifactId>
+                <version>${commons-compress.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>commons-codec</groupId>
+                <artifactId>commons-codec</artifactId>
+                <version>${commons-codec.version}</version>
+            </dependency>
+
+            <!-- Protobuf -->
+            <dependency>
+                <groupId>com.google.protobuf</groupId>
+                <artifactId>protobuf-java</artifactId>
+                <version>${protobuf.version}</version>
+            </dependency>
+
+            <!-- JSON Schema to POJO -->
+            <dependency>
+                <groupId>org.jsonschema2pojo</groupId>
+                <artifactId>jsonschema2pojo-core</artifactId>
+                <version>${jsonschema2pojo.version}</version>
+            </dependency>
+
             <!-- Test dependencies -->
             <dependency>
                 <groupId>ch.qos.logback</groupId>
@@ -120,17 +217,11 @@
                 <version>${junit-jupiter.version}</version>
                 <scope>test</scope>
             </dependency>
-            <dependency>
-                <groupId>org.testcontainers</groupId>
-                <artifactId>testcontainers-junit-jupiter</artifactId>
-                <version>${testcontainers.version}</version>
-                <scope>test</scope>
-            </dependency>
             <dependency>
                 <groupId>org.projectlombok</groupId>
                 <artifactId>lombok</artifactId>
                 <version>${lombok.version}</version>
-                <scope>test</scope>
+                <scope>provided</scope>
             </dependency>
             <dependency>
                 <groupId>com.google.guava</groupId>
@@ -138,6 +229,12 @@
                 <version>${guava.version}</version>
                 <scope>test</scope>
             </dependency>
+            <dependency>
+                <groupId>org.instancio</groupId>
+                <artifactId>instancio-core</artifactId>
+                <version>${instancio.version}</version>
+                <scope>test</scope>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 
diff --git a/testcontainers-autogen/pom.xml b/testcontainers-autogen/pom.xml
index cb230dd2..a110dc44 100644
--- a/testcontainers-autogen/pom.xml
+++ b/testcontainers-autogen/pom.xml
@@ -21,20 +21,11 @@
     <license.header.file>${project.parent.basedir}/LICENSE_HEADER.txt</license.header.file>
   </properties>
 
-  <dependencyManagement>
-    <dependencies>
-      <dependency>
-        <groupId>org.jsonschema2pojo</groupId>
-        <artifactId>jsonschema2pojo-core</artifactId>
-        <version>${jsonschema2pojo.version}</version>
-      </dependency>
-    </dependencies>
-  </dependencyManagement>
-
   <dependencies>
     <dependency>
       <groupId>org.jsonschema2pojo</groupId>
       <artifactId>jsonschema2pojo-core</artifactId>
+      <version>${jsonschema2pojo.version}</version>
     </dependency>
   </dependencies>
 </project>
diff --git a/testcontainers/pom.xml b/testcontainers/pom.xml
index b74dfd9a..dea59c21 100644
--- a/testcontainers/pom.xml
+++ b/testcontainers/pom.xml
@@ -19,13 +19,30 @@
     <license.header.file>${project.parent.basedir}/LICENSE_HEADER.txt</license.header.file>
     <maven.compiler.release>17</maven.compiler.release>
     <jetcd.version>0.8.6</jetcd.version>
+    <httpclient5.version>5.5</httpclient5.version>
+    <instancio.version>5.5.1</instancio.version>
     <grpc.version>1.76.0</grpc.version>
     <protobuf.version>3.25.8</protobuf.version>
     <protobuf-plugin.version>0.6.1</protobuf-plugin.version>
-    <apache.http-client.version>5.5</apache.http-client.version>
-    <instancio.version>5.5.1</instancio.version>
   </properties>
 
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>io.grpc</groupId>
+        <artifactId>grpc-bom</artifactId>
+        <version>${grpc.version}</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+      <dependency>
+        <groupId>com.google.protobuf</groupId>
+        <artifactId>protobuf-java</artifactId>
+        <version>${protobuf.version}</version>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
+
   <dependencies>
     <dependency>
       <groupId>org.slf4j</groupId>
@@ -41,23 +58,20 @@
     <dependency>
       <groupId>com.fasterxml.jackson.dataformat</groupId>
       <artifactId>jackson-dataformat-yaml</artifactId>
-      <version>${jackson.version}</version>
     </dependency>
     <dependency>
       <groupId>com.fasterxml.jackson.datatype</groupId>
       <artifactId>jackson-datatype-jdk8</artifactId>
-      <version>${jackson.version}</version>
     </dependency>
     <dependency>
       <groupId>org.projectlombok</groupId>
       <artifactId>lombok</artifactId>
       <scope>compile</scope>
     </dependency>
-    <!-- https://mvnrepository.com/artifact/org.apache.httpcomponents.client5/httpclient5 -->
     <dependency>
       <groupId>org.apache.httpcomponents.client5</groupId>
       <artifactId>httpclient5</artifactId>
-      <version>${apache.http-client.version}</version>
+      <version>${httpclient5.version}</version>
     </dependency>
 
     <!-- Test -->