From 3859c4e7053d503a9f21d44561a63e3070c357cc Mon Sep 17 00:00:00 2001 From: Stephen Crawford Date: Mon, 21 Nov 2022 09:37:01 -0500 Subject: [PATCH 1/5] Force woodstox to 6.4.0 Signed-off-by: Stephen Crawford --- build.gradle | 1 + 1 file changed, 1 insertion(+) diff --git a/build.gradle b/build.gradle index c6d44ec2d5..0e114f4396 100644 --- a/build.gradle +++ b/build.gradle @@ -83,6 +83,7 @@ configurations.all { force "org.apache.commons:commons-lang3:3.4" force "org.springframework:spring-core:5.3.20" force "com.google.guava:guava:30.0-jre" + force "com.fasterxml.woodstox:woodstox-core:6.4.0" } } From 6d4030dcc7deec301063cf9fa33318fd7ee8fa6b Mon Sep 17 00:00:00 2001 From: Stephen Crawford Date: Mon, 21 Nov 2022 10:15:31 -0500 Subject: [PATCH 2/5] Fix dependency versions Signed-off-by: Stephen Crawford --- build.gradle | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 0e114f4396..ecb70ec337 100644 --- a/build.gradle +++ b/build.gradle @@ -84,6 +84,12 @@ configurations.all { force "org.springframework:spring-core:5.3.20" force "com.google.guava:guava:30.0-jre" force "com.fasterxml.woodstox:woodstox-core:6.4.0" + force "org.scala-lang:scala-library:2.13.9" + force "org.yaml:snakeyaml:1.32" + force 'io.netty:netty-buffer:4.1.78.Final' + force 'io.netty:netty-common:4.1.78.Final' + force 'io.netty:netty-handler:4.1.78.Final' + force 'io.netty:netty-transport:4.1.78.Final' } } @@ -95,7 +101,7 @@ dependencies { implementation 'org.greenrobot:eventbus:3.2.0' implementation 'commons-cli:commons-cli:1.3.1' implementation 'org.bouncycastle:bcprov-jdk15on:1.67' - implementation 'com.fasterxml.jackson.core:jackson-databind:2.13.4' + implementation 'com.fasterxml.jackson.core:jackson-databind:2.14.0' implementation 'org.ldaptive:ldaptive:1.2.3' implementation 'org.apache.httpcomponents:httpclient-cache:4.5.13' implementation 'io.jsonwebtoken:jjwt-api:0.10.8' From 5dedec335c5ad5daa05a8fd3f9cf96fab03644d1 Mon Sep 17 00:00:00 2001 From: Stephen Crawford Date: Mon, 21 Nov 2022 13:25:02 -0500 Subject: [PATCH 3/5] remove snakeyaml and netty Signed-off-by: Stephen Crawford --- build.gradle | 5 ----- 1 file changed, 5 deletions(-) diff --git a/build.gradle b/build.gradle index ecb70ec337..ad5b00207c 100644 --- a/build.gradle +++ b/build.gradle @@ -85,11 +85,6 @@ configurations.all { force "com.google.guava:guava:30.0-jre" force "com.fasterxml.woodstox:woodstox-core:6.4.0" force "org.scala-lang:scala-library:2.13.9" - force "org.yaml:snakeyaml:1.32" - force 'io.netty:netty-buffer:4.1.78.Final' - force 'io.netty:netty-common:4.1.78.Final' - force 'io.netty:netty-handler:4.1.78.Final' - force 'io.netty:netty-transport:4.1.78.Final' } } From 36ff6a95dc668bff5e01656190a10fc55e65df05 Mon Sep 17 00:00:00 2001 From: Stephen Crawford Date: Wed, 23 Nov 2022 16:47:11 -0500 Subject: [PATCH 4/5] force rerun Signed-off-by: Stephen Crawford --- CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 2562cbbf1b..ac2b6e9453 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,4 +1,4 @@ ## Contributing to this Project OpenSearch is a community project that is built and maintained by people just like **you**. -[This document](https://github.com/opensearch-project/.github/blob/main/CONTRIBUTING.md) explains how you can contribute to this and related projects. \ No newline at end of file +[This document](https://github.com/opensearch-project/.github/blob/main/CONTRIBUTING.md) explains how you can contribute to this and related projects. From 2f800762fbffe4bf0d1da89f32977f4b6353afed Mon Sep 17 00:00:00 2001 From: Stephen Crawford Date: Wed, 23 Nov 2022 17:07:47 -0500 Subject: [PATCH 5/5] remove fail fast Signed-off-by: Stephen Crawford --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0b38495917..a7245b0195 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -10,7 +10,7 @@ jobs: name: build runs-on: ubuntu-latest strategy: - fail-fast: true + fail-fast: false matrix: jdk: [8, 11, 14]