Merge remote-tracking branch 'origin/master' into fix/startup-warning

# Conflicts: # src/test/java/org/prebid/server/bidder/vrtcal/VrtcalBidderTest.java
prebid · Oct 26, 2021 · 9e18f52 · 9e18f52
2 parents 6d13c50 + 09fd67f
commit 9e18f52
Show file tree

Hide file tree

Showing 210 changed files with 6,716 additions and 90 deletions.
diff --git a/.github/workflows/pr-functional-tests.yml b/.github/workflows/pr-functional-tests.yml
@@ -0,0 +1,39 @@
+name: Functional tests
+
+on:
+  pull_request:
+    paths-ignore:
+      - 'docs/**'
+      - '.github/**'
+    branches:
+      - master
+  release:
+    types:
+      - created
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        java: [ 11 ]
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Set up JDK
+        uses: actions/setup-java@v1
+        with:
+          java-version: ${{ matrix.java }}
+
+      - name: Cache Maven dependendcies
+        uses: actions/cache@v1
+        with:
+          path: ~/.m2/repository
+          key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
+          restore-keys: |
+            ${{ runner.os }}-maven-
+
+      - name: Build with Maven
+        run: mvn -B verify -DskipUnitTests=true --file extra/pom.xml
diff --git a/.github/workflows/pullrequest.yml → .github/workflows/pr-java-ci.yml b/.github/workflows/pullrequest.yml → .github/workflows/pr-java-ci.yml
@@ -20,7 +20,7 @@ jobs:
         java: [ 11 ]
 
     steps:
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v2
 
       - name: Set up JDK
         uses: actions/setup-java@v1

diff --git a/.gitignore b/.gitignore
@@ -12,3 +12,5 @@
 target/
 
 .DS_Store
+
+.allure/
diff --git a/.maven-dockerinclude b/.maven-dockerinclude
@@ -0,0 +1,2 @@
+target/*.jar
+src/main/docker/*
diff --git a/Dockerfile b/Dockerfile
@@ -0,0 +1,15 @@
+FROM openjdk:11-jdk-slim
+
+WORKDIR /app/prebid-server
+
+VOLUME /app/prebid-server/conf
+VOLUME /app/prebid-server/data
+
+COPY src/main/docker/run.sh ./
+COPY src/main/docker/application.yaml ./
+COPY target/prebid-server.jar ./
+
+EXPOSE 8080
+EXPOSE 8060
+
+ENTRYPOINT [ "/app/prebid-server/run.sh" ]
diff --git a/extra/bundle/pom.xml b/extra/bundle/pom.xml
@@ -4,7 +4,7 @@
 
     <groupId>org.prebid</groupId>
     <artifactId>prebid-server-bundle</artifactId>
-    <version>1.77.0-SNAPSHOT</version>
+    <version>1.78.0-SNAPSHOT</version>
 
     <name>prebid-server-bundle</name>
 
@@ -69,12 +69,12 @@
         <dependency>
             <groupId>org.prebid</groupId>
             <artifactId>prebid-server</artifactId>
-            <version>1.77.0-SNAPSHOT</version>
+            <version>1.78.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.prebid.server.hooks.modules</groupId>
             <artifactId>ortb2-blocking</artifactId>
-            <version>1.77.0-SNAPSHOT</version>
+            <version>1.78.0-SNAPSHOT</version>
         </dependency>
     </dependencies>
 

diff --git a/extra/modules/ortb2-blocking/README.md b/extra/modules/ortb2-blocking/README.md
@@ -1,6 +1,6 @@
 # Overview
 
-Prebid Server doesn't provide the services as SSP normally provides, including account configuration of blocked:
+Prebid Server doesn't provide all services an SSP normally provides, including account configuration of blocked:
 
 - advertiser domains
 - advertiser categories

diff --git a/extra/modules/ortb2-blocking/pom.xml b/extra/modules/ortb2-blocking/pom.xml
@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+<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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
         <groupId>org.prebid.server.hooks.modules</groupId>
         <artifactId>all-modules</artifactId>
-        <version>1.77.0-SNAPSHOT</version>
+        <version>1.78.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>ortb2-blocking</artifactId>

diff --git a/extra/modules/pom.xml b/extra/modules/pom.xml
@@ -4,7 +4,7 @@
 
     <groupId>org.prebid.server.hooks.modules</groupId>
     <artifactId>all-modules</artifactId>
-    <version>1.77.0-SNAPSHOT</version>
+    <version>1.78.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <modules>
@@ -17,7 +17,7 @@
         <maven.compiler.source>11</maven.compiler.source>
         <maven.compiler.target>11</maven.compiler.target>
 
-        <prebid-server.version>1.77.0-SNAPSHOT</prebid-server.version>
+        <prebid-server.version>1.78.0-SNAPSHOT</prebid-server.version>
 
         <lombok.version>1.18.4</lombok.version>
 

diff --git a/extra/pom.xml b/extra/pom.xml
@@ -4,7 +4,7 @@
 
     <groupId>org.prebid</groupId>
     <artifactId>prebid-server-aggregator</artifactId>
-    <version>1.77.0-SNAPSHOT</version>
+    <version>1.78.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <scm>

diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
 
     <groupId>org.prebid</groupId>
     <artifactId>prebid-server</artifactId>
-    <version>1.77.0-SNAPSHOT</version>
+    <version>1.78.0-SNAPSHOT</version>
 
     <name>prebid-server</name>
     <description>Prebid Server (Server-side Header Bidding)</description>
@@ -55,6 +55,11 @@
         <jetty.version>9.4.43.v20210629</jetty.version>
         <restassured.version>3.0.6</restassured.version>
         <h2.version>1.4.196</h2.version>
+        <spock.version>1.3-groovy-2.5</spock.version>
+        <testcontainers.version>1.15.3</testcontainers.version>
+        <mockserver-client.version>5.11.2</mockserver-client.version>
+        <allure.version>2.14.0</allure.version>
+        <aspectj.version>1.9.7</aspectj.version>
 
         <!-- plugin versions -->
         <checkstyle-plugin.version>3.1.0</checkstyle-plugin.version>
@@ -63,7 +68,13 @@
         <jacoco-plugin.version>0.8.2</jacoco-plugin.version>
         <git-commmit-plugin.version>2.2.4</git-commmit-plugin.version>
         <maven-compiler-plugin.version>3.8.0</maven-compiler-plugin.version>
-        <maven-surefire-plugin.version>2.22.1</maven-surefire-plugin.version>
+        <maven-surefire-plugin.version>2.22.2</maven-surefire-plugin.version>
+        <maven-failsafe-plugin.version>${maven-surefire-plugin.version}</maven-failsafe-plugin.version>
+        <docker-maven-plugin.version>0.36.0</docker-maven-plugin.version>
+        <gmavenplus-plugin.version>1.12.1</gmavenplus-plugin.version>
+        <allure-maven.version>2.10.0</allure-maven.version>
+        <skipFunctionalTests>false</skipFunctionalTests>
+        <skipUnitTests>false</skipUnitTests>
     </properties>
 
     <dependencyManagement>
@@ -195,6 +206,18 @@
             <artifactId>jackson-module-blackbird</artifactId>
             <version>${jackson.version}</version>
         </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.datatype</groupId>
+            <artifactId>jackson-datatype-jsr310</artifactId>
+            <version>${jackson.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.dataformat</groupId>
+            <artifactId>jackson-dataformat-xml</artifactId>
+            <version>${jackson.version}</version>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>com.networknt</groupId>
             <artifactId>json-schema-validator</artifactId>
@@ -400,6 +423,17 @@
             <version>${restassured.version}</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.spockframework</groupId>
+            <artifactId>spock-core</artifactId>
+            <version>${spock.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.hibernate</groupId>
+            <artifactId>hibernate-core</artifactId>
+            <scope>test</scope>
+        </dependency>
         <!-- for Mockito to be able to mock Vert.x-specific classes -->
         <dependency>
             <groupId>io.vertx</groupId>
@@ -413,6 +447,41 @@
             <version>${h2.version}</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.testcontainers</groupId>
+            <artifactId>testcontainers</artifactId>
+            <version>${testcontainers.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.testcontainers</groupId>
+            <artifactId>spock</artifactId>
+            <version>${testcontainers.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.testcontainers</groupId>
+            <artifactId>mockserver</artifactId>
+            <version>${testcontainers.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.testcontainers</groupId>
+            <artifactId>mysql</artifactId>
+            <version>${testcontainers.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.mock-server</groupId>
+            <artifactId>mockserver-client-java</artifactId>
+            <version>${mockserver-client.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.qameta.allure</groupId>
+            <artifactId>allure-spock</artifactId>
+            <version>${allure.version}</version>
+        </dependency>
     </dependencies>
 
     <build>
@@ -428,6 +497,17 @@
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-surefire-plugin</artifactId>
                     <version>${maven-surefire-plugin.version}</version>
+                    <configuration>
+                        <skipTests>${skipUnitTests}</skipTests>
+                    </configuration>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-failsafe-plugin</artifactId>
+                    <version>${maven-failsafe-plugin.version}</version>
+                    <configuration>
+                        <skipITs>${skipFunctionalTests}</skipITs>
+                    </configuration>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
@@ -451,6 +531,11 @@
                         </dependency>
                     </dependencies>
                 </plugin>
+                <plugin>
+                    <groupId>org.codehaus.gmavenplus</groupId>
+                    <artifactId>gmavenplus-plugin</artifactId>
+                    <version>${gmavenplus-plugin.version}</version>
+                </plugin>
             </plugins>
         </pluginManagement>
 
@@ -576,8 +661,72 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>io.fabric8</groupId>
+                <artifactId>docker-maven-plugin</artifactId>
+                <version>${docker-maven-plugin.version}</version>
+                <executions>
+                    <execution>
+                        <id>build-containers</id>
+                        <phase>pre-integration-test</phase>
+                        <goals>
+                            <goal>build</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.codehaus.gmavenplus</groupId>
+                <artifactId>gmavenplus-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>compileTests</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-failsafe-plugin</artifactId>
+                <configuration>
+                    <argLine>
+                        -javaagent:"${settings.localRepository}/org/aspectj/aspectjweaver/${aspectj.version}/aspectjweaver-${aspectj.version}.jar"
+                    </argLine>
+                    <systemPropertyVariables>
+                        <allure.results.directory>target/allure-results</allure.results.directory>
+                        <mockserver.version>${mockserver-client.version}</mockserver.version>
+                    </systemPropertyVariables>
+                </configuration>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>integration-test</goal>
+                            <goal>verify</goal>
+                        </goals>
+                        <configuration>
+                            <includes>
+                                <include>**/*Spec.java</include>
+                            </includes>
+                        </configuration>
+                    </execution>
+                </executions>
+                <dependencies>
+                    <dependency>
+                        <groupId>org.aspectj</groupId>
+                        <artifactId>aspectjweaver</artifactId>
+                        <version>${aspectj.version}</version>
+                    </dependency>
+                </dependencies>
+            </plugin>
+            <plugin>
+                <groupId>io.qameta.allure</groupId>
+                <artifactId>allure-maven</artifactId>
+                <version>${allure-maven.version}</version>
+            </plugin>
         </plugins>
     </build>
+
     <reporting>
         <plugins>
             <plugin>

diff --git a/src/main/docker/application.yaml b/src/main/docker/application.yaml
@@ -0,0 +1,4 @@
+gdpr:
+  vendorlist:
+    v2:
+      cache-dir: /app/prebid-server/data/vendorlist-v2
diff --git a/src/main/docker/run.sh b/src/main/docker/run.sh
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+exec java \
+  -Dvertx.cacheDirBase=/app/prebid-server/data/.vertx \
+  -Dspring.config.additional-location=/app/prebid-server/,/app/prebid-server/conf/ \
+  ${JAVA_OPTS} \
+  -jar \
+  /app/prebid-server/prebid-server.jar