Skip to content

Commit

Permalink
Modules: Synchronise dependencies (#2929)
Browse files Browse the repository at this point in the history
  • Loading branch information
@osulzhenko
osulzhenko authored Jan 31, 2024
1 parent f0489f6 commit 5348d88
Show file tree
Hide file tree
Showing 7 changed files with 54 additions and 95 deletions.
56 changes: 5 additions & 51 deletions extra/bundle/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.prebid</groupId>
<artifactId>prebid-server-aggregator</artifactId>
<version>2.9.0-SNAPSHOT</version>
<version>${revision}</version>
<relativePath>../../extra/pom.xml</relativePath>
</parent>

Expand All @@ -21,74 +21,28 @@
<maven.compiler.source>${java.version}</maven.compiler.source>
<maven.compiler.target>${java.version}</maven.compiler.target>
<spring.boot.version>2.5.6</spring.boot.version>
<jackson.version>2.14.0-rc1</jackson.version>
<httpclient.version>4.5.13</httpclient.version>
</properties>

<dependencyManagement>
<dependencies>
<!-- Override Spring dependencies -->
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
<version>${jackson.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>${jackson.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
<version>${jackson.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.dataformat</groupId>
<artifactId>jackson-dataformat-yaml</artifactId>
<version>${jackson.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.module</groupId>
<artifactId>jackson-module-afterburner</artifactId>
<version>${jackson.version}</version>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
<version>${httpclient.version}</version>
</dependency>
<!-- Spring dependencies -->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-dependencies</artifactId>
<version>${spring.boot.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>

<dependencies>
<dependency>
<groupId>org.prebid</groupId>
<artifactId>prebid-server</artifactId>
<version>2.9.0-SNAPSHOT</version>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.prebid.server.hooks.modules</groupId>
<artifactId>confiant-ad-quality</artifactId>
<version>2.9.0-SNAPSHOT</version>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.prebid.server.hooks.modules</groupId>
<artifactId>ortb2-blocking</artifactId>
<version>2.9.0-SNAPSHOT</version>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.prebid.server.hooks.modules</groupId>
<artifactId>pb-richmedia-filter</artifactId>
<version>2.9.0-SNAPSHOT</version>
<version>${project.version}</version>
</dependency>
</dependencies>

Expand Down
2 changes: 1 addition & 1 deletion extra/modules/confiant-ad-quality/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.prebid.server.hooks.modules</groupId>
<artifactId>all-modules</artifactId>
<version>2.9.0-SNAPSHOT</version>
<version>${revision}</version>
</parent>

<artifactId>confiant-ad-quality</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion extra/modules/ortb2-blocking/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.prebid.server.hooks.modules</groupId>
<artifactId>all-modules</artifactId>
<version>2.9.0-SNAPSHOT</version>
<version>${revision}</version>
</parent>

<artifactId>ortb2-blocking</artifactId>
Expand Down
3 changes: 2 additions & 1 deletion extra/modules/pb-richmedia-filter/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -1,10 +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 http://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>2.9.0-SNAPSHOT</version>
<version>${revision}</version>
</parent>

<artifactId>pb-richmedia-filter</artifactId>
Expand Down
13 changes: 2 additions & 11 deletions extra/modules/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.prebid</groupId>
<artifactId>prebid-server-aggregator</artifactId>
<version>2.9.0-SNAPSHOT</version>
<version>${revision}</version>
<relativePath>../../extra/pom.xml</relativePath>
</parent>

Expand All @@ -29,10 +29,6 @@
<maven.compiler.source>${java.version}</maven.compiler.source>
<maven.compiler.target>${java.version}</maven.compiler.target>

<prebid-server.version>2.9.0-SNAPSHOT</prebid-server.version>

<lombok.version>1.18.22</lombok.version>

<junit-bom.version>5.9.0</junit-bom.version>
<assertj.version>3.23.1</assertj.version>
<junit.version>4.13.2</junit.version>
Expand All @@ -47,7 +43,7 @@
<dependency>
<groupId>org.prebid</groupId>
<artifactId>prebid-server</artifactId>
<version>${prebid-server.version}</version>
<version>${revision}</version>
</dependency>
<dependency>
<groupId>org.projectlombok</groupId>
Expand Down Expand Up @@ -84,11 +80,6 @@
<groupId>org.prebid</groupId>
<artifactId>prebid-server</artifactId>
</dependency>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.junit.vintage</groupId>
<artifactId>junit-vintage-engine</artifactId>
Expand Down
14 changes: 13 additions & 1 deletion extra/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

<groupId>org.prebid</groupId>
<artifactId>prebid-server-aggregator</artifactId>
<version>2.9.0-SNAPSHOT</version>
<version>${revision}</version>
<packaging>pom</packaging>

<scm>
Expand All @@ -15,10 +15,13 @@
</scm>

<properties>
<revision>2.9.0-SNAPSHOT</revision>

<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<maven.compiler.source>17</maven.compiler.source>
<maven.compiler.target>17</maven.compiler.target>
<lombok.version>1.18.24</lombok.version>
<maven-release-plugin.version>3.0.0-M6</maven-release-plugin.version>
</properties>

Expand All @@ -28,6 +31,15 @@
<module>bundle</module>
</modules>

<dependencies>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>${lombok.version}</version>
<scope>provided</scope>
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
Expand Down
59 changes: 30 additions & 29 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.prebid</groupId>
<artifactId>prebid-server-aggregator</artifactId>
<version>2.9.0-SNAPSHOT</version>
<version>${revision}</version>
<relativePath>extra/pom.xml</relativePath>
</parent>

Expand All @@ -28,39 +28,32 @@

<!-- dependencies versions -->
<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.9.10</vertx.version>
<netty.version>4.1.69.Final</netty.version>
<lombok.version>1.18.24</lombok.version>
<commons.version>3.12.0</commons.version>
<commons.collections.version>4.4</commons.collections.version>
<commons.compress.version>1.21</commons.compress.version>
<commons-math3.version>3.6.1</commons-math3.version>
<httpclient.version>4.5.13</httpclient.version>
<httpclient.version>4.5.14</httpclient.version>
<ipaddress.version>5.3.1</ipaddress.version>
<oshi.version>6.4.5</oshi.version>
<jackson.version>2.14.1</jackson.version>
<json-schema-validator.version>1.0.76</json-schema-validator.version>
<jsonpatch.version>1.13</jsonpatch.version>
<mysql.version>8.0.28</mysql.version>
<postgresql.version>42.4.3</postgresql.version>
<caffeine.version>2.6.2</caffeine.version>
<psl.version>2.2.0</psl.version>
<metrics.version>4.0.3</metrics.version>
<metrics-influxdb.version>1.2.2</metrics-influxdb.version>
<consent-string-sdk.version>2.0.2</consent-string-sdk.version>
<iabtcf.version>2.0.7</iabtcf.version>
<metrics-prometheus.version>0.12.0</metrics-prometheus.version>
<maxmind-client.version>2.12.0</maxmind-client.version>
<logback.version>1.2.13</logback.version>
<log4j.version>2.19.0</log4j.version>
<hikari.version>5.0.1</hikari.version>
<gpp-encoder.version>3.0.10</gpp-encoder.version>
<protobuf.version>3.21.7</protobuf.version>
<protoc.version>3.17.3</protoc.version>
<json-logic.version>1.0.7</json-logic.version>
<slf4j.version>1.7.32</slf4j.version>

<!-- test dependencies versions -->
<junit.version>4.13.2</junit.version>
Expand Down Expand Up @@ -109,24 +102,43 @@
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
</dependency>
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpcore</artifactId>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>com.rabbitmq</groupId>
<artifactId>amqp-client</artifactId>
</dependency>
<dependency>
<groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging</artifactId>
</dependency>
</dependencies>
</dependencyManagement>

<dependencies>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter</artifactId>
<version>${spring.boot.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-aop</artifactId>
<version>${spring.boot.version}</version>
</dependency>
<dependency>
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
<version>${javax.annotation-api.version}</version>
</dependency>
<dependency>
<groupId>javax.validation</groupId>
Expand All @@ -136,7 +148,6 @@
<dependency>
<groupId>org.hibernate.validator</groupId>
<artifactId>hibernate-validator</artifactId>
<version>${hibernate-validator.version}</version>
</dependency>
<dependency>
<groupId>io.vertx</groupId>
Expand Down Expand Up @@ -177,13 +188,6 @@
<groupId>io.netty</groupId>
<artifactId>netty-transport-native-epoll</artifactId>
<classifier>linux-x86_64</classifier>
<version>${netty.version}</version>
</dependency>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>${lombok.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
Expand Down Expand Up @@ -280,7 +284,6 @@
<dependency>
<groupId>com.github.ben-manes.caffeine</groupId>
<artifactId>caffeine</artifactId>
<version>${caffeine.version}</version>
</dependency>
<dependency>
<groupId>de.malkusch.whois-server-list</groupId>
Expand All @@ -296,17 +299,14 @@
<dependency>
<groupId>io.dropwizard.metrics</groupId>
<artifactId>metrics-core</artifactId>
<version>${metrics.version}</version>
</dependency>
<dependency>
<groupId>io.dropwizard.metrics</groupId>
<artifactId>metrics-jvm</artifactId>
<version>${metrics.version}</version>
</dependency>
<dependency>
<groupId>io.dropwizard.metrics</groupId>
<artifactId>metrics-graphite</artifactId>
<version>${metrics.version}</version>
</dependency>
<dependency>
<groupId>com.izettle</groupId>
Expand Down Expand Up @@ -336,12 +336,10 @@
<dependency>
<groupId>io.prometheus</groupId>
<artifactId>simpleclient_vertx</artifactId>
<version>${metrics-prometheus.version}</version>
</dependency>
<dependency>
<groupId>io.prometheus</groupId>
<artifactId>simpleclient_dropwizard</artifactId>
<version>${metrics-prometheus.version}</version>
</dependency>
<dependency>
<groupId>com.maxmind.geoip2</groupId>
Expand All @@ -359,15 +357,18 @@
<artifactId>logback-core</artifactId>
<version>${logback.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>${slf4j.version}</version>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-to-slf4j</artifactId>
<version>${log4j.version}</version>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-api</artifactId>
<version>${log4j.version}</version>
</dependency>
<dependency>
<groupId>com.zaxxer</groupId>
Expand Down

0 comments on commit 5348d88

Please sign in to comment.