Merge remote-tracking branch 'origin/master' into bid-adjustments-for-price-floors

# Conflicts:
#	src/main/java/org/prebid/server/auction/ExchangeService.java

Author: AntoxaAntoxic

docs/application-settings.md

@@ -25,6 +25,11 @@ There are two ways to configure application settings: database and file. This do
 - `auction.bidadjustments.mediatype.*.*.*[].value` - value of the bid adjustment
 - `auction.bidadjustments.mediatype.*.*.*[].currency` - currency of the bid adjustment
 - `auction.events.enabled` - enables events for account if true
+- `auction.bid-rounding` - bid rounding options are:
+  - **down** - rounding down to the lower price bucket
+  - **up** - rounding up to the higher price bucket
+  - **timesplit** - 50% of the time rounding down to the lower PB and 50% of the time rounding up to the higher price bucket
+  - **true** - if the price >= 50% of the range, rounding up to the higher price bucket, otherwise rounding down
 - `auction.price-floors.enabled` - enables price floors for account if true. Defaults to true.
 - `auction.price-floors.fetch.enabled`- enables data fetch for price floors for account if true. Defaults to false.
 - `auction.price-floors.fetch.url` - url to fetch price floors data from.
@@ -50,6 +55,7 @@ Keep in mind following restrictions:
 - `auction.preferredmediatype.<bidder>.<media-type>` - <media-type> that will be left for <bidder> that doesn't support multi-format. Other media types will be removed. Acceptable values: `banner`, `video`, `audio`, `native`.
 - `auction.privacysandbox.cookiedeprecation.enabled` - boolean that turns on setting and reading of the Chrome Privacy Sandbox testing label header. Defaults to false.
 - `auction.privacysandbox.cookiedeprecation.ttlsec` - if the above setting is true, how long to set the receive-cookie-deprecation cookie's expiration
+- `auction.cache.enabled` - enables bids caching for account if true. Defaults to true.
 - `privacy.gdpr.enabled` - enables gdpr verifications if true. Has higher priority than configuration in
   application.yaml.
 - `privacy.gdpr.eea-countries` - overrides the host-level list of 2-letter country codes where TCF processing is applied

extra/bundle/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.prebid</groupId>
         <artifactId>prebid-server-aggregator</artifactId>
-        <version>3.26.0-SNAPSHOT</version>
+        <version>3.27.0-SNAPSHOT</version>
         <relativePath>../../extra/pom.xml</relativePath>
     </parent>
 

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

@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.prebid.server.hooks.modules</groupId>
         <artifactId>all-modules</artifactId>
-        <version>3.26.0-SNAPSHOT</version>
+        <version>3.27.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>confiant-ad-quality</artifactId>

extra/modules/fiftyone-devicedetection/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.prebid.server.hooks.modules</groupId>
         <artifactId>all-modules</artifactId>
-        <version>3.26.0-SNAPSHOT</version>
+        <version>3.27.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>fiftyone-devicedetection</artifactId>

extra/modules/fiftyone-devicedetection/src/main/java/org/prebid/server/hooks/modules/fiftyone/devicedetection/v1/core/OrtbDeviceType.java

@@ -27,7 +27,7 @@ public enum OrtbDeviceType {
             Map.entry("Mobile", OrtbDeviceType.MOBILE_TABLET),
             Map.entry("Router", OrtbDeviceType.CONNECTED_DEVICE),
             Map.entry("SmallScreen", OrtbDeviceType.CONNECTED_DEVICE),
-            Map.entry("SmartPhone", OrtbDeviceType.MOBILE_TABLET),
+            Map.entry("SmartPhone", OrtbDeviceType.PHONE),
             Map.entry("SmartSpeaker", OrtbDeviceType.CONNECTED_DEVICE),
             Map.entry("SmartWatch", OrtbDeviceType.CONNECTED_DEVICE),
             Map.entry("Tablet", OrtbDeviceType.TABLET),

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

@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.prebid.server.hooks.modules</groupId>
         <artifactId>all-modules</artifactId>
-        <version>3.26.0-SNAPSHOT</version>
+        <version>3.27.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>greenbids-real-time-data</artifactId>

extra/modules/ortb2-blocking/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.prebid.server.hooks.modules</groupId>
         <artifactId>all-modules</artifactId>
-        <version>3.26.0-SNAPSHOT</version>
+        <version>3.27.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>ortb2-blocking</artifactId>

extra/modules/pb-request-correction/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.prebid.server.hooks.modules</groupId>
         <artifactId>all-modules</artifactId>
-        <version>3.26.0-SNAPSHOT</version>
+        <version>3.27.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>pb-request-correction</artifactId>

extra/modules/pb-response-correction/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.prebid.server.hooks.modules</groupId>
         <artifactId>all-modules</artifactId>
-        <version>3.26.0-SNAPSHOT</version>
+        <version>3.27.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>pb-response-correction</artifactId>

extra/modules/pb-richmedia-filter/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.prebid.server.hooks.modules</groupId>
         <artifactId>all-modules</artifactId>
-        <version>3.26.0-SNAPSHOT</version>
+        <version>3.27.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>pb-richmedia-filter</artifactId>