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..e8022f4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM amazoncorretto:17 +FROM amazoncorretto:21 WORKDIR /app/prebid-cache diff --git a/pom.xml b/pom.xml index 699156e..5b55914 100644 --- a/pom.xml +++ b/pom.xml @@ -41,26 +41,25 @@ manual yyyy-MM-dd HH:mm - 17 + 21 UTF-8 UTF-8 3.2.1 3.2.0 - 3.0.0-M6 - 3.10.1 + 3.2.1 + 3.11.0 3.0.0-M5 0.1.4 - 2.6.7 + 3.1.5 6.2.4.RELEASE 2.10.1 32.0.0-jre 3.1.6 3.4.4 - 1.18.28 + 1.18.30 4.2.17 3.0.0 0.10.2 - 3.14.1 6.2.0 3.5.1 3.0.0-beta-10 @@ -74,7 +73,7 @@ 5.5.5 - 1.8.10 + 1.9.20 1.17.6 5.13.2 2.2.4 @@ -210,12 +209,6 @@ ${reflections.version} test - - nl.jqno.equalsverifier - equalsverifier - ${equals-verifier.version} - test - com.aerospike aerospike-client 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> 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