From c39c3c2a6e2e8cfe1f33caf8f7894472239a6702 Mon Sep 17 00:00:00 2001 From: Craig Perkins Date: Wed, 31 Jul 2024 16:08:22 -0400 Subject: [PATCH 1/2] Bump jakarta.ws.rs:jakarta.ws.rs-api from 3.1.0 to 4.0.0 and resteasy to v7 Signed-off-by: Craig Perkins --- buildSrc/version.properties | 2 +- qa/wildfly/build.gradle | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/buildSrc/version.properties b/buildSrc/version.properties index eb67af909bccf..2d44553c87963 100644 --- a/buildSrc/version.properties +++ b/buildSrc/version.properties @@ -71,7 +71,7 @@ zstd = 1.5.5-5 jzlib = 1.1.3 -resteasy = 6.2.4.Final +resteasy = 7.0.0.Alpha2 # opentelemetry dependencies opentelemetry = 1.40.0 diff --git a/qa/wildfly/build.gradle b/qa/wildfly/build.gradle index abf033fff378a..8b32e6fe75caf 100644 --- a/qa/wildfly/build.gradle +++ b/qa/wildfly/build.gradle @@ -43,7 +43,7 @@ dependencies { providedCompile('jakarta.enterprise:jakarta.enterprise.cdi-api:4.1.0') { exclude module: 'jakarta.annotation-api' } - providedCompile 'jakarta.ws.rs:jakarta.ws.rs-api:3.1.0' + providedCompile 'jakarta.ws.rs:jakarta.ws.rs-api:4.0.0' providedCompile "org.jboss.resteasy:resteasy-core:${versions.resteasy}" providedCompile "org.jboss.resteasy:resteasy-core-spi:${versions.resteasy}" api("org.jboss.resteasy:resteasy-jackson2-provider:${versions.resteasy}") { From c2689d983fc5c7c3793f547d51ae90c1906670f1 Mon Sep 17 00:00:00 2001 From: Craig Perkins Date: Wed, 31 Jul 2024 16:11:46 -0400 Subject: [PATCH 2/2] Add to CHANGELOG Signed-off-by: Craig Perkins --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index c1846bd5e7cfd..2332bceaeed55 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -18,6 +18,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), - OpenJDK Update (July 2024 Patch releases) ([#14998](https://github.com/opensearch-project/OpenSearch/pull/14998)) - Bump `com.microsoft.azure:msal4j` from 1.16.1 to 1.16.2 ([#14995](https://github.com/opensearch-project/OpenSearch/pull/14995)) - Bump `actions/github-script` from 6 to 7 ([#14997](https://github.com/opensearch-project/OpenSearch/pull/14997)) +- Bump `jakarta.ws.rs:jakarta.ws.rs-api` from 3.1.0 to 4.0.0 and resteasy to v7 ([#15050](https://github.com/opensearch-project/OpenSearch/pull/15050)) ### Changed - Add lower limit for primary and replica batch allocators timeout ([#14979](https://github.com/opensearch-project/OpenSearch/pull/14979))