From 5916943be5ea0b2e0f1430e91e82eaa190d408e8 Mon Sep 17 00:00:00 2001 From: antonbabak Date: Thu, 9 Oct 2025 11:41:20 +0200 Subject: [PATCH 1/4] Dependencies: Update compatibility-breaking dependencies --- .../hooks/modules/optable/targeting/model/Id.java | 2 +- extra/pom.xml | 8 +------- pom.xml | 4 ++-- .../server/bidder/consumable/ConsumableBidder.java | 8 ++++---- .../request/ProtobufForwardExtensionMapper.java | 4 ++-- .../response/ProtobufBackwardExtensionMapper.java | 4 ++-- .../protobuf/response/ProtobufResponseUtils.java | 4 ++-- .../org/prebid/server/settings/SettingsCache.java | 10 +++++----- .../server/spring/config/SettingsConfiguration.java | 11 +++++++---- .../server/spring/config/bidder/AsoConfiguration.java | 2 +- .../spring/config/bidder/BidTheatreConfiguration.java | 2 +- .../server/spring/config/bidder/BwxConfiguration.java | 2 +- .../config/bidder/DefineMediaConfiguration.java | 2 +- .../spring/config/bidder/ExcoConfiguration.java | 2 +- .../spring/config/bidder/LoopmeConfiguration.java | 2 +- .../spring/config/bidder/MabidderConfiguration.java | 2 +- .../spring/config/bidder/MobkoiConfiguration.java | 2 +- .../config/bidder/OwnAdxBidderConfiguration.java | 2 +- .../spring/config/bidder/RoulaxConfiguration.java | 2 +- .../config/bidder/SmrtconnectConfiguration.java | 2 +- .../spring/config/bidder/TheadxConfiguration.java | 2 +- .../config/bidder/TradPlusBidderConfiguration.java | 2 +- .../config/bidder/TrustedstackConfiguration.java | 2 +- .../config/bidder/ZMaticooBidderConfiguration.java | 2 +- .../config/model/ExponentialBackoffProperties.java | 4 ++-- 25 files changed, 43 insertions(+), 46 deletions(-) diff --git a/extra/modules/optable-targeting/src/main/java/org/prebid/server/hooks/modules/optable/targeting/model/Id.java b/extra/modules/optable-targeting/src/main/java/org/prebid/server/hooks/modules/optable/targeting/model/Id.java index d80057fddde..9da964b4bfc 100644 --- a/extra/modules/optable-targeting/src/main/java/org/prebid/server/hooks/modules/optable/targeting/model/Id.java +++ b/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 { diff --git a/extra/pom.xml b/extra/pom.xml index e0aa6a72a77..d3f2cad91be 100644 --- a/extra/pom.xml +++ b/extra/pom.xml @@ -35,7 +35,6 @@ 3.5.5 4.5.20 - 2.0.1.Final 4.4 1.27.1 3.6.1 @@ -52,7 +51,7 @@ 2.0.10 3.2.4 4.2.1 - 3.25.6 + 4.32.1 ${protobuf.version} 1.0.9 2.31.22 @@ -111,11 +110,6 @@ wiremock-jetty12 ${wiremock.version} - - javax.validation - validation-api - ${validation-api.version} - com.ongres.scram client diff --git a/pom.xml b/pom.xml index 124d184e651..a01da4f6a2f 100644 --- a/pom.xml +++ b/pom.xml @@ -41,8 +41,8 @@ jakarta.annotation-api - javax.validation - validation-api + jakarta.validation + jakarta.validation-api org.hibernate.validator diff --git a/src/main/java/org/prebid/server/bidder/consumable/ConsumableBidder.java b/src/main/java/org/prebid/server/bidder/consumable/ConsumableBidder.java index 5b70032a98d..45400c311d9 100644 --- a/src/main/java/org/prebid/server/bidder/consumable/ConsumableBidder.java +++ b/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>> 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 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; } diff --git a/src/main/java/org/prebid/server/protobuf/request/ProtobufForwardExtensionMapper.java b/src/main/java/org/prebid/server/protobuf/request/ProtobufForwardExtensionMapper.java index 68766362a23..318e1246082 100644 --- a/src/main/java/org/prebid/server/protobuf/request/ProtobufForwardExtensionMapper.java +++ b/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 extensionDescriptor(); + ExtensionLite extensionDescriptor(); } diff --git a/src/main/java/org/prebid/server/protobuf/response/ProtobufBackwardExtensionMapper.java b/src/main/java/org/prebid/server/protobuf/response/ProtobufBackwardExtensionMapper.java index 6e273b3eba9..b27e4ae0e38 100644 --- a/src/main/java/org/prebid/server/protobuf/response/ProtobufBackwardExtensionMapper.java +++ b/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 extensionDescriptor(); + ExtensionLite extensionDescriptor(); } diff --git a/src/main/java/org/prebid/server/protobuf/response/ProtobufResponseUtils.java b/src/main/java/org/prebid/server/protobuf/response/ProtobufResponseUtils.java index 65b272d5281..fc891cf756c 100644 --- a/src/main/java/org/prebid/server/protobuf/response/ProtobufResponseUtils.java +++ b/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 na .build(); } - private static , FromType, ToType> + private static , FromType, ToType> ToType extractExtension( ProtobufBackwardExtensionMapper mapper, ContainingType value) { diff --git a/src/main/java/org/prebid/server/settings/SettingsCache.java b/src/main/java/org/prebid/server/settings/SettingsCache.java index 1066d0a121c..7cb86a48799 100644 --- a/src/main/java/org/prebid/server/settings/SettingsCache.java +++ b/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); } diff --git a/src/main/java/org/prebid/server/spring/config/SettingsConfiguration.java b/src/main/java/org/prebid/server/spring/config/SettingsConfiguration.java index 79517afcc6d..8e9197df573 100644 --- a/src/main/java/org/prebid/server/spring/config/SettingsConfiguration.java +++ b/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 diff --git a/src/main/java/org/prebid/server/spring/config/bidder/AsoConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/AsoConfiguration.java index 840b578ea28..28907c6e507 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/AsoConfiguration.java +++ b/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) diff --git a/src/main/java/org/prebid/server/spring/config/bidder/BidTheatreConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/BidTheatreConfiguration.java index 2cbf98062df..84a7f9a0763 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/BidTheatreConfiguration.java +++ b/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) diff --git a/src/main/java/org/prebid/server/spring/config/bidder/BwxConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/BwxConfiguration.java index 6b8ce8bf7d2..9f224314556 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/BwxConfiguration.java +++ b/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) diff --git a/src/main/java/org/prebid/server/spring/config/bidder/DefineMediaConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/DefineMediaConfiguration.java index f0026d2e9e7..e242cb80d25 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/DefineMediaConfiguration.java +++ b/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) diff --git a/src/main/java/org/prebid/server/spring/config/bidder/ExcoConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/ExcoConfiguration.java index 9e079821d2e..920fdb1af21 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/ExcoConfiguration.java +++ b/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) diff --git a/src/main/java/org/prebid/server/spring/config/bidder/LoopmeConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/LoopmeConfiguration.java index 757f8059ed7..89218c215b0 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/LoopmeConfiguration.java +++ b/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) diff --git a/src/main/java/org/prebid/server/spring/config/bidder/MabidderConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/MabidderConfiguration.java index 3adf4eaa583..980093d2e21 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/MabidderConfiguration.java +++ b/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) diff --git a/src/main/java/org/prebid/server/spring/config/bidder/MobkoiConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/MobkoiConfiguration.java index 9b4761fdfaf..42c77bc4272 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/MobkoiConfiguration.java +++ b/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) diff --git a/src/main/java/org/prebid/server/spring/config/bidder/OwnAdxBidderConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/OwnAdxBidderConfiguration.java index b34028b4221..52ef00a150d 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/OwnAdxBidderConfiguration.java +++ b/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) diff --git a/src/main/java/org/prebid/server/spring/config/bidder/RoulaxConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/RoulaxConfiguration.java index 01ba4e70e3d..3c23779d959 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/RoulaxConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/RoulaxConfiguration.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/roulax.yaml", factory = YamlPropertySourceFactory.class) diff --git a/src/main/java/org/prebid/server/spring/config/bidder/SmrtconnectConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/SmrtconnectConfiguration.java index 24eb4d44996..4513ca9d9fe 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/SmrtconnectConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/SmrtconnectConfiguration.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/smrtconnect.yaml", factory = YamlPropertySourceFactory.class) diff --git a/src/main/java/org/prebid/server/spring/config/bidder/TheadxConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/TheadxConfiguration.java index 6bb9e397e05..bb9f007c1ff 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/TheadxConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/TheadxConfiguration.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/theadx.yaml", factory = YamlPropertySourceFactory.class) diff --git a/src/main/java/org/prebid/server/spring/config/bidder/TradPlusBidderConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/TradPlusBidderConfiguration.java index 8bd04ffd8f3..bf96cef2be0 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/TradPlusBidderConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/TradPlusBidderConfiguration.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/tradplus.yaml", factory = YamlPropertySourceFactory.class) diff --git a/src/main/java/org/prebid/server/spring/config/bidder/TrustedstackConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/TrustedstackConfiguration.java index 679792ee341..6fb33c78a9f 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/TrustedstackConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/TrustedstackConfiguration.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/trustedstack.yaml", factory = YamlPropertySourceFactory.class) diff --git a/src/main/java/org/prebid/server/spring/config/bidder/ZMaticooBidderConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/ZMaticooBidderConfiguration.java index 540a58a67ec..f2d86acdc61 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/ZMaticooBidderConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/ZMaticooBidderConfiguration.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/zmaticoo.yaml", factory = YamlPropertySourceFactory.class) diff --git a/src/main/java/org/prebid/server/spring/config/model/ExponentialBackoffProperties.java b/src/main/java/org/prebid/server/spring/config/model/ExponentialBackoffProperties.java index 83889e16288..e9f9bfa355b 100644 --- a/src/main/java/org/prebid/server/spring/config/model/ExponentialBackoffProperties.java +++ b/src/main/java/org/prebid/server/spring/config/model/ExponentialBackoffProperties.java @@ -4,8 +4,8 @@ import lombok.NoArgsConstructor; import org.springframework.validation.annotation.Validated; -import javax.validation.constraints.Min; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.Min; +import jakarta.validation.constraints.NotNull; @Data @Validated From 3f8c8f7ab1a67d079b31c410372840fae2e586fd Mon Sep 17 00:00:00 2001 From: antonbabak Date: Mon, 13 Oct 2025 15:29:04 +0200 Subject: [PATCH 2/4] Bump Minor Dependencies --- extra/pom.xml | 26 +++++++++---------- pom.xml | 6 ++--- .../bidder/huaweiads/HuaweiDeviceBuilder.java | 2 +- .../org/prebid/server/json/JsonLogic.java | 5 ++-- .../bidder/preciso/PrecisoBidderTest.java | 4 +-- 5 files changed, 21 insertions(+), 22 deletions(-) diff --git a/extra/pom.xml b/extra/pom.xml index d3f2cad91be..a704941b025 100644 --- a/extra/pom.xml +++ b/extra/pom.xml @@ -24,42 +24,42 @@ 3.1.1 - 3.14.0 - 3.5.3 + 3.14.1 + 3.5.4 ${maven-surefire-plugin.version} 0.8.13 0.46.0 3.6.0 - 10.17.0 + 12.0.1 3.5.5 4.5.20 - 4.4 - 1.27.1 + 4.5.0 + 1.28.0 3.6.1 1.10.0 2.1 4.5.14 5.5.1 - 6.8.0 - 1.5.6 + 6.9.0 + 1.5.9 1.13 2.2.0 1.3.4 0.16.0 2.0.10 3.2.4 - 4.2.1 + 4.4.0 4.32.1 ${protobuf.version} - 1.0.9 - 2.31.22 - 4.2.30 + 1.1.0 + 2.35.5 + 4.2.37 - 3.12.1 - 2.4-M5-groovy-4.0 + 3.13.1 + 2.4-M6-groovy-4.0 5.15.0 diff --git a/pom.xml b/pom.xml index a01da4f6a2f..afe61cea9ea 100644 --- a/pom.xml +++ b/pom.xml @@ -23,11 +23,11 @@ 2.0.0 - 9.0.1 + 9.0.2 - 4.1.1 + 4.2.1 1.7.1 - 3.6.0 + 3.6.1 0.6.1 diff --git a/src/main/java/org/prebid/server/bidder/huaweiads/HuaweiDeviceBuilder.java b/src/main/java/org/prebid/server/bidder/huaweiads/HuaweiDeviceBuilder.java index ff95dcd40ea..916279f2d36 100644 --- a/src/main/java/org/prebid/server/bidder/huaweiads/HuaweiDeviceBuilder.java +++ b/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(); diff --git a/src/main/java/org/prebid/server/json/JsonLogic.java b/src/main/java/org/prebid/server/json/JsonLogic.java index 01d8fbb9fe8..cd8ac3eb54e 100644 --- a/src/main/java/org/prebid/server/json/JsonLogic.java +++ b/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 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); } } diff --git a/src/test/java/org/prebid/server/bidder/preciso/PrecisoBidderTest.java b/src/test/java/org/prebid/server/bidder/preciso/PrecisoBidderTest.java index b6784daaed0..25d631334a1 100644 --- a/src/test/java/org/prebid/server/bidder/preciso/PrecisoBidderTest.java +++ b/src/test/java/org/prebid/server/bidder/preciso/PrecisoBidderTest.java @@ -54,10 +54,8 @@ public void setUp() { @Test public void creationShouldFailOnInvalidEndpointUrl() { - assertThatIllegalArgumentException() - .isThrownBy(() -> new PrecisoBidder( - "invalid_url", currencyConversionService, jacksonMapper)); + .isThrownBy(() -> new PrecisoBidder("invalid_url", currencyConversionService, jacksonMapper)); } From d5797e88cfebcafda244f9c88b28483b0099ae4f Mon Sep 17 00:00:00 2001 From: antonbabak Date: Mon, 20 Oct 2025 14:36:49 +0200 Subject: [PATCH 3/4] Bump more dependencies --- extra/pom.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/extra/pom.xml b/extra/pom.xml index a704941b025..1c9b8a2a178 100644 --- a/extra/pom.xml +++ b/extra/pom.xml @@ -30,7 +30,7 @@ 0.8.13 0.46.0 3.6.0 - 12.0.1 + 12.1.0 3.5.5 @@ -42,7 +42,7 @@ 2.1 4.5.14 5.5.1 - 6.9.0 + 6.9.1 1.5.9 1.13 2.2.0 @@ -51,10 +51,10 @@ 2.0.10 3.2.4 4.4.0 - 4.32.1 + 4.33.0 ${protobuf.version} 1.1.0 - 2.35.5 + 2.35.10 4.2.37 From 2e40d55075f1824e20da7a1270a2688011aeeb07 Mon Sep 17 00:00:00 2001 From: antonbabak Date: Mon, 20 Oct 2025 16:23:37 +0200 Subject: [PATCH 4/4] Module dependencies update --- extra/modules/greenbids-real-time-data/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/extra/modules/greenbids-real-time-data/pom.xml b/extra/modules/greenbids-real-time-data/pom.xml index 4fb30e2cd4a..9fd6914af61 100644 --- a/extra/modules/greenbids-real-time-data/pom.xml +++ b/extra/modules/greenbids-real-time-data/pom.xml @@ -14,8 +14,8 @@ 1.6.1 - 1.21.0 - 2.50.0 + 1.23.1 + 2.58.1