From 4f12627733c1b2df1ba83cb6e131d84e5bd94e76 Mon Sep 17 00:00:00 2001
From: Serhii Nahornyi <sergiy3344@gmail.com>
Date: Mon, 6 Nov 2023 11:37:12 +0200
Subject: [PATCH 1/8] Core: Update Java version

---
 .github/workflows/pr-functional-tests.yml | 2 +-
 .github/workflows/pr-java-ci.yml          | 2 +-
 Dockerfile                                | 2 +-
 pom.xml                                   | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/pr-functional-tests.yml b/.github/workflows/pr-functional-tests.yml
index d4343f6..fb8f30a 100644
--- a/.github/workflows/pr-functional-tests.yml
+++ b/.github/workflows/pr-functional-tests.yml
@@ -17,7 +17,7 @@ jobs:
 
     strategy:
       matrix:
-        java: [ 17 ]
+        java: [ 21 ]
 
     steps:
       - uses: actions/checkout@v3
diff --git a/.github/workflows/pr-java-ci.yml b/.github/workflows/pr-java-ci.yml
index 3640c6f..de6b7d5 100644
--- a/.github/workflows/pr-java-ci.yml
+++ b/.github/workflows/pr-java-ci.yml
@@ -17,7 +17,7 @@ jobs:
 
     strategy:
       matrix:
-        java: [ 17 ]
+        java: [ 21 ]
 
     steps:
       - uses: actions/checkout@v3
diff --git a/Dockerfile b/Dockerfile
index 0dc1019..9ad2d13 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM amazoncorretto:17
+FROM eclipse-temurin:21-alpine
 
 WORKDIR /app/prebid-cache
 
diff --git a/pom.xml b/pom.xml
index a4843e7..f23f712 100644
--- a/pom.xml
+++ b/pom.xml
@@ -41,7 +41,7 @@
         <ci.repository.revision.number>manual</ci.repository.revision.number>
         <mvn.build.timestamp.format>yyyy-MM-dd HH:mm</mvn.build.timestamp.format>
 
-        <java.version>17</java.version>
+        <java.version>21</java.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <maven-source-plugin.version>3.2.1</maven-source-plugin.version>

From 34b36ac3fcc109700cce620f27d5cbadf2a3d85a Mon Sep 17 00:00:00 2001
From: Serhii Nahornyi <sergiy3344@gmail.com>
Date: Mon, 6 Nov 2023 11:39:47 +0200
Subject: [PATCH 2/8] Core: Update Lombok version

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index f23f712..4ca653b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -56,7 +56,7 @@
         <guava.version>32.0.0-jre</guava.version>
         <caffeine.version>3.1.6</caffeine.version>
         <disruptor.version>3.4.4</disruptor.version>
-        <lombok.version>1.18.28</lombok.version>
+        <lombok.version>1.18.30</lombok.version>
         <metrics-graphite.version>4.2.17</metrics-graphite.version>
         <javax.el-api.version>3.0.0</javax.el-api.version>
         <reflections.version>0.10.2</reflections.version>

From c491e25586dd48b8174a0c82eaae18920d34ed7b Mon Sep 17 00:00:00 2001
From: Serhii Nahornyi <sergiy3344@gmail.com>
Date: Mon, 6 Nov 2023 11:44:07 +0200
Subject: [PATCH 3/8] Core: Update Kotlin version

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 4ca653b..7aa8d09 100644
--- a/pom.xml
+++ b/pom.xml
@@ -74,7 +74,7 @@
 
         <!-- Functional Tests -->
         <kotest.version>5.5.5</kotest.version>
-        <kotlin.version>1.8.10</kotlin.version>
+        <kotlin.version>1.9.20</kotlin.version>
         <testcontainers.version>1.17.6</testcontainers.version>
         <mockserver-client.version>5.13.2</mockserver-client.version>
         <ktor.version>2.2.4</ktor.version>

From 7a0bfb3c8d86d4558c8c6acfc7b5bcfcd8bc0502 Mon Sep 17 00:00:00 2001
From: Serhii Nahornyi <sergiy3344@gmail.com>
Date: Mon, 6 Nov 2023 12:00:29 +0200
Subject: [PATCH 4/8] Core: Update plugins version

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 7aa8d09..291d309 100644
--- a/pom.xml
+++ b/pom.xml
@@ -47,10 +47,10 @@
         <maven-source-plugin.version>3.2.1</maven-source-plugin.version>
         <maven-clean-plugin.version>3.2.0</maven-clean-plugin.version>
         <maven-surefire-plugin.version>3.0.0-M6</maven-surefire-plugin.version>
-        <maven-compiler-plugin.version>3.10.1</maven-compiler-plugin.version>
+        <maven-compiler-plugin.version>3.11.0</maven-compiler-plugin.version>
         <maven-release-plugin.version>3.0.0-M5</maven-release-plugin.version>
         <rest-maven-plugin.version>0.1.4</rest-maven-plugin.version>
-        <spring-boot-maven-plugin.version>2.6.7</spring-boot-maven-plugin.version>
+        <spring-boot-maven-plugin.version>3.1.5</spring-boot-maven-plugin.version>
         <lettuce-core.version>6.2.4.RELEASE</lettuce-core.version>
         <gson.version>2.10.1</gson.version>
         <guava.version>32.0.0-jre</guava.version>

From 3bcedacabce8d2acff1417de1b7beb12a0d7bdae Mon Sep 17 00:00:00 2001
From: Serhii Nahornyi <sergiy3344@gmail.com>
Date: Mon, 6 Nov 2023 12:01:40 +0200
Subject: [PATCH 5/8] Core: Update surefire version

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 291d309..3050a82 100644
--- a/pom.xml
+++ b/pom.xml
@@ -46,7 +46,7 @@
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <maven-source-plugin.version>3.2.1</maven-source-plugin.version>
         <maven-clean-plugin.version>3.2.0</maven-clean-plugin.version>
-        <maven-surefire-plugin.version>3.0.0-M6</maven-surefire-plugin.version>
+        <maven-surefire-plugin.version>3.2.1</maven-surefire-plugin.version>
         <maven-compiler-plugin.version>3.11.0</maven-compiler-plugin.version>
         <maven-release-plugin.version>3.0.0-M5</maven-release-plugin.version>
         <rest-maven-plugin.version>0.1.4</rest-maven-plugin.version>

From df3a0847b1d2bbd5ee18ad56398d1761db0b7485 Mon Sep 17 00:00:00 2001
From: Serhii Nahornyi <sergiy3344@gmail.com>
Date: Mon, 6 Nov 2023 12:08:31 +0200
Subject: [PATCH 6/8] Core: Update jqno version

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 3050a82..da8a9ee 100644
--- a/pom.xml
+++ b/pom.xml
@@ -60,7 +60,7 @@
         <metrics-graphite.version>4.2.17</metrics-graphite.version>
         <javax.el-api.version>3.0.0</javax.el-api.version>
         <reflections.version>0.10.2</reflections.version>
-        <equals-verifier.version>3.14.1</equals-verifier.version>
+        <equals-verifier.version>3.15.3</equals-verifier.version>
         <aerospike-client.version>6.1.11</aerospike-client.version>
         <reactor-extra.version>3.5.1</reactor-extra.version>
         <wiremock.version>3.0.0-beta-10</wiremock.version>

From 73bd1cd89bbc0c474ea0b01a3ac729e544b939e1 Mon Sep 17 00:00:00 2001
From: Serhii Nahornyi <sergiy3344@gmail.com>
Date: Mon, 6 Nov 2023 12:14:42 +0200
Subject: [PATCH 7/8] Remove useless test

---
 pom.xml                                       |  7 ----
 .../prebid/cache/model/ContractModelTest.java | 36 -------------------
 2 files changed, 43 deletions(-)
 delete mode 100644 src/test/java/org/prebid/cache/model/ContractModelTest.java

diff --git a/pom.xml b/pom.xml
index da8a9ee..77a2e1f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -60,7 +60,6 @@
         <metrics-graphite.version>4.2.17</metrics-graphite.version>
         <javax.el-api.version>3.0.0</javax.el-api.version>
         <reflections.version>0.10.2</reflections.version>
-        <equals-verifier.version>3.15.3</equals-verifier.version>
         <aerospike-client.version>6.1.11</aerospike-client.version>
         <reactor-extra.version>3.5.1</reactor-extra.version>
         <wiremock.version>3.0.0-beta-10</wiremock.version>
@@ -210,12 +209,6 @@
             <version>${reflections.version}</version>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>nl.jqno.equalsverifier</groupId>
-            <artifactId>equalsverifier</artifactId>
-            <version>${equals-verifier.version}</version>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>com.aerospike</groupId>
             <artifactId>aerospike-client</artifactId>
diff --git a/src/test/java/org/prebid/cache/model/ContractModelTest.java b/src/test/java/org/prebid/cache/model/ContractModelTest.java
deleted file mode 100644
index e93275c..0000000
--- a/src/test/java/org/prebid/cache/model/ContractModelTest.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package org.prebid.cache.model;
-
-import nl.jqno.equalsverifier.EqualsVerifier;
-import org.junit.jupiter.params.ParameterizedTest;
-import org.junit.jupiter.params.provider.MethodSource;
-import org.reflections.Reflections;
-import org.reflections.scanners.SubTypesScanner;
-import org.reflections.util.ConfigurationBuilder;
-import org.reflections.util.FilterBuilder;
-
-import static org.reflections.util.ClasspathHelper.*;
-
-class ContractModelTest {
-
-    @ParameterizedTest
-    @MethodSource("modelClassProvider")
-    void verifyEqualsAndHashCode(Class<?> clazz) {
-        EqualsVerifier.forClass(clazz).verify();
-    }
-
-    static Iterable<Class<?>> modelClassProvider() {
-
-        Reflections reflections = new Reflections(
-                new ConfigurationBuilder().setScanners(
-                        new SubTypesScanner(false)
-                )
-                        .setUrls(forPackage("org.prebid.cache", staticClassLoader()))
-                        .filterInputsBy(new FilterBuilder()
-                                .include("org\\.prebid\\.cache\\.model\\..*\\.class")
-                                .exclude("org\\.prebid\\.cache\\.model\\..*(Builder|Test)\\.class")
-                        )
-        );
-
-        return reflections.getSubTypesOf(Object.class);
-    }
-}
\ No newline at end of file

From d17ce0eaf5bddd446e2aaa7b2a36cb6436dbbb96 Mon Sep 17 00:00:00 2001
From: Serhii Nahornyi <sergiy3344@gmail.com>
Date: Mon, 6 Nov 2023 13:48:43 +0200
Subject: [PATCH 8/8] Change image

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 9ad2d13..e8022f4 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM eclipse-temurin:21-alpine
+FROM amazoncorretto:21
 
 WORKDIR /app/prebid-cache
 
