diff --git a/pom.xml b/pom.xml
index e4d8db170..ec1d479ff 100644
--- a/pom.xml
+++ b/pom.xml
@@ -99,7 +99,7 @@
install
-
+
org.apache.maven.plugins
maven-release-plugin
@@ -238,6 +238,7 @@
+
@@ -246,8 +247,8 @@
UTF-8
true
- 5.3.18
- 5.6.2
+ 5.3.19
+ 5.6.3
2.10.5.20201202
5.8.2
@@ -270,7 +271,7 @@
5.4.27.Final
5.11.9.Final
- 2.0.1.Final
+ 2.0.2
6.2.2.Final
1.5.0
@@ -407,12 +408,6 @@
slf4j-ext
${slf4j.version}
-
- org.slf4j
- slf4j-log4j12
- ${slf4j.version}
- test
-
org.slf4j
jul-to-slf4j
@@ -477,8 +472,8 @@
provided
- javax.validation
- validation-api
+ jakarta.validation
+ jakarta.validation-api
${validation.api.version}
@@ -729,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-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 a41a28a75..976e5b454 100644
--- a/vpro-shared-configuration/pom.xml
+++ b/vpro-shared-configuration/pom.xml
@@ -50,18 +50,14 @@
lombok
- javax.validation
- validation-api
+ jakarta.validation
+ jakarta.validation-api
nl.vpro.shared
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 a8c95d3b3..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
@@ -79,8 +74,8 @@
javax.annotation-api
- javax.validation
- validation-api
+ jakarta.validation
+ jakarta.validation-api
com.github.tomakehurst
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-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-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-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/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-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..2cd645ca8 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,8 +90,8 @@
commons-httpclient
commons-httpclient
- 3.1
test
+ 3.1
diff --git a/vpro-shared-validation/pom.xml b/vpro-shared-validation/pom.xml
index 0bf537a00..fd9a09cdc 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
@@ -38,16 +38,16 @@
test
- javax.el
- javax.el-api
- 3.0.0
+ jakarta.el
+ jakarta.el-api
test
+ 3.0.3
- org.glassfish.web
- javax.el
- 2.2.6
+ org.glassfish
+ jakarta.el
test
+ 3.0.4
com.fasterxml
@@ -55,11 +55,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 @@
+
+
+
+
+
+
+
+
+
+
+
+
+