Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Backport] [1.3] Update Joda to 2.12.2 (#6083) #6108

Merged
merged 1 commit into from
Jan 31, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand Down
2 changes: 1 addition & 1 deletion buildSrc/version.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
1 change: 0 additions & 1 deletion server/licenses/joda-time-2.10.12.jar.sha1

This file was deleted.

1 change: 1 addition & 0 deletions server/licenses/joda-time-2.12.2.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
78e18a7b4180e911dafba0a412adfa82c1e3d14b
Original file line number Diff line number Diff line change
Expand Up @@ -58,9 +58,7 @@
import static org.hamcrest.Matchers.is;

public class DateUtilsTests extends OpenSearchTestCase {
private static final Set<String> IGNORE = new HashSet<>(
Arrays.asList("Pacific/Enderbury", "Pacific/Kanton", "Pacific/Niue", "America/Pangnirtung")
);
private static final Set<String> IGNORE = new HashSet<>(Arrays.asList("America/Ciudad_Juarez"));

public void testTimezoneIds() {
assertNull(DateUtils.dateTimeZoneToZoneId(null));
Expand Down