Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

build(deps): switch to new namespace for jakarta.json-api library #4272

Merged
merged 1 commit into from
Jun 14, 2024
Merged

build(deps): switch to new namespace for jakarta.json-api library #4272

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 8 additions & 7 deletions DEPENDENCIES
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
maven/mavencentral/com.apicatalog/carbon-did/0.3.0, Apache-2.0, approved, clearlydefined

Check warning on line 1 in DEPENDENCIES

View workflow job for this annotation

GitHub Actions / check / Dash-Verify-Licenses

Restricted Dependencies found 

Some dependencies are marked 'restricted' - please review them
maven/mavencentral/com.apicatalog/copper-multibase/0.5.0, Apache-2.0, approved, #14501
maven/mavencentral/com.apicatalog/copper-multicodec/0.1.1, Apache-2.0, approved, #14500
maven/mavencentral/com.apicatalog/iron-ed25519-cryptosuite-2020/0.14.0, Apache-2.0, approved, #14503
maven/mavencentral/com.apicatalog/iron-verifiable-credentials/0.14.0, Apache-2.0, approved, clearlydefined
maven/mavencentral/com.apicatalog/titanium-json-ld/1.0.0, Apache-2.0, approved, clearlydefined
maven/mavencentral/com.apicatalog/titanium-json-ld/1.4.0, Apache-2.0, approved, #13683
maven/mavencentral/com.apicatalog/titanium-json-ld/1.4.0, Apache-2.0, approved, #15200
maven/mavencentral/com.atomikos/atomikos-util/6.0.0, Apache-2.0, approved, #9326
maven/mavencentral/com.atomikos/transactions-api/6.0.0, Apache-2.0, approved, #10351
maven/mavencentral/com.atomikos/transactions-jdbc/6.0.0, Apache-2.0, approved, #9273
Expand Down Expand Up @@ -45,9 +45,9 @@
maven/mavencentral/com.github.docker-java/docker-java-api/3.3.6, Apache-2.0, approved, #10346
maven/mavencentral/com.github.docker-java/docker-java-transport-zerodep/3.3.6, Apache-2.0 AND (Apache-2.0 AND BSD-3-Clause), approved, #7946
maven/mavencentral/com.github.docker-java/docker-java-transport/3.3.6, Apache-2.0, approved, #7942
maven/mavencentral/com.github.java-json-tools/btf/1.3, Apache-2.0 OR LGPL-3.0-or-later, approved, #2721
maven/mavencentral/com.github.java-json-tools/btf/1.3, Apache-2.0 AND GPL-1.0-or-later AND LGPL-3.0-only AND Apache-2.0 AND LGPL-3.0-only, restricted, #15201
maven/mavencentral/com.github.java-json-tools/jackson-coreutils-equivalence/1.0, LGPL-3.0 OR Apache-2.0, approved, clearlydefined
maven/mavencentral/com.github.java-json-tools/jackson-coreutils/2.0, Apache-2.0 OR LGPL-3.0-or-later, approved, #2719
maven/mavencentral/com.github.java-json-tools/jackson-coreutils/2.0, Apache-2.0 AND LGPL-2.1-or-later AND LGPL-3.0-only AND (Apache-2.0 AND GPL-1.0-or-later AND LGPL-3.0-only) AND Apache-2.0 AND LGPL-3.0-only, restricted, #15186
maven/mavencentral/com.github.java-json-tools/json-patch/1.13, Apache-2.0 OR LGPL-3.0-or-later, approved, CQ23929
maven/mavencentral/com.github.java-json-tools/json-schema-core/1.2.14, Apache-2.0 OR LGPL-3.0-or-later, approved, #2722
maven/mavencentral/com.github.java-json-tools/json-schema-validator/2.2.14, Apache-2.0 OR LGPL-3.0-or-later, approved, CQ20779
Expand Down Expand Up @@ -96,11 +96,11 @@
maven/mavencentral/commons-beanutils/commons-beanutils/1.9.4, Apache-2.0, approved, CQ12654
maven/mavencentral/commons-codec/commons-codec/1.11, Apache-2.0 AND BSD-3-Clause, approved, CQ15971
maven/mavencentral/commons-codec/commons-codec/1.15, Apache-2.0 AND BSD-3-Clause AND LicenseRef-Public-Domain, approved, CQ22641
maven/mavencentral/commons-collections/commons-collections/3.2.2, Apache-2.0, approved, CQ10385
maven/mavencentral/commons-collections/commons-collections/3.2.2, Apache-2.0, approved, #15185
maven/mavencentral/commons-io/commons-io/2.11.0, Apache-2.0, approved, CQ23745
maven/mavencentral/commons-logging/commons-logging/1.1.1, Apache-2.0, approved, CQ1907
maven/mavencentral/commons-logging/commons-logging/1.2, Apache-2.0, approved, CQ10162
maven/mavencentral/dev.failsafe/failsafe-okhttp/3.3.2, Apache-2.0, approved, #9178
maven/mavencentral/dev.failsafe/failsafe-okhttp/3.3.2, Apache-2.0, approved, #15208
maven/mavencentral/dev.failsafe/failsafe/3.3.2, Apache-2.0, approved, #9268
maven/mavencentral/info.picocli/picocli/4.7.6, Apache-2.0, approved, #4365
maven/mavencentral/io.cloudevents/cloudevents-api/3.0.0, Apache-2.0, approved, #14228
Expand Down Expand Up @@ -136,7 +136,7 @@
maven/mavencentral/io.prometheus/simpleclient_tracer_otel_agent/0.16.0, Apache-2.0, approved, clearlydefined
maven/mavencentral/io.rest-assured/json-path/5.4.0, Apache-2.0, approved, #12042
maven/mavencentral/io.rest-assured/rest-assured-common/5.4.0, Apache-2.0, approved, #12039
maven/mavencentral/io.rest-assured/rest-assured/5.4.0, Apache-2.0, approved, #12040
maven/mavencentral/io.rest-assured/rest-assured/5.4.0, Apache-2.0, approved, #15190
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.2.21, Apache-2.0, approved, #5947
Expand Down Expand Up @@ -189,7 +189,7 @@
maven/mavencentral/net.bytebuddy/byte-buddy/1.14.1, Apache-2.0 AND BSD-3-Clause, approved, #7163
maven/mavencentral/net.bytebuddy/byte-buddy/1.14.15, Apache-2.0 AND BSD-3-Clause, approved, #7163
maven/mavencentral/net.bytebuddy/byte-buddy/1.14.16, Apache-2.0 AND BSD-3-Clause, approved, #7163
maven/mavencentral/net.java.dev.jna/jna/5.13.0, Apache-2.0 AND LGPL-2.1-or-later, approved, #6709
maven/mavencentral/net.java.dev.jna/jna/5.13.0, Apache-2.0 AND LGPL-2.1-or-later, approved, #15196
maven/mavencentral/net.javacrumbs.json-unit/json-unit-core/2.36.0, Apache-2.0, approved, clearlydefined
maven/mavencentral/net.minidev/accessors-smart/2.4.7, Apache-2.0, approved, #7515
maven/mavencentral/net.minidev/json-smart/2.4.7, Apache-2.0, approved, #3288
Expand Down Expand Up @@ -270,6 +270,7 @@
maven/mavencentral/org.eclipse.jetty/jetty-util/11.0.21, EPL-2.0 OR Apache-2.0, approved, rt.jetty
maven/mavencentral/org.eclipse.jetty/jetty-webapp/11.0.21, EPL-2.0 OR Apache-2.0, approved, rt.jetty
maven/mavencentral/org.eclipse.jetty/jetty-xml/11.0.21, EPL-2.0 OR Apache-2.0, approved, rt.jetty
maven/mavencentral/org.eclipse.parsson/parsson/1.1.6, EPL-2.0, approved, ee4j.parsson
maven/mavencentral/org.glassfish.hk2.external/aopalliance-repackaged/3.0.6, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.glassfish
maven/mavencentral/org.glassfish.hk2/hk2-api/3.0.6, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.glassfish
maven/mavencentral/org.glassfish.hk2/hk2-locator/3.0.6, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.glassfish
Expand Down
1 change: 0 additions & 1 deletion build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,5 +57,4 @@ allprojects {
configDirectory.set(rootProject.file("resources"))
}


}
2 changes: 1 addition & 1 deletion core/common/lib/json-ld-lib/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ plugins {
}

dependencies {
api(libs.jakartaJson)
api(libs.jakarta.json.api)
api(libs.jackson.datatype.jakarta.jsonp)
api(libs.titaniumJsonLd)
implementation(libs.jackson.datatype.jsr310)
Expand Down
2 changes: 0 additions & 2 deletions core/common/lib/transform-lib/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,6 @@ dependencies {
api(project(":spi:common:transform-spi"))
api(project(":spi:data-plane-selector:data-plane-selector-spi"))

api(libs.jakartaJson)

testImplementation(project(":tests:junit-base"));
testImplementation(project(":core:common:lib:json-ld-lib"))
}
2 changes: 0 additions & 2 deletions core/common/lib/validator-lib/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,6 @@ dependencies {
api(project(":spi:common:json-ld-spi"))
api(project(":spi:common:validator-spi"))

api(libs.jakartaJson)

testImplementation(project(":tests:junit-base"));

}
2 changes: 0 additions & 2 deletions core/control-plane/control-plane-transform/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,6 @@ dependencies {
api(project(":spi:common:json-ld-spi"))
api(project(":spi:control-plane:asset-spi"))

api(libs.jakartaJson)

testImplementation(project(":tests:junit-base"));
testImplementation(project(":core:common:lib:json-ld-lib"))
testImplementation(project(":core:common:lib:transform-lib"))
Expand Down
4 changes: 1 addition & 3 deletions data-protocols/dsp/dsp-catalog/dsp-catalog-http-dispatcher/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,5 @@ dependencies {
api(project(":extensions:common:json-ld"))
api(project(":spi:control-plane:catalog-spi"))

api(libs.jakartaJson)

testImplementation(testFixtures(project(":data-protocols:dsp:dsp-http-spi")))
}
}
2 changes: 1 addition & 1 deletion data-protocols/dsp/dsp-http-spi/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ dependencies {
api(project(":data-protocols:dsp:dsp-spi"))

api(libs.okhttp)
api(libs.jakartaJson)
api(libs.jakarta.json.api)
api(libs.jakarta.rsApi)

testFixturesApi(project(":core:common:junit"))
Expand Down
4 changes: 1 addition & 3 deletions data-protocols/dsp/dsp-negotiation/dsp-negotiation-http-dispatcher/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,5 @@ dependencies {
api(project(":extensions:common:json-ld"))
api(project(":spi:control-plane:contract-spi"))

api(libs.jakartaJson)

testImplementation(testFixtures(project(":data-protocols:dsp:dsp-http-spi")))
}
}
2 changes: 1 addition & 1 deletion extensions/common/crypto/lib/jws2020-lib/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ dependencies {
implementation(libs.nimbus.jwt)
// used for the Ed25519 Verifier in conjunction with OctetKeyPairs (OKP)
runtimeOnly(libs.tink)
implementation(libs.jakartaJson)
implementation(libs.jakarta.json.api)

api("com.apicatalog:iron-verifiable-credentials:0.14.0") {
exclude("com.github.multiformats")
Expand Down
1 change: 0 additions & 1 deletion extensions/common/json-ld/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ plugins {
}

dependencies {
api(libs.jakartaJson)
api(libs.jackson.datatype.jakarta.jsonp)
api(libs.titaniumJsonLd)

Expand Down
2 changes: 1 addition & 1 deletion extensions/common/vault/vault-hashicorp/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ dependencies {
testImplementation(project(":core:common:connector-core"))
testImplementation(testFixtures(project(":core:common:lib:http-lib")))
testImplementation(project(":core:common:junit"))
testImplementation(libs.jakartaJson)
testImplementation(libs.jakarta.json.api)
testImplementation(libs.testcontainers.junit)
testImplementation(libs.testcontainers.vault)
implementation(libs.bouncyCastle.bcpkixJdk18on)
Expand Down
6 changes: 4 additions & 2 deletions gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ edc = "0.7.1-SNAPSHOT"
failsafe = "3.3.2"
h2 = "2.2.224"
httpMockServer = "5.15.0"
jakarta-json = "2.0.1"
jakarta-json = "2.1.3"
jakarta-transaction = "2.0.1"
jackson = "2.17.1"
jersey = "3.1.7"
Expand All @@ -28,6 +28,7 @@ nimbus = "9.40"
okhttp = "4.12.0"
opentelemetry = "1.32.0"
opentelemetry-proto = "1.3.1-alpha"
parsson = "1.1.6"
postgres = "42.7.3"
restAssured = "5.4.0"
rsApi = "4.0.0"
Expand All @@ -54,9 +55,9 @@ jackson-annotations = { module = "com.fasterxml.jackson.core:jackson-annotations
jackson-databind = { module = "com.fasterxml.jackson.core:jackson-databind", version.ref = "jackson" }
jackson-datatype-jakarta-jsonp = { module = "com.fasterxml.jackson.datatype:jackson-datatype-jakarta-jsonp", version.ref = "jackson" }
jackson-datatype-jsr310 = { module = "com.fasterxml.jackson.datatype:jackson-datatype-jsr310", version.ref = "jackson" }
jakarta-json-api = { module = "jakarta.json:jakarta.json-api", version.ref = "jakarta-json" }
jakarta-rsApi = { module = "jakarta.ws.rs:jakarta.ws.rs-api", version.ref = "rsApi" }
jakarta-transaction-api = { module = "jakarta.transaction:jakarta.transaction-api", version.ref = "jakarta-transaction" }
jakartaJson = { module = "org.glassfish:jakarta.json", version.ref = "jakarta-json" }
jersey-common = { module = "org.glassfish.jersey.core:jersey-common", version.ref = "jersey" }
jersey-inject = { module = "org.glassfish.jersey.inject:jersey-hk2", version.ref = "jersey" }
jersey-jackson = { module = "org.glassfish.jersey.media:jersey-media-json-jackson", version.ref = "jersey" }
Expand All @@ -81,6 +82,7 @@ okhttp = { module = "com.squareup.okhttp3:okhttp", version.ref = "okhttp" }
opentelemetry-api = { module = "io.opentelemetry:opentelemetry-api", version.ref = "opentelemetry" }
opentelemetry-instrumentation-annotations = { module = "io.opentelemetry.instrumentation:opentelemetry-instrumentation-annotations", version.ref = "opentelemetry" }
opentelemetry-proto = { module = "io.opentelemetry.proto:opentelemetry-proto", version.ref = "opentelemetry-proto" }
parsson = { module = "org.eclipse.parsson:parsson", version.ref = "parsson" }
restAssured = { module = "io.rest-assured:rest-assured", version.ref = "restAssured" }
swagger-annotations-jakarta = { module = "io.swagger.core.v3:swagger-annotations-jakarta", version.ref = "swagger" }
titaniumJsonLd = { module = "com.apicatalog:titanium-json-ld", version.ref = "titanium" }
Expand Down
4 changes: 3 additions & 1 deletion spi/common/json-ld-spi/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,11 @@ plugins {
}

dependencies {
api(libs.jakartaJson)
api(libs.jakarta.json.api)

api(project(":spi:common:transform-spi"))

implementation(libs.parsson)
}


2 changes: 1 addition & 1 deletion spi/common/validator-spi/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ plugins {
dependencies {
api(project(":spi:common:core-spi"))

api(libs.jakartaJson)
api(libs.jakarta.json.api)
}


1 change: 0 additions & 1 deletion system-tests/e2e-dataplane-tests/tests/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ dependencies {
testImplementation(project(":core:common:junit"))
testImplementation(project(":core:common:lib:keys-lib"))
testImplementation(project(":extensions:common:json-ld"))
testImplementation(libs.jakartaJson)

testImplementation(libs.restAssured)
testImplementation(libs.assertj)
Expand Down
23 changes: 10 additions & 13 deletions ...ane-tests/tests/src/test/java/org/eclipse/edc/test/e2e/DataPlaneSelectorEndToEndTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,12 @@
import org.eclipse.edc.connector.dataplane.selector.spi.strategy.SelectionStrategy;
import org.eclipse.edc.connector.dataplane.selector.spi.strategy.SelectionStrategyRegistry;
import org.eclipse.edc.junit.annotations.EndToEndTest;
import org.eclipse.edc.junit.extensions.EdcRuntimeExtension;
import org.eclipse.edc.junit.extensions.EmbeddedRuntime;
import org.eclipse.edc.junit.extensions.RuntimeExtension;
import org.eclipse.edc.junit.extensions.RuntimePerMethodExtension;
import org.eclipse.edc.policy.model.Policy;
import org.eclipse.edc.spi.protocol.ProtocolWebhook;
import org.eclipse.edc.spi.types.domain.DataAddress;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.RegisterExtension;

Expand All @@ -44,26 +45,27 @@
public class DataPlaneSelectorEndToEndTest {

@RegisterExtension
private final EdcRuntimeExtension controlPlane = new EdcRuntimeExtension(
private final RuntimeExtension controlPlane = new RuntimePerMethodExtension(new EmbeddedRuntime(
"control-plane",
Map.of(
"web.http.control.port", String.valueOf(getFreePort()),
"web.http.control.path", "/control",
"edc.dataplane.client.selector.strategy", SELECT_FIRST

"edc.dataplane.client.selector.strategy", SELECT_FIRST,
"edc.data.plane.selector.state-machine.check.period", "1",
"edc.core.retry.retries.max", "0"
),
":core:control-plane:control-plane-core",
":core:data-plane-selector:data-plane-selector-core",
":extensions:control-plane:transfer:transfer-data-plane-signaling",
":extensions:common:iam:iam-mock",
":extensions:common:http",
":extensions:common:api:control-api-configuration"
);
)).registerServiceMock(ProtocolWebhook.class, mock());

private final int dataPlaneControlPort = getFreePort();

@RegisterExtension
private final EdcRuntimeExtension dataPlane = new EdcRuntimeExtension(
private final RuntimeExtension dataPlane = new RuntimePerMethodExtension(new EmbeddedRuntime(
"data-plane",
Map.of(
"web.http.port", String.valueOf(getFreePort()),
Expand All @@ -77,12 +79,7 @@ public class DataPlaneSelectorEndToEndTest {
":extensions:control-plane:api:control-plane-api-client",
":extensions:data-plane:data-plane-signaling:data-plane-signaling-api",
":extensions:common:http"
);

@BeforeEach
void setUp() {
controlPlane.registerServiceMock(ProtocolWebhook.class, mock());
}
));

@Test
void shouldNotSelectUnavailableDataPlanes() {
Expand Down
1 change: 0 additions & 1 deletion system-tests/e2e-transfer-test/runner/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ dependencies {
testImplementation(testFixtures(project(":extensions:common:sql:sql-core")))
testImplementation(testFixtures(project(":extensions:control-plane:api:management-api:management-api-test-fixtures")))
testImplementation(project(":extensions:common:json-ld"))
testImplementation(libs.jakartaJson)

testImplementation(libs.postgres)
testImplementation(libs.restAssured)
Expand Down
1 change: 0 additions & 1 deletion system-tests/management-api/management-api-test-runner/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@ dependencies {
testImplementation(libs.assertj)
testImplementation(libs.awaitility)
testImplementation(libs.junit.jupiter.api)
testImplementation(libs.jakartaJson)
testImplementation(testFixtures(project(":extensions:common:sql:sql-core")))
testImplementation(libs.testcontainers.junit)
testImplementation(libs.testcontainers.postgres)
Expand Down
1 change: 0 additions & 1 deletion system-tests/sts-api/sts-api-test-runner/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ dependencies {
testImplementation(libs.assertj)
testImplementation(libs.awaitility)
testImplementation(libs.junit.jupiter.api)
testImplementation(libs.jakartaJson)

testCompileOnly(project(":system-tests:sts-api:sts-api-test-runtime"))
testImplementation(testFixtures(project(":spi:common:identity-trust-sts-spi")))
Expand Down
1 change: 0 additions & 1 deletion system-tests/telemetry/telemetry-test-runner/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ dependencies {
testImplementation(libs.assertj)
testImplementation(libs.awaitility)
testImplementation(libs.junit.jupiter.api)
testImplementation(libs.jakartaJson)
testImplementation(libs.mockserver.netty)
testImplementation(libs.mockserver.client)
testImplementation(libs.opentelemetry.proto)
Expand Down
1 change: 0 additions & 1 deletion system-tests/version-api/version-api-test-runner/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@ dependencies {
testImplementation(libs.assertj)
testImplementation(libs.awaitility)
testImplementation(libs.junit.jupiter.api)
testImplementation(libs.jakartaJson)
testImplementation(testFixtures(project(":extensions:common:sql:sql-core")))
testImplementation(libs.testcontainers.junit)
testImplementation(libs.testcontainers.postgres)
Expand Down
Loading