From 26fa5f6a398475a0ef6c3b7bb42967fd60e02f3b Mon Sep 17 00:00:00 2001 From: Andriy Redko Date: Mon, 30 Jan 2023 14:03:49 -0500 Subject: [PATCH] Update Joda to 2.12.2 (#6083) Signed-off-by: Andriy Redko (cherry picked from commit 3e3b1551114b1d1fdb30b40bc7a38749ff1ecb3b) Signed-off-by: Andriy Redko --- CHANGELOG.md | 1 + buildSrc/version.properties | 2 +- server/licenses/joda-time-2.10.12.jar.sha1 | 1 - server/licenses/joda-time-2.12.2.jar.sha1 | 1 + .../test/java/org/opensearch/common/time/DateUtilsTests.java | 4 +--- 5 files changed, 4 insertions(+), 5 deletions(-) delete mode 100644 server/licenses/joda-time-2.10.12.jar.sha1 create mode 100644 server/licenses/joda-time-2.12.2.jar.sha1 diff --git a/CHANGELOG.md b/CHANGELOG.md index 50e742e68ad9f..b8a7f0ee16e83 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -69,6 +69,7 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) - Bump reactor-netty-http to 1.0.24 in repository-azure ([#4880](https://github.com/opensearch-project/OpenSearch/pull/4880)) - Upgrade jetty-http, kotlin-stdlib and snakeyaml ([#4981](https://github.com/opensearch-project/OpenSearch/pull/4981)) - OpenJDK Update (January 2023 Patch releases) ([#6090](https://github.com/opensearch-project/OpenSearch/pull/6090)) +- Bumps `joda` from 2.10.13 to 2.12.2 ([#6107](https://github.com/opensearch-project/OpenSearch/pull/6107)) ### Changed - Dependency updates (httpcore, mockito, slf4j, httpasyncclient, commons-codec) ([#4308](https://github.com/opensearch-project/OpenSearch/pull/4308)) diff --git a/buildSrc/version.properties b/buildSrc/version.properties index 191df2eeb3529..5448f9761de52 100644 --- a/buildSrc/version.properties +++ b/buildSrc/version.properties @@ -23,7 +23,7 @@ kotlin = 1.7.10 jna = 5.5.0 netty = 4.1.86.Final -joda = 2.10.12 +joda = 2.12.2 # when updating this version, you need to ensure compatibility with: # - plugins/ingest-attachment (transitive dependency, check the upstream POM) diff --git a/server/licenses/joda-time-2.10.12.jar.sha1 b/server/licenses/joda-time-2.10.12.jar.sha1 deleted file mode 100644 index 538f23152f69d..0000000000000 --- a/server/licenses/joda-time-2.10.12.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -95b3f193ad0493d94dcd7daa9ea575c30e6be5f5 \ No newline at end of file diff --git a/server/licenses/joda-time-2.12.2.jar.sha1 b/server/licenses/joda-time-2.12.2.jar.sha1 new file mode 100644 index 0000000000000..6e9b28eb35597 --- /dev/null +++ b/server/licenses/joda-time-2.12.2.jar.sha1 @@ -0,0 +1 @@ +78e18a7b4180e911dafba0a412adfa82c1e3d14b \ No newline at end of file diff --git a/server/src/test/java/org/opensearch/common/time/DateUtilsTests.java b/server/src/test/java/org/opensearch/common/time/DateUtilsTests.java index b6f20ac27bcbe..d9662d1de9e0c 100644 --- a/server/src/test/java/org/opensearch/common/time/DateUtilsTests.java +++ b/server/src/test/java/org/opensearch/common/time/DateUtilsTests.java @@ -58,9 +58,7 @@ import static org.hamcrest.Matchers.is; public class DateUtilsTests extends OpenSearchTestCase { - private static final Set IGNORE = new HashSet<>( - Arrays.asList("Pacific/Enderbury", "Pacific/Kanton", "Pacific/Niue", "America/Pangnirtung") - ); + private static final Set IGNORE = new HashSet<>(Arrays.asList("America/Ciudad_Juarez")); public void testTimezoneIds() { assertNull(DateUtils.dateTimeZoneToZoneId(null));