Dependencies: Update compatibility-breaking dependencies

extra/modules/greenbids-real-time-data/pom.xml

@@ -14,8 +14,8 @@
 
     <properties>
         <uap-java.version>1.6.1</uap-java.version>
-        <onnxruntime.version>1.21.0</onnxruntime.version>
-        <google-cloud-storage.version>2.50.0</google-cloud-storage.version>
+        <onnxruntime.version>1.23.1</onnxruntime.version>
+        <google-cloud-storage.version>2.58.1</google-cloud-storage.version>
     </properties>
 
     <dependencies>

extra/modules/optable-targeting/src/main/java/org/prebid/server/hooks/modules/optable/targeting/model/Id.java

@@ -2,7 +2,7 @@
 
 import lombok.Value;
 
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 
 @Value(staticConstructor = "of")
 public class Id {

extra/pom.xml

@@ -24,43 +24,42 @@
 
         <!-- Maven plugin versions -->
         <maven-release-plugin.version>3.1.1</maven-release-plugin.version>
-        <maven-compiler-plugin.version>3.14.0</maven-compiler-plugin.version>
-        <maven-surefire-plugin.version>3.5.3</maven-surefire-plugin.version>
+        <maven-compiler-plugin.version>3.14.1</maven-compiler-plugin.version>
+        <maven-surefire-plugin.version>3.5.4</maven-surefire-plugin.version>
         <maven-failsafe-plugin.version>${maven-surefire-plugin.version}</maven-failsafe-plugin.version>
         <jacoco-maven-plugin.version>0.8.13</jacoco-maven-plugin.version>
         <docker-maven-plugin.version>0.46.0</docker-maven-plugin.version>
         <checkstyle-plugin.version>3.6.0</checkstyle-plugin.version>
-        <checkstyle.version>10.17.0</checkstyle.version>
+        <checkstyle.version>12.1.0</checkstyle.version>
 
         <!-- Project production dependency versions -->
         <spring.boot.version>3.5.5</spring.boot.version>
         <vertx.version>4.5.20</vertx.version>
-        <validation-api.version>2.0.1.Final</validation-api.version>
-        <commons.collections.version>4.4</commons.collections.version>
-        <commons.compress.version>1.27.1</commons.compress.version>
+        <commons.collections.version>4.5.0</commons.collections.version>
+        <commons.compress.version>1.28.0</commons.compress.version>
         <commons-math3.version>3.6.1</commons-math3.version>
         <commons-validator.version>1.10.0</commons-validator.version>
         <scram.version>2.1</scram.version>
         <httpclient.version>4.5.14</httpclient.version>
         <ipaddress.version>5.5.1</ipaddress.version>
-        <oshi.version>6.8.0</oshi.version>
-        <json-schema-validator.version>1.5.6</json-schema-validator.version>
+        <oshi.version>6.9.1</oshi.version>
+        <json-schema-validator.version>1.5.9</json-schema-validator.version>
         <jsonpatch.version>1.13</jsonpatch.version>
         <psl.version>2.2.0</psl.version>
         <metrics-influxdb.version>1.3.4</metrics-influxdb.version>
         <vertx.prometheus.version>0.16.0</vertx.prometheus.version>
         <iabtcf.version>2.0.10</iabtcf.version>
         <gpp-encoder.version>3.2.4</gpp-encoder.version>
-        <maxmind-client.version>4.2.1</maxmind-client.version>
-        <protobuf.version>3.25.6</protobuf.version>
+        <maxmind-client.version>4.4.0</maxmind-client.version>
+        <protobuf.version>4.33.0</protobuf.version>
         <protoc.version>${protobuf.version}</protoc.version>
-        <json-logic.version>1.0.9</json-logic.version>
-        <aws.awssdk.version>2.31.22</aws.awssdk.version>
-        <dropwizard-metrics.version>4.2.30</dropwizard-metrics.version>
+        <json-logic.version>1.1.0</json-logic.version>
+        <aws.awssdk.version>2.35.10</aws.awssdk.version>
+        <dropwizard-metrics.version>4.2.37</dropwizard-metrics.version>
 
         <!-- Project test dependency versions -->
-        <wiremock.version>3.12.1</wiremock.version>
-        <spock.version>2.4-M5-groovy-4.0</spock.version>
+        <wiremock.version>3.13.1</wiremock.version>
+        <spock.version>2.4-M6-groovy-4.0</spock.version>
         <!--TODO: replace with WireMock -->
         <mockserver.version>5.15.0</mockserver.version>
 
@@ -111,11 +110,6 @@
                 <artifactId>wiremock-jetty12</artifactId>
                 <version>${wiremock.version}</version>
             </dependency>
-            <dependency>
-                <groupId>javax.validation</groupId>
-                <artifactId>validation-api</artifactId>
-                <version>${validation-api.version}</version>
-            </dependency>
             <dependency>
                 <groupId>com.ongres.scram</groupId>
                 <artifactId>client</artifactId>

pom.xml

@@ -23,11 +23,11 @@
 
         <!-- plugin versions -->
         <download-plugin.version>2.0.0</download-plugin.version>
-        <git-commit-id-plugin.version>9.0.1</git-commit-id-plugin.version>
+        <git-commit-id-plugin.version>9.0.2</git-commit-id-plugin.version>
 
-        <gmavenplus-plugin.version>4.1.1</gmavenplus-plugin.version>
+        <gmavenplus-plugin.version>4.2.1</gmavenplus-plugin.version>
         <os-maven-plugin.version>1.7.1</os-maven-plugin.version>
-        <build-helper-maven-plugin.version>3.6.0</build-helper-maven-plugin.version>
+        <build-helper-maven-plugin.version>3.6.1</build-helper-maven-plugin.version>
         <protobuf-maven-plugin.version>0.6.1</protobuf-maven-plugin.version>
     </properties>
 
@@ -41,8 +41,8 @@
             <artifactId>jakarta.annotation-api</artifactId>
         </dependency>
         <dependency>
-            <groupId>javax.validation</groupId>
-            <artifactId>validation-api</artifactId>
+            <groupId>jakarta.validation</groupId>
+            <artifactId>jakarta.validation-api</artifactId>
         </dependency>
         <dependency>
             <groupId>org.hibernate.validator</groupId>

src/main/java/org/prebid/server/bidder/consumable/ConsumableBidder.java

@@ -3,7 +3,6 @@
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.node.ObjectNode;
-import com.google.common.base.Strings;
 import com.iab.openrtb.request.App;
 import com.iab.openrtb.request.BidRequest;
 import com.iab.openrtb.request.Imp;
@@ -13,6 +12,7 @@
 import com.iab.openrtb.response.SeatBid;
 import io.vertx.core.MultiMap;
 import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.prebid.server.bidder.Bidder;
 import org.prebid.server.bidder.model.BidderBid;
 import org.prebid.server.bidder.model.BidderCall;
@@ -65,7 +65,7 @@ public Result<List<HttpRequest<BidRequest>>> makeHttpRequests(BidRequest bidRequ
                 if (!isImpValid(bidRequest.getSite(), bidRequest.getApp(), impExt)) {
                     continue;
                 }
-                if (Strings.isNullOrEmpty(placementId) && !Strings.isNullOrEmpty(impExt.getPlacementId())) {
+                if (StringUtils.isBlank(placementId) && StringUtils.isNotBlank(impExt.getPlacementId())) {
                     placementId = impExt.getPlacementId();
                 }
 
@@ -93,7 +93,7 @@ private ExtImpConsumable parseImpExt(Imp imp) {
     }
 
     private boolean isImpValid(Site site, App app, ExtImpConsumable impExt) {
-        return (app != null && !Strings.isNullOrEmpty(impExt.getPlacementId()))
+        return (app != null && StringUtils.isNotBlank(impExt.getPlacementId()))
                 || (site != null && impExt.getSiteId() != 0 && impExt.getNetworkId() != 0 && impExt.getUnitId() != 0);
 
     }
@@ -103,7 +103,7 @@ private BidRequest modifyBidRequest(BidRequest bidRequest, List<Imp> imps) {
     }
 
     private String constructUri(String placementId) {
-        final String uri = Strings.isNullOrEmpty(placementId) ? SITE_URI_PATH : (APP_URI_PATH + placementId);
+        final String uri = StringUtils.isBlank(placementId) ? SITE_URI_PATH : (APP_URI_PATH + placementId);
         return this.endpointUrl + uri;
     }
 

src/main/java/org/prebid/server/bidder/huaweiads/HuaweiDeviceBuilder.java

@@ -78,7 +78,7 @@ private Device makeDeviceWithDeviceId(com.iab.openrtb.request.Device device, Use
 
         final String gaid = isGaidEmpty
                 ? deviceIfa.orElseThrow(() -> new PreBidException("getDeviceID: openRTBRequest.User.Ext is nil "
-                + "and device.Gaid is not specified."))
+                        + "and device.Gaid is not specified."))
                 : userData.getGaid().getFirst();
         final String oaid = isOaidEmpty ? null : userData.getOaid().getFirst();
         final String imei = isImeiEmpty ? null : userData.getImei().getFirst();

src/main/java/org/prebid/server/json/JsonLogic.java

@@ -5,6 +5,7 @@
 import io.github.jamsesso.jsonlogic.ast.JsonLogicParser;
 import io.github.jamsesso.jsonlogic.evaluator.JsonLogicEvaluationException;
 import io.github.jamsesso.jsonlogic.evaluator.JsonLogicEvaluator;
+import org.apache.commons.lang3.StringUtils;
 
 import java.util.Map;
 import java.util.Objects;
@@ -26,11 +27,11 @@ public JsonLogicNode parse(String jsonNode) {
     }
 
     public boolean evaluate(JsonLogicNode jsonLogicNode, Map<String, Object> data) throws JsonLogicEvaluationException {
-        final Object result = evaluator.evaluate(jsonLogicNode, data);
+        final Object result = evaluator.evaluate(jsonLogicNode, data, StringUtils.EMPTY);
 
         if (result instanceof Boolean booleanResult) {
             return booleanResult;
         }
-        throw new JsonLogicEvaluationException("Wrong type was returned.");
+        throw new JsonLogicEvaluationException("Wrong type was returned.", StringUtils.EMPTY);
     }
 }

src/main/java/org/prebid/server/protobuf/request/ProtobufForwardExtensionMapper.java

@@ -1,6 +1,6 @@
 package org.prebid.server.protobuf.request;
 
-import com.google.protobuf.Extension;
+import com.google.protobuf.ExtensionLite;
 import com.google.protobuf.Message;
 
 /**
@@ -10,5 +10,5 @@ public interface ProtobufForwardExtensionMapper<ContainingType extends Message,
 
     ToType map(FromType fromType);
 
-    Extension<ContainingType, ToType> extensionDescriptor();
+    ExtensionLite<ContainingType, ToType> extensionDescriptor();
 }

src/main/java/org/prebid/server/protobuf/response/ProtobufBackwardExtensionMapper.java

@@ -1,6 +1,6 @@
 package org.prebid.server.protobuf.response;
 
-import com.google.protobuf.Extension;
+import com.google.protobuf.ExtensionLite;
 import com.google.protobuf.Message;
 
 /**
@@ -10,5 +10,5 @@ public interface ProtobufBackwardExtensionMapper<ContainingType extends Message,
 
     ToType map(FromType fromType);
 
-    Extension<ContainingType, FromType> extensionDescriptor();
+    ExtensionLite<ContainingType, FromType> extensionDescriptor();
 }

src/main/java/org/prebid/server/protobuf/response/ProtobufResponseUtils.java

@@ -2,7 +2,7 @@
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.google.protobuf.GeneratedMessageV3;
+import com.google.protobuf.GeneratedMessage;
 import com.iab.openrtb.response.Asset;
 import com.iab.openrtb.response.Bid;
 import com.iab.openrtb.response.BidResponse;
@@ -248,7 +248,7 @@ public static ProtobufMapper<OpenRtb.NativeResponse.Asset.Video, VideoObject> na
                         .build();
     }
 
-    private static <ContainingType extends GeneratedMessageV3.ExtendableMessage<ContainingType>, FromType, ToType>
+    private static <ContainingType extends GeneratedMessage.ExtendableMessage<ContainingType>, FromType, ToType>
             ToType extractExtension(
             ProtobufBackwardExtensionMapper<ContainingType, FromType, ToType> mapper, ContainingType value) {
 

src/main/java/org/prebid/server/settings/SettingsCache.java

@@ -4,9 +4,9 @@
 import com.github.benmanes.caffeine.cache.Expiry;
 import org.apache.commons.collections4.MapUtils;
 import org.apache.commons.lang3.ObjectUtils;
-import org.checkerframework.checker.index.qual.NonNegative;
 import org.prebid.server.settings.model.StoredItem;
 
+import jakarta.validation.constraints.PositiveOrZero;
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
@@ -108,12 +108,12 @@ public long expireAfterCreate(K key, V value, long currentTime) {
         }
 
         @Override
-        public long expireAfterUpdate(K key, V value, long currentTime, @NonNegative long currentDuration) {
+        public long expireAfterUpdate(K key, V value, long currentTime, @PositiveOrZero long currentDuration) {
             return expireAfterNanos;
         }
 
         @Override
-        public long expireAfterRead(K key, V value, long currentTime, @NonNegative long currentDuration) {
+        public long expireAfterRead(K key, V value, long currentTime, @PositiveOrZero long currentDuration) {
             return currentDuration;
         }
     }
@@ -134,12 +134,12 @@ public long expireAfterCreate(K key, V value, long currentTime) {
         }
 
         @Override
-        public long expireAfterUpdate(K key, V value, long currentTime, @NonNegative long currentDuration) {
+        public long expireAfterUpdate(K key, V value, long currentTime, @PositiveOrZero long currentDuration) {
             return baseExpiry.expireAfterUpdate(key, value, currentTime, currentDuration) + jitter();
         }
 
         @Override
-        public long expireAfterRead(K key, V value, long currentTime, @NonNegative long currentDuration) {
+        public long expireAfterRead(K key, V value, long currentTime, @PositiveOrZero long currentDuration) {
             return baseExpiry.expireAfterRead(key, value, currentTime, currentDuration);
         }
 

src/main/java/org/prebid/server/spring/config/SettingsConfiguration.java

@@ -51,9 +51,9 @@
 import software.amazon.awssdk.regions.Region;
 import software.amazon.awssdk.services.s3.S3AsyncClient;
 
-import javax.validation.constraints.Min;
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.Min;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.time.Clock;
@@ -259,6 +259,9 @@ static class S3SettingsConfiguration {
 
         @Component
         @ConfigurationProperties(prefix = "settings.s3")
+        @ConditionalOnProperty(
+                prefix = "settings.s3",
+                name = {"accounts-dir", "stored-imps-dir", "stored-requests-dir"})
         @Validated
         @Data
         @NoArgsConstructor
@@ -294,7 +297,7 @@ private boolean useStaticCredentials() {
             @NotBlank
             private String bucket;
 
-            @NotBlank
+            @NotNull
             private Boolean forcePathStyle;
 
             @NotBlank

src/main/java/org/prebid/server/spring/config/bidder/AsoConfiguration.java

@@ -13,7 +13,7 @@
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.PropertySource;
 
-import javax.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotBlank;
 
 @Configuration
 @PropertySource(value = "classpath:/bidder-config/aso.yaml", factory = YamlPropertySourceFactory.class)

src/main/java/org/prebid/server/spring/config/bidder/BidTheatreConfiguration.java

@@ -13,7 +13,7 @@
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.PropertySource;
 
-import javax.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotBlank;
 
 @Configuration
 @PropertySource(value = "classpath:/bidder-config/bidtheatre.yaml", factory = YamlPropertySourceFactory.class)

src/main/java/org/prebid/server/spring/config/bidder/BwxConfiguration.java

@@ -13,7 +13,7 @@
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.PropertySource;
 
-import javax.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotBlank;
 
 @Configuration
 @PropertySource(value = "classpath:/bidder-config/bwx.yaml", factory = YamlPropertySourceFactory.class)

src/main/java/org/prebid/server/spring/config/bidder/DefineMediaConfiguration.java

@@ -13,7 +13,7 @@
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.PropertySource;
 
-import javax.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotBlank;
 
 @Configuration
 @PropertySource(value = "classpath:/bidder-config/definemedia.yaml", factory = YamlPropertySourceFactory.class)

src/main/java/org/prebid/server/spring/config/bidder/ExcoConfiguration.java

@@ -13,7 +13,7 @@
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.PropertySource;
 
-import javax.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotBlank;
 
 @Configuration
 @PropertySource(value = "classpath:/bidder-config/exco.yaml", factory = YamlPropertySourceFactory.class)

src/main/java/org/prebid/server/spring/config/bidder/LoopmeConfiguration.java

@@ -13,7 +13,7 @@
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.PropertySource;
 
-import javax.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotBlank;
 
 @Configuration
 @PropertySource(value = "classpath:/bidder-config/loopme.yaml", factory = YamlPropertySourceFactory.class)

src/main/java/org/prebid/server/spring/config/bidder/MabidderConfiguration.java

@@ -13,7 +13,7 @@
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.PropertySource;
 
-import javax.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotBlank;
 
 @Configuration
 @PropertySource(value = "classpath:/bidder-config/mabidder.yaml", factory = YamlPropertySourceFactory.class)

src/main/java/org/prebid/server/spring/config/bidder/MobkoiConfiguration.java

@@ -13,7 +13,7 @@
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.PropertySource;
 
-import javax.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotBlank;
 
 @Configuration
 @PropertySource(value = "classpath:/bidder-config/mobkoi.yaml", factory = YamlPropertySourceFactory.class)

src/main/java/org/prebid/server/spring/config/bidder/OwnAdxBidderConfiguration.java

@@ -13,7 +13,7 @@
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.PropertySource;
 
-import javax.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotBlank;
 
 @Configuration
 @PropertySource(value = "classpath:/bidder-config/ownadx.yaml", factory = YamlPropertySourceFactory.class)