From fa0b6c57f138c01212d72fa1663834d75fec1102 Mon Sep 17 00:00:00 2001 From: Darshit Chanpura Date: Wed, 6 Sep 2023 11:00:44 -0400 Subject: [PATCH 1/4] Bumps jetty version to 12.0.1 to fix GMS-2023-1857 Signed-off-by: Darshit Chanpura --- test/fixtures/hdfs-fixture/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/fixtures/hdfs-fixture/build.gradle b/test/fixtures/hdfs-fixture/build.gradle index 42de21875d291..366f005ac4886 100644 --- a/test/fixtures/hdfs-fixture/build.gradle +++ b/test/fixtures/hdfs-fixture/build.gradle @@ -33,7 +33,7 @@ apply plugin: 'opensearch.java' group = 'hdfs' versions << [ - 'jetty': '9.4.51.v20230217' + 'jetty': '12.0.1' ] dependencies { From 687a3fee093c4ba0e5b17231189a95808c08ec47 Mon Sep 17 00:00:00 2001 From: Darshit Chanpura Date: Wed, 6 Sep 2023 11:02:50 -0400 Subject: [PATCH 2/4] Adds this PR to changelog Signed-off-by: Darshit Chanpura --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 425177bfd2cf6..8f86b0a795345 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -41,6 +41,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), - Bump `org.bouncycastle:bcmail-jdk15on` to `org.bouncycastle:bcmail-jdk15to18` version 1.75 ([#8247](https://github.com/opensearch-project/OpenSearch/pull/8247)) - Bump `org.bouncycastle:bcpkix-jdk15on` to `org.bouncycastle:bcpkix-jdk15to18` version 1.75 ([#8247](https://github.com/opensearch-project/OpenSearch/pull/8247)) - Bump JNA version from 5.5 to 5.13 ([#9963](https://github.com/opensearch-project/OpenSearch/pull/9963)) +- Bumps jetty version to 12.0.1 to fix GMS-2023-1857 ([#9822](https://github.com/opensearch-project/OpenSearch/pull/9822)) ### Changed - [CCR] Add getHistoryOperationsFromTranslog method to fetch the history snapshot from translogs ([#3948](https://github.com/opensearch-project/OpenSearch/pull/3948)) From ba3a76d58e6344a5577a565423cbd4f88fa86ccc Mon Sep 17 00:00:00 2001 From: Darshit Chanpura Date: Tue, 12 Sep 2023 21:36:03 -0400 Subject: [PATCH 3/4] Updates javax websocket server version Signed-off-by: Darshit Chanpura --- test/fixtures/hdfs-fixture/build.gradle | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/test/fixtures/hdfs-fixture/build.gradle b/test/fixtures/hdfs-fixture/build.gradle index 366f005ac4886..2510949a98875 100644 --- a/test/fixtures/hdfs-fixture/build.gradle +++ b/test/fixtures/hdfs-fixture/build.gradle @@ -33,7 +33,8 @@ apply plugin: 'opensearch.java' group = 'hdfs' versions << [ - 'jetty': '12.0.1' + 'jetty': '12.0.1', + 'jettywebsocket': '9.4.52.v20230823' ] dependencies { @@ -63,7 +64,7 @@ dependencies { api "com.google.protobuf:protobuf-java:${versions.protobuf}" api "org.jetbrains.kotlin:kotlin-stdlib:${versions.kotlin}" api "org.eclipse.jetty:jetty-server:${versions.jetty}" - api "org.eclipse.jetty.websocket:javax-websocket-server-impl:${versions.jetty}" + api "org.eclipse.jetty.websocket:javax-websocket-server-impl:${versions.jettywebsocket}" api 'org.apache.zookeeper:zookeeper:3.9.0' api "org.apache.commons:commons-text:1.10.0" api "commons-net:commons-net:3.9.0" From 95167d1c404382509bbce0af2f3cd4b9c4e92150 Mon Sep 17 00:00:00 2001 From: Darshit Chanpura Date: Thu, 14 Sep 2023 12:35:44 -0400 Subject: [PATCH 4/4] Updates jetty version to match jetty websocket version Signed-off-by: Darshit Chanpura --- CHANGELOG.md | 2 +- test/fixtures/hdfs-fixture/build.gradle | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8f86b0a795345..6acba3d09922d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -41,7 +41,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), - Bump `org.bouncycastle:bcmail-jdk15on` to `org.bouncycastle:bcmail-jdk15to18` version 1.75 ([#8247](https://github.com/opensearch-project/OpenSearch/pull/8247)) - Bump `org.bouncycastle:bcpkix-jdk15on` to `org.bouncycastle:bcpkix-jdk15to18` version 1.75 ([#8247](https://github.com/opensearch-project/OpenSearch/pull/8247)) - Bump JNA version from 5.5 to 5.13 ([#9963](https://github.com/opensearch-project/OpenSearch/pull/9963)) -- Bumps jetty version to 12.0.1 to fix GMS-2023-1857 ([#9822](https://github.com/opensearch-project/OpenSearch/pull/9822)) +- Bumps jetty version to 9.4.52.v20230823 to fix GMS-2023-1857 ([#9822](https://github.com/opensearch-project/OpenSearch/pull/9822)) ### Changed - [CCR] Add getHistoryOperationsFromTranslog method to fetch the history snapshot from translogs ([#3948](https://github.com/opensearch-project/OpenSearch/pull/3948)) diff --git a/test/fixtures/hdfs-fixture/build.gradle b/test/fixtures/hdfs-fixture/build.gradle index 2510949a98875..5217089cf3b4c 100644 --- a/test/fixtures/hdfs-fixture/build.gradle +++ b/test/fixtures/hdfs-fixture/build.gradle @@ -33,8 +33,7 @@ apply plugin: 'opensearch.java' group = 'hdfs' versions << [ - 'jetty': '12.0.1', - 'jettywebsocket': '9.4.52.v20230823' + 'jetty': '9.4.52.v20230823' ] dependencies { @@ -64,7 +63,7 @@ dependencies { api "com.google.protobuf:protobuf-java:${versions.protobuf}" api "org.jetbrains.kotlin:kotlin-stdlib:${versions.kotlin}" api "org.eclipse.jetty:jetty-server:${versions.jetty}" - api "org.eclipse.jetty.websocket:javax-websocket-server-impl:${versions.jettywebsocket}" + api "org.eclipse.jetty.websocket:javax-websocket-server-impl:${versions.jetty}" api 'org.apache.zookeeper:zookeeper:3.9.0' api "org.apache.commons:commons-text:1.10.0" api "commons-net:commons-net:3.9.0"