Dependencies: Updates (#3054)

prebid · Apr 12, 2024 · 35f990b · 35f990b
1 parent 4ab3cae
commit 35f990b
Show file tree

Hide file tree

Showing 344 changed files with 1,125 additions and 1,086 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -115,7 +115,7 @@ ij_java_for_statement_wrap = off
 ij_java_generate_final_locals = false
 ij_java_generate_final_parameters = false
 ij_java_if_brace_force = never
-ij_java_imports_layout = *,|,javax.**,java.**,|,$*
+ij_java_imports_layout = *,|,javax.**,jakarta.**,java.**,|,$*
 ij_java_indent_case_from_switch = true
 ij_java_insert_inner_class_imports = false
 ij_java_insert_override_annotation = true

diff --git a/checkstyle.xml b/checkstyle.xml
@@ -75,7 +75,7 @@
         </module>
         <module name="ImportOrder">
             <property name="option" value="bottom"/>
-            <property name="groups" value="*,/^java/"/>
+            <property name="groups" value="*,/^java|^jakarta/"/>
             <property name="ordered" value="false"/>
             <property name="separated" value="true"/>
             <property name="caseSensitive" value="true"/>

diff --git a/extra/modules/confiant-ad-quality/pom.xml b/extra/modules/confiant-ad-quality/pom.xml
@@ -17,7 +17,7 @@
         <dependency>
             <groupId>io.vertx</groupId>
             <artifactId>vertx-redis-client</artifactId>
-            <version>3.9.10</version>
+            <version>${vertx.version}</version>
         </dependency>
     </dependencies>
 </project>
diff --git a/...rc/main/java/org/prebid/server/hooks/modules/com/confiant/adquality/core/RedisClient.java b/...rc/main/java/org/prebid/server/hooks/modules/com/confiant/adquality/core/RedisClient.java
@@ -4,8 +4,8 @@
 import io.vertx.core.Handler;
 import io.vertx.core.Promise;
 import io.vertx.core.Vertx;
-import io.vertx.core.logging.Logger;
-import io.vertx.core.logging.LoggerFactory;
+import org.prebid.server.log.Logger;
+import org.prebid.server.log.LoggerFactory;
 import io.vertx.redis.client.Redis;
 import io.vertx.redis.client.RedisAPI;
 import io.vertx.redis.client.RedisConnection;
@@ -45,7 +45,7 @@ public RedisClient(
     public void start(Promise<Void> startFuture) {
         createRedisClient(onCreate -> {
             if (onCreate.succeeded()) {
-                logger.info("Confiant Redis {0} connection is established", type);
+                logger.info("Confiant Redis {} connection is established", type);
                 startFuture.tryComplete();
             }
         }, false);

diff --git a/...rc/main/java/org/prebid/server/hooks/modules/com/confiant/adquality/core/RedisParser.java b/...rc/main/java/org/prebid/server/hooks/modules/com/confiant/adquality/core/RedisParser.java
@@ -2,8 +2,8 @@
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import io.vertx.core.logging.Logger;
-import io.vertx.core.logging.LoggerFactory;
+import org.prebid.server.log.Logger;
+import org.prebid.server.log.LoggerFactory;
 import org.prebid.server.hooks.modules.com.confiant.adquality.model.BidScanResult;
 import org.prebid.server.hooks.modules.com.confiant.adquality.model.RedisError;
 

diff --git a/...rg/prebid/server/hooks/modules/pb/richmedia/filter/model/PbRichMediaFilterProperties.java b/...rg/prebid/server/hooks/modules/pb/richmedia/filter/model/PbRichMediaFilterProperties.java
@@ -3,7 +3,7 @@
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Value;
 
-import javax.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotBlank;
 
 @Value(staticConstructor = "of")
 public class PbRichMediaFilterProperties {

diff --git a/extra/pom.xml b/extra/pom.xml
@@ -19,7 +19,8 @@
         <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>
+        <vertx.version>4.5.5</vertx.version>
+        <lombok.version>1.18.30</lombok.version>
         <maven-release-plugin.version>3.0.0-M6</maven-release-plugin.version>
     </properties>
 

diff --git a/pom.xml b/pom.xml
@@ -27,33 +27,31 @@
         <dockerfileName>Dockerfile</dockerfileName>
 
         <!-- dependencies versions -->
-        <spring.boot.version>2.5.6</spring.boot.version>
+        <spring.boot.version>3.2.3</spring.boot.version>
         <validation-api.version>2.0.1.Final</validation-api.version>
-        <vertx.version>3.9.10</vertx.version>
         <commons.version>3.14.0</commons.version>
         <commons.collections.version>4.4</commons.collections.version>
         <commons.compress.version>1.26.0</commons.compress.version>
         <commons-math3.version>3.6.1</commons-math3.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>
+        <jackson.version>2.16.2</jackson.version>
         <json-schema-validator.version>1.0.76</json-schema-validator.version>
         <jsonpatch.version>1.13</jsonpatch.version>
         <mysql.version>8.0.28</mysql.version>
         <postgresql.version>42.7.2</postgresql.version>
         <psl.version>2.2.0</psl.version>
         <metrics-influxdb.version>1.2.2</metrics-influxdb.version>
+        <vertx.prometheus.version>0.16.0</vertx.prometheus.version>
         <consent-string-sdk.version>2.0.2</consent-string-sdk.version>
         <iabtcf.version>2.0.7</iabtcf.version>
         <maxmind-client.version>2.12.0</maxmind-client.version>
-        <logback.version>1.2.13</logback.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>
@@ -63,9 +61,9 @@
         <wiremock.version>2.35.1</wiremock.version>
         <awaitility.version>4.2.0</awaitility.version>
         <jetty.version>9.4.53.v20231009</jetty.version>
-        <restassured.version>4.4.0</restassured.version>
+        <restassured.version>5.4.0</restassured.version>
         <h2.version>2.2.220</h2.version>
-        <spock.version>2.4-M1-groovy-3.0</spock.version>
+        <spock.version>2.4-M2-groovy-4.0</spock.version>
         <groovy.version>3.0.14</groovy.version>
         <testcontainers.version>1.17.4</testcontainers.version>
         <mockserver.version>5.14.0</mockserver.version>
@@ -76,7 +74,7 @@
         <checkstyle-plugin.version>3.1.2</checkstyle-plugin.version>
         <checkstyle.version>10.3</checkstyle.version>
         <download-plugin.version>1.2.0</download-plugin.version>
-        <jacoco-plugin.version>0.8.7</jacoco-plugin.version>
+        <jacoco-plugin.version>0.8.11</jacoco-plugin.version>
         <git-commmit-plugin.version>2.2.4</git-commmit-plugin.version>
         <maven-compiler-plugin.version>3.10.1</maven-compiler-plugin.version>
         <maven-surefire-plugin.version>2.22.2</maven-surefire-plugin.version>
@@ -135,8 +133,8 @@
             <artifactId>spring-boot-starter-aop</artifactId>
         </dependency>
         <dependency>
-            <groupId>javax.annotation</groupId>
-            <artifactId>javax.annotation-api</artifactId>
+            <groupId>jakarta.annotation</groupId>
+            <artifactId>jakarta.annotation-api</artifactId>
         </dependency>
         <dependency>
             <groupId>javax.validation</groupId>
@@ -338,41 +336,19 @@
         </dependency>
         <dependency>
             <groupId>io.prometheus</groupId>
-            <artifactId>simpleclient_vertx</artifactId>
+            <artifactId>simpleclient_vertx4</artifactId>
+            <version>${vertx.prometheus.version}</version>
         </dependency>
         <dependency>
             <groupId>io.prometheus</groupId>
             <artifactId>simpleclient_dropwizard</artifactId>
+            <version>${vertx.prometheus.version}</version>
         </dependency>
         <dependency>
             <groupId>com.maxmind.geoip2</groupId>
             <artifactId>geoip2</artifactId>
             <version>${maxmind-client.version}</version>
         </dependency>
-        <!--TODO: Remove this after bumping to new Spring Parent with safe log4j and logback -->
-        <dependency>
-            <groupId>ch.qos.logback</groupId>
-            <artifactId>logback-classic</artifactId>
-            <version>${logback.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>ch.qos.logback</groupId>
-            <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>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.logging.log4j</groupId>
-            <artifactId>log4j-api</artifactId>
-        </dependency>
         <dependency>
             <groupId>com.zaxxer</groupId>
             <artifactId>HikariCP</artifactId>
@@ -524,6 +500,18 @@
             <version>${restassured.version}</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>io.rest-assured</groupId>
+            <artifactId>json-path</artifactId>
+            <version>${restassured.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.rest-assured</groupId>
+            <artifactId>xml-path</artifactId>
+            <version>${restassured.version}</version>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>net.bytebuddy</groupId>
             <artifactId>byte-buddy</artifactId>
@@ -549,7 +537,7 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.hibernate</groupId>
+            <groupId>org.hibernate.orm</groupId>
             <artifactId>hibernate-core</artifactId>
             <scope>test</scope>
         </dependency>
@@ -600,6 +588,11 @@
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-compiler-plugin</artifactId>
                     <version>${maven-compiler-plugin.version}</version>
+                    <configuration>
+                        <compilerArgs>
+                            <arg>-parameters</arg>
+                        </compilerArgs>
+                    </configuration>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>

diff --git a/src/main/java/org/prebid/server/activity/ActivitiesConfigResolver.java b/src/main/java/org/prebid/server/activity/ActivitiesConfigResolver.java
@@ -1,7 +1,7 @@
 package org.prebid.server.activity;
 
-import io.vertx.core.logging.LoggerFactory;
 import org.prebid.server.log.ConditionalLogger;
+import org.prebid.server.log.LoggerFactory;
 import org.prebid.server.settings.model.Account;
 import org.prebid.server.settings.model.AccountPrivacyConfig;
 import org.prebid.server.settings.model.activity.AccountActivityConfiguration;

diff --git a/...java/org/prebid/server/activity/infrastructure/creator/ActivityInfrastructureCreator.java b/...java/org/prebid/server/activity/infrastructure/creator/ActivityInfrastructureCreator.java
@@ -1,7 +1,5 @@
 package org.prebid.server.activity.infrastructure.creator;
 
-import io.vertx.core.logging.Logger;
-import io.vertx.core.logging.LoggerFactory;
 import org.apache.commons.collections4.ListUtils;
 import org.prebid.server.activity.Activity;
 import org.prebid.server.activity.infrastructure.ActivityController;
@@ -11,6 +9,8 @@
 import org.prebid.server.activity.infrastructure.rule.Rule;
 import org.prebid.server.auction.gpp.model.GppContext;
 import org.prebid.server.json.JacksonMapper;
+import org.prebid.server.log.Logger;
+import org.prebid.server.log.LoggerFactory;
 import org.prebid.server.metric.MetricName;
 import org.prebid.server.metric.Metrics;
 import org.prebid.server.proto.openrtb.ext.request.TraceLevel;

diff --git a/src/main/java/org/prebid/server/analytics/reporter/AnalyticsReporterDelegator.java b/src/main/java/org/prebid/server/analytics/reporter/AnalyticsReporterDelegator.java
@@ -10,8 +10,6 @@
 import io.vertx.core.AsyncResult;
 import io.vertx.core.Future;
 import io.vertx.core.Vertx;
-import io.vertx.core.logging.Logger;
-import io.vertx.core.logging.LoggerFactory;
 import org.apache.commons.collections4.CollectionUtils;
 import org.prebid.server.activity.Activity;
 import org.prebid.server.activity.ComponentType;
@@ -31,6 +29,8 @@
 import org.prebid.server.auction.privacy.enforcement.mask.UserFpdActivityMask;
 import org.prebid.server.exception.InvalidRequestException;
 import org.prebid.server.log.ConditionalLogger;
+import org.prebid.server.log.Logger;
+import org.prebid.server.log.LoggerFactory;
 import org.prebid.server.metric.MetricName;
 import org.prebid.server.metric.Metrics;
 import org.prebid.server.privacy.gdpr.model.PrivacyEnforcementAction;
@@ -126,8 +126,8 @@ private <T> void delegateEvent(T event,
             }
         } else {
             final Throwable privacyEnforcementException = privacyEnforcementMapResult.cause();
-            logger.error("Analytics TCF enforcement check failed for consentString: {0} and "
-                            + "delegates with vendorIds {1}", privacyEnforcementException,
+            logger.error("Analytics TCF enforcement check failed for consentString: {} and "
+                            + "delegates with vendorIds {}", privacyEnforcementException,
                     tcfContext.getConsentString(), delegates);
         }
     }

diff --git a/src/main/java/org/prebid/server/analytics/reporter/log/LogAnalyticsReporter.java b/src/main/java/org/prebid/server/analytics/reporter/log/LogAnalyticsReporter.java
@@ -1,8 +1,6 @@
 package org.prebid.server.analytics.reporter.log;
 
 import io.vertx.core.Future;
-import io.vertx.core.logging.Logger;
-import io.vertx.core.logging.LoggerFactory;
 import org.prebid.server.analytics.AnalyticsReporter;
 import org.prebid.server.analytics.model.AmpEvent;
 import org.prebid.server.analytics.model.AuctionEvent;
@@ -12,6 +10,8 @@
 import org.prebid.server.analytics.model.VideoEvent;
 import org.prebid.server.analytics.reporter.log.model.LogEvent;
 import org.prebid.server.json.JacksonMapper;
+import org.prebid.server.log.Logger;
+import org.prebid.server.log.LoggerFactory;
 
 import java.util.Objects;
 

diff --git a/src/main/java/org/prebid/server/analytics/reporter/pubstack/PubstackAnalyticsReporter.java b/src/main/java/org/prebid/server/analytics/reporter/pubstack/PubstackAnalyticsReporter.java
@@ -2,9 +2,8 @@
 
 import io.vertx.core.AsyncResult;
 import io.vertx.core.Future;
+import io.vertx.core.Promise;
 import io.vertx.core.Vertx;
-import io.vertx.core.logging.Logger;
-import io.vertx.core.logging.LoggerFactory;
 import org.apache.commons.collections4.MapUtils;
 import org.apache.commons.lang3.BooleanUtils;
 import org.prebid.server.analytics.AnalyticsReporter;
@@ -20,6 +19,8 @@
 import org.prebid.server.exception.PreBidException;
 import org.prebid.server.json.DecodeException;
 import org.prebid.server.json.JacksonMapper;
+import org.prebid.server.log.Logger;
+import org.prebid.server.log.LoggerFactory;
 import org.prebid.server.util.HttpUtil;
 import org.prebid.server.vertx.Initializable;
 import org.prebid.server.vertx.httpclient.HttpClient;
@@ -124,17 +125,18 @@ public String name() {
     }
 
     @Override
-    public void initialize() {
+    public void initialize(Promise<Void> initializePromise) {
         vertx.setPeriodic(configurationRefreshDelay, id -> fetchRemoteConfig());
         fetchRemoteConfig();
+        initializePromise.tryComplete();
     }
 
     void shutdown() {
         eventHandlers.values().forEach(PubstackEventHandler::reportEvents);
     }
 
     private void fetchRemoteConfig() {
-        logger.info("[pubstack] Updating config: {0}", pubstackConfig);
+        logger.info("[pubstack] Updating config: {}", pubstackConfig);
         httpClient.get(makeEventEndpointUrl(pubstackConfig.getEndpoint(), pubstackConfig.getScopeId()), timeout)
                 .map(this::processRemoteConfigurationResponse)
                 .onComplete(this::updateConfigsOnChange);
@@ -156,7 +158,7 @@ private PubstackConfig processRemoteConfigurationResponse(HttpClientResponse res
 
     private void updateConfigsOnChange(AsyncResult<PubstackConfig> asyncConfigResult) {
         if (asyncConfigResult.failed()) {
-            logger.error("[pubstask] Fail to fetch remote configuration: {0}", asyncConfigResult.cause().getMessage());
+            logger.error("[pubstask] Fail to fetch remote configuration: {}", asyncConfigResult.cause().getMessage());
         } else if (!Objects.equals(pubstackConfig, asyncConfigResult.result())) {
             final PubstackConfig pubstackConfig = asyncConfigResult.result();
             eventHandlers.values().forEach(PubstackEventHandler::reportEvents);

diff --git a/src/main/java/org/prebid/server/analytics/reporter/pubstack/PubstackEventHandler.java b/src/main/java/org/prebid/server/analytics/reporter/pubstack/PubstackEventHandler.java
@@ -7,11 +7,11 @@
 import io.vertx.core.Vertx;
 import io.vertx.core.http.HttpHeaders;
 import io.vertx.core.http.HttpMethod;
-import io.vertx.core.logging.Logger;
-import io.vertx.core.logging.LoggerFactory;
 import org.prebid.server.analytics.reporter.pubstack.model.PubstackAnalyticsProperties;
 import org.prebid.server.exception.PreBidException;
 import org.prebid.server.json.JacksonMapper;
+import org.prebid.server.log.Logger;
+import org.prebid.server.log.LoggerFactory;
 import org.prebid.server.util.HttpUtil;
 import org.prebid.server.vertx.httpclient.HttpClient;
 import org.prebid.server.vertx.httpclient.model.HttpClientResponse;
@@ -118,7 +118,7 @@ private <T> boolean reportEventsOnCondition(Predicate<T> conditionToSend, T cond
                     sendEvents(events);
                 }
             } catch (Exception exception) {
-                logger.error("[pubstack] Failed to send analytics report to endpoint {0} with a reason {1}",
+                logger.error("[pubstack] Failed to send analytics report to endpoint {} with a reason {}",
                         endpoint, exception.getMessage());
             } finally {
                 lockOnSend.unlock();
@@ -163,13 +163,13 @@ private static byte[] gzip(String value) {
 
     private void handleReportResponse(AsyncResult<HttpClientResponse> result) {
         if (result.failed()) {
-            logger.error("[pubstack] Failed to send events to endpoint {0} with a reason: {1}",
+            logger.error("[pubstack] Failed to send events to endpoint {} with a reason: {}",
                     endpoint, result.cause().getMessage());
         } else {
             final HttpClientResponse httpClientResponse = result.result();
             final int statusCode = httpClientResponse.getStatusCode();
             if (statusCode != HttpResponseStatus.OK.code()) {
-                logger.error("[pubstack] Wrong code received {0} instead of 200", statusCode);
+                logger.error("[pubstack] Wrong code received {} instead of 200", statusCode);
             }
         }
     }