From 2ab120e9106ceffd9c6a291fbf1a83ff5c6dc217 Mon Sep 17 00:00:00 2001 From: Michiel Meeuwissen Date: Tue, 19 Apr 2022 10:40:20 +0200 Subject: [PATCH 1/3] migration to jakarta coordinates. --- pom.xml | 6 +++--- vpro-shared-configuration/pom.xml | 4 ++-- vpro-shared-elasticsearch-client/pom.xml | 4 ++-- vpro-shared-i18n/pom.xml | 4 ++-- vpro-shared-validation/pom.xml | 4 ++-- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/pom.xml b/pom.xml index e4d8db170..1dcdba25a 100644 --- a/pom.xml +++ b/pom.xml @@ -270,7 +270,7 @@ 5.4.27.Final 5.11.9.Final - 2.0.1.Final + 2.0.2 6.2.2.Final 1.5.0 @@ -477,8 +477,8 @@ provided - javax.validation - validation-api + jakarta.validation + jakarta.validation-api ${validation.api.version} diff --git a/vpro-shared-configuration/pom.xml b/vpro-shared-configuration/pom.xml index a41a28a75..891405128 100644 --- a/vpro-shared-configuration/pom.xml +++ b/vpro-shared-configuration/pom.xml @@ -50,8 +50,8 @@ lombok - javax.validation - validation-api + jakarta.validation + jakarta.validation-api nl.vpro.shared diff --git a/vpro-shared-elasticsearch-client/pom.xml b/vpro-shared-elasticsearch-client/pom.xml index a8c95d3b3..b2343af9b 100644 --- a/vpro-shared-elasticsearch-client/pom.xml +++ b/vpro-shared-elasticsearch-client/pom.xml @@ -79,8 +79,8 @@ javax.annotation-api - javax.validation - validation-api + jakarta.validation + jakarta.validation-api com.github.tomakehurst diff --git a/vpro-shared-i18n/pom.xml b/vpro-shared-i18n/pom.xml index 9c782d692..bcbb2a00e 100644 --- a/vpro-shared-i18n/pom.xml +++ b/vpro-shared-i18n/pom.xml @@ -26,8 +26,8 @@ test - javax.validation - validation-api + jakarta.validation + jakarta.validation-api true diff --git a/vpro-shared-validation/pom.xml b/vpro-shared-validation/pom.xml index 0bf537a00..f46482ba2 100644 --- a/vpro-shared-validation/pom.xml +++ b/vpro-shared-validation/pom.xml @@ -14,8 +14,8 @@ - javax.validation - validation-api + jakarta.validation + jakarta.validation-api nl.vpro.shared From ec9a6933e5aac3d60fb5212be0ff6abd5db18a51 Mon Sep 17 00:00:00 2001 From: Michiel Meeuwissen Date: Tue, 19 Apr 2022 17:15:02 +0200 Subject: [PATCH 2/3] Dropping all log4j1. --- pom.xml | 25 ++++++++++++------- vpro-shared-client-resteasy/pom.xml | 5 ---- .../src/test/resources/log4j2.xml | 13 ++++++++++ vpro-shared-configuration/pom.xml | 4 --- .../src/test/resources/log4j.xml | 17 ------------- .../src/test/resources/log4j2.xml | 13 ++++++++++ vpro-shared-elasticsearch-client/pom.xml | 7 +----- .../test/resources/{log4j.xml => log4j2.xml} | 0 .../pom.xml | 5 ---- .../src/test/resources/log4j.xml | 16 ------------ .../src/test/resources/log4j2.xml | 13 ++++++++++ vpro-shared-rs-client/pom.xml | 5 ---- .../src/test/resources/log4j.xml | 17 ------------- .../src/test/resources/log4j2.xml | 13 ++++++++++ vpro-shared-test/src/test/resources/log4j.xml | 16 ------------ .../src/test/resources/log4j2.xml | 13 ++++++++++ vpro-shared-util/pom.xml | 6 ----- vpro-shared-validation/pom.xml | 15 +++-------- .../src/test/resources/log4j.xml | 17 ------------- .../src/test/resources/log4j2.xml | 0 vpro-shared-web/pom.xml | 6 +---- vpro-shared-web/src/test/resources/log4j.xml | 17 ------------- vpro-shared-web/src/test/resources/log4j2.xml | 17 +++++++++++++ vpro-shared-xml/pom.xml | 5 ---- vpro-shared-xml/src/test/resources/log4j.xml | 17 ------------- vpro-shared-xml/src/test/resources/log4j2.xml | 13 ++++++++++ 26 files changed, 117 insertions(+), 178 deletions(-) create mode 100644 vpro-shared-client-resteasy/src/test/resources/log4j2.xml delete mode 100644 vpro-shared-configuration/src/test/resources/log4j.xml create mode 100644 vpro-shared-configuration/src/test/resources/log4j2.xml rename vpro-shared-elasticsearch-client/src/test/resources/{log4j.xml => log4j2.xml} (100%) delete mode 100644 vpro-shared-elasticsearch-high-level-client/src/test/resources/log4j.xml create mode 100644 vpro-shared-elasticsearch-high-level-client/src/test/resources/log4j2.xml delete mode 100644 vpro-shared-rs-client/src/test/resources/log4j.xml create mode 100644 vpro-shared-rs-client/src/test/resources/log4j2.xml delete mode 100644 vpro-shared-test/src/test/resources/log4j.xml create mode 100644 vpro-shared-test/src/test/resources/log4j2.xml delete mode 100644 vpro-shared-validation/src/test/resources/log4j.xml rename vpro-shared-client-resteasy/src/test/resources/log4j.xml => vpro-shared-validation/src/test/resources/log4j2.xml (100%) delete mode 100644 vpro-shared-web/src/test/resources/log4j.xml create mode 100644 vpro-shared-web/src/test/resources/log4j2.xml delete mode 100644 vpro-shared-xml/src/test/resources/log4j.xml create mode 100644 vpro-shared-xml/src/test/resources/log4j2.xml diff --git a/pom.xml b/pom.xml index 1dcdba25a..8a3cfb7de 100644 --- a/pom.xml +++ b/pom.xml @@ -97,9 +97,21 @@ + + + org.apache.logging.log4j + log4j-slf4j-impl + test + + + org.apache.logging.log4j + log4j-jul + test + + install - + org.apache.maven.plugins maven-release-plugin @@ -238,6 +250,7 @@ + @@ -246,8 +259,8 @@ UTF-8 true - 5.3.18 - 5.6.2 + 5.3.19 + 5.6.3 2.10.5.20201202 5.8.2 @@ -407,12 +420,6 @@ slf4j-ext ${slf4j.version} - - org.slf4j - slf4j-log4j12 - ${slf4j.version} - test - org.slf4j jul-to-slf4j diff --git a/vpro-shared-client-resteasy/pom.xml b/vpro-shared-client-resteasy/pom.xml index 8a0bb0c31..afc541eb7 100644 --- a/vpro-shared-client-resteasy/pom.xml +++ b/vpro-shared-client-resteasy/pom.xml @@ -48,11 +48,6 @@ javax.cache cache-api - - org.slf4j - slf4j-log4j12 - test - diff --git a/vpro-shared-client-resteasy/src/test/resources/log4j2.xml b/vpro-shared-client-resteasy/src/test/resources/log4j2.xml new file mode 100644 index 000000000..d1fb6f74e --- /dev/null +++ b/vpro-shared-client-resteasy/src/test/resources/log4j2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/vpro-shared-configuration/pom.xml b/vpro-shared-configuration/pom.xml index 891405128..976e5b454 100644 --- a/vpro-shared-configuration/pom.xml +++ b/vpro-shared-configuration/pom.xml @@ -58,10 +58,6 @@ vpro-shared-util compile - - org.slf4j - slf4j-log4j12 - org.codehaus.groovy groovy diff --git a/vpro-shared-configuration/src/test/resources/log4j.xml b/vpro-shared-configuration/src/test/resources/log4j.xml deleted file mode 100644 index 44c771bf7..000000000 --- a/vpro-shared-configuration/src/test/resources/log4j.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/vpro-shared-configuration/src/test/resources/log4j2.xml b/vpro-shared-configuration/src/test/resources/log4j2.xml new file mode 100644 index 000000000..f431e2b57 --- /dev/null +++ b/vpro-shared-configuration/src/test/resources/log4j2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/vpro-shared-elasticsearch-client/pom.xml b/vpro-shared-elasticsearch-client/pom.xml index b2343af9b..04f310898 100644 --- a/vpro-shared-elasticsearch-client/pom.xml +++ b/vpro-shared-elasticsearch-client/pom.xml @@ -29,7 +29,7 @@ com.amazonaws aws-java-sdk-core - 1.12.124 + 1.12.196 true @@ -64,11 +64,6 @@ org.projectlombok lombok - - org.slf4j - slf4j-log4j12 - test - org.assertj assertj-core diff --git a/vpro-shared-elasticsearch-client/src/test/resources/log4j.xml b/vpro-shared-elasticsearch-client/src/test/resources/log4j2.xml similarity index 100% rename from vpro-shared-elasticsearch-client/src/test/resources/log4j.xml rename to vpro-shared-elasticsearch-client/src/test/resources/log4j2.xml diff --git a/vpro-shared-elasticsearch-high-level-client/pom.xml b/vpro-shared-elasticsearch-high-level-client/pom.xml index bebdb80a0..017ef0c50 100644 --- a/vpro-shared-elasticsearch-high-level-client/pom.xml +++ b/vpro-shared-elasticsearch-high-level-client/pom.xml @@ -32,11 +32,6 @@ org.projectlombok lombok - - org.slf4j - slf4j-log4j12 - test - org.elasticsearch.client elasticsearch-rest-high-level-client diff --git a/vpro-shared-elasticsearch-high-level-client/src/test/resources/log4j.xml b/vpro-shared-elasticsearch-high-level-client/src/test/resources/log4j.xml deleted file mode 100644 index d1115b5c5..000000000 --- a/vpro-shared-elasticsearch-high-level-client/src/test/resources/log4j.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/vpro-shared-elasticsearch-high-level-client/src/test/resources/log4j2.xml b/vpro-shared-elasticsearch-high-level-client/src/test/resources/log4j2.xml new file mode 100644 index 000000000..f431e2b57 --- /dev/null +++ b/vpro-shared-elasticsearch-high-level-client/src/test/resources/log4j2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/vpro-shared-rs-client/pom.xml b/vpro-shared-rs-client/pom.xml index 07e06fcea..42466f624 100644 --- a/vpro-shared-rs-client/pom.xml +++ b/vpro-shared-rs-client/pom.xml @@ -26,11 +26,6 @@ org.projectlombok lombok - - org.slf4j - slf4j-log4j12 - test - javax.ws.rs javax.ws.rs-api diff --git a/vpro-shared-rs-client/src/test/resources/log4j.xml b/vpro-shared-rs-client/src/test/resources/log4j.xml deleted file mode 100644 index 30cd6e57e..000000000 --- a/vpro-shared-rs-client/src/test/resources/log4j.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/vpro-shared-rs-client/src/test/resources/log4j2.xml b/vpro-shared-rs-client/src/test/resources/log4j2.xml new file mode 100644 index 000000000..d1fb6f74e --- /dev/null +++ b/vpro-shared-rs-client/src/test/resources/log4j2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/vpro-shared-test/src/test/resources/log4j.xml b/vpro-shared-test/src/test/resources/log4j.xml deleted file mode 100644 index 18433ee20..000000000 --- a/vpro-shared-test/src/test/resources/log4j.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/vpro-shared-test/src/test/resources/log4j2.xml b/vpro-shared-test/src/test/resources/log4j2.xml new file mode 100644 index 000000000..d1fb6f74e --- /dev/null +++ b/vpro-shared-test/src/test/resources/log4j2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/vpro-shared-util/pom.xml b/vpro-shared-util/pom.xml index 6b7250f92..f2984996f 100644 --- a/vpro-shared-util/pom.xml +++ b/vpro-shared-util/pom.xml @@ -47,11 +47,6 @@ com.google.guava guava - - org.apache.logging.log4j - log4j-slf4j-impl - test - org.apache.logging.log4j log4j-core @@ -95,7 +90,6 @@ commons-httpclient commons-httpclient - 3.1 test diff --git a/vpro-shared-validation/pom.xml b/vpro-shared-validation/pom.xml index f46482ba2..ae550d5c2 100644 --- a/vpro-shared-validation/pom.xml +++ b/vpro-shared-validation/pom.xml @@ -38,15 +38,13 @@ test - javax.el - javax.el-api - 3.0.0 + jakarta.el + jakarta.el-api test - org.glassfish.web - javax.el - 2.2.6 + org.glassfish + jakarta.el test @@ -55,11 +53,6 @@ 1.5.1 test - - org.slf4j - slf4j-log4j12 - test - org.jsoup jsoup diff --git a/vpro-shared-validation/src/test/resources/log4j.xml b/vpro-shared-validation/src/test/resources/log4j.xml deleted file mode 100644 index 30cd6e57e..000000000 --- a/vpro-shared-validation/src/test/resources/log4j.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/vpro-shared-client-resteasy/src/test/resources/log4j.xml b/vpro-shared-validation/src/test/resources/log4j2.xml similarity index 100% rename from vpro-shared-client-resteasy/src/test/resources/log4j.xml rename to vpro-shared-validation/src/test/resources/log4j2.xml diff --git a/vpro-shared-web/pom.xml b/vpro-shared-web/pom.xml index 550b82e01..60c296967 100644 --- a/vpro-shared-web/pom.xml +++ b/vpro-shared-web/pom.xml @@ -18,11 +18,7 @@ org.slf4j slf4j-api - - org.slf4j - slf4j-log4j12 - test - + com.fasterxml.jackson.core jackson-core diff --git a/vpro-shared-web/src/test/resources/log4j.xml b/vpro-shared-web/src/test/resources/log4j.xml deleted file mode 100644 index 30cd6e57e..000000000 --- a/vpro-shared-web/src/test/resources/log4j.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/vpro-shared-web/src/test/resources/log4j2.xml b/vpro-shared-web/src/test/resources/log4j2.xml new file mode 100644 index 000000000..f27d5bfee --- /dev/null +++ b/vpro-shared-web/src/test/resources/log4j2.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + diff --git a/vpro-shared-xml/pom.xml b/vpro-shared-xml/pom.xml index 9193ea9e4..ef108676c 100644 --- a/vpro-shared-xml/pom.xml +++ b/vpro-shared-xml/pom.xml @@ -20,11 +20,6 @@ org.projectlombok lombok - - org.slf4j - slf4j-log4j12 - test - javax.xml.bind jaxb-api diff --git a/vpro-shared-xml/src/test/resources/log4j.xml b/vpro-shared-xml/src/test/resources/log4j.xml deleted file mode 100644 index 30cd6e57e..000000000 --- a/vpro-shared-xml/src/test/resources/log4j.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/vpro-shared-xml/src/test/resources/log4j2.xml b/vpro-shared-xml/src/test/resources/log4j2.xml new file mode 100644 index 000000000..d1fb6f74e --- /dev/null +++ b/vpro-shared-xml/src/test/resources/log4j2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + From 8384a54081e714b90e0a64799bc95e57684b4878 Mon Sep 17 00:00:00 2001 From: Michiel Meeuwissen Date: Tue, 19 Apr 2022 17:23:27 +0200 Subject: [PATCH 3/3] More jakarta and log4j1 --- pom.xml | 22 +++++++++---------- vpro-shared-jackson2/pom.xml | 5 ----- .../src/test/resources/log4j.xml | 16 -------------- .../src/test/resources/log4j2.xml | 14 ++++++++++++ vpro-shared-logging/pom.xml | 5 +++-- vpro-shared-test/pom.xml | 5 ----- vpro-shared-util/pom.xml | 1 + vpro-shared-validation/pom.xml | 2 ++ 8 files changed, 30 insertions(+), 40 deletions(-) delete mode 100644 vpro-shared-jackson2/src/test/resources/log4j.xml create mode 100644 vpro-shared-jackson2/src/test/resources/log4j2.xml diff --git a/pom.xml b/pom.xml index 8a3cfb7de..ec1d479ff 100644 --- a/pom.xml +++ b/pom.xml @@ -97,18 +97,6 @@ - - - org.apache.logging.log4j - log4j-slf4j-impl - test - - - org.apache.logging.log4j - log4j-jul - test - - install @@ -736,6 +724,16 @@ 3.21.3 true + + org.apache.logging.log4j + log4j-slf4j-impl + test + + + org.apache.logging.log4j + log4j-jul + test + diff --git a/vpro-shared-jackson2/pom.xml b/vpro-shared-jackson2/pom.xml index 7bd3e687b..d6dbaa018 100644 --- a/vpro-shared-jackson2/pom.xml +++ b/vpro-shared-jackson2/pom.xml @@ -41,11 +41,6 @@ jackson-dataformat-avro ${jackson2.version} --> - - org.slf4j - slf4j-log4j12 - test - org.skyscreamer jsonassert diff --git a/vpro-shared-jackson2/src/test/resources/log4j.xml b/vpro-shared-jackson2/src/test/resources/log4j.xml deleted file mode 100644 index d1115b5c5..000000000 --- a/vpro-shared-jackson2/src/test/resources/log4j.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/vpro-shared-jackson2/src/test/resources/log4j2.xml b/vpro-shared-jackson2/src/test/resources/log4j2.xml new file mode 100644 index 000000000..4965d8719 --- /dev/null +++ b/vpro-shared-jackson2/src/test/resources/log4j2.xml @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + diff --git a/vpro-shared-logging/pom.xml b/vpro-shared-logging/pom.xml index e3442ccc0..689e9786e 100644 --- a/vpro-shared-logging/pom.xml +++ b/vpro-shared-logging/pom.xml @@ -34,11 +34,12 @@ org.projectlombok lombok - + com.google.flogger flogger diff --git a/vpro-shared-test/pom.xml b/vpro-shared-test/pom.xml index 7ce5671e5..fb5a0b156 100644 --- a/vpro-shared-test/pom.xml +++ b/vpro-shared-test/pom.xml @@ -58,11 +58,6 @@ assertj-core compile - - org.slf4j - slf4j-log4j12 - test - org.projectlombok lombok diff --git a/vpro-shared-util/pom.xml b/vpro-shared-util/pom.xml index f2984996f..2cd645ca8 100644 --- a/vpro-shared-util/pom.xml +++ b/vpro-shared-util/pom.xml @@ -91,6 +91,7 @@ commons-httpclient commons-httpclient test + 3.1 diff --git a/vpro-shared-validation/pom.xml b/vpro-shared-validation/pom.xml index ae550d5c2..fd9a09cdc 100644 --- a/vpro-shared-validation/pom.xml +++ b/vpro-shared-validation/pom.xml @@ -41,11 +41,13 @@ jakarta.el jakarta.el-api test + 3.0.3 org.glassfish jakarta.el test + 3.0.4 com.fasterxml