diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 800af72aa..1ce8b1304 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -5,7 +5,7 @@ on: push
jobs:
ci:
- uses: europeana/metis-actions/.github/workflows/ci.yml@jdk17
+ uses: europeana/metis-actions/.github/workflows/ci.yml@jdk21
with:
sonar_organization: europeana
sonar_project_key: europeana_metis-framework
@@ -14,14 +14,14 @@ jobs:
deploy-artifacts:
needs: ci
- uses: europeana/metis-actions/.github/workflows/deploy-artifacts.yml@jdk17
+ uses: europeana/metis-actions/.github/workflows/deploy-artifacts.yml@jdk21
secrets:
ARTIFACTORY_USERNAME: ${{ secrets.ARTIFACTORY_USERNAME }}
ARTIFACTORY_PASSWORD: ${{ secrets.ARTIFACTORY_PASSWORD }}
docker-build_metis-authentication:
needs: ci
- uses: europeana/metis-actions/.github/workflows/docker-build-push.yml@jdk17
+ uses: europeana/metis-actions/.github/workflows/docker-build-push.yml@jdk21
with:
docker-organization: europeana
docker-image-name: metis-authentication
@@ -31,7 +31,7 @@ jobs:
DOCKER_HUB_PASSWORD: ${{ secrets.DOCKER_HUB_PASSWORD }}
docker-build_metis-core:
needs: ci
- uses: europeana/metis-actions/.github/workflows/docker-build-push.yml@jdk17
+ uses: europeana/metis-actions/.github/workflows/docker-build-push.yml@jdk21
with:
docker-organization: europeana
docker-image-name: metis-core
@@ -41,7 +41,7 @@ jobs:
DOCKER_HUB_PASSWORD: ${{ secrets.DOCKER_HUB_PASSWORD }}
docker-build_metis-dereference:
needs: ci
- uses: europeana/metis-actions/.github/workflows/docker-build-push.yml@jdk17
+ uses: europeana/metis-actions/.github/workflows/docker-build-push.yml@jdk21
with:
docker-organization: europeana
docker-image-name: metis-dereference
@@ -51,7 +51,7 @@ jobs:
DOCKER_HUB_PASSWORD: ${{ secrets.DOCKER_HUB_PASSWORD }}
docker-build_metis-repository:
needs: ci
- uses: europeana/metis-actions/.github/workflows/docker-build-push.yml@jdk17
+ uses: europeana/metis-actions/.github/workflows/docker-build-push.yml@jdk21
with:
docker-organization: europeana
docker-image-name: metis-repository
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 3f107c4df..559135d09 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -16,7 +16,7 @@ on:
jobs:
ci-release:
- uses: europeana/metis-actions/.github/workflows/release.yml@jdk17
+ uses: europeana/metis-actions/.github/workflows/release.yml@jdk21
with:
release-version: ${{ github.event.inputs.release-version }}
commit-hash-branch: ${{ github.event.inputs.commit-hash-branch }}
diff --git a/metis-authentication/metis-authentication-rest-client/pom.xml b/metis-authentication/metis-authentication-rest-client/pom.xml
index 47dc71469..aae552528 100644
--- a/metis-authentication/metis-authentication-rest-client/pom.xml
+++ b/metis-authentication/metis-authentication-rest-client/pom.xml
@@ -34,9 +34,8 @@
${project.version}
- com.github.tomakehurst
- wiremock
- test
+ org.wiremock
+ wiremock-standalone
org.junit.jupiter
diff --git a/metis-core/metis-core-service/pom.xml b/metis-core/metis-core-service/pom.xml
index 79071c52b..78392ac0c 100644
--- a/metis-core/metis-core-service/pom.xml
+++ b/metis-core/metis-core-service/pom.xml
@@ -83,9 +83,8 @@
test
- com.github.tomakehurst
- wiremock
- test
+ org.wiremock
+ wiremock-standalone
com.fasterxml.jackson.core
diff --git a/metis-core/pom.xml b/metis-core/pom.xml
index 7a83c55c3..a11d34adc 100644
--- a/metis-core/pom.xml
+++ b/metis-core/pom.xml
@@ -11,7 +11,6 @@
UTF-8
- 2.7.5
diff --git a/metis-enrichment/metis-enrichment-client/pom.xml b/metis-enrichment/metis-enrichment-client/pom.xml
index 0ad836cab..de7750e9d 100644
--- a/metis-enrichment/metis-enrichment-client/pom.xml
+++ b/metis-enrichment/metis-enrichment-client/pom.xml
@@ -28,10 +28,8 @@
mockito-core
- com.github.tomakehurst
- wiremock-jre8
- ${version.wiremock-jre}
- test
+ org.wiremock
+ wiremock-standalone
eu.europeana.metis
diff --git a/metis-harvesting/pom.xml b/metis-harvesting/pom.xml
index 8d71633cc..19016c0a9 100644
--- a/metis-harvesting/pom.xml
+++ b/metis-harvesting/pom.xml
@@ -37,9 +37,8 @@
${version.saxon.he}
- com.github.tomakehurst
- wiremock
- ${version.com.github.tomakehurst.wiremock}
+ org.wiremock
+ wiremock-standalone
test
diff --git a/metis-media-service/pom.xml b/metis-media-service/pom.xml
index 836ca468d..82357a3f7 100644
--- a/metis-media-service/pom.xml
+++ b/metis-media-service/pom.xml
@@ -36,12 +36,6 @@
${version.mpd.parser}
-
- com.github.tomakehurst
- wiremock
- test
-
-
com.fasterxml.jackson.core
jackson-databind
@@ -133,10 +127,8 @@
mockito-core
- com.github.tomakehurst
- wiremock-jre8
- ${version.wiremock-jre}
- test
+ org.wiremock
+ wiremock-standalone
diff --git a/metis-media-service/src/test/java/eu/europeana/metis/mediaprocessing/extraction/AudioVideoProcessorTest.java b/metis-media-service/src/test/java/eu/europeana/metis/mediaprocessing/extraction/AudioVideoProcessorTest.java
index aa0021d16..b471fb754 100644
--- a/metis-media-service/src/test/java/eu/europeana/metis/mediaprocessing/extraction/AudioVideoProcessorTest.java
+++ b/metis-media-service/src/test/java/eu/europeana/metis/mediaprocessing/extraction/AudioVideoProcessorTest.java
@@ -1,7 +1,6 @@
package eu.europeana.metis.mediaprocessing.extraction;
import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;
-import static com.github.tomakehurst.wiremock.client.WireMock.containing;
import static com.github.tomakehurst.wiremock.client.WireMock.get;
import static com.github.tomakehurst.wiremock.client.WireMock.urlEqualTo;
import static com.github.tomakehurst.wiremock.core.WireMockConfiguration.wireMockConfig;
@@ -470,7 +469,6 @@ void testParseMpdResource() throws MediaExtractionException, URISyntaxException
.thenReturn(new URI("http://127.0.0.1:" + portForWireMock + "/test-url.mpd"));
wireMockServer.stubFor(get(urlEqualTo("/test-url.mpd"))
- .withHeader("Accept", containing("text"))
.willReturn(aResponse()
.withStatus(200)
.withHeader("Content-Type", "application/xml")
diff --git a/metis-validation/metis-validation-service/pom.xml b/metis-validation/metis-validation-service/pom.xml
index ad781577f..26b0e9cef 100644
--- a/metis-validation/metis-validation-service/pom.xml
+++ b/metis-validation/metis-validation-service/pom.xml
@@ -75,11 +75,9 @@
${version.spring.context}
-
- com.github.tomakehurst
- wiremock
- test
+ org.wiremock
+ wiremock-standalone
org.powermock
diff --git a/pom.xml b/pom.xml
index 1b73f4484..61c028201 100644
--- a/pom.xml
+++ b/pom.xml
@@ -51,7 +51,7 @@
maven-compiler-plugin
${version.maven.compiler.plugin}
- 17
+ 21
@@ -132,7 +132,6 @@
1.7.0
1.68
1.4
- 2.27.2
3.0.1
1.10.0
1.21
@@ -180,7 +179,7 @@
1.7.30
8.8.2
5.3.7
- 2.7.8
+ 2.7.18
${version.spring}
${version.spring}
5.5.0
@@ -190,7 +189,7 @@
3.0.0
1.6.2
1.26
- 2.35.1
+ 3.3.1
1.19.0
2.12.2
2.8.2
@@ -567,9 +566,9 @@
test
- com.github.tomakehurst
- wiremock
- ${version.com.github.tomakehurst.wiremock}
+ org.wiremock
+ wiremock-standalone
+ ${version.org.wiremock}
test