fix: more dependency fixes (#178)

paullatzelsperger · web-flow · commit b58ae320eb94 · 2024-04-05T12:06:19.000+02:00
* fix(dependency): update more dependencies

* DEPENDENCIES
diff --git a/DEPENDENCIES b/DEPENDENCIES
@@ -51,7 +51,6 @@ maven/mavencentral/com.fasterxml.jackson.core/jackson-annotations/2.13.5, Apache
 maven/mavencentral/com.fasterxml.jackson.core/jackson-annotations/2.14.2, Apache-2.0, approved, #5303
 maven/mavencentral/com.fasterxml.jackson.core/jackson-annotations/2.15.1, Apache-2.0, approved, #7947
 maven/mavencentral/com.fasterxml.jackson.core/jackson-annotations/2.15.3, Apache-2.0, approved, #7947
-maven/mavencentral/com.fasterxml.jackson.core/jackson-annotations/2.16.2, Apache-2.0, approved, #11606
 maven/mavencentral/com.fasterxml.jackson.core/jackson-annotations/2.17.0, Apache-2.0, approved, #13672
 maven/mavencentral/com.fasterxml.jackson.core/jackson-core/2.13.5, Apache-2.0, approved, #2133
 maven/mavencentral/com.fasterxml.jackson.core/jackson-core/2.14.2, Apache-2.0 AND MIT, approved, #4303
@@ -62,14 +61,12 @@ maven/mavencentral/com.fasterxml.jackson.core/jackson-databind/2.13.5, Apache-2.
 maven/mavencentral/com.fasterxml.jackson.core/jackson-databind/2.14.2, Apache-2.0, approved, #4105
 maven/mavencentral/com.fasterxml.jackson.core/jackson-databind/2.15.1, Apache-2.0, approved, #7934
 maven/mavencentral/com.fasterxml.jackson.core/jackson-databind/2.15.3, Apache-2.0, approved, #7934
-maven/mavencentral/com.fasterxml.jackson.core/jackson-databind/2.16.2, Apache-2.0, approved, #11605
 maven/mavencentral/com.fasterxml.jackson.core/jackson-databind/2.17.0, Apache-2.0, approved, #13671
 maven/mavencentral/com.fasterxml.jackson.dataformat/jackson-dataformat-xml/2.13.5, Apache-2.0, approved, #3768
 maven/mavencentral/com.fasterxml.jackson.dataformat/jackson-dataformat-xml/2.17.0, Apache-2.0, approved, #13666
 maven/mavencentral/com.fasterxml.jackson.dataformat/jackson-dataformat-yaml/2.12.1, Apache-2.0, approved, CQ23167
 maven/mavencentral/com.fasterxml.jackson.dataformat/jackson-dataformat-yaml/2.15.1, Apache-2.0, approved, #8802
 maven/mavencentral/com.fasterxml.jackson.dataformat/jackson-dataformat-yaml/2.17.0, Apache-2.0, approved, #13669
-maven/mavencentral/com.fasterxml.jackson.datatype/jackson-datatype-jakarta-jsonp/2.16.2, Apache-2.0, approved, #11854
 maven/mavencentral/com.fasterxml.jackson.datatype/jackson-datatype-jakarta-jsonp/2.17.0, Apache-2.0, approved, #14161
 maven/mavencentral/com.fasterxml.jackson.datatype/jackson-datatype-jsr310/2.12.1, Apache-2.0, approved, CQ23727
 maven/mavencentral/com.fasterxml.jackson.datatype/jackson-datatype-jsr310/2.13.5, Apache-2.0, approved, clearlydefined
@@ -164,7 +161,7 @@ maven/mavencentral/io.rest-assured/xml-path/5.4.0, Apache-2.0, approved, #12038
 maven/mavencentral/io.setl/rdf-urdna/1.1, Apache-2.0, approved, clearlydefined
 maven/mavencentral/io.swagger.core.v3/swagger-annotations-jakarta/2.1.13, Apache-2.0, approved, clearlydefined
 maven/mavencentral/io.swagger.core.v3/swagger-annotations-jakarta/2.2.15, Apache-2.0, approved, #5947
-maven/mavencentral/io.swagger.core.v3/swagger-annotations-jakarta/2.2.20, Apache-2.0, approved, #5947
+maven/mavencentral/io.swagger.core.v3/swagger-annotations-jakarta/2.2.21, Apache-2.0, approved, #5947
 maven/mavencentral/io.swagger.core.v3/swagger-core-jakarta/2.1.13, Apache-2.0, approved, clearlydefined
 maven/mavencentral/io.swagger.core.v3/swagger-core-jakarta/2.2.15, Apache-2.0, approved, #5929
 maven/mavencentral/io.swagger.core.v3/swagger-integration-jakarta/2.1.13, Apache-2.0, approved, clearlydefined
@@ -228,6 +225,7 @@ maven/mavencentral/org.assertj/assertj-core/3.24.2, Apache-2.0, approved, #6161
 maven/mavencentral/org.assertj/assertj-core/3.25.1, Apache-2.0, approved, #12585
 maven/mavencentral/org.assertj/assertj-core/3.25.3, Apache-2.0, approved, #12585
 maven/mavencentral/org.awaitility/awaitility/4.2.0, Apache-2.0, approved, #14178
+maven/mavencentral/org.awaitility/awaitility/4.2.1, Apache-2.0, approved, #14178
 maven/mavencentral/org.bouncycastle/bcpkix-jdk18on/1.77, MIT, approved, #11593
 maven/mavencentral/org.bouncycastle/bcprov-jdk18on/1.77, MIT AND CC0-1.0, approved, #11595
 maven/mavencentral/org.bouncycastle/bcutil-jdk18on/1.77, MIT, approved, #11596
@@ -286,23 +284,23 @@ maven/mavencentral/org.eclipse.edc/data-plane-selector-spi/0.6.1-SNAPSHOT, Apach
 maven/mavencentral/org.eclipse.edc/data-plane-spi/0.6.1-SNAPSHOT, Apache-2.0, approved, technology.edc
 maven/mavencentral/org.eclipse.edc/data-plane-store-sql/0.6.1-SNAPSHOT, Apache-2.0, approved, technology.edc
 maven/mavencentral/org.eclipse.edc/data-plane-util/0.6.1-SNAPSHOT, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/dsp-api-configuration/0.6.1-SNAPSHOT, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/dsp-catalog-api/0.6.1-SNAPSHOT, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/dsp-catalog-http-api/0.6.1-SNAPSHOT, Apache-2.0, approved, technology.edc
 maven/mavencentral/org.eclipse.edc/dsp-catalog-http-dispatcher/0.6.1-SNAPSHOT, Apache-2.0, approved, technology.edc
 maven/mavencentral/org.eclipse.edc/dsp-catalog-transform/0.6.1-SNAPSHOT, Apache-2.0, approved, technology.edc
 maven/mavencentral/org.eclipse.edc/dsp-catalog/0.6.1-SNAPSHOT, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/dsp-http-api-configuration/0.6.1-SNAPSHOT, Apache-2.0, approved, technology.edc
 maven/mavencentral/org.eclipse.edc/dsp-http-core/0.6.1-SNAPSHOT, Apache-2.0, approved, technology.edc
 maven/mavencentral/org.eclipse.edc/dsp-http-spi/0.6.1-SNAPSHOT, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/dsp-negotiation-api/0.6.1-SNAPSHOT, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/dsp-negotiation-http-api/0.6.1-SNAPSHOT, Apache-2.0, approved, technology.edc
 maven/mavencentral/org.eclipse.edc/dsp-negotiation-http-dispatcher/0.6.1-SNAPSHOT, Apache-2.0, approved, technology.edc
 maven/mavencentral/org.eclipse.edc/dsp-negotiation-transform/0.6.1-SNAPSHOT, Apache-2.0, approved, technology.edc
 maven/mavencentral/org.eclipse.edc/dsp-negotiation/0.6.1-SNAPSHOT, Apache-2.0, approved, technology.edc
 maven/mavencentral/org.eclipse.edc/dsp-spi/0.6.1-SNAPSHOT, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/dsp-transfer-process-api/0.6.1-SNAPSHOT, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/dsp-transfer-process-http-api/0.6.1-SNAPSHOT, Apache-2.0, approved, technology.edc
 maven/mavencentral/org.eclipse.edc/dsp-transfer-process-http-dispatcher/0.6.1-SNAPSHOT, Apache-2.0, approved, technology.edc
 maven/mavencentral/org.eclipse.edc/dsp-transfer-process-transform/0.6.1-SNAPSHOT, Apache-2.0, approved, technology.edc
 maven/mavencentral/org.eclipse.edc/dsp-transfer-process/0.6.1-SNAPSHOT, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/dsp-version-api/0.6.1-SNAPSHOT, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/dsp-version-http-api/0.6.1-SNAPSHOT, Apache-2.0, approved, technology.edc
 maven/mavencentral/org.eclipse.edc/dsp/0.6.1-SNAPSHOT, Apache-2.0, approved, technology.edc
 maven/mavencentral/org.eclipse.edc/http-lib/0.6.1-SNAPSHOT, Apache-2.0, approved, technology.edc
 maven/mavencentral/org.eclipse.edc/http-spi/0.6.1-SNAPSHOT, Apache-2.0, approved, technology.edc
@@ -363,9 +361,9 @@ maven/mavencentral/org.eclipse.edc/transfer-spi/0.6.1-SNAPSHOT, Apache-2.0, appr
 maven/mavencentral/org.eclipse.edc/transform-lib/0.6.1-SNAPSHOT, Apache-2.0, approved, technology.edc
 maven/mavencentral/org.eclipse.edc/transform-spi/0.6.1-SNAPSHOT, Apache-2.0, approved, technology.edc
 maven/mavencentral/org.eclipse.edc/util-lib/0.6.1-SNAPSHOT, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/util/0.6.1-SNAPSHOT, Apache-2.0, approved, technology.edc
 maven/mavencentral/org.eclipse.edc/validator-lib/0.6.1-SNAPSHOT, Apache-2.0, approved, technology.edc
 maven/mavencentral/org.eclipse.edc/validator-spi/0.6.1-SNAPSHOT, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/verifiable-credentials-spi/0.6.1-SNAPSHOT, Apache-2.0, approved, technology.edc
 maven/mavencentral/org.eclipse.edc/web-spi/0.6.1-SNAPSHOT, Apache-2.0, approved, technology.edc
 maven/mavencentral/org.eclipse.jetty.toolchain/jetty-jakarta-servlet-api/5.0.2, EPL-2.0 OR Apache-2.0, approved, rt.jetty
 maven/mavencentral/org.eclipse.jetty.toolchain/jetty-jakarta-websocket-api/2.0.0, EPL-2.0 OR Apache-2.0, approved, rt.jetty
@@ -415,9 +413,9 @@ maven/mavencentral/org.javassist/javassist/3.25.0-GA, MPL-1.1 OR LGPL-2.1-or-lat
 maven/mavencentral/org.javassist/javassist/3.28.0-GA, Apache-2.0 OR LGPL-2.1-or-later OR MPL-1.1, approved, #327
 maven/mavencentral/org.javassist/javassist/3.29.2-GA, Apache-2.0 AND LGPL-2.1-or-later AND MPL-1.1, approved, #6023
 maven/mavencentral/org.jetbrains.kotlin/kotlin-stdlib-common/1.9.10, Apache-2.0, approved, #14186
-maven/mavencentral/org.jetbrains.kotlin/kotlin-stdlib-jdk7/1.9.10, None, restricted, #14193
+maven/mavencentral/org.jetbrains.kotlin/kotlin-stdlib-jdk7/1.9.10, Apache-2.0, approved, #14193
 maven/mavencentral/org.jetbrains.kotlin/kotlin-stdlib-jdk8/1.8.21, Apache-2.0, approved, #8919
-maven/mavencentral/org.jetbrains.kotlin/kotlin-stdlib-jdk8/1.9.10, None, restricted, #14191
+maven/mavencentral/org.jetbrains.kotlin/kotlin-stdlib-jdk8/1.9.10, Apache-2.0, approved, #14191
 maven/mavencentral/org.jetbrains.kotlin/kotlin-stdlib/1.9.10, Apache-2.0, approved, #11827
 maven/mavencentral/org.jetbrains/annotations/13.0, Apache-2.0, approved, clearlydefined
 maven/mavencentral/org.jetbrains/annotations/17.0.0, Apache-2.0, approved, clearlydefined
diff --git a/extensions/common/azure/azure-blob-core/build.gradle.kts b/extensions/common/azure/azure-blob-core/build.gradle.kts
@@ -21,7 +21,7 @@ dependencies {
     api(libs.edc.controlplane.spi)
     implementation(libs.azure.storageblob)
     implementation(libs.azure.identity)
-    implementation(libs.edc.util)
+    implementation(libs.edc.lib.util)
 
     testFixturesApi(libs.edc.core.dataPlane.util)
 
diff --git a/extensions/common/azure/azure-eventgrid/build.gradle.kts b/extensions/common/azure/azure-eventgrid/build.gradle.kts
@@ -18,7 +18,7 @@ plugins {
 
 dependencies {
     api(libs.edc.controlplane.spi)
-    implementation(libs.edc.util)
+    implementation(libs.edc.lib.util)
 
     implementation(libs.azure.eventgrid)
 }
diff --git a/extensions/common/azure/azure-resource-manager/build.gradle.kts b/extensions/common/azure/azure-resource-manager/build.gradle.kts
@@ -18,7 +18,7 @@ plugins {
 
 dependencies {
     implementation(libs.edc.core.dataPlane.util)
-    implementation(libs.edc.util)
+    implementation(libs.edc.lib.util)
     implementation(libs.azure.identity)
     implementation(libs.azure.resourcemanager)
     implementation(libs.azure.resourcemanager.authorization)
diff --git a/extensions/common/azure/azure-test/build.gradle.kts b/extensions/common/azure/azure-test/build.gradle.kts
@@ -23,7 +23,7 @@ dependencies {
     testFixturesApi(libs.edc.spi.transaction.datasource)
     testFixturesApi(libs.postgres)
     testFixturesApi(libs.testcontainers.junit)
-    testFixturesApi(libs.edc.util)
+    testFixturesApi(libs.edc.lib.util)
     testFixturesApi(libs.edc.junit)
     testFixturesApi(libs.edc.sql.core)
     testFixturesApi(libs.azure.storageblob)
diff --git a/extensions/control-plane/store/asset-index-cosmos/build.gradle.kts b/extensions/control-plane/store/asset-index-cosmos/build.gradle.kts
@@ -18,7 +18,7 @@ plugins {
 
 dependencies {
     api(libs.edc.spi.core)
-    api(libs.edc.util)
+    api(libs.edc.lib.util)
     implementation(libs.failsafe.core)
 
     testImplementation(testFixtures(project(":extensions:common:azure:azure-test")))
diff --git a/extensions/control-plane/store/contract-definition-store-cosmos/build.gradle.kts b/extensions/control-plane/store/contract-definition-store-cosmos/build.gradle.kts
@@ -18,7 +18,7 @@ plugins {
 
 dependencies {
     testImplementation(libs.edc.spi.contract)
-    testImplementation(libs.edc.util)
+    testImplementation(libs.edc.lib.util)
 
     implementation(libs.failsafe.core)
 
diff --git a/extensions/control-plane/store/contract-negotiation-store-cosmos/build.gradle.kts b/extensions/control-plane/store/contract-negotiation-store-cosmos/build.gradle.kts
@@ -18,7 +18,7 @@ plugins {
 
 dependencies {
     api(libs.edc.spi.contract)
-    api(libs.edc.util)
+    api(libs.edc.lib.util)
 
     implementation(libs.failsafe.core)
 
diff --git a/extensions/control-plane/store/policy-definition-store-cosmos/build.gradle.kts b/extensions/control-plane/store/policy-definition-store-cosmos/build.gradle.kts
@@ -18,7 +18,7 @@ plugins {
 
 dependencies {
     api(libs.edc.spi.policy)
-    implementation(libs.edc.util)
+    implementation(libs.edc.lib.util)
 
     implementation(libs.failsafe.core)
 
diff --git a/extensions/control-plane/store/transfer-process-store-cosmos/build.gradle.kts b/extensions/control-plane/store/transfer-process-store-cosmos/build.gradle.kts
@@ -18,7 +18,7 @@ plugins {
 
 dependencies {
     api(libs.edc.spi.transfer)
-    api(libs.edc.util)
+    api(libs.edc.lib.util)
 
     implementation(libs.failsafe.core)
 
diff --git a/extensions/data-plane/data-plane-azure-data-factory/build.gradle.kts b/extensions/data-plane/data-plane-azure-data-factory/build.gradle.kts
@@ -20,7 +20,7 @@ dependencies {
     api(project(":extensions:common:azure:azure-blob-core"))
     api(libs.edc.spi.dataplane)
     implementation(libs.edc.core.dataPlane.util)
-    implementation(libs.edc.util)
+    implementation(libs.edc.lib.util)
     implementation(libs.azure.identity)
     implementation(libs.azure.resourcemanager.datafactory)
     implementation(libs.azure.resourcemanager.storage)
diff --git a/extensions/data-plane/data-plane-azure-storage/build.gradle.kts b/extensions/data-plane/data-plane-azure-storage/build.gradle.kts
@@ -21,7 +21,7 @@ dependencies {
     api(libs.edc.core.dataPlane.util)
     api(libs.edc.spi.dataplane)
     implementation(libs.edc.core.dataPlane.util)
-    implementation(libs.edc.util)
+    implementation(libs.edc.lib.util)
 
     implementation(libs.azure.storageblob)
     implementation(libs.failsafe.core)
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -77,9 +77,12 @@ edc-spi-asset = { module = "org.eclipse.edc:asset-spi", version.ref = "edc" }
 edc-transfer-dataplane = { module = "org.eclipse.edc:transfer-data-plane", version.ref = "edc" }
 edc-transfer-httppull-receiver = { module = "org.eclipse.edc:transfer-pull-http-receiver", version.ref = "edc" }
 edc-transfer-httppull-receiver-dynamic = { module = "org.eclipse.edc:transfer-pull-http-dynamic-receiver", version.ref = "edc" }
-edc-util = { module = "org.eclipse.edc:util", version.ref = "edc" }
 edc-management-api-test-fixtures = { module = "org.eclipse.edc:management-api-test-fixtures", version.ref = "edc" }
 
+# EDC libs
+edc-lib-util = { module = "org.eclipse.edc:util-lib", version.ref = "edc" }
+
+
 # EDC dependencies for testing
 edc-sql-core = { module = "org.eclipse.edc:sql-core", version.ref = "edc" }
 edc-sql-assetindex = { module = "org.eclipse.edc:asset-index-sql", version.ref = "edc" }
diff --git a/system-tests/azure-blob-transfer-fixtures/build.gradle.kts b/system-tests/azure-blob-transfer-fixtures/build.gradle.kts
@@ -21,7 +21,7 @@ dependencies {
     testFixturesApi(project(":extensions:common:azure:azure-blob-core"))
     testFixturesApi(libs.edc.jsonld)
     testFixturesApi(testFixtures(libs.edc.management.api.test.fixtures))
-    testFixturesApi(libs.edc.util)
+    testFixturesApi(libs.edc.lib.util)
     testFixturesImplementation(libs.restAssured)
     testFixturesImplementation(libs.azure.storageblob)
     testFixturesImplementation(libs.edc.junit)
diff --git a/system-tests/runtimes/azure-data-factory-transfer-consumer/build.gradle.kts b/system-tests/runtimes/azure-data-factory-transfer-consumer/build.gradle.kts
@@ -34,7 +34,7 @@ dependencies {
 
     implementation(project(":extensions:control-plane:provision:provision-blob"))
     implementation(project(":extensions:common:vault:vault-azure"))
-    implementation(libs.edc.util)
+    implementation(libs.edc.lib.util)
 
     api(libs.jakarta.rsApi)
 }
diff --git a/system-tests/runtimes/azure-data-factory-transfer-provider/build.gradle.kts b/system-tests/runtimes/azure-data-factory-transfer-provider/build.gradle.kts
@@ -22,7 +22,7 @@ plugins {
 dependencies {
     implementation(libs.edc.core.connector)
     implementation(libs.edc.spi.dataplane)
-    implementation(libs.edc.util)
+    implementation(libs.edc.lib.util)
     implementation(libs.edc.core.controlplane)
     implementation(libs.edc.dpf.selector.core)
     implementation(libs.edc.core.dataplane)
diff --git a/system-tests/runtimes/azure-storage-transfer-consumer/build.gradle.kts b/system-tests/runtimes/azure-storage-transfer-consumer/build.gradle.kts
@@ -35,7 +35,7 @@ dependencies {
 
     implementation(project(":extensions:control-plane:provision:provision-blob"))
 
-    implementation(libs.edc.util)
+    implementation(libs.edc.lib.util)
     implementation(libs.edc.core.controlplane.apiclient)
 
 
diff --git a/system-tests/runtimes/azure-storage-transfer-provider/build.gradle.kts b/system-tests/runtimes/azure-storage-transfer-provider/build.gradle.kts
@@ -21,7 +21,7 @@ plugins {
 
 dependencies {
     implementation(libs.edc.core.connector)
-    implementation(libs.edc.util)
+    implementation(libs.edc.lib.util)
 
     implementation(libs.edc.core.controlplane)
     implementation(libs.edc.dpf.selector.core)

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ plugins {`
`18`	`18`
`19`	`19`	`dependencies {`
`20`	`20`	`api(libs.edc.controlplane.spi)`
`21`		`- implementation(libs.edc.util)`
	`21`	`+ implementation(libs.edc.lib.util)`
`22`	`22`
`23`	`23`	`implementation(libs.azure.eventgrid)`
`24`	`24`	`}`