Skip to content

Commit 85d4732

Browse files
authored
build: fix compilation (#170)
* build: fix compilation * dependencies
1 parent fdbc521 commit 85d4732

File tree

7 files changed

+15
-24
lines changed

7 files changed

+15
-24
lines changed

DEPENDENCIES

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ maven/mavencentral/com.google.guava/guava/33.1.0-jre, Apache-2.0 AND CC0-1.0, ap
9797
maven/mavencentral/com.google.guava/listenablefuture/9999.0-empty-to-avoid-conflict-with-guava, Apache-2.0, approved, CQ22657
9898
maven/mavencentral/com.google.protobuf/protobuf-java/3.24.3, BSD-3-Clause, approved, clearlydefined
9999
maven/mavencentral/com.microsoft.azure/msal4j-persistence-extension/1.2.0, MIT, approved, clearlydefined
100-
maven/mavencentral/com.microsoft.azure/msal4j/1.14.0, MIT, approved, clearlydefined
100+
maven/mavencentral/com.microsoft.azure/msal4j/1.14.0, MIT, approved, #14159
101101
maven/mavencentral/com.microsoft.azure/msal4j/1.4.0, MIT, approved, clearlydefined
102102
maven/mavencentral/com.nimbusds/content-type/2.2, Apache-2.0, approved, clearlydefined
103103
maven/mavencentral/com.nimbusds/lang-tag/1.7, Apache-2.0, approved, clearlydefined
@@ -263,11 +263,12 @@ maven/mavencentral/org.eclipse.edc/control-plane-api-client-spi/0.5.2-SNAPSHOT,
263263
maven/mavencentral/org.eclipse.edc/control-plane-api-client/0.5.2-SNAPSHOT, Apache-2.0, approved, technology.edc
264264
maven/mavencentral/org.eclipse.edc/control-plane-api/0.5.2-SNAPSHOT, Apache-2.0, approved, technology.edc
265265
maven/mavencentral/org.eclipse.edc/control-plane-core/0.5.2-SNAPSHOT, Apache-2.0, approved, technology.edc
266+
maven/mavencentral/org.eclipse.edc/control-plane-policies-lib/0.5.2-SNAPSHOT, Apache-2.0, approved, technology.edc
266267
maven/mavencentral/org.eclipse.edc/control-plane-spi/0.5.2-SNAPSHOT, Apache-2.0, approved, technology.edc
267268
maven/mavencentral/org.eclipse.edc/core-spi/0.3.1, Apache-2.0, approved, technology.edc
268269
maven/mavencentral/org.eclipse.edc/core-spi/0.4.1, Apache-2.0, approved, technology.edc
269270
maven/mavencentral/org.eclipse.edc/core-spi/0.5.2-SNAPSHOT, Apache-2.0, approved, technology.edc
270-
maven/mavencentral/org.eclipse.edc/crypto-common/0.5.2-SNAPSHOT, Apache-2.0, approved, technology.edc
271+
maven/mavencentral/org.eclipse.edc/crypto-common-lib/0.5.2-SNAPSHOT, Apache-2.0, approved, technology.edc
271272
maven/mavencentral/org.eclipse.edc/data-plane-client-embedded/0.5.2-SNAPSHOT, Apache-2.0, approved, technology.edc
272273
maven/mavencentral/org.eclipse.edc/data-plane-client/0.5.2-SNAPSHOT, Apache-2.0, approved, technology.edc
273274
maven/mavencentral/org.eclipse.edc/data-plane-core/0.5.2-SNAPSHOT, Apache-2.0, approved, technology.edc
@@ -307,10 +308,12 @@ maven/mavencentral/org.eclipse.edc/identity-hub-store-spi/0.3.1, Apache-2.0, app
307308
maven/mavencentral/org.eclipse.edc/identity-hub-store-sql/0.3.1, Apache-2.0, approved, technology.edc
308309
maven/mavencentral/org.eclipse.edc/identity-trust-spi/0.5.2-SNAPSHOT, Apache-2.0, approved, technology.edc
309310
maven/mavencentral/org.eclipse.edc/jersey-core/0.5.2-SNAPSHOT, Apache-2.0, approved, technology.edc
310-
maven/mavencentral/org.eclipse.edc/jersey-providers/0.5.2-SNAPSHOT, Apache-2.0, approved, technology.edc
311+
maven/mavencentral/org.eclipse.edc/jersey-providers-lib/0.5.2-SNAPSHOT, Apache-2.0, approved, technology.edc
311312
maven/mavencentral/org.eclipse.edc/jetty-core/0.5.2-SNAPSHOT, Apache-2.0, approved, technology.edc
313+
maven/mavencentral/org.eclipse.edc/json-ld-lib/0.5.2-SNAPSHOT, Apache-2.0, approved, technology.edc
312314
maven/mavencentral/org.eclipse.edc/json-ld-spi/0.5.2-SNAPSHOT, Apache-2.0, approved, technology.edc
313315
maven/mavencentral/org.eclipse.edc/json-ld/0.5.2-SNAPSHOT, Apache-2.0, approved, technology.edc
316+
maven/mavencentral/org.eclipse.edc/junit-base/0.5.2-SNAPSHOT, Apache-2.0, approved, technology.edc
314317
maven/mavencentral/org.eclipse.edc/junit/0.5.2-SNAPSHOT, Apache-2.0, approved, technology.edc
315318
maven/mavencentral/org.eclipse.edc/jwt-spi/0.5.2-SNAPSHOT, Apache-2.0, approved, technology.edc
316319
maven/mavencentral/org.eclipse.edc/keys-lib/0.5.2-SNAPSHOT, Apache-2.0, approved, technology.edc
@@ -321,12 +324,13 @@ maven/mavencentral/org.eclipse.edc/management-api/0.5.2-SNAPSHOT, Apache-2.0, ap
321324
maven/mavencentral/org.eclipse.edc/participant-store-sql/0.3.1, Apache-2.0, approved, technology.edc
322325
maven/mavencentral/org.eclipse.edc/policy-definition-api/0.5.2-SNAPSHOT, Apache-2.0, approved, technology.edc
323326
maven/mavencentral/org.eclipse.edc/policy-definition-store-sql/0.5.2-SNAPSHOT, Apache-2.0, approved, technology.edc
327+
maven/mavencentral/org.eclipse.edc/policy-engine-lib/0.5.2-SNAPSHOT, Apache-2.0, approved, technology.edc
324328
maven/mavencentral/org.eclipse.edc/policy-engine-spi/0.4.1, Apache-2.0, approved, technology.edc
325329
maven/mavencentral/org.eclipse.edc/policy-engine-spi/0.5.2-SNAPSHOT, Apache-2.0, approved, technology.edc
326-
maven/mavencentral/org.eclipse.edc/policy-engine/0.5.2-SNAPSHOT, Apache-2.0, approved, technology.edc
327-
maven/mavencentral/org.eclipse.edc/policy-evaluator/0.5.2-SNAPSHOT, Apache-2.0, approved, technology.edc
330+
maven/mavencentral/org.eclipse.edc/policy-evaluator-lib/0.5.2-SNAPSHOT, Apache-2.0, approved, technology.edc
328331
maven/mavencentral/org.eclipse.edc/policy-model/0.5.2-SNAPSHOT, Apache-2.0, approved, technology.edc
329332
maven/mavencentral/org.eclipse.edc/policy-spi/0.5.2-SNAPSHOT, Apache-2.0, approved, technology.edc
333+
maven/mavencentral/org.eclipse.edc/query-lib/0.5.2-SNAPSHOT, Apache-2.0, approved, technology.edc
330334
maven/mavencentral/org.eclipse.edc/registration-service-spi/0.4.1, Apache-2.0, approved, technology.edc
331335
maven/mavencentral/org.eclipse.edc/registration-service-store-spi/0.3.1, Apache-2.0, approved, technology.edc
332336
maven/mavencentral/org.eclipse.edc/registration-service-store-spi/0.4.1, Apache-2.0, approved, technology.edc
@@ -336,7 +340,8 @@ maven/mavencentral/org.eclipse.edc/runtime-metamodel/0.5.2-SNAPSHOT, Apache-2.0,
336340
maven/mavencentral/org.eclipse.edc/sql-core/0.3.1, Apache-2.0, approved, technology.edc
337341
maven/mavencentral/org.eclipse.edc/sql-core/0.5.2-SNAPSHOT, Apache-2.0, approved, technology.edc
338342
maven/mavencentral/org.eclipse.edc/sql-lease/0.5.2-SNAPSHOT, Apache-2.0, approved, technology.edc
339-
maven/mavencentral/org.eclipse.edc/state-machine/0.5.2-SNAPSHOT, Apache-2.0, approved, technology.edc
343+
maven/mavencentral/org.eclipse.edc/state-machine-lib/0.5.2-SNAPSHOT, Apache-2.0, approved, technology.edc
344+
maven/mavencentral/org.eclipse.edc/store-lib/0.5.2-SNAPSHOT, Apache-2.0, approved, technology.edc
340345
maven/mavencentral/org.eclipse.edc/token-core/0.5.2-SNAPSHOT, Apache-2.0, approved, technology.edc
341346
maven/mavencentral/org.eclipse.edc/token-spi/0.5.2-SNAPSHOT, Apache-2.0, approved, technology.edc
342347
maven/mavencentral/org.eclipse.edc/transaction-datasource-spi/0.3.1, Apache-2.0, approved, technology.edc

build.gradle.kts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ plugins {
1919
val techAzScmUrl: String by project
2020
val techAzScmConnection: String by project
2121
val annotationProcessorVersion: String by project
22-
val metaModelVersion: String by project
2322

2423
buildscript {
2524
dependencies {

gradle/libs.versions.toml

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -14,20 +14,13 @@ awaitility = "4.2.0"
1414
azure-rm = "2.33.0"
1515
bouncyCastle-jdk18on = "1.77"
1616
failsafe = "3.3.2"
17-
httpMockServer = "5.15.0"
18-
jakarta-json = "2.0.1"
1917
junit = "5.10.1"
20-
mockito = "5.2.0"
21-
nimbus = "9.37.3"
22-
openTelemetry = "1.18.0"
23-
opentelemetry-proto = "1.0.0-alpha"
2418
postgres = "42.7.2"
2519
restAssured = "5.3.2"
2620
rsApi = "3.1.0"
2721
testcontainers = "1.19.6"
2822

2923

30-
3124
[libraries]
3225
awaitility = { module = "org.awaitility:awaitility", version.ref = "awaitility" }
3326
assertj = { module = "org.assertj:assertj-core", version = "3.25.1" }
@@ -101,24 +94,14 @@ edc-sql-participant-store = { module = "org.eclipse.edc:participant-store-sql",
10194

10295
# third-partyi deps
10396
failsafe-core = { module = "dev.failsafe:failsafe", version.ref = "failsafe" }
104-
opentelemetry-annotations = { module = "io.opentelemetry:opentelemetry-extension-annotations", version.ref = "openTelemetry" }
105-
opentelemetry-api = { module = "io.opentelemetry:opentelemetry-api", version.ref = "openTelemetry" }
106-
opentelemetry-proto = { module = "io.opentelemetry.proto:opentelemetry-proto", version.ref = "opentelemetry-proto" }
10797
restAssured = { module = "io.rest-assured:rest-assured", version.ref = "restAssured" }
108-
jakartaJson = { module = "org.glassfish:jakarta.json", version.ref = "jakarta-json" }
10998
jakarta-rsApi = { module = "jakarta.ws.rs:jakarta.ws.rs-api", version.ref = "rsApi" }
11099
junit-jupiter-api = { module = "org.junit.jupiter:junit-jupiter-api", version.ref = "junit" }
111100
junit-jupiter-engine = { module = "org.junit.jupiter:junit-jupiter-engine", version.ref = "junit" }
112101
edc-jsonld = { module = "org.eclipse.edc:json-ld", version.ref = "edc" }
113-
mockserver-client = { module = "org.mock-server:mockserver-client-java", version.ref = "httpMockServer" }
114-
mockserver-netty = { module = "org.mock-server:mockserver-netty", version.ref = "httpMockServer" }
115-
nimbus-jwt = { module = "com.nimbusds:nimbus-jose-jwt", version.ref = "nimbus" }
116-
mockito-core = { module = "org.mockito:mockito-core", version.ref = "mockito" }
117-
mockito-inline = { module = "org.mockito:mockito-inline", version.ref = "mockito" }
118102
postgres = { module = "org.postgresql:postgresql", version.ref = "postgres" }
119103
testcontainers-junit = { module = "org.testcontainers:junit-jupiter", version.ref = "testcontainers" }
120104

121-
122105
# Azure dependencies
123106
azure-eventgrid = { group = "com.azure", name = "azure-messaging-eventgrid", version = "4.21.0" }
124107
azure-identity = { group = "com.azure", name = "azure-identity", version = "1.11.2" }

system-tests/runtimes/azure-data-factory-transfer-consumer/build.gradle.kts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ plugins {
1919
}
2020

2121
dependencies {
22+
implementation(libs.edc.core.connector)
2223
implementation(libs.edc.core.controlplane)
2324
implementation(libs.edc.dpf.selector.core)
2425

system-tests/runtimes/azure-data-factory-transfer-provider/build.gradle.kts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ plugins {
2020
}
2121

2222
dependencies {
23+
implementation(libs.edc.core.connector)
2324
implementation(libs.edc.spi.dataplane)
2425
implementation(libs.edc.util)
2526
implementation(libs.edc.core.controlplane)

system-tests/runtimes/azure-storage-transfer-consumer/build.gradle.kts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ plugins {
2020
}
2121

2222
dependencies {
23+
implementation(libs.edc.core.connector)
2324
implementation(libs.edc.core.controlplane)
2425
implementation(libs.edc.dpf.selector.core)
2526

system-tests/runtimes/azure-storage-transfer-provider/build.gradle.kts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ plugins {
2020
}
2121

2222
dependencies {
23+
implementation(libs.edc.core.connector)
2324
implementation(libs.edc.util)
2425

2526
implementation(libs.edc.core.controlplane)

0 commit comments

Comments
 (0)