From 4d71980d56c12cff5c9c1cfb62b88f1e47df3456 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 14 Jun 2024 06:24:24 +0000 Subject: [PATCH 1/4] fix(deps): update all minor dependencies gradle --- hivemq-edge/build.gradle.kts | 2 +- hivemq-edge/gradle.properties | 4 ++-- modules/hivemq-edge-module-opcua/gradle.properties | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/hivemq-edge/build.gradle.kts b/hivemq-edge/build.gradle.kts index 3c9ac868bf..7a8c9cd67c 100644 --- a/hivemq-edge/build.gradle.kts +++ b/hivemq-edge/build.gradle.kts @@ -192,7 +192,7 @@ dependencies { implementation("org.bouncycastle:bcprov-jdk15on") //json schema - implementation("com.networknt:json-schema-validator:1.0.84") + implementation("com.networknt:json-schema-validator:1.4.0") implementation("com.github.victools:jsonschema-generator:4.35.0") implementation("com.github.victools:jsonschema-module-jackson:4.35.0") } diff --git a/hivemq-edge/gradle.properties b/hivemq-edge/gradle.properties index f80bcc7734..cbab4ad3a9 100644 --- a/hivemq-edge/gradle.properties +++ b/hivemq-edge/gradle.properties @@ -9,7 +9,7 @@ hivemq-edge-adapter-sdk.version=2024.4 # netty netty.version=4.1.108.Final # Jersey (JAXRS / Sun) -jersey.jaxrs.sun.version=2.28 +jersey.jaxrs.sun.version=2.43 # logging slf4j.version=2.0.12 logback.version=1.5.4 @@ -78,4 +78,4 @@ plugin.nexus-publish.version=1.1.0 plugin.github-release.version=2.4.1 plugin.versions.version=0.51.0 plugin.node.version=5.0.0 -assertj.version=3.25.3 +assertj.version=3.26.0 diff --git a/modules/hivemq-edge-module-opcua/gradle.properties b/modules/hivemq-edge-module-opcua/gradle.properties index 96b26e70b1..dfacf6dd3e 100644 --- a/modules/hivemq-edge-module-opcua/gradle.properties +++ b/modules/hivemq-edge-module-opcua/gradle.properties @@ -16,7 +16,7 @@ commons-io.version=2.13.0 junit.jupiter.version=5.10.2 junit.jupiter.platform.version=1.10.2 mockito.version=4.11.0 -assertj.version=3.25.3 +assertj.version=3.26.0 awaitility.version=4.2.1 # logging slf4j.version=1.7.30 From f71fd4df27bfcc7accf84f987f205f217abccbcb Mon Sep 17 00:00:00 2001 From: Daniel Krueger Date: Fri, 14 Jun 2024 09:06:00 +0200 Subject: [PATCH 2/4] fix compilation after dependency update --- .../java/com/hivemq/protocols/ProtocolAdapterSchemaManager.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hivemq-edge/src/main/java/com/hivemq/protocols/ProtocolAdapterSchemaManager.java b/hivemq-edge/src/main/java/com/hivemq/protocols/ProtocolAdapterSchemaManager.java index 49da7e572d..dd1c2e5933 100644 --- a/hivemq-edge/src/main/java/com/hivemq/protocols/ProtocolAdapterSchemaManager.java +++ b/hivemq-edge/src/main/java/com/hivemq/protocols/ProtocolAdapterSchemaManager.java @@ -98,7 +98,7 @@ public ProtocolAdapterSchemaManager( static ProtocolAdapterValidationFailure convertMessage(ValidationMessage validationMessage) { return new ProtocolAdapterValidationFailureImpl(validationMessage.getMessage(), - validationMessage.getPath(), + validationMessage.getEvaluationPath().toString(), validationMessage.getClass()); } From 1fec9f89f610b969aae5a254bffec50b42d01fd8 Mon Sep 17 00:00:00 2001 From: Daniel Krueger Date: Fri, 14 Jun 2024 09:42:28 +0200 Subject: [PATCH 3/4] revert networkNT depdendency update --- hivemq-edge/build.gradle.kts | 2 +- .../java/com/hivemq/protocols/ProtocolAdapterSchemaManager.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/hivemq-edge/build.gradle.kts b/hivemq-edge/build.gradle.kts index 7a8c9cd67c..3c9ac868bf 100644 --- a/hivemq-edge/build.gradle.kts +++ b/hivemq-edge/build.gradle.kts @@ -192,7 +192,7 @@ dependencies { implementation("org.bouncycastle:bcprov-jdk15on") //json schema - implementation("com.networknt:json-schema-validator:1.4.0") + implementation("com.networknt:json-schema-validator:1.0.84") implementation("com.github.victools:jsonschema-generator:4.35.0") implementation("com.github.victools:jsonschema-module-jackson:4.35.0") } diff --git a/hivemq-edge/src/main/java/com/hivemq/protocols/ProtocolAdapterSchemaManager.java b/hivemq-edge/src/main/java/com/hivemq/protocols/ProtocolAdapterSchemaManager.java index dd1c2e5933..49da7e572d 100644 --- a/hivemq-edge/src/main/java/com/hivemq/protocols/ProtocolAdapterSchemaManager.java +++ b/hivemq-edge/src/main/java/com/hivemq/protocols/ProtocolAdapterSchemaManager.java @@ -98,7 +98,7 @@ public ProtocolAdapterSchemaManager( static ProtocolAdapterValidationFailure convertMessage(ValidationMessage validationMessage) { return new ProtocolAdapterValidationFailureImpl(validationMessage.getMessage(), - validationMessage.getEvaluationPath().toString(), + validationMessage.getPath(), validationMessage.getClass()); } From 8a9515d8615e6ab06d2860ab3bddc9a19da5de24 Mon Sep 17 00:00:00 2001 From: Daniel Krueger Date: Fri, 14 Jun 2024 09:52:55 +0200 Subject: [PATCH 4/4] revert networkNT depdendency update and set it to 1.0.88 --- hivemq-edge/build.gradle.kts | 2 +- renovate.json5 | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/hivemq-edge/build.gradle.kts b/hivemq-edge/build.gradle.kts index 3c9ac868bf..aa9e1ad1c4 100644 --- a/hivemq-edge/build.gradle.kts +++ b/hivemq-edge/build.gradle.kts @@ -192,7 +192,7 @@ dependencies { implementation("org.bouncycastle:bcprov-jdk15on") //json schema - implementation("com.networknt:json-schema-validator:1.0.84") + implementation("com.networknt:json-schema-validator:1.0.88") implementation("com.github.victools:jsonschema-generator:4.35.0") implementation("com.github.victools:jsonschema-module-jackson:4.35.0") } diff --git a/renovate.json5 b/renovate.json5 index 46caa93dc2..12d633b6af 100644 --- a/renovate.json5 +++ b/renovate.json5 @@ -98,6 +98,14 @@ "ignoreUnstable": false, "enabled": false }, + // 1.0.88 is the version that compiles with the current data hub + { + "matchPackagePrefixes": [ + "com.networknt" + ], + "matchCurrentVersion": "[1.0.88,)", + "allowedVersions": "<=1.0.88" + }, // 8.14.3 is the latest version that still has the Apache v2 license. So, we can't upgrade to versions greater than that. { "matchPackagePrefixes": [