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 2.x] Bump joda from 2.12.2 to 2.12.7 #13222

Merged
merged 1 commit into from
Apr 16, 2024
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 @@ -32,6 +32,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
- Bump Apache Tika from 2.6.0 to 2.9.2 ([#12627](https://github.com/opensearch-project/OpenSearch/pull/12627))
- Bump `com.gradle.enterprise` from 3.16.2 to 3.17.1 ([#13116](https://github.com/opensearch-project/OpenSearch/pull/13116), [#13191](https://github.com/opensearch-project/OpenSearch/pull/13191))
- Bump `gradle/wrapper-validation-action` from 2 to 3 ([#13192](https://github.com/opensearch-project/OpenSearch/pull/13192))
- Bump joda from 2.12.2 to 2.12.7 ([#13193](https://github.com/opensearch-project/OpenSearch/pull/13193))

### Changed
- [BWC and API enforcement] Enforcing the presence of API annotations at build time ([#12872](https://github.com/opensearch-project/OpenSearch/pull/12872))
Expand Down
2 changes: 1 addition & 1 deletion buildSrc/version.properties
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jakarta_annotation = 1.3.5
jna = 5.13.0

netty = 4.1.108.Final
joda = 2.12.2
joda = 2.12.7

# project reactor
reactor_netty = 1.1.17
Expand Down
1 change: 0 additions & 1 deletion server/licenses/joda-time-2.12.2.jar.sha1

This file was deleted.

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

public class DateUtilsTests extends OpenSearchTestCase {
private static final Set<String> IGNORE = new HashSet<>(Arrays.asList("America/Ciudad_Juarez"));
private static final Set<String> IGNORE = new HashSet<>(Arrays.asList("Antarctica/Vostok"));

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