Skip to content

Commit

Permalink
Update Joda to 2.12.2 (#6083)
Browse files Browse the repository at this point in the history
Signed-off-by: Andriy Redko <[email protected]>
(cherry picked from commit 3e3b155)
Signed-off-by: Andriy Redko <[email protected]>
  • Loading branch information
reta committed Jan 30, 2023
1 parent 47d7d69 commit d999329
Show file tree
Hide file tree
Showing 5 changed files with 4 additions and 5 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
- Bumps `reactor-netty` from 1.1.1 to 1.1.2 ([#5878](https://github.com/opensearch-project/OpenSearch/pull/5878))
- OpenJDK Update (January 2023 Patch releases) ([#6075](https://github.com/opensearch-project/OpenSearch/pull/6075))
- Bumps `Mockito` from 4.7.0 to 5.1.0, `ByteBuddy` from 1.12.18 to 1.12.22 ([#6088](https://github.com/opensearch-project/OpenSearch/pull/6088))
- Bumps `joda` from 2.10.13 to 2.12.2 ([#6094](https://github.com/opensearch-project/OpenSearch/pull/6094))

### Changed
- Use ReplicationFailedException instead of OpensearchException in ReplicationTarget ([#4725](https://github.com/opensearch-project/OpenSearch/pull/4725))
Expand Down
2 changes: 1 addition & 1 deletion buildSrc/version.properties
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ kotlin = 1.7.10
jna = 5.5.0

netty = 4.1.86.Final
joda = 2.10.12
joda = 2.12.2

# client dependencies
httpclient = 4.5.13
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

0 comments on commit d999329

Please sign in to comment.