Skip to content

Commit

Permalink
Update com.networknt:json-schema-validator dependency from 1.0.81 to …
Browse files Browse the repository at this point in the history
…1.0.83 (#7933)

* Update network schema

Signed-off-by: Stephen Crawford <steecraw@amazon.com>

* Update CHANGELOG.md

Signed-off-by: Stephen Crawford <65832608+scrawfor99@users.noreply.github.com>

* Update CHANGELOG.md

Signed-off-by: Stephen Crawford <65832608+scrawfor99@users.noreply.github.com>

* Add joni and jcoding to path

Signed-off-by: Stephen Crawford <steecraw@amazon.com>

* Update buildSrc/src/main/java/org/opensearch/gradle/precommit/ValidateJsonAgainstSchemaTask.java

Signed-off-by: Stephen Crawford <65832608+scrawfor99@users.noreply.github.com>

* Update buildSrc/src/main/java/org/opensearch/gradle/precommit/ValidateJsonAgainstSchemaTask.java

Signed-off-by: Stephen Crawford <65832608+scrawfor99@users.noreply.github.com>

* Update buildSrc/src/main/java/org/opensearch/gradle/precommit/ValidateJsonAgainstSchemaTask.java

Signed-off-by: Stephen Crawford <65832608+scrawfor99@users.noreply.github.com>

* Update rest-api-spec/src/main/resources/rest-api-spec/api/bulk.json

Signed-off-by: Stephen Crawford <65832608+scrawfor99@users.noreply.github.com>

* Update rest-api-spec/src/main/resources/rest-api-spec/api/bulk.json

Signed-off-by: Stephen Crawford <65832608+scrawfor99@users.noreply.github.com>

* Update Apache Lucene to 9.7.0-snapshot-204acc3 (#7887)

Signed-off-by: Andriy Redko <andriy.redko@aiven.io>

* Add bwc version 2.8.1 (#7942)

Signed-off-by: Andriy Redko <andriy.redko@aiven.io>
Co-authored-by: opensearch-trigger-bot[bot] <98922864+opensearch-trigger-bot[bot]@users.noreply.github.com>

* Fix changelog entries (#7946)

Move entry for #7321 to correct section and fix the malformed entry
from #7452.

Signed-off-by: Andrew Ross <andrross@amazon.com>

* SegRep with Remote: Add Remote store as a segment replication source (#7653)

* SegRep with Remote: Add Remote store as a segment replication source

Signed-off-by: Ankit Kala <ankikala@amazon.com>

* Fix Gradle check

Signed-off-by: Ankit Kala <ankikala@amazon.com>

* Retrying Gradle check

Signed-off-by: Ankit Kala <ankikala@amazon.com>

---------

Signed-off-by: Ankit Kala <ankikala@amazon.com>

* rebase

Signed-off-by: Stephen Crawford <steecraw@amazon.com>

* remove empty line

Signed-off-by: Stephen Crawford <steecraw@amazon.com>

* Update CHANGELOG.md

Signed-off-by: Stephen Crawford <65832608+scrawfor99@users.noreply.github.com>

---------

Signed-off-by: Stephen Crawford <steecraw@amazon.com>
Signed-off-by: Stephen Crawford <65832608+scrawfor99@users.noreply.github.com>
Signed-off-by: Andriy Redko <andriy.redko@aiven.io>
Signed-off-by: Andrew Ross <andrross@amazon.com>
Signed-off-by: Ankit Kala <ankikala@amazon.com>
Co-authored-by: Andriy Redko <andriy.redko@aiven.io>
Co-authored-by: opensearch-trigger-bot[bot] <98922864+opensearch-trigger-bot[bot]@users.noreply.github.com>
Co-authored-by: Andrew Ross <andrross@amazon.com>
Co-authored-by: Ankit Kala <ankikala@amazon.com>
  • Loading branch information
5 people committed Jun 8, 2023
1 parent e6348c5 commit c888fce
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 1 deletion.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
- Add `com.github.luben:zstd-jni` version 1.5.5-3 ([#2996](https://github.com/opensearch-project/OpenSearch/pull/2996))
- OpenJDK Update (April 2023 Patch releases) ([#7344](https://github.com/opensearch-project/OpenSearch/pull/7344)
- Bump `com.amazonaws` 1.12.270 to `software.amazon.awssdk` 2.20.55 ([7372](https://github.com/opensearch-project/OpenSearch/pull/7372/))
- Bump `com.networknt:json-schema-validator` from 1.0.81 to 1.0.83 ([7933](https://github.com/opensearch-project/OpenSearch/pull/7933/))
- Bump `com.google.http-client:google-http-client:1.43.2` from 1.42.0 to 1.43.2 ([7928](https://github.com/opensearch-project/OpenSearch/pull/7928)))
- Bump `com.azure:azure-storage-blob` from 12.21.1 to 12.22.2 ([7930](https://github.com/opensearch-project/OpenSearch/pull/7930))

Expand Down
4 changes: 3 additions & 1 deletion buildSrc/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,9 @@ dependencies {
api 'com.avast.gradle:gradle-docker-compose-plugin:0.16.12'
api "org.yaml:snakeyaml:${props.getProperty('snakeyaml')}"
api 'org.apache.maven:maven-model:3.9.2'
api 'com.networknt:json-schema-validator:1.0.81'
api 'com.networknt:json-schema-validator:1.0.83'
api 'org.jruby.jcodings:jcodings:1.0.58'
api 'org.jruby.joni:joni:2.1.48'
api "com.fasterxml.jackson.core:jackson-databind:${props.getProperty('jackson_databind')}"

testFixturesApi "junit:junit:${props.getProperty('junit')}"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,7 @@ public void validate(InputChanges inputChanges) throws IOException {
File jsonSchemaOnDisk = getJsonSchema();
getLogger().debug("JSON schema : [{}]", jsonSchemaOnDisk.getAbsolutePath());
SchemaValidatorsConfig config = new SchemaValidatorsConfig();
config.setEcma262Validator(true);
JsonSchemaFactory factory = JsonSchemaFactory.getInstance(SpecVersion.VersionFlag.V7);
JsonSchema jsonSchema = factory.getSchema(mapper.readTree(jsonSchemaOnDisk), config);
Map<File, Set<String>> errors = new LinkedHashMap<>();
Expand Down

0 comments on commit c888fce

Please sign in to comment.