Skip to content

Commit

Permalink
build(deps): remove root version catalog dependency (#99)
Browse files Browse the repository at this point in the history
  • Loading branch information
ndr-brt authored Apr 13, 2023
1 parent 0c35585 commit 8b75b24
Show file tree
Hide file tree
Showing 15 changed files with 38 additions and 28 deletions.
2 changes: 1 addition & 1 deletion core/identity-hub-credentials-verifier/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ dependencies {
implementation(project(":spi:identity-hub-spi"))

implementation(libs.edc.spi.identity.did)
implementation(root.nimbus.jwt)
implementation(libs.nimbus.jwt)

testImplementation(testFixtures(project(":spi:identity-hub-spi")))
testImplementation(project(":extensions:identity-hub-api"))
Expand Down
2 changes: 1 addition & 1 deletion core/identity-hub/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ dependencies {
api(project(":spi:identity-hub-spi"))
implementation(project(":spi:identity-hub-store-spi"))

implementation(root.nimbus.jwt)
implementation(libs.nimbus.jwt)
implementation(libs.edc.spi.transaction)

testImplementation(libs.edc.core.junit)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ dependencies {
implementation(project(":spi:identity-hub-spi"))

implementation(libs.edc.spi.identity.did)
implementation(root.nimbus.jwt)
implementation(libs.nimbus.jwt)

testImplementation(testFixtures(project(":spi:identity-hub-spi")))
testImplementation(project(":extensions:identity-hub-api"))
Expand Down
4 changes: 2 additions & 2 deletions extensions/identity-hub-api/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ dependencies {


testImplementation(libs.edc.core.junit)
testImplementation(root.nimbus.jwt)
testImplementation(root.restAssured)
testImplementation(libs.nimbus.jwt)
testImplementation(libs.restAssured)
testImplementation(project(":spi:identity-hub-spi"))
testImplementation(project(":extensions:credentials:identity-hub-credentials-jwt"))

Expand Down
2 changes: 1 addition & 1 deletion extensions/identity-hub-verifier-jwt/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ dependencies {
implementation(project(":spi:identity-hub-spi"))

implementation(libs.edc.spi.identity.did)
implementation(root.nimbus.jwt)
implementation(libs.nimbus.jwt)

testImplementation(testFixtures(project(":spi:identity-hub-spi")))
testImplementation(project(":extensions:identity-hub-api"))
Expand Down
2 changes: 1 addition & 1 deletion extensions/self-description-api/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -23,5 +23,5 @@ dependencies {

implementation(libs.edc.ext.http)
testImplementation(libs.edc.core.junit)
testImplementation(root.restAssured)
testImplementation(libs.restAssured)
}
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ dependencies {
api(project(":spi:identity-hub-store-spi"))
api(libs.edc.ext.azure.cosmos.core)

implementation(root.failsafe.core)
implementation(root.azure.cosmos)
implementation(libs.failsafe.core)
implementation(libs.azure.cosmos)

testImplementation(testFixtures(project(":spi:identity-hub-store-spi")))
testImplementation(testFixtures(libs.edc.ext.azure.test))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,5 @@ dependencies {
testImplementation(libs.edc.core.junit)
testImplementation(testFixtures(libs.edc.core.sql))
testImplementation(testFixtures(project(":spi:identity-hub-store-spi")))
testImplementation(root.postgres)
testImplementation(libs.postgres)
}
17 changes: 16 additions & 1 deletion gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,20 @@
format.version = "1.1"

[versions]
assertj = "3.23.1"
edc = "0.0.1-SNAPSHOT"
failsafe = "3.3.1"
jackson = "2.14.2"
jupiter = "5.9.2"
nimbus = "9.25"
picocli = "4.6.3"
postgres = "42.6.0"
restAssured = "4.5.0"
swagger = "2.1.13"

[libraries]
assertj = { module = "org.assertj:assertj-core", version.ref = "assertj" }
azure-cosmos = { group = "com.azure", name = "azure-cosmos", version = "4.42.0" }
edc-util = { module = "org.eclipse.edc:util", version.ref = "edc" }
edc-junit = { module = "org.eclipse.edc:junit", version.ref = "edc" }
edc-boot = { module = "org.eclipse.edc:boot", version.ref = "edc" }
Expand Down Expand Up @@ -37,12 +46,18 @@ edc-ext-vault-azure = { module = "org.eclipse.edc:vault-azure", version.ref = "e
edc-ext-azure-cosmos-core = { module = "org.eclipse.edc:azure-cosmos-core", version.ref = "edc" }
edc-ext-azure-test = { module = "org.eclipse.edc:azure-test", version.ref = "edc" }
edc-ext-jdklogger = { module = "org.eclipse.edc:monitor-jdk-logger", version.ref = "edc" }

failsafe-core = { module = "dev.failsafe:failsafe", version.ref = "failsafe" }
jackson-databind = { module = "com.fasterxml.jackson.core:jackson-databind", version.ref = "jackson" }
junit-jupiter-api = { module = "org.junit.jupiter:junit-jupiter-api", version.ref = "jupiter" }
nimbus-jwt = { module = "com.nimbusds:nimbus-jose-jwt", version.ref = "nimbus" }
picocli-core = { module = "info.picocli:picocli", version.ref = "picocli" }
picocli-codegen = { module = "info.picocli:picocli-codegen", version.ref = "picocli" }
postgres = { module = "org.postgresql:postgresql", version.ref = "postgres" }
restAssured = { module = "io.rest-assured:rest-assured", version.ref = "restAssured" }
swagger-jaxrs = { module = "io.swagger.core.v3:swagger-jaxrs2-jakarta", version.ref = "swagger" }

[bundles]
connector = [ "edc.boot", "edc.core-connector", "edc.ext.http", "edc.ext-observability" ]

[plugins]
shadow = { id = "com.github.johnrengelman.shadow", version = "8.0.0" }
4 changes: 2 additions & 2 deletions identity-hub-cli/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ dependencies {
implementation(libs.edc.core.connector)
implementation(libs.edc.ext.identity.did.crypto)
implementation(libs.edc.spi.identity.did)
implementation(root.jackson.databind)
implementation(root.nimbus.jwt)
implementation(libs.jackson.databind)
implementation(libs.nimbus.jwt)

testImplementation(testFixtures(project(":spi:identity-hub-spi")))
}
Expand Down
5 changes: 0 additions & 5 deletions settings.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,6 @@ dependencyResolutionManagement {
mavenCentral()
mavenLocal()
}
versionCatalogs {
create("root") {
from("org.eclipse.edc:edc-versions:0.0.1-SNAPSHOT")
}
}
}

include(":core:identity-hub")
Expand Down
2 changes: 1 addition & 1 deletion spi/identity-hub-client-spi/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,5 @@ plugins {
dependencies {
api(libs.edc.spi.core)
api(project(":spi:identity-hub-spi"))
implementation(root.nimbus.jwt)
implementation(libs.nimbus.jwt)
}
6 changes: 3 additions & 3 deletions spi/identity-hub-spi/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,14 @@ val swagger: String by project

dependencies {

implementation(root.jackson.databind)
implementation(root.nimbus.jwt)
implementation(libs.jackson.databind)
implementation(libs.nimbus.jwt)
implementation(libs.edc.spi.identity.did)

implementation(libs.swagger.jaxrs) {
exclude(group = "com.fasterxml.jackson.jaxrs", module = "jackson-jaxrs-json-provider")
}

testFixturesImplementation(root.nimbus.jwt)
testFixturesImplementation(libs.nimbus.jwt)
testFixturesImplementation(libs.edc.spi.identity.did)
}
8 changes: 4 additions & 4 deletions spi/identity-hub-store-spi/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ dependencies {
api(libs.edc.spi.core)

testFixturesImplementation(testFixtures(project(":spi:identity-hub-spi")))
testFixturesImplementation(root.junit.jupiter.api)
testFixturesImplementation(root.assertj)
testFixturesImplementation(root.nimbus.jwt)
testFixturesImplementation(root.jackson.databind)
testFixturesImplementation(libs.junit.jupiter.api)
testFixturesImplementation(libs.assertj)
testFixturesImplementation(libs.nimbus.jwt)
testFixturesImplementation(libs.jackson.databind)
}
4 changes: 2 additions & 2 deletions system-tests/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ dependencies {
testImplementation(testFixtures(project(":spi:identity-hub-spi")))
testImplementation(libs.picocli.core)
testImplementation(libs.picocli.codegen)
testImplementation(root.jackson.databind)
testImplementation(root.nimbus.jwt)
testImplementation(libs.jackson.databind)
testImplementation(libs.nimbus.jwt)
}

edcBuild {
Expand Down

0 comments on commit 8b75b24

Please sign in to comment.