chore: Convert dependencies to use libs.version.toml (sovity#908)

* Add Azure repo for core-EDC fork * Prepare lib.toml
truzzt · May 2, 2024 · e1da7ec · e1da7ec
1 parent 86df529
commit e1da7ec
Show file tree

Hide file tree

Showing 36 changed files with 463 additions and 293 deletions.
diff --git a/.github/ISSUE_TEMPLATE/release.md b/.github/ISSUE_TEMPLATE/release.md
@@ -49,7 +49,7 @@ Feel free to edit this release checklist in-progress depending on what tasks nee
   - [ ] Set the UI release version for `EDC_UI_IMAGE` of
         the [docker-compose's .env file](https://github.com/sovity/edc-extensions/blob/main/.env).
   - [ ] If the Eclipse EDC version changed, update
-        the [eclipse-edc-management-api.yaml file](https://github.com/sovity/edc-extensions/blob/main/docs/eclipse-edc-management-api.yaml).
+        the [eclipse-edc-management-api.yaml file](https://github.com/sovity/edc-extensions/blob/main/docs/api/eclipse-edc-management-api.yaml).
   - [ ] Update the Postman Collection if required.
   - [ ] Merge the `release-prep` PR.
 - [ ] Wait for the main branch to be green. You can check the status in GH [actions](https://github.com/sovity/edc-extensions/actions).
@@ -60,7 +60,7 @@ Feel free to edit this release checklist in-progress depending on what tasks nee
     - [ ] Test with `EDC_UI_ACTIVE_PROFILE=sovity-open-source`
     - [ ] Test with `EDC_UI_ACTIVE_PROFILE=mds-open-source`
   - [ ] Ensure with a `docker ps -a` that all containers are healthy, and not `healthy: starting` or `healthy: unhealthy`.
-- [ ] Test the postman collection against that running docker-compose.
+- [ ] Test the [postman collection](../../docs/api/postman_collection.json) against that running docker-compose.
 - [ ] [Create a release](https://github.com/sovity/edc-extensions/releases/new)
   - [ ] In `Choose the tag`, type your new release version in the format `vx.y.z` (for instance `v1.2.3`) then click `+Create new tag vx.y.z on release`.
   - [ ] Re-use the changelog section as release description, and the version as title.

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,6 +1,5 @@
 import org.gradle.api.tasks.testing.logging.TestExceptionFormat
 import org.gradle.api.tasks.testing.logging.TestLogEvent
-import org.gradle.internal.impldep.org.jsoup.safety.Safelist.basic
 
 plugins {
     id("java")
@@ -9,8 +8,8 @@ plugins {
 }
 
 dependencies {
-    testImplementation("org.junit.jupiter:junit-jupiter-api:5.10.0")
-    testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.10.0")
+    testImplementation(libs.junit.api)
+    testRuntimeOnly(libs.junit.engine)
 }
 
 val downloadArtifact: Configuration by configurations.creating {

diff --git a/docs/eclipse-edc-management-api.yaml → docs/api/eclipse-edc-management-api.yaml b/docs/eclipse-edc-management-api.yaml → docs/api/eclipse-edc-management-api.yaml
diff --git a/docs/postman_collection.json → docs/api/postman_collection.json b/docs/postman_collection.json → docs/api/postman_collection.json
diff --git a/docs/sovity-edc-api-wrapper.yaml → docs/api/sovity-edc-api-wrapper.yaml b/docs/sovity-edc-api-wrapper.yaml → docs/api/sovity-edc-api-wrapper.yaml
diff --git a/extensions/edc-ui-config/build.gradle.kts b/extensions/edc-ui-config/build.gradle.kts
@@ -11,17 +11,17 @@ plugins {
 }
 
 dependencies {
-    api("${edcGroup}:core-spi:${edcVersion}")
-    api("${edcGroup}:control-plane-spi:${edcVersion}")
-    implementation("${edcGroup}:api-core:${edcVersion}")
-    implementation("${edcGroup}:management-api-configuration:${edcVersion}")
+    api(libs.edc.coreSpi)
+    api(libs.edc.controlPlaneSpi)
+    implementation(libs.edc.apiCore)
+    implementation(libs.edc.managementApiConfiguration)
 
-    implementation("jakarta.ws.rs:jakarta.ws.rs-api:3.1.0")
-    implementation("jakarta.validation:jakarta.validation-api:3.0.2")
+    implementation(libs.jakarta.rsApi)
+    implementation(libs.jakarta.validationApi)
 
-    testImplementation("${edcGroup}:control-plane-core:${edcVersion}")
-    testImplementation("${edcGroup}:junit:${edcVersion}")
-    testImplementation("${edcGroup}:http:${edcVersion}") {
+    testImplementation(libs.edc.controlPlaneCore)
+    testImplementation(libs.edc.junit)
+    testImplementation(libs.edc.http) {
         exclude(group = "org.eclipse.jetty", module = "jetty-client")
         exclude(group = "org.eclipse.jetty", module = "jetty-http")
         exclude(group = "org.eclipse.jetty", module = "jetty-io")
@@ -31,18 +31,13 @@ dependencies {
     }
 
     // Updated jetty versions for e.g. CVE-2023-26048
-    testImplementation("${jettyGroup}:jetty-client:${jettyVersion}")
-    testImplementation("${jettyGroup}:jetty-http:${jettyVersion}")
-    testImplementation("${jettyGroup}:jetty-io:${jettyVersion}")
-    testImplementation("${jettyGroup}:jetty-server:${jettyVersion}")
-    testImplementation("${jettyGroup}:jetty-util:${jettyVersion}")
-    testImplementation("${jettyGroup}:jetty-webapp:${jettyVersion}")
-
-    testImplementation("io.rest-assured:rest-assured:${restAssured}")
-    testImplementation("${edcGroup}:data-plane-selector-core:${edcVersion}")
-    testImplementation("org.mockito:mockito-core:${mockitoVersion}")
-    testImplementation("org.junit.jupiter:junit-jupiter-api:5.10.0")
-    testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.10.0")
+    testImplementation(libs.bundles.jetty.cve2023)
+
+    testImplementation(libs.restAssured.restAssured)
+    testImplementation(libs.edc.dataPlaneSelectorCore)
+    testImplementation(libs.mockito.core)
+    testImplementation(libs.junit.api)
+    testRuntimeOnly(libs.junit.engine)
 }
 
 val sovityEdcExtensionGroup: String by project

diff --git a/extensions/last-commit-info/build.gradle.kts b/extensions/last-commit-info/build.gradle.kts
@@ -12,23 +12,23 @@ plugins {
 }
 
 dependencies {
-    annotationProcessor("org.projectlombok:lombok:${lombokVersion}")
-    compileOnly("org.projectlombok:lombok:${lombokVersion}")
+    annotationProcessor(libs.lombok)
+    compileOnly(libs.lombok)
 
-    api("${edcGroup}:core-spi:${edcVersion}")
-    api("${edcGroup}:control-plane-spi:${edcVersion}")
-    implementation("${edcGroup}:api-core:${edcVersion}")
-    implementation("${edcGroup}:management-api-configuration:${edcVersion}")
+    api(libs.edc.coreSpi)
+    api(libs.edc.controlPlaneSpi)
+    implementation(libs.edc.apiCore)
+    implementation(libs.edc.managementApiConfiguration)
 
-    implementation("jakarta.ws.rs:jakarta.ws.rs-api:3.1.0")
-    implementation("jakarta.validation:jakarta.validation-api:3.0.2")
+    implementation(libs.jakarta.rsApi)
+    implementation(libs.jakarta.validationApi)
 
-    testAnnotationProcessor("org.projectlombok:lombok:${lombokVersion}")
-    testCompileOnly("org.projectlombok:lombok:${lombokVersion}")
+    testAnnotationProcessor(libs.lombok)
+    testCompileOnly(libs.lombok)
 
-    testImplementation("${edcGroup}:control-plane-core:${edcVersion}")
-    testImplementation("${edcGroup}:junit:${edcVersion}")
-    testImplementation("${edcGroup}:http:${edcVersion}") {
+    testImplementation(libs.edc.controlPlaneCore)
+    testImplementation(libs.edc.junit)
+    testImplementation(libs.edc.http) {
         exclude(group = "org.eclipse.jetty", module = "jetty-client")
         exclude(group = "org.eclipse.jetty", module = "jetty-http")
         exclude(group = "org.eclipse.jetty", module = "jetty-io")
@@ -38,18 +38,13 @@ dependencies {
     }
 
     // Updated jetty versions for e.g. CVE-2023-26048
-    testImplementation("${jettyGroup}:jetty-client:${jettyVersion}")
-    testImplementation("${jettyGroup}:jetty-http:${jettyVersion}")
-    testImplementation("${jettyGroup}:jetty-io:${jettyVersion}")
-    testImplementation("${jettyGroup}:jetty-server:${jettyVersion}")
-    testImplementation("${jettyGroup}:jetty-util:${jettyVersion}")
-    testImplementation("${jettyGroup}:jetty-webapp:${jettyVersion}")
+    testImplementation(libs.bundles.jetty.cve2023)
 
-    testImplementation("io.rest-assured:rest-assured:${restAssured}")
-    testImplementation("${edcGroup}:data-plane-selector-core:${edcVersion}")
-    testImplementation("org.mockito:mockito-core:${mockitoVersion}")
-    testImplementation("org.junit.jupiter:junit-jupiter-api:5.10.0")
-    testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.10.0")
+    testImplementation(libs.restAssured.restAssured)
+    testImplementation(libs.edc.dataPlaneSelectorCore)
+    testImplementation(libs.mockito.core)
+    testImplementation(libs.junit.api)
+    testRuntimeOnly(libs.junit.engine)
 }
 
 val sovityEdcExtensionGroup: String by project

diff --git a/extensions/policy-always-true/build.gradle.kts b/extensions/policy-always-true/build.gradle.kts
@@ -8,17 +8,17 @@ plugins {
 }
 
 dependencies {
-    api("${edcGroup}:core-spi:${edcVersion}")
-    api("${edcGroup}:policy-engine-spi:${edcVersion}")
-    api("${edcGroup}:control-plane-spi:${edcVersion}")
-    implementation("${edcGroup}:api-core:${edcVersion}")
+    api(libs.edc.coreSpi)
+    api(libs.edc.policyEngineSpi)
+    api(libs.edc.controlPlaneSpi)
+    implementation(libs.edc.apiCore)
 
-    testImplementation("${edcGroup}:control-plane-core:${edcVersion}")
-    testImplementation("${edcGroup}:junit:${edcVersion}")
-    testImplementation("${edcGroup}:data-plane-selector-core:${edcVersion}")
-    testImplementation("org.mockito:mockito-core:${mockitoVersion}")
-    testImplementation("org.junit.jupiter:junit-jupiter-api:5.10.0")
-    testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.10.0")
+    testImplementation(libs.edc.controlPlaneCore)
+    testImplementation(libs.edc.junit)
+    testImplementation(libs.edc.dataPlaneSelectorCore)
+    testImplementation(libs.mockito.core)
+    testImplementation(libs.junit.api)
+    testRuntimeOnly(libs.junit.engine)
 }
 
 val sovityEdcExtensionGroup: String by project

diff --git a/extensions/policy-referring-connector/build.gradle.kts b/extensions/policy-referring-connector/build.gradle.kts
@@ -9,14 +9,14 @@ plugins {
 }
 
 dependencies {
-    api("${edcGroup}:auth-spi:${edcVersion}")
-    api("${edcGroup}:policy-engine-spi:${edcVersion}")
-    api("${edcGroup}:contract-spi:${edcVersion}")
-    testImplementation("${edcGroup}:junit:${edcVersion}")
+    api(libs.edc.authSpi)
+    api(libs.edc.policyEngineSpi)
+    api(libs.edc.contractSpi)
+    testImplementation(libs.edc.junit)
 
-    testImplementation("org.mockito:mockito-core:${mockitoVersion}")
-    testImplementation("org.junit.jupiter:junit-jupiter-api:${jupiterVersion}")
-    testImplementation("org.junit.jupiter:junit-jupiter-params:${jupiterVersion}")
+    testImplementation(libs.mockito.core)
+    testImplementation(libs.junit.api)
+    testImplementation(libs.junit.params)
 }
 
 tasks.withType<Test> {

diff --git a/extensions/policy-time-interval/build.gradle.kts b/extensions/policy-time-interval/build.gradle.kts
@@ -7,9 +7,9 @@ plugins {
 }
 
 dependencies {
-    api("${edcGroup}:auth-spi:${edcVersion}")
-    api("${edcGroup}:policy-engine-spi:${edcVersion}")
-    testImplementation("${edcGroup}:junit:${edcVersion}")
+    api(libs.edc.authSpi)
+    api(libs.edc.policyEngineSpi)
+    testImplementation(libs.edc.junit)
 }
 
 val sovityEdcExtensionGroup: String by project

diff --git a/extensions/postgres-flyway/build.gradle.kts b/extensions/postgres-flyway/build.gradle.kts
@@ -12,22 +12,22 @@ plugins {
 }
 
 dependencies {
-    annotationProcessor("org.projectlombok:lombok:${lombokVersion}")
-    compileOnly("org.projectlombok:lombok:${lombokVersion}")
+    annotationProcessor(libs.lombok)
+    compileOnly(libs.lombok)
 
-    implementation("${edcGroup}:core-spi:${edcVersion}")
-    implementation("${edcGroup}:sql-core:${edcVersion}")
+    implementation(libs.edc.coreSpi)
+    implementation(libs.edc.sqlCore)
 
     // Adds Database-Related EDC-Extensions (EDC-SQL-Stores, JDBC-Driver, Pool and Transactions)
-    implementation("${edcGroup}:control-plane-sql:${edcVersion}")
-    implementation("${tractusGroup}:sql-pool:${tractusVersion}")
-    implementation("${edcGroup}:transaction-local:${edcVersion}")
+    implementation(libs.edc.controlPlaneSql)
+    implementation(libs.edc.transactionLocal)
+    implementation(libs.tractus.sqlPool)
 
-    implementation("org.postgresql:postgresql:${postgresVersion}")
+    implementation(libs.postgres)
 
-    implementation("org.flywaydb:flyway-core:${flywayVersion}")
+    implementation(libs.flyway.core)
 
-    testImplementation("${edcGroup}:junit:${edcVersion}")
+    testImplementation(libs.edc.junit)
 }
 
 val sovityEdcExtensionGroup: String by project

diff --git a/extensions/test-backend-controller/build.gradle.kts b/extensions/test-backend-controller/build.gradle.kts
@@ -6,9 +6,9 @@ plugins {
 }
 
 dependencies {
-    api("${edcGroup}:api-core:${edcVersion}")
-    api("${edcGroup}:core-spi:${edcVersion}")
-    api("${edcGroup}:http:${edcVersion}")
+    api(libs.edc.apiCore)
+    api(libs.edc.coreSpi)
+    api(libs.edc.http)
 }
 
 val sovityEdcExtensionGroup: String by project
@@ -20,4 +20,4 @@ publishing {
             from(components["java"])
         }
     }
-}
+}
diff --git a/extensions/transfer-process-status-checker/build.gradle.kts b/extensions/transfer-process-status-checker/build.gradle.kts
@@ -7,8 +7,8 @@ plugins {
 }
 
 dependencies {
-    api("${edcGroup}:transfer-spi:${edcVersion}")
-    testImplementation("${edcGroup}:junit:${edcVersion}")
+    api(libs.edc.transferSpi)
+    testImplementation(libs.edc.junit)
 }
 
 val sovityEdcExtensionGroup: String by project

diff --git a/extensions/wrapper/README.md b/extensions/wrapper/README.md
@@ -21,7 +21,7 @@ We provide a full type-safe and opinionated API Wrapper for better access to the
 ## Explore
 
 Create and consume Data Offers using clean type-safe JSON REST APIs:
-- [API Wrapper OpenAPI YAML](../../docs/sovity-edc-api-wrapper.yaml).
+- [API Wrapper OpenAPI YAML](../../docs/api/sovity-edc-api-wrapper.yaml).
 - [Java API Client Library](./clients/java-client)
 - [TypeScript API Client Library](./clients/typescript-client)
 

diff --git a/extensions/wrapper/clients/java-client-example/build.gradle.kts b/extensions/wrapper/clients/java-client-example/build.gradle.kts
@@ -1,6 +1,6 @@
 plugins {
     java
-    id("io.quarkus") version "2.16.6.Final"
+    alias(libs.plugins.quarkus)
 }
 
 repositories {
@@ -13,7 +13,7 @@ val quarkusPlatformArtifactId = "quarkus-bom"
 val quarkusPlatformVersion = "2.16.6.Final"
 
 dependencies {
-    implementation(enforcedPlatform("${quarkusPlatformGroupId}:${quarkusPlatformArtifactId}:${quarkusPlatformVersion}"))
+    implementation(enforcedPlatform(libs.quarkus.bom))
     implementation("io.quarkus:quarkus-arc")
     implementation("io.quarkus:quarkus-resteasy-reactive-jackson")