Skip to content

Commit

Permalink
Updates jetty version to match jetty websocket version
Browse files Browse the repository at this point in the history
Signed-off-by: Darshit Chanpura <[email protected]>
  • Loading branch information
DarshitChanpura committed Sep 14, 2023
1 parent ba3a76d commit 95167d1
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 4 deletions.
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand Down
5 changes: 2 additions & 3 deletions test/fixtures/hdfs-fixture/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -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"
Expand Down

0 comments on commit 95167d1

Please sign in to comment.