Skip to content

Commit 7d50a0b

Browse files
author
ilya
committed
Merge branch 'master' into DATA-22937
# Conflicts: # extra/bundle/pom.xml # extra/modules/live-intent-omni-channel-identity/pom.xml # extra/modules/live-intent-omni-channel-identity/src/main/java/org/prebid/server/hooks/modules/liveintent/omni/channel/identity/config/LiveIntentOmniChannelIdentityConfiguration.java # extra/modules/live-intent-omni-channel-identity/src/main/java/org/prebid/server/hooks/modules/liveintent/omni/channel/identity/model/IdResResponse.java # extra/modules/live-intent-omni-channel-identity/src/main/java/org/prebid/server/hooks/modules/liveintent/omni/channel/identity/v1/hooks/LiveIntentOmniChannelIdentityProcessedAuctionRequestHook.java # extra/modules/live-intent-omni-channel-identity/src/test/java/org/prebid/server/hooks/modules/liveintent/omni/channel/identity/v1/LiveIntentOmniChannelIdentityProcessedAuctionRequestHookTest.java # extra/modules/pom.xml
2 parents bc299e9 + 8cf9c00 commit 7d50a0b

459 files changed

Lines changed: 24091 additions & 1012 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/scripts/codepath-notification‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,3 +22,4 @@ pubmatic|Pubmatic: header-bidding@pubmatic.com
2222
openx|OpenX: prebid@openx.com
2323
medianet|Medianet: prebid@media.net
2424
thetradedesk|TheTradeDesk: Prebid-Maintainers@thetradedesk.com
25+
gumgum|GumGum: prebid@gumgum.com

‎Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM amazoncorretto:21.0.6-al2023
1+
FROM amazoncorretto:21.0.8-al2023
22

33
WORKDIR /app/prebid-server
44

‎Dockerfile-modules‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM amazoncorretto:21.0.6-al2023
1+
FROM amazoncorretto:21.0.8-al2023
22

33
WORKDIR /app/prebid-server
44

‎docs/application-settings.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ There are two ways to configure application settings: database and file. This do
1212
- `auction.truncate-target-attr` - Maximum targeting attributes size. Values between 1 and 255.
1313
- `auction.default-integration` - Default integration to assume.
1414
- `auction.debug-allow` - enables debug output in the auction response. Default `true`.
15+
- `auction.impression-limit` - a max number of impressions allowed for the auction, impressions that exceed this limit will be dropped, 0 means no limit.
1516
- `auction.bid-validations.banner-creative-max-size` - Overrides creative max size validation for banners. Valid values
1617
are:
1718
- "skip": don't do anything about creative max size for this publisher

‎docs/config-app.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ This section can be extended against standard [Spring configuration](https://doc
1414
This parameter exists to allow to change the location of the directory Vert.x will create because it will and there is no way to make it not.
1515
- `vertx.init-timeout-ms` - time to wait for asynchronous initialization steps completion before considering them stuck. When exceeded - exception is thrown and Prebid Server stops.
1616
- `vertx.enable-per-client-endpoint-metrics` - enables HTTP client metrics per destination endpoint (`host:port`)
17+
- `vertx.round-robin-inet-address` - enables round-robin inet address selection of the ip address to use
1718

1819
## Server
1920
- `server.max-headers-size` - set the maximum length of all headers.
@@ -345,6 +346,7 @@ For HTTP data source available next options:
345346
- `settings.http.amp-endpoint` - the url to fetch AMP stored requests.
346347
- `settings.http.video-endpoint` - the url to fetch video stored requests.
347348
- `settings.http.category-endpoint` - the url to fetch categories for long form video.
349+
- `settings.http.rfc3986-compatible` - if equals to `true` the url will be build according to RFC 3986, `false` by default
348350

349351
For account processing rules available next options:
350352
- `settings.enforce-valid-account` - if equals to `true` then request without account id will be rejected with 401.

‎extra/bundle/pom.xml‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>org.prebid</groupId>
77
<artifactId>prebid-server-aggregator</artifactId>
8-
<version>3.27.0-SNAPSHOT</version>
8+
<version>3.32.0-SNAPSHOT</version>
99
<relativePath>../../extra/pom.xml</relativePath>
1010
</parent>
1111

@@ -55,6 +55,16 @@
5555
<artifactId>pb-request-correction</artifactId>
5656
<version>${project.version}</version>
5757
</dependency>
58+
<dependency>
59+
<groupId>org.prebid.server.hooks.modules</groupId>
60+
<artifactId>optable-targeting</artifactId>
61+
<version>${project.version}</version>
62+
</dependency>
63+
<dependency>
64+
<groupId>org.prebid.server.hooks.modules</groupId>
65+
<artifactId>wurfl-devicedetection</artifactId>
66+
<version>${project.version}</version>
67+
</dependency>
5868
<dependency>
5969
<groupId>org.prebid.server.hooks.modules</groupId>
6070
<artifactId>live-intent-omni-channel-identity</artifactId>

‎extra/modules/confiant-ad-quality/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>org.prebid.server.hooks.modules</groupId>
77
<artifactId>all-modules</artifactId>
8-
<version>3.27.0-SNAPSHOT</version>
8+
<version>3.32.0-SNAPSHOT</version>
99
</parent>
1010

1111
<artifactId>confiant-ad-quality</artifactId>

‎extra/modules/fiftyone-devicedetection/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>org.prebid.server.hooks.modules</groupId>
77
<artifactId>all-modules</artifactId>
8-
<version>3.27.0-SNAPSHOT</version>
8+
<version>3.32.0-SNAPSHOT</version>
99
</parent>
1010

1111
<artifactId>fiftyone-devicedetection</artifactId>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>org.prebid.server.hooks.modules</groupId>
66
<artifactId>all-modules</artifactId>
7-
<version>3.27.0-SNAPSHOT</version>
7+
<version>3.32.0-SNAPSHOT</version>
88
</parent>
99

1010
<artifactId>greenbids-real-time-data</artifactId>

‎extra/modules/live-intent-omni-channel-identity/pom.xml‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
2+
<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">
43
<modelVersion>4.0.0</modelVersion>
54
<parent>
65
<groupId>org.prebid.server.hooks.modules</groupId>
76
<artifactId>all-modules</artifactId>
8-
<version>3.27.0-SNAPSHOT</version>
7+
<version>3.32.0-SNAPSHOT</version>
98
</parent>
109

1110
<artifactId>live-intent-omni-channel-identity</artifactId>

0 commit comments

Comments
 (0)