From 5348d883f3cab2c13390d85dd2ab6832d7038a1c Mon Sep 17 00:00:00 2001
From: osulzhenko <125548596+osulzhenko@users.noreply.github.com>
Date: Wed, 31 Jan 2024 14:08:15 +0200
Subject: [PATCH] Modules: Synchronise dependencies (#2929)

---
 extra/bundle/pom.xml                      | 56 ++-------------------
 extra/modules/confiant-ad-quality/pom.xml |  2 +-
 extra/modules/ortb2-blocking/pom.xml      |  2 +-
 extra/modules/pb-richmedia-filter/pom.xml |  3 +-
 extra/modules/pom.xml                     | 13 +----
 extra/pom.xml                             | 14 +++++-
 pom.xml                                   | 59 ++++++++++++-----------
 7 files changed, 54 insertions(+), 95 deletions(-)

diff --git a/extra/bundle/pom.xml b/extra/bundle/pom.xml
index 5da0a0f4c07..08450d9c2a3 100644
--- a/extra/bundle/pom.xml
+++ b/extra/bundle/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.prebid</groupId>
         <artifactId>prebid-server-aggregator</artifactId>
-        <version>2.9.0-SNAPSHOT</version>
+        <version>${revision}</version>
         <relativePath>../../extra/pom.xml</relativePath>
     </parent>
 
@@ -21,74 +21,28 @@
         <maven.compiler.source>${java.version}</maven.compiler.source>
         <maven.compiler.target>${java.version}</maven.compiler.target>
         <spring.boot.version>2.5.6</spring.boot.version>
-        <jackson.version>2.14.0-rc1</jackson.version>
-        <httpclient.version>4.5.13</httpclient.version>
     </properties>
 
-    <dependencyManagement>
-        <dependencies>
-            <!-- Override Spring dependencies -->
-            <dependency>
-                <groupId>com.fasterxml.jackson.core</groupId>
-                <artifactId>jackson-core</artifactId>
-                <version>${jackson.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>com.fasterxml.jackson.dataformat</groupId>
-                <artifactId>jackson-dataformat-yaml</artifactId>
-                <version>${jackson.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>com.fasterxml.jackson.module</groupId>
-                <artifactId>jackson-module-afterburner</artifactId>
-                <version>${jackson.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.httpcomponents</groupId>
-                <artifactId>httpclient</artifactId>
-                <version>${httpclient.version}</version>
-            </dependency>
-            <!-- Spring dependencies -->
-            <dependency>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-dependencies</artifactId>
-                <version>${spring.boot.version}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-
     <dependencies>
         <dependency>
             <groupId>org.prebid</groupId>
             <artifactId>prebid-server</artifactId>
-            <version>2.9.0-SNAPSHOT</version>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.prebid.server.hooks.modules</groupId>
             <artifactId>confiant-ad-quality</artifactId>
-            <version>2.9.0-SNAPSHOT</version>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.prebid.server.hooks.modules</groupId>
             <artifactId>ortb2-blocking</artifactId>
-            <version>2.9.0-SNAPSHOT</version>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.prebid.server.hooks.modules</groupId>
             <artifactId>pb-richmedia-filter</artifactId>
-            <version>2.9.0-SNAPSHOT</version>
+            <version>${project.version}</version>
         </dependency>
     </dependencies>
 
diff --git a/extra/modules/confiant-ad-quality/pom.xml b/extra/modules/confiant-ad-quality/pom.xml
index ab97ccf349c..ce0f7e9862b 100644
--- a/extra/modules/confiant-ad-quality/pom.xml
+++ b/extra/modules/confiant-ad-quality/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.prebid.server.hooks.modules</groupId>
         <artifactId>all-modules</artifactId>
-        <version>2.9.0-SNAPSHOT</version>
+        <version>${revision}</version>
     </parent>
 
     <artifactId>confiant-ad-quality</artifactId>
diff --git a/extra/modules/ortb2-blocking/pom.xml b/extra/modules/ortb2-blocking/pom.xml
index b98d104dc57..97d8b497402 100644
--- a/extra/modules/ortb2-blocking/pom.xml
+++ b/extra/modules/ortb2-blocking/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.prebid.server.hooks.modules</groupId>
         <artifactId>all-modules</artifactId>
-        <version>2.9.0-SNAPSHOT</version>
+        <version>${revision}</version>
     </parent>
 
     <artifactId>ortb2-blocking</artifactId>
diff --git a/extra/modules/pb-richmedia-filter/pom.xml b/extra/modules/pb-richmedia-filter/pom.xml
index 226e1793c23..f4c9b9b7516 100644
--- a/extra/modules/pb-richmedia-filter/pom.xml
+++ b/extra/modules/pb-richmedia-filter/pom.xml
@@ -1,10 +1,11 @@
 <?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>
+
     <parent>
         <groupId>org.prebid.server.hooks.modules</groupId>
         <artifactId>all-modules</artifactId>
-        <version>2.9.0-SNAPSHOT</version>
+        <version>${revision}</version>
     </parent>
 
     <artifactId>pb-richmedia-filter</artifactId>
diff --git a/extra/modules/pom.xml b/extra/modules/pom.xml
index 4e518f9ed50..7157b977063 100644
--- a/extra/modules/pom.xml
+++ b/extra/modules/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.prebid</groupId>
         <artifactId>prebid-server-aggregator</artifactId>
-        <version>2.9.0-SNAPSHOT</version>
+        <version>${revision}</version>
         <relativePath>../../extra/pom.xml</relativePath>
     </parent>
 
@@ -29,10 +29,6 @@
         <maven.compiler.source>${java.version}</maven.compiler.source>
         <maven.compiler.target>${java.version}</maven.compiler.target>
 
-        <prebid-server.version>2.9.0-SNAPSHOT</prebid-server.version>
-
-        <lombok.version>1.18.22</lombok.version>
-
         <junit-bom.version>5.9.0</junit-bom.version>
         <assertj.version>3.23.1</assertj.version>
         <junit.version>4.13.2</junit.version>
@@ -47,7 +43,7 @@
             <dependency>
                 <groupId>org.prebid</groupId>
                 <artifactId>prebid-server</artifactId>
-                <version>${prebid-server.version}</version>
+                <version>${revision}</version>
             </dependency>
             <dependency>
                 <groupId>org.projectlombok</groupId>
@@ -84,11 +80,6 @@
             <groupId>org.prebid</groupId>
             <artifactId>prebid-server</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.projectlombok</groupId>
-            <artifactId>lombok</artifactId>
-            <scope>provided</scope>
-        </dependency>
         <dependency>
             <groupId>org.junit.vintage</groupId>
             <artifactId>junit-vintage-engine</artifactId>
diff --git a/extra/pom.xml b/extra/pom.xml
index 2ffc7fe60eb..1404764e675 100644
--- a/extra/pom.xml
+++ b/extra/pom.xml
@@ -4,7 +4,7 @@
 
     <groupId>org.prebid</groupId>
     <artifactId>prebid-server-aggregator</artifactId>
-    <version>2.9.0-SNAPSHOT</version>
+    <version>${revision}</version>
     <packaging>pom</packaging>
 
     <scm>
@@ -15,10 +15,13 @@
     </scm>
 
     <properties>
+        <revision>2.9.0-SNAPSHOT</revision>
+
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <maven.compiler.source>17</maven.compiler.source>
         <maven.compiler.target>17</maven.compiler.target>
+        <lombok.version>1.18.24</lombok.version>
         <maven-release-plugin.version>3.0.0-M6</maven-release-plugin.version>
     </properties>
 
@@ -28,6 +31,15 @@
         <module>bundle</module>
     </modules>
 
+    <dependencies>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <version>${lombok.version}</version>
+            <scope>provided</scope>
+        </dependency>
+    </dependencies>
+
     <build>
         <plugins>
             <plugin>
diff --git a/pom.xml b/pom.xml
index 9b4defe90b3..2033f4375cc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.prebid</groupId>
         <artifactId>prebid-server-aggregator</artifactId>
-        <version>2.9.0-SNAPSHOT</version>
+        <version>${revision}</version>
         <relativePath>extra/pom.xml</relativePath>
     </parent>
 
@@ -28,17 +28,13 @@
 
         <!-- dependencies versions -->
         <spring.boot.version>2.5.6</spring.boot.version>
-        <javax.annotation-api.version>1.3.1</javax.annotation-api.version>
         <validation-api.version>2.0.1.Final</validation-api.version>
-        <hibernate-validator.version>6.1.5.Final</hibernate-validator.version>
         <vertx.version>3.9.10</vertx.version>
-        <netty.version>4.1.69.Final</netty.version>
-        <lombok.version>1.18.24</lombok.version>
         <commons.version>3.12.0</commons.version>
         <commons.collections.version>4.4</commons.collections.version>
         <commons.compress.version>1.21</commons.compress.version>
         <commons-math3.version>3.6.1</commons-math3.version>
-        <httpclient.version>4.5.13</httpclient.version>
+        <httpclient.version>4.5.14</httpclient.version>
         <ipaddress.version>5.3.1</ipaddress.version>
         <oshi.version>6.4.5</oshi.version>
         <jackson.version>2.14.1</jackson.version>
@@ -46,21 +42,18 @@
         <jsonpatch.version>1.13</jsonpatch.version>
         <mysql.version>8.0.28</mysql.version>
         <postgresql.version>42.4.3</postgresql.version>
-        <caffeine.version>2.6.2</caffeine.version>
         <psl.version>2.2.0</psl.version>
-        <metrics.version>4.0.3</metrics.version>
         <metrics-influxdb.version>1.2.2</metrics-influxdb.version>
         <consent-string-sdk.version>2.0.2</consent-string-sdk.version>
         <iabtcf.version>2.0.7</iabtcf.version>
-        <metrics-prometheus.version>0.12.0</metrics-prometheus.version>
         <maxmind-client.version>2.12.0</maxmind-client.version>
         <logback.version>1.2.13</logback.version>
-        <log4j.version>2.19.0</log4j.version>
         <hikari.version>5.0.1</hikari.version>
         <gpp-encoder.version>3.0.10</gpp-encoder.version>
         <protobuf.version>3.21.7</protobuf.version>
         <protoc.version>3.17.3</protoc.version>
         <json-logic.version>1.0.7</json-logic.version>
+        <slf4j.version>1.7.32</slf4j.version>
 
         <!-- test dependencies versions -->
         <junit.version>4.13.2</junit.version>
@@ -109,6 +102,28 @@
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
+            <dependency>
+                <groupId>com.google.code.gson</groupId>
+                <artifactId>gson</artifactId>
+            </dependency>
+            <dependency>
+                <groupId>commons-codec</groupId>
+                <artifactId>commons-codec</artifactId>
+                <scope>compile</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.httpcomponents</groupId>
+                <artifactId>httpcore</artifactId>
+                <scope>compile</scope>
+            </dependency>
+            <dependency>
+                <groupId>com.rabbitmq</groupId>
+                <artifactId>amqp-client</artifactId>
+            </dependency>
+            <dependency>
+                <groupId>org.jboss.logging</groupId>
+                <artifactId>jboss-logging</artifactId>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 
@@ -116,17 +131,14 @@
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter</artifactId>
-            <version>${spring.boot.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-aop</artifactId>
-            <version>${spring.boot.version}</version>
         </dependency>
         <dependency>
             <groupId>javax.annotation</groupId>
             <artifactId>javax.annotation-api</artifactId>
-            <version>${javax.annotation-api.version}</version>
         </dependency>
         <dependency>
             <groupId>javax.validation</groupId>
@@ -136,7 +148,6 @@
         <dependency>
             <groupId>org.hibernate.validator</groupId>
             <artifactId>hibernate-validator</artifactId>
-            <version>${hibernate-validator.version}</version>
         </dependency>
         <dependency>
             <groupId>io.vertx</groupId>
@@ -177,13 +188,6 @@
             <groupId>io.netty</groupId>
             <artifactId>netty-transport-native-epoll</artifactId>
             <classifier>linux-x86_64</classifier>
-            <version>${netty.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.projectlombok</groupId>
-            <artifactId>lombok</artifactId>
-            <version>${lombok.version}</version>
-            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
@@ -280,7 +284,6 @@
         <dependency>
             <groupId>com.github.ben-manes.caffeine</groupId>
             <artifactId>caffeine</artifactId>
-            <version>${caffeine.version}</version>
         </dependency>
         <dependency>
             <groupId>de.malkusch.whois-server-list</groupId>
@@ -296,17 +299,14 @@
         <dependency>
             <groupId>io.dropwizard.metrics</groupId>
             <artifactId>metrics-core</artifactId>
-            <version>${metrics.version}</version>
         </dependency>
         <dependency>
             <groupId>io.dropwizard.metrics</groupId>
             <artifactId>metrics-jvm</artifactId>
-            <version>${metrics.version}</version>
         </dependency>
         <dependency>
             <groupId>io.dropwizard.metrics</groupId>
             <artifactId>metrics-graphite</artifactId>
-            <version>${metrics.version}</version>
         </dependency>
         <dependency>
             <groupId>com.izettle</groupId>
@@ -336,12 +336,10 @@
         <dependency>
             <groupId>io.prometheus</groupId>
             <artifactId>simpleclient_vertx</artifactId>
-            <version>${metrics-prometheus.version}</version>
         </dependency>
         <dependency>
             <groupId>io.prometheus</groupId>
             <artifactId>simpleclient_dropwizard</artifactId>
-            <version>${metrics-prometheus.version}</version>
         </dependency>
         <dependency>
             <groupId>com.maxmind.geoip2</groupId>
@@ -359,15 +357,18 @@
             <artifactId>logback-core</artifactId>
             <version>${logback.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+            <version>${slf4j.version}</version>
+        </dependency>
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-to-slf4j</artifactId>
-            <version>${log4j.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-api</artifactId>
-            <version>${log4j.version}</version>
         </dependency>
         <dependency>
             <groupId>com.zaxxer</groupId>