[pull] master from prebid:master

docs/developers/functional-tests.md

@@ -2,8 +2,8 @@
 
 Main language: Groovy. Project functional tests use [Spock](https://spockframework.org/) as a main testing framework.
 Also used [Docker](https://www.docker.com/) for running PBS and other services.
-[Testcontainers](https://www.testcontainers.org/) is used as provider of lightweight, throwaway instances of PBS, MySQLContainer, MockServerContainer containers.
-And [MockServer](https://www.mock-server.com/) for mocking external services.
+[Testcontainers](https://www.testcontainers.org/) is used as provider of lightweight, throwaway instances of PBS, MySQLContainer, WireMock containers.
+And [WireMock](https://wiremock.org/) for mocking external services.
 
 ## Getting Started
 
@@ -64,12 +64,12 @@ Functional tests need to have name template **.\*Spec.groovy**
 - `/functional/testcontainers/PBSTestExtension` - allows to hook into a spec’s lifecycle to add ErrorListener using annotation `PBSTest`.
 - `/functional/testcontainers/TestcontainersExtension` - allow to hook into a spec’s lifecycle to start and stop support service containers using global extension.
 - `/functional/testcontainers/container` - responsible for creating and configuring containers.
-- `/functional/testcontainers/scaffolding/NetworkScaffolding` -  makes HTTP requests to a MockServer.
+- `/functional/testcontainers/scaffolding/NetworkScaffolding` -  makes HTTP requests to a WireMock.
 
 
 **Properties:**
 
-`launchContainers` - responsible for starting the MockServer and the MySQLContainer container. Default value is false to not launch containers for unit tests.
+`launchContainers` - responsible for starting containers. Default value is false to not launch containers for unit tests.
 `tests.max-container-count` - maximum number of simultaneously running PBS containers. Default value is 5.
 `skipFunctionalTests` - allow to skip funtional tests. Default value is false.
 `skipUnitTests` - allow to skip unit tests. Default value is false.

extra/modules/pb-ortb2-blocking/README.md

@@ -12,7 +12,7 @@ This module allows Prebid Server host companies to better support adapters that
 
 # Maintainer contacts
 
-Any suggestions or questions can be directed to [header-bidding@rubiconproject.com](header-bidding@rubiconproject.com)
+Any suggestions or questions can be directed to [header-bidding@magnite.com](header-bidding@magnite.com)
 e-mail.
 
 Or just open new [issue](https://github.com/prebid/prebid-server-java/issues/new)

extra/pom.xml

@@ -61,8 +61,6 @@
         <wiremock.version>3.13.2</wiremock.version>
         <wiremock-spring-boot.version>4.2.1</wiremock-spring-boot.version>
         <spock.version>2.4-groovy-5.0</spock.version>
-        <!--TODO: replace with WireMock -->
-        <mockserver.version>5.15.0</mockserver.version>
         <rest-assured-bom.version>6.0.0</rest-assured-bom.version>
 
         <!-- Test properties -->
@@ -271,21 +269,6 @@
                 <artifactId>json-logic-java</artifactId>
                 <version>${json-logic.version}</version>
             </dependency>
-            <dependency>
-                <groupId>org.mock-server</groupId>
-                <artifactId>mockserver-client-java</artifactId>
-                <version>${mockserver.version}</version>
-                <exclusions>
-                    <exclusion>
-                        <groupId>com.google.code.findbugs</groupId>
-                        <artifactId>jsr305</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>commons-logging</groupId>
-                        <artifactId>commons-logging</artifactId>
-                    </exclusion>
-                </exclusions>
-            </dependency>
         </dependencies>
     </dependencyManagement>
 

pom.xml

@@ -316,11 +316,6 @@
             <artifactId>testcontainers</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.testcontainers</groupId>
-            <artifactId>testcontainers-mockserver</artifactId>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>org.testcontainers</groupId>
             <artifactId>testcontainers-mysql</artifactId>
@@ -351,11 +346,6 @@
             <artifactId>postgresql</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.mock-server</groupId>
-            <artifactId>mockserver-client-java</artifactId>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>org.influxdb</groupId>
             <artifactId>influxdb-java</artifactId>
@@ -627,7 +617,6 @@
                 <artifactId>maven-failsafe-plugin</artifactId>
                 <configuration>
                     <systemPropertyVariables>
-                        <mockserver.version>${mockserver.version}</mockserver.version>
                         <pbs.version>${project.version}</pbs.version>
                         <tests.max-container-count>5</tests.max-container-count>
                         <tests.fixed-container-ports>false</tests.fixed-container-ports>

sample/configs/prebid-config-db.yaml

@@ -8,7 +8,7 @@ adapters:
     enabled: true
   pubmatic:
     enabled: true
-  rubicon:
+  magnite:
     enabled: true
 metrics:
   prefix: prebid

sample/configs/prebid-config-s3.yaml

@@ -13,7 +13,7 @@ adapters:
     enabled: true
   pubmatic:
     enabled: true
-  rubicon:
+  magnite:
     enabled: true
 metrics:
   prefix: prebid

sample/configs/prebid-config-with-51d-dd.yaml

@@ -8,7 +8,7 @@ adapters:
     enabled: true
   pubmatic:
     enabled: true
-  rubicon:
+  magnite:
     enabled: true
 metrics:
   prefix: prebid

sample/configs/prebid-config-with-module.yaml

@@ -8,7 +8,7 @@ adapters:
     enabled: true
   pubmatic:
     enabled: true
-  rubicon:
+  magnite:
     enabled: true
 metrics:
   prefix: prebid

sample/configs/prebid-config-with-optable.yaml

@@ -8,7 +8,7 @@ adapters:
     enabled: true
   pubmatic:
     enabled: true
-  rubicon:
+  magnite:
     enabled: true
   improvedigital:
     enabled: true

sample/configs/prebid-config-with-wurfl.yaml

@@ -8,7 +8,7 @@ adapters:
     enabled: true
   pubmatic:
     enabled: true
-  rubicon:
+  magnite:
     enabled: true
 metrics:
   prefix: prebid

sample/configs/prebid-config.yaml

@@ -8,7 +8,7 @@ adapters:
     enabled: true
   pubmatic:
     enabled: true
-  rubicon:
+  magnite:
     enabled: true
 metrics:
   prefix: prebid

src/main/java/org/prebid/server/auction/TargetingKeywordsCreator.java

@@ -35,7 +35,7 @@ public class TargetingKeywordsCreator {
      */
     private static final String ENV_KEY = "_env";
     /**
-     * Name of the Bidder. For example, "appnexus" or "rubicon".
+     * Name of the Bidder. For example, "appnexus" or "magnite".
      */
     private static final String BIDDER_KEY = "_bidder";
     /**