Bump dependencies (#1576)

* Bump dependencies * Groovy works now. Allure-spock was the culprit * Surefire bug workaround and JUnit shenanigans * Added java 17 workflow * Fixed cron expressions, removed java 17 workflow :( * Reverted allure dependency * Port Allure reporter * Second attempt on adding java 17 workflow * Second attempt on adding java 17 workflow * Add header info why Allure reporter was ported * Fix test name macro expansion * Added Java 17 profile with automatic activation
prebid · Dec 3, 2021 · bb7c3d6 · bb7c3d6
1 parent 4fc3622
commit bb7c3d6
Show file tree

Hide file tree

Showing 11 changed files with 335 additions and 35 deletions.
diff --git a/.github/workflows/pr-java-ci.yml b/.github/workflows/pr-java-ci.yml
@@ -17,7 +17,7 @@ jobs:
 
     strategy:
       matrix:
-        java: [ 11 ]
+        java: [ 11, 17 ]
 
     steps:
       - uses: actions/checkout@v2

diff --git a/extra/bundle/pom.xml b/extra/bundle/pom.xml
@@ -21,8 +21,8 @@
         <maven.compiler.target>11</maven.compiler.target>
         <java.version>11</java.version>
 
-        <spring.boot.version>2.1.1.RELEASE</spring.boot.version>
-        <jackson.version>2.10.0</jackson.version>
+        <spring.boot.version>2.5.6</spring.boot.version>
+        <jackson.version>2.13.0</jackson.version>
         <httpclient.version>4.5.13</httpclient.version>
     </properties>
 

diff --git a/extra/modules/pom.xml b/extra/modules/pom.xml
@@ -28,7 +28,7 @@
 
         <prebid-server.version>1.80.0-SNAPSHOT</prebid-server.version>
 
-        <lombok.version>1.18.4</lombok.version>
+        <lombok.version>1.18.22</lombok.version>
 
         <junit-bom.version>5.7.2</junit-bom.version>
         <assertj.version>3.20.2</assertj.version>

diff --git a/pom.xml b/pom.xml
@@ -1,5 +1,6 @@
 <?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 http://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 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
@@ -21,23 +22,23 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <maven.compiler.source>11</maven.compiler.source>
-        <maven.compiler.target>11</maven.compiler.target>
         <java.version>11</java.version>
+        <maven.compiler.source>${java.version}</maven.compiler.source>
+        <maven.compiler.target>${java.version}</maven.compiler.target>
 
         <!-- dependencies versions -->
-        <spring.boot.version>2.1.1.RELEASE</spring.boot.version>
+        <spring.boot.version>2.5.6</spring.boot.version>
         <javax.annotation-api.version>1.3.1</javax.annotation-api.version>
         <validation-api.version>2.0.1.Final</validation-api.version>
         <hibernate-validator.version>6.1.5.Final</hibernate-validator.version>
-        <vertx.version>3.8.3</vertx.version>
-        <lombok.version>1.18.4</lombok.version>
+        <vertx.version>3.9.10</vertx.version>
+        <lombok.version>1.18.22</lombok.version>
         <commons.version>3.6</commons.version>
         <commons.collections.version>4.1</commons.collections.version>
         <commons.compress.version>1.21</commons.compress.version>
         <httpclient.version>4.5.13</httpclient.version>
         <ipaddress.version>5.3.1</ipaddress.version>
-        <jackson.version>2.12.5</jackson.version>
+        <jackson.version>2.13.0</jackson.version>
         <json.schema.validator.version>0.1.7</json.schema.validator.version>
         <jsonpatch.version>1.13</jsonpatch.version>
         <mysql.version>8.0.16</mysql.version>
@@ -53,33 +54,34 @@
 
         <!-- test dependencies versions -->
         <junit.version>4.13.2</junit.version>
+        <junit-jupiter.version>5.8.1</junit-jupiter.version>
         <mockito.version>4.0.0</mockito.version>
+        <mockito-junit-jupiter.version>4.0.0</mockito-junit-jupiter.version>
         <assertj.version>3.21.0</assertj.version>
-        <wiremock.version>2.27.2</wiremock.version>
+        <wiremock.version>2.31.0</wiremock.version>
         <awaitility.version>4.1.0</awaitility.version>
         <jetty.version>9.4.43.v20210629</jetty.version>
-        <restassured.version>3.0.7</restassured.version>
+        <restassured.version>4.4.0</restassured.version>
         <h2.version>1.4.200</h2.version>
-        <spock.version>1.3-groovy-2.5</spock.version>
-        <testcontainers.version>1.15.3</testcontainers.version>
+        <spock.version>2.0-groovy-3.0</spock.version>
+        <testcontainers.version>1.16.2</testcontainers.version>
         <mockserver-client.version>5.11.2</mockserver-client.version>
-        <allure.version>2.14.0</allure.version>
+        <allure.version>2.16.1</allure.version>
         <aspectj.version>1.9.7</aspectj.version>
-        <restassured.version>3.3.0</restassured.version>
         <h2.version>1.4.200</h2.version>
         <bytebuddy.version>1.11.19</bytebuddy.version>
 
         <!-- plugin versions -->
         <checkstyle-plugin.version>3.1.0</checkstyle-plugin.version>
         <checkstyle.version>8.29</checkstyle.version>
         <download-plugin.version>1.2.0</download-plugin.version>
-        <jacoco-plugin.version>0.8.2</jacoco-plugin.version>
+        <jacoco-plugin.version>0.8.7</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.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>
+        <gmavenplus-plugin.version>1.13.0</gmavenplus-plugin.version>
         <allure-maven.version>2.10.0</allure-maven.version>
         <skipFunctionalTests>false</skipFunctionalTests>
         <skipUnitTests>false</skipUnitTests>
@@ -324,12 +326,24 @@
             <version>${junit.version}</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.junit.vintage</groupId>
+            <artifactId>junit-vintage-engine</artifactId>
+            <version>${junit-jupiter.version}</version>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-core</artifactId>
             <version>${mockito.version}</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-junit-jupiter</artifactId>
+            <version>${mockito-junit-jupiter.version}</version>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>org.assertj</groupId>
             <artifactId>assertj-core</artifactId>
@@ -467,12 +481,6 @@
             <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>
@@ -493,8 +501,9 @@
         </dependency>
         <dependency>
             <groupId>io.qameta.allure</groupId>
-            <artifactId>allure-spock</artifactId>
+            <artifactId>allure-java-commons</artifactId>
             <version>${allure.version}</version>
+            <scope>test</scope>
         </dependency>
     </dependencies>
 
@@ -512,6 +521,9 @@
                     <artifactId>maven-surefire-plugin</artifactId>
                     <version>${maven-surefire-plugin.version}</version>
                     <configuration>
+                        <systemPropertyVariables>
+                            <launchContainers>false</launchContainers>
+                        </systemPropertyVariables>
                         <skipTests>${skipUnitTests}</skipTests>
                     </configuration>
                 </plugin>
@@ -520,6 +532,9 @@
                     <artifactId>maven-failsafe-plugin</artifactId>
                     <version>${maven-failsafe-plugin.version}</version>
                     <configuration>
+                        <systemPropertyVariables>
+                            <launchContainers>true</launchContainers>
+                        </systemPropertyVariables>
                         <skipITs>${skipFunctionalTests}</skipITs>
                     </configuration>
                 </plugin>
@@ -768,4 +783,18 @@
             </plugin>
         </plugins>
     </reporting>
+
+    <profiles>
+        <profile>
+            <id>Java 17</id>
+            <activation>
+                <jdk>[17,)</jdk>
+            </activation>
+            <properties>
+                <java.version>17</java.version>
+                <maven.compiler.source>${java.version}</maven.compiler.source>
+                <maven.compiler.target>${java.version}</maven.compiler.target>
+            </properties>
+        </profile>
+    </profiles>
 </project>
diff --git a/src/test/groovy/org/prebid/server/functional/testcontainers/Dependencies.groovy b/src/test/groovy/org/prebid/server/functional/testcontainers/Dependencies.groovy
@@ -8,6 +8,8 @@ import org.testcontainers.lifecycle.Startables
 
 class Dependencies {
 
+    private static final Boolean IS_LAUNCH_CONTAINERS = Boolean.valueOf(System.getProperty("launchContainers"))
+
     static final ObjectMapperWrapper objectMapperWrapper = new ObjectMapperWrapper()
 
     static final Network network = Network.newNetwork()
@@ -23,13 +25,17 @@ class Dependencies {
             .withNetwork(network)
 
     static void start() {
-        Startables.deepStart([networkServiceContainer, mysqlContainer])
-                  .join()
+        if (IS_LAUNCH_CONTAINERS) {
+            Startables.deepStart([networkServiceContainer, mysqlContainer])
+                      .join()
+        }
     }
 
     static void stop() {
-        [networkServiceContainer, mysqlContainer].parallelStream()
-                                                 .forEach({ it.stop() })
+        if (IS_LAUNCH_CONTAINERS) {
+            [networkServiceContainer, mysqlContainer].parallelStream()
+                                                     .forEach({ it.stop() })
+        }
     }
 
     private Dependencies() {} // should not be instantiated

diff --git a/...oovy/org/prebid/server/functional/testcontainers/container/NetworkServiceContainer.groovy b/...oovy/org/prebid/server/functional/testcontainers/container/NetworkServiceContainer.groovy
@@ -2,11 +2,12 @@ package org.prebid.server.functional.testcontainers.container
 
 import org.testcontainers.containers.MockServerContainer
 import org.testcontainers.containers.Network
+import org.testcontainers.utility.DockerImageName
 
 class NetworkServiceContainer extends MockServerContainer {
 
     NetworkServiceContainer(String version) {
-        super(version)
+        super(DockerImageName.parse("mockserver/mockserver:mockserver-$version"))
     }
 
     String getHostAndPort() {

diff --git a/src/test/groovy/org/prebid/server/functional/tests/AuctionSpec.groovy b/src/test/groovy/org/prebid/server/functional/tests/AuctionSpec.groovy
@@ -60,7 +60,7 @@ class AuctionSpec extends BaseSpec {
     }
 
     @Unroll
-    def "PBS should prefer timeout from the auction request when stored request timeout is #tmax"() {
+    def "PBS should prefer timeout from the auction request"() {
         given: "Default basic BidRequest with generic bidder"
         def timeout = getRandomTimeout()
         def bidRequest = BidRequest.defaultBidRequest.tap {