From c968c0c9113f7664581791ba94c2193d0e2d336f Mon Sep 17 00:00:00 2001 From: Jaro Hartmann Date: Thu, 5 Oct 2023 15:53:50 +0200 Subject: [PATCH] feat(pom):[TRI-1679] Move dependency version to root pom --- irs-api/pom.xml | 28 +++++++++++-------------- irs-common/pom.xml | 5 ++--- irs-cucumber-tests/pom.xml | 16 +++++--------- irs-edc-client/pom.xml | 39 +++++++++++++++++++++-------------- irs-integration-tests/pom.xml | 6 +++--- irs-load-tests/pom.xml | 4 ++-- irs-models/pom.xml | 4 ++-- irs-policy-store/pom.xml | 4 ++-- irs-registry-client/pom.xml | 6 +++--- irs-testdata-upload/pom.xml | 10 ++++----- irs-testing/pom.xml | 6 +++--- pom.xml | 37 ++++++++++++++++++++++++++++----- 12 files changed, 95 insertions(+), 70 deletions(-) diff --git a/irs-api/pom.xml b/irs-api/pom.xml index 640e0af8b1..cf840c0318 100644 --- a/irs-api/pom.xml +++ b/irs-api/pom.xml @@ -45,12 +45,8 @@ io.minio minio - 8.5.4 + ${minio.version} - - com.fasterxml.jackson.core - jackson-databind - org.bouncycastle bcprov-jdk15on @@ -66,7 +62,7 @@ com.squareup.okhttp3 okhttp - 4.10.0 + ${okhttp.version} org.springframework.boot @@ -86,7 +82,7 @@ org.yaml snakeyaml - 2.0 + ${snakeyaml.version} org.springframework.boot @@ -134,7 +130,7 @@ commons-io commons-io - 2.14.0 + ${commons-io.version} org.springdoc @@ -166,7 +162,7 @@ net.jimblackler jsonschemafriend - 0.11.4 + ${jsonschemafriend.version} org.jsoup @@ -177,12 +173,12 @@ org.jsoup jsoup - 1.16.1 + ${jsoup.version} org.graalvm.sdk graal-sdk - 23.0.1 + ${graal-sdk.version} @@ -205,13 +201,13 @@ org.awaitility awaitility - 4.2.0 + ${awaitility.version} test io.swagger.core.v3 swagger-annotations - 2.2.16 + ${swagger-annotations.version} io.github.resilience4j @@ -221,13 +217,13 @@ com.github.tomakehurst wiremock-standalone - 2.27.2 + ${wiremock-standalone.version} test commons-validator commons-validator - 1.7 + ${commons-validator.version} @@ -255,7 +251,7 @@ org.openapitools openapi-generator-maven-plugin - 7.0.1 + ${openapi-generator-maven-plugin.version} diff --git a/irs-common/pom.xml b/irs-common/pom.xml index d0c9d2ea15..2c9ea7fe49 100644 --- a/irs-common/pom.xml +++ b/irs-common/pom.xml @@ -23,7 +23,6 @@ org.projectlombok lombok true - 1.18.26 org.apache.commons @@ -61,7 +60,7 @@ io.minio minio - 8.5.4 + ${minio.version} com.fasterxml.jackson.core @@ -76,7 +75,7 @@ com.squareup.okio okio-jvm - 3.5.0 + ${okio-jvm.version} diff --git a/irs-cucumber-tests/pom.xml b/irs-cucumber-tests/pom.xml index d1cb0b6c36..3213fdc1c8 100644 --- a/irs-cucumber-tests/pom.xml +++ b/irs-cucumber-tests/pom.xml @@ -14,23 +14,19 @@ IRS Cucumber - - 7.11.1 - - io.cucumber cucumber-bom - ${cucumber.version} + ${cucumber-bom.version} pom import org.junit junit-bom - 5.9.2 + ${junit-bom.version} pom import @@ -90,18 +86,18 @@ org.yaml snakeyaml - 2.0 + ${snakeyaml.version} io.rest-assured rest-assured - 5.2.1 + ${rest-assured.version} test org.awaitility awaitility - 4.2.0 + ${awaitility.version} test @@ -117,7 +113,6 @@ org.apache.maven.plugins maven-compiler-plugin - 3.11.0 ${project.build.sourceEncoding} ${maven.compiler.source} @@ -127,7 +122,6 @@ org.apache.maven.plugins maven-surefire-plugin - 3.0.0-M8 diff --git a/irs-edc-client/pom.xml b/irs-edc-client/pom.xml index e6e2677bbd..ebd3960297 100644 --- a/irs-edc-client/pom.xml +++ b/irs-edc-client/pom.xml @@ -48,7 +48,7 @@ commons-validator commons-validator - 1.7 + ${commons-validator.version} org.apache.commons @@ -85,13 +85,13 @@ io.swagger.core.v3 swagger-annotations - 2.2.8 + ${swagger-annotations.version} org.eclipse.edc connector-core - 0.1.3 + ${edc.version} runtime-metamodel @@ -111,33 +111,42 @@ com.squareup.okio okio-jvm - 3.5.0 + ${okio-jvm.version} org.bouncycastle bcpkix-jdk18on - 1.75 + ${bc-jdk18on.version} org.bouncycastle bcprov-jdk18on - 1.75 + ${bc-jdk18on.version} org.eclipse.edc dsp - 0.1.3 + ${edc.version} runtime-metamodel org.eclipse.edc + + jetty-xml + org.eclipse.jetty + + + jetty-xml + org.eclipse.jetty + 11.0.16 + org.eclipse.edc json-ld - 0.1.3 + ${edc.version} runtime-metamodel @@ -148,7 +157,7 @@ runtime-metamodel org.eclipse.edc - 0.1.3 + ${edc.version} @@ -166,13 +175,13 @@ com.github.tomakehurst wiremock-jre8-standalone - 2.35.0 + ${wiremock-jre8-standalone.version} test io.rest-assured rest-assured - 5.2.0 + ${rest-assured.version} test @@ -185,26 +194,26 @@ io.rest-assured json-path - 5.2.0 + ${rest-assured.version} test io.rest-assured xml-path - 5.2.0 + ${rest-assured.version} test io.rest-assured rest-assured-common - 5.2.0 + ${rest-assured.version} test org.awaitility awaitility - 4.2.0 + ${awaitility.version} test diff --git a/irs-integration-tests/pom.xml b/irs-integration-tests/pom.xml index 8323748a65..220b7615f8 100644 --- a/irs-integration-tests/pom.xml +++ b/irs-integration-tests/pom.xml @@ -35,7 +35,7 @@ org.yaml snakeyaml - 2.0 + ${snakeyaml.version} com.fasterxml.jackson.datatype @@ -44,7 +44,7 @@ io.rest-assured rest-assured - 5.2.1 + ${rest-assured.version} test @@ -55,7 +55,7 @@ org.awaitility awaitility - 4.2.0 + ${awaitility.version} test diff --git a/irs-load-tests/pom.xml b/irs-load-tests/pom.xml index f19ea75378..1cc1a9f2be 100644 --- a/irs-load-tests/pom.xml +++ b/irs-load-tests/pom.xml @@ -19,7 +19,7 @@ io.gatling gatling-app - 3.9.5 + ${gatling.version} test @@ -29,7 +29,7 @@ io.gatling gatling-maven-plugin - 4.3.0 + ${gatling-maven-plugin.version} true diff --git a/irs-models/pom.xml b/irs-models/pom.xml index 3941257471..ca3e004d04 100644 --- a/irs-models/pom.xml +++ b/irs-models/pom.xml @@ -61,13 +61,13 @@ io.swagger.core.v3 swagger-annotations - 2.2.8 + ${swagger-annotations.version} org.yaml snakeyaml - 2.0 + ${snakeyaml.version} org.projectlombok diff --git a/irs-policy-store/pom.xml b/irs-policy-store/pom.xml index 2806ac1ad8..7b124de253 100644 --- a/irs-policy-store/pom.xml +++ b/irs-policy-store/pom.xml @@ -37,7 +37,7 @@ io.minio minio - 8.5.4 + ${minio.version} com.fasterxml.jackson.core @@ -57,7 +57,7 @@ org.yaml snakeyaml - 2.0 + ${snakeyaml.version} org.projectlombok diff --git a/irs-registry-client/pom.xml b/irs-registry-client/pom.xml index 3d7a73b538..fa3ce498d1 100644 --- a/irs-registry-client/pom.xml +++ b/irs-registry-client/pom.xml @@ -39,7 +39,7 @@ org.apache.commons commons-lang3 - 3.12.0 + ${commons-lang3.version} org.springframework.boot @@ -49,7 +49,7 @@ org.yaml snakeyaml - 2.0 + ${snakeyaml.version} org.eclipse.tractusx.irs @@ -64,7 +64,7 @@ org.apache.maven.plugins maven-assembly-plugin - 3.3.0 + ${maven-assembly-plugin.version} jar-with-dependencies diff --git a/irs-testdata-upload/pom.xml b/irs-testdata-upload/pom.xml index 7c89b03b13..893f251883 100644 --- a/irs-testdata-upload/pom.xml +++ b/irs-testdata-upload/pom.xml @@ -19,18 +19,18 @@ org.bouncycastle bcprov-jdk18on - 1.76 + ${bc-jdk18on.version} org.bouncycastle bcpkix-jdk18on - 1.76 + ${bc-jdk18on.version} com.fasterxml.jackson.core jackson-databind - 2.14.2 + ${jackson-databind.version} org.projectlombok @@ -44,7 +44,7 @@ org.junit.jupiter junit-jupiter-engine - 5.9.2 + ${junit-jupiter-engine.version} test @@ -60,7 +60,7 @@ org.apache.maven.plugins maven-assembly-plugin - 3.3.0 + ${maven-assembly-plugin.version} diff --git a/irs-testing/pom.xml b/irs-testing/pom.xml index 0a43b37c23..ae4fb8e7ff 100644 --- a/irs-testing/pom.xml +++ b/irs-testing/pom.xml @@ -20,7 +20,7 @@ org.testcontainers testcontainers-bom - 1.17.6 + ${testcontainers-bom.version} pom import @@ -49,13 +49,13 @@ net.minidev json-smart - 2.4.10 + ${json-smart.version} org.yaml snakeyaml - 2.0 + ${snakeyaml.version} net.datafaker diff --git a/pom.xml b/pom.xml index 3b44be7d7b..b21269e3d1 100644 --- a/pom.xml +++ b/pom.xml @@ -47,8 +47,32 @@ 2.36.0 4.6.0 3.23.1 - 3.7.6 + 3.9.5 2.1.0 + 8.5.6 + 5.2.1 + 4.2.0 + 5.9.2 + 7.11.1 + 2.0 + 1.2.1-SNAPSHOT + 1.7 + 2.2.16 + 0.1.3 + 3.5.0 + 1.76 + 2.35.0 + 23.0.1 + 2.27.2 + 1.16.1 + 0.11.4 + 2.14.0 + 3.12.0 + 4.10.0 + 2.14.2 + 5.9.2 + 2.4.10 + 1.17.6 1.1.0 @@ -59,12 +83,15 @@ 0.8.8 3.19.0 8.2.1 - 3.1.2 3.3.0 3.11.0 3.1.1 - 1.2.1-SNAPSHOT + 7.0.1 + 4.3.0 + 3.3.0 + 3.1.0 + 0.0.1-SNAPSHOT @@ -113,7 +140,7 @@ org.eclipse.dash license-tool-plugin - 0.0.1-SNAPSHOT + ${license-tool-plugin.version} test @@ -161,7 +188,7 @@ org.apache.maven.plugins maven-gpg-plugin - 3.1.0 + ${maven-gpg-plugin.version} --pinentry-mode