From 5f134d53eb7c02c1e4f000b0bb1f0bc962ce44ce Mon Sep 17 00:00:00 2001 From: osulzhenko Date: Thu, 27 Feb 2025 11:03:37 +0200 Subject: [PATCH 01/22] Dependencies: resolve maven conflicts between core and bundle --- extra/modules/greenbids-real-time-data/pom.xml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/extra/modules/greenbids-real-time-data/pom.xml b/extra/modules/greenbids-real-time-data/pom.xml index 7e8c9f8e095..06a2a8da11e 100644 --- a/extra/modules/greenbids-real-time-data/pom.xml +++ b/extra/modules/greenbids-real-time-data/pom.xml @@ -29,6 +29,12 @@ com.google.cloud google-cloud-storage 2.41.0 + + + failureaccess + com.google.guava + + From a5beede3a77730ecc520155c31e35b8d6f71251d Mon Sep 17 00:00:00 2001 From: osulzhenko Date: Tue, 4 Mar 2025 11:25:05 +0200 Subject: [PATCH 02/22] update after review --- extra/modules/greenbids-real-time-data/pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/extra/modules/greenbids-real-time-data/pom.xml b/extra/modules/greenbids-real-time-data/pom.xml index 06a2a8da11e..c67c84ed9f7 100644 --- a/extra/modules/greenbids-real-time-data/pom.xml +++ b/extra/modules/greenbids-real-time-data/pom.xml @@ -22,17 +22,17 @@ com.microsoft.onnxruntime onnxruntime - 1.16.1 + 1.20.0 com.google.cloud google-cloud-storage - 2.41.0 + 2.48.0 - failureaccess com.google.guava + failureaccess From ad5b98e16bcda801c693acf2b6571986325fc373 Mon Sep 17 00:00:00 2001 From: osulzhenko Date: Tue, 4 Mar 2025 12:01:47 +0200 Subject: [PATCH 03/22] update dependency --- extra/modules/greenbids-real-time-data/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extra/modules/greenbids-real-time-data/pom.xml b/extra/modules/greenbids-real-time-data/pom.xml index c67c84ed9f7..e23e7d95dbb 100644 --- a/extra/modules/greenbids-real-time-data/pom.xml +++ b/extra/modules/greenbids-real-time-data/pom.xml @@ -22,7 +22,7 @@ com.microsoft.onnxruntime onnxruntime - 1.20.0 + 1.16.1 From f46cb04d9268820a686e6361e5f28be3342ce1e7 Mon Sep 17 00:00:00 2001 From: osulzhenko Date: Tue, 4 Mar 2025 12:03:54 +0200 Subject: [PATCH 04/22] update dependency --- extra/modules/greenbids-real-time-data/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/extra/modules/greenbids-real-time-data/pom.xml b/extra/modules/greenbids-real-time-data/pom.xml index e23e7d95dbb..94b9dc093bf 100644 --- a/extra/modules/greenbids-real-time-data/pom.xml +++ b/extra/modules/greenbids-real-time-data/pom.xml @@ -22,13 +22,13 @@ com.microsoft.onnxruntime onnxruntime - 1.16.1 + 1.20.0 com.google.cloud google-cloud-storage - 2.48.0 + 2.41.0 com.google.guava From 75be25a9b7aa438e19ae3abc9a160d03d11006ae Mon Sep 17 00:00:00 2001 From: osulzhenko Date: Tue, 4 Mar 2025 12:05:40 +0200 Subject: [PATCH 05/22] update dependency --- extra/modules/greenbids-real-time-data/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extra/modules/greenbids-real-time-data/pom.xml b/extra/modules/greenbids-real-time-data/pom.xml index 94b9dc093bf..8b7920ccd77 100644 --- a/extra/modules/greenbids-real-time-data/pom.xml +++ b/extra/modules/greenbids-real-time-data/pom.xml @@ -22,7 +22,7 @@ com.microsoft.onnxruntime onnxruntime - 1.20.0 + 1.16.1 From 7fc5818d674b66a31b1de066d6bd6ec6ba577ab5 Mon Sep 17 00:00:00 2001 From: osulzhenko Date: Tue, 4 Mar 2025 12:10:06 +0200 Subject: [PATCH 06/22] update dependency --- extra/modules/greenbids-real-time-data/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/extra/modules/greenbids-real-time-data/pom.xml b/extra/modules/greenbids-real-time-data/pom.xml index 8b7920ccd77..c67c84ed9f7 100644 --- a/extra/modules/greenbids-real-time-data/pom.xml +++ b/extra/modules/greenbids-real-time-data/pom.xml @@ -22,13 +22,13 @@ com.microsoft.onnxruntime onnxruntime - 1.16.1 + 1.20.0 com.google.cloud google-cloud-storage - 2.41.0 + 2.48.0 com.google.guava From a2fb8710fb6904ecb151e5ca79178c90706585c9 Mon Sep 17 00:00:00 2001 From: osulzhenko Date: Tue, 4 Mar 2025 15:44:23 +0200 Subject: [PATCH 07/22] update dependency --- .github/workflows/pr-java-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pr-java-ci.yml b/.github/workflows/pr-java-ci.yml index ee5780984e5..35d498ba687 100644 --- a/.github/workflows/pr-java-ci.yml +++ b/.github/workflows/pr-java-ci.yml @@ -31,4 +31,4 @@ jobs: java-version: ${{ matrix.java }} - name: Build with Maven - run: mvn -B package --file extra/pom.xml + run: mvn clean -B package --file extra/pom.xml From b1aaecc9f751b8664cd2e74b64589921ebbcd41b Mon Sep 17 00:00:00 2001 From: osulzhenko Date: Tue, 4 Mar 2025 15:46:07 +0200 Subject: [PATCH 08/22] update dependency --- .github/workflows/pr-java-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pr-java-ci.yml b/.github/workflows/pr-java-ci.yml index 35d498ba687..ee5780984e5 100644 --- a/.github/workflows/pr-java-ci.yml +++ b/.github/workflows/pr-java-ci.yml @@ -31,4 +31,4 @@ jobs: java-version: ${{ matrix.java }} - name: Build with Maven - run: mvn clean -B package --file extra/pom.xml + run: mvn -B package --file extra/pom.xml From 889cba138607fe2a8c4497aec477ec84a29fda1c Mon Sep 17 00:00:00 2001 From: osulzhenko Date: Tue, 4 Mar 2025 16:08:37 +0200 Subject: [PATCH 09/22] update dependency --- .github/workflows/pr-java-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pr-java-ci.yml b/.github/workflows/pr-java-ci.yml index ee5780984e5..a0ecdd6892f 100644 --- a/.github/workflows/pr-java-ci.yml +++ b/.github/workflows/pr-java-ci.yml @@ -23,7 +23,7 @@ jobs: - uses: actions/checkout@v4 - name: Set up JDK - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: distribution: 'temurin' cache: 'maven' From 86b2f928f4ed7c58bdbf14e5a1bfcbc324170b6e Mon Sep 17 00:00:00 2001 From: osulzhenko Date: Tue, 4 Mar 2025 16:17:05 +0200 Subject: [PATCH 10/22] update dependency --- extra/modules/greenbids-real-time-data/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/extra/modules/greenbids-real-time-data/pom.xml b/extra/modules/greenbids-real-time-data/pom.xml index c67c84ed9f7..8b7920ccd77 100644 --- a/extra/modules/greenbids-real-time-data/pom.xml +++ b/extra/modules/greenbids-real-time-data/pom.xml @@ -22,13 +22,13 @@ com.microsoft.onnxruntime onnxruntime - 1.20.0 + 1.16.1 com.google.cloud google-cloud-storage - 2.48.0 + 2.41.0 com.google.guava From f3a843c379b9f00ecb7cff2efb0e03759b73ffb2 Mon Sep 17 00:00:00 2001 From: osulzhenko Date: Tue, 4 Mar 2025 16:19:05 +0200 Subject: [PATCH 11/22] update dependency --- extra/modules/greenbids-real-time-data/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extra/modules/greenbids-real-time-data/pom.xml b/extra/modules/greenbids-real-time-data/pom.xml index 8b7920ccd77..06a2a8da11e 100644 --- a/extra/modules/greenbids-real-time-data/pom.xml +++ b/extra/modules/greenbids-real-time-data/pom.xml @@ -31,8 +31,8 @@ 2.41.0 - com.google.guava failureaccess + com.google.guava From b791ae58a76b3f59a645d92459dddff5de2883b2 Mon Sep 17 00:00:00 2001 From: osulzhenko Date: Tue, 4 Mar 2025 17:01:10 +0200 Subject: [PATCH 12/22] update dependency --- extra/modules/greenbids-real-time-data/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/extra/modules/greenbids-real-time-data/pom.xml b/extra/modules/greenbids-real-time-data/pom.xml index 06a2a8da11e..4b338fd0472 100644 --- a/extra/modules/greenbids-real-time-data/pom.xml +++ b/extra/modules/greenbids-real-time-data/pom.xml @@ -22,13 +22,13 @@ com.microsoft.onnxruntime onnxruntime - 1.16.1 + 1.20.0 com.google.cloud google-cloud-storage - 2.41.0 + 2.48.0 failureaccess From 2aa8c68f55f09781cd7915171e10ce3b8524f2c1 Mon Sep 17 00:00:00 2001 From: osulzhenko Date: Tue, 4 Mar 2025 17:04:45 +0200 Subject: [PATCH 13/22] update dependency --- .github/workflows/pr-java-ci.yml | 1 - extra/modules/greenbids-real-time-data/pom.xml | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/pr-java-ci.yml b/.github/workflows/pr-java-ci.yml index a0ecdd6892f..244bdcdea67 100644 --- a/.github/workflows/pr-java-ci.yml +++ b/.github/workflows/pr-java-ci.yml @@ -27,7 +27,6 @@ jobs: with: distribution: 'temurin' cache: 'maven' - cache-dependency-path: extra/pom.xml java-version: ${{ matrix.java }} - name: Build with Maven diff --git a/extra/modules/greenbids-real-time-data/pom.xml b/extra/modules/greenbids-real-time-data/pom.xml index 4b338fd0472..dfd1910acbd 100644 --- a/extra/modules/greenbids-real-time-data/pom.xml +++ b/extra/modules/greenbids-real-time-data/pom.xml @@ -28,7 +28,7 @@ com.google.cloud google-cloud-storage - 2.48.0 + 2.41.0 failureaccess From de18717136524654ab03d94a9b56a3a8a5850398 Mon Sep 17 00:00:00 2001 From: osulzhenko Date: Tue, 4 Mar 2025 17:06:17 +0200 Subject: [PATCH 14/22] update dependency --- extra/modules/greenbids-real-time-data/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extra/modules/greenbids-real-time-data/pom.xml b/extra/modules/greenbids-real-time-data/pom.xml index dfd1910acbd..06a2a8da11e 100644 --- a/extra/modules/greenbids-real-time-data/pom.xml +++ b/extra/modules/greenbids-real-time-data/pom.xml @@ -22,7 +22,7 @@ com.microsoft.onnxruntime onnxruntime - 1.20.0 + 1.16.1 From 6f818bf7f66e17690d4803aeb0264a8a602b0f90 Mon Sep 17 00:00:00 2001 From: osulzhenko Date: Tue, 4 Mar 2025 17:14:13 +0200 Subject: [PATCH 15/22] update dependency --- extra/modules/greenbids-real-time-data/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extra/modules/greenbids-real-time-data/pom.xml b/extra/modules/greenbids-real-time-data/pom.xml index 06a2a8da11e..fb38b8010fb 100644 --- a/extra/modules/greenbids-real-time-data/pom.xml +++ b/extra/modules/greenbids-real-time-data/pom.xml @@ -28,7 +28,7 @@ com.google.cloud google-cloud-storage - 2.41.0 + 2.48.0 failureaccess From 403124da238fae48a3e5d04701e3948e31518323 Mon Sep 17 00:00:00 2001 From: osulzhenko Date: Tue, 4 Mar 2025 17:16:58 +0200 Subject: [PATCH 16/22] update dependency --- extra/modules/greenbids-real-time-data/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/extra/modules/greenbids-real-time-data/pom.xml b/extra/modules/greenbids-real-time-data/pom.xml index fb38b8010fb..8b7920ccd77 100644 --- a/extra/modules/greenbids-real-time-data/pom.xml +++ b/extra/modules/greenbids-real-time-data/pom.xml @@ -28,11 +28,11 @@ com.google.cloud google-cloud-storage - 2.48.0 + 2.41.0 - failureaccess com.google.guava + failureaccess From ef33e1625c582f4fd214741c6f446105f5e8e624 Mon Sep 17 00:00:00 2001 From: osulzhenko Date: Tue, 4 Mar 2025 17:30:03 +0200 Subject: [PATCH 17/22] update dependency --- .github/workflows/pr-java-ci.yml | 1 + extra/modules/greenbids-real-time-data/pom.xml | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/pr-java-ci.yml b/.github/workflows/pr-java-ci.yml index 244bdcdea67..a0ecdd6892f 100644 --- a/.github/workflows/pr-java-ci.yml +++ b/.github/workflows/pr-java-ci.yml @@ -27,6 +27,7 @@ jobs: with: distribution: 'temurin' cache: 'maven' + cache-dependency-path: extra/pom.xml java-version: ${{ matrix.java }} - name: Build with Maven diff --git a/extra/modules/greenbids-real-time-data/pom.xml b/extra/modules/greenbids-real-time-data/pom.xml index 8b7920ccd77..ae1558a6a0b 100644 --- a/extra/modules/greenbids-real-time-data/pom.xml +++ b/extra/modules/greenbids-real-time-data/pom.xml @@ -22,13 +22,13 @@ com.microsoft.onnxruntime onnxruntime - 1.16.1 + 1.20.0 com.google.cloud google-cloud-storage - 2.41.0 + 2.48.0 com.google.guava From 0808a7b5f950d0f7fef0678ddde9529c6dbc776e Mon Sep 17 00:00:00 2001 From: osulzhenko Date: Tue, 4 Mar 2025 20:54:14 +0200 Subject: [PATCH 18/22] update dependency --- extra/modules/greenbids-real-time-data/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/extra/modules/greenbids-real-time-data/pom.xml b/extra/modules/greenbids-real-time-data/pom.xml index ae1558a6a0b..8b7920ccd77 100644 --- a/extra/modules/greenbids-real-time-data/pom.xml +++ b/extra/modules/greenbids-real-time-data/pom.xml @@ -22,13 +22,13 @@ com.microsoft.onnxruntime onnxruntime - 1.20.0 + 1.16.1 com.google.cloud google-cloud-storage - 2.48.0 + 2.41.0 com.google.guava From d046f4400ccca539cbc497ba298824a06a2f762a Mon Sep 17 00:00:00 2001 From: osulzhenko Date: Tue, 4 Mar 2025 22:19:15 +0200 Subject: [PATCH 19/22] comment video in test proto file --- src/test/proto/test-opernrtb.proto | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/test/proto/test-opernrtb.proto b/src/test/proto/test-opernrtb.proto index 4c57b2031aa..40d12c580ee 100644 --- a/src/test/proto/test-opernrtb.proto +++ b/src/test/proto/test-opernrtb.proto @@ -81,10 +81,10 @@ extend com.iabtechlab.openrtb.v2.NativeRequest.EventTrackers { optional TestExt eventTrackers = 8871; } -extend com.iabtechlab.openrtb.v2.BidRequest.Imp.Video.CompanionAd { - - optional TestExt companionAd = 8871; -} +//extend com.iabtechlab.openrtb.v2.BidRequest.Imp.Video.CompanionAd { +// +// optional TestExt companionAd = 8871; +//} extend com.iabtechlab.openrtb.v2.NativeRequest.Asset.Data { From e0369aa4c7ed1bd493ddf92296f9a37b3e642311 Mon Sep 17 00:00:00 2001 From: osulzhenko Date: Tue, 4 Mar 2025 22:26:02 +0200 Subject: [PATCH 20/22] comment video in test proto file --- src/test/proto/test-opernrtb.proto | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/test/proto/test-opernrtb.proto b/src/test/proto/test-opernrtb.proto index 40d12c580ee..4c57b2031aa 100644 --- a/src/test/proto/test-opernrtb.proto +++ b/src/test/proto/test-opernrtb.proto @@ -81,10 +81,10 @@ extend com.iabtechlab.openrtb.v2.NativeRequest.EventTrackers { optional TestExt eventTrackers = 8871; } -//extend com.iabtechlab.openrtb.v2.BidRequest.Imp.Video.CompanionAd { -// -// optional TestExt companionAd = 8871; -//} +extend com.iabtechlab.openrtb.v2.BidRequest.Imp.Video.CompanionAd { + + optional TestExt companionAd = 8871; +} extend com.iabtechlab.openrtb.v2.NativeRequest.Asset.Data { From aa812f9daaed713aa04bbf5a52ef3533600656a9 Mon Sep 17 00:00:00 2001 From: osulzhenko Date: Tue, 4 Mar 2025 22:27:08 +0200 Subject: [PATCH 21/22] update dependencies --- extra/modules/greenbids-real-time-data/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/extra/modules/greenbids-real-time-data/pom.xml b/extra/modules/greenbids-real-time-data/pom.xml index 8b7920ccd77..c67c84ed9f7 100644 --- a/extra/modules/greenbids-real-time-data/pom.xml +++ b/extra/modules/greenbids-real-time-data/pom.xml @@ -22,13 +22,13 @@ com.microsoft.onnxruntime onnxruntime - 1.16.1 + 1.20.0 com.google.cloud google-cloud-storage - 2.41.0 + 2.48.0 com.google.guava From 367618a0a3bb94854f85e29f369333d3734d12f2 Mon Sep 17 00:00:00 2001 From: osulzhenko Date: Fri, 7 Mar 2025 19:25:38 +0200 Subject: [PATCH 22/22] update dependencies --- extra/modules/greenbids-real-time-data/pom.xml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/extra/modules/greenbids-real-time-data/pom.xml b/extra/modules/greenbids-real-time-data/pom.xml index 8537f2d3ce7..c00b0605ff8 100644 --- a/extra/modules/greenbids-real-time-data/pom.xml +++ b/extra/modules/greenbids-real-time-data/pom.xml @@ -30,6 +30,10 @@ google-cloud-storage 2.48.0 + + commons-logging + commons-logging + com.google.guava failureaccess