From 940ecec8b5064afc1352d113697fbdb74079e4f7 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 27 Jan 2024 01:58:16 +0000 Subject: [PATCH 1/2] deps: update dependency com.networknt:json-schema-validator to v1.3.0 --- gradle/libs.versions.toml | 2 +- model/src/test/kotlin/JsonSchemaTest.kt | 2 +- .../spdx/src/funTest/kotlin/SpdxDocumentReporterFunTest.kt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index dfcf321a700af..6b93f6f1fe1d2 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -32,7 +32,7 @@ jgit = "6.8.0.202311291450-r" jiraRestClient = "5.2.7" jruby = "9.4.5.0" jslt = "0.1.14" -jsonSchemaValidator = "1.2.0" +jsonSchemaValidator = "1.3.0" kotest = "5.8.0" kotlinxCoroutines = "1.7.3" kotlinxHtml = "0.11.0" diff --git a/model/src/test/kotlin/JsonSchemaTest.kt b/model/src/test/kotlin/JsonSchemaTest.kt index 2ca13c9b8ff8c..c70f72809a783 100644 --- a/model/src/test/kotlin/JsonSchemaTest.kt +++ b/model/src/test/kotlin/JsonSchemaTest.kt @@ -107,7 +107,7 @@ class JsonSchemaTest : StringSpec({ private val schemaV7 = JsonSchemaFactory .builder(JsonSchemaFactory.getInstance(SpecVersion.VersionFlag.V7)) - .objectMapper(yamlMapper) + .yamlMapper(yamlMapper) .build() private val repositoryConfigurationSchema = diff --git a/plugins/reporters/spdx/src/funTest/kotlin/SpdxDocumentReporterFunTest.kt b/plugins/reporters/spdx/src/funTest/kotlin/SpdxDocumentReporterFunTest.kt index bf5f58537b03b..7de4ab07a5287 100644 --- a/plugins/reporters/spdx/src/funTest/kotlin/SpdxDocumentReporterFunTest.kt +++ b/plugins/reporters/spdx/src/funTest/kotlin/SpdxDocumentReporterFunTest.kt @@ -73,7 +73,7 @@ class SpdxDocumentReporterFunTest : WordSpec({ val jsonMapper = FileFormat.JSON.mapper val schema = JsonSchemaFactory .builder(JsonSchemaFactory.getInstance(SpecVersion.VersionFlag.V7)) - .objectMapper(FileFormat.JSON.mapper) + .jsonMapper(FileFormat.JSON.mapper) .build() .getSchema(getAssetFile("spdx-schema.json").toURI()) From ee839609852c21f226171f4ddd5b45eecd767514 Mon Sep 17 00:00:00 2001 From: Sebastian Schuberth Date: Sat, 27 Jan 2024 09:09:27 +0100 Subject: [PATCH 2/2] test(osv): Update expected results Signed-off-by: Sebastian Schuberth --- ...vulnerabilities-by-name-and-version-expected-result.json | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/clients/osv/src/funTest/assets/vulnerabilities-by-name-and-version-expected-result.json b/clients/osv/src/funTest/assets/vulnerabilities-by-name-and-version-expected-result.json index ac00ce80eb786..4e88a65b11700 100644 --- a/clients/osv/src/funTest/assets/vulnerabilities-by-name-and-version-expected-result.json +++ b/clients/osv/src/funTest/assets/vulnerabilities-by-name-and-version-expected-result.json @@ -554,7 +554,7 @@ { "schema_version": "1.6.0", "id": "GHSA-h5c8-rqwp-cp95", - "modified": "2024-01-25T03:46:07.488106Z", + "modified": "2024-01-27T03:49:21.174960Z", "published": "2024-01-11T15:20:48Z", "aliases": [ "CVE-2024-22195" @@ -671,6 +671,10 @@ "type": "WEB", "url": "https://lists.fedoraproject.org/archives/list/package-announce@lists.fedoraproject.org/message/5XCWZD464AJJJUBOO7CMPXQ4ROBC6JX2/" }, + { + "type": "WEB", + "url": "https://lists.fedoraproject.org/archives/list/package-announce@lists.fedoraproject.org/message/DELCVUUYX75I5K4Q5WMJG4MUZJA6VAIP/" + }, { "type": "WEB", "url": "https://lists.fedoraproject.org/archives/list/package-announce@lists.fedoraproject.org/message/O7YWRBX6JQCWC2XXCTZ55C7DPMGICCN3/"