From e98903cd041e1ec4124f9eac842d892e23f7758b Mon Sep 17 00:00:00 2001 From: Stephen Colebourne Date: Thu, 23 Sep 2021 02:23:50 +0100 Subject: [PATCH] Release v2.10.11 --- README.md | 6 +++--- pom.xml | 2 +- src/changes/changes.xml | 6 ++++++ src/conf/MANIFEST.MF | 18 +++++++++--------- src/site/markdown/index.md | 4 ++-- .../java/org/joda/time/TestDateTimeZone.java | 1 + 6 files changed, 22 insertions(+), 15 deletions(-) diff --git a/README.md b/README.md index 783fd215e..56e99a8cf 100644 --- a/README.md +++ b/README.md @@ -51,7 +51,7 @@ Various documentation is available: ### Releases -[Release 2.10.10](https://www.joda.org/joda-time/download.html) is the current latest release. +[Release 2.10.11](https://www.joda.org/joda-time/download.html) is the current latest release. This release is considered stable and worthy of the 2.x tag. It depends on JDK 1.5 or later. @@ -62,13 +62,13 @@ Available in the [Maven Central repository](https://search.maven.org/search?q=g: joda-time joda-time - 2.10.10 + 2.10.11 ``` **Gradle configuration:** ```groovy -compile 'joda-time:joda-time:2.10.10' +compile 'joda-time:joda-time:2.10.11' ``` ![Tidelift dependency check](https://tidelift.com/badges/github/JodaOrg/joda-time) diff --git a/pom.xml b/pom.xml index 56e70ac44..34983b58f 100644 --- a/pom.xml +++ b/pom.xml @@ -8,7 +8,7 @@ joda-time jar Joda-Time - 2.10.11-SNAPSHOT + 2.10.11 Date and time library to replace JDK date handling https://www.joda.org/joda-time/ diff --git a/src/changes/changes.xml b/src/changes/changes.xml index 1b60599d5..1c4a0d2b5 100644 --- a/src/changes/changes.xml +++ b/src/changes/changes.xml @@ -8,6 +8,12 @@ + + + Defend against possible release of hugely damaging timezone data. + See https://github.com/JodaOrg/joda-time/issues/566 + + DateTimeZone data updated to version 2021a. diff --git a/src/conf/MANIFEST.MF b/src/conf/MANIFEST.MF index cb9b4dd9d..70e243232 100644 --- a/src/conf/MANIFEST.MF +++ b/src/conf/MANIFEST.MF @@ -5,19 +5,19 @@ Specification-Vendor: Joda.org Specification-Version: 2.10 Implementation-Vendor: Joda.org Implementation-Title: org.joda.time -Implementation-Version: 2.10.10 +Implementation-Version: 2.10.11 Implementation-Vendor-Id: org.joda Bundle-ManifestVersion: 2 Bundle-Vendor: Joda.org Bundle-Name: Joda-Time Bundle-SymbolicName: joda-time -Bundle-Version: 2.10.10 -Export-Package: org.joda.time;version=2.10.10, - org.joda.time.base;version=2.10.10, - org.joda.time.chrono;version=2.10.10, - org.joda.time.convert;version=2.10.10, - org.joda.time.field;version=2.10.10, - org.joda.time.format;version=2.10.10, - org.joda.time.tz;version=2.10.10 +Bundle-Version: 2.10.11 +Export-Package: org.joda.time;version=2.10.11, + org.joda.time.base;version=2.10.11, + org.joda.time.chrono;version=2.10.11, + org.joda.time.convert;version=2.10.11, + org.joda.time.field;version=2.10.11, + org.joda.time.format;version=2.10.11, + org.joda.time.tz;version=2.10.11 Bundle-License: Apache 2.0 Bundle-DocURL: https://www.joda.org/joda-time/ diff --git a/src/site/markdown/index.md b/src/site/markdown/index.md index d870ea1f8..c06bfebe7 100644 --- a/src/site/markdown/index.md +++ b/src/site/markdown/index.md @@ -130,7 +130,7 @@ Joda-Time is licenced under the business friendly Apache ## Releases -[Release 2.10.10](download.html) is the current latest release. +[Release 2.10.11](download.html) is the current latest release. This release is considered stable and worthy of the 2.x tag. See the [change notes](changes-report.html) for full details. @@ -144,7 +144,7 @@ Available in [Maven Central](https://search.maven.org/search?q=g:joda-time%20AND joda-time joda-time - 2.10.10 + 2.10.11 ``` diff --git a/src/test/java/org/joda/time/TestDateTimeZone.java b/src/test/java/org/joda/time/TestDateTimeZone.java index b32f7e637..43649e460 100644 --- a/src/test/java/org/joda/time/TestDateTimeZone.java +++ b/src/test/java/org/joda/time/TestDateTimeZone.java @@ -251,6 +251,7 @@ public void testForID_String() { } public void testForID_ensureTzdb() { + // if these tests fail, check https://github.com/JodaOrg/joda-time/issues/566 for more info assertEquals("Europe/Oslo", DateTimeZone.forID("Europe/Oslo").getID()); assertEquals("Europe/Stockholm", DateTimeZone.forID("Europe/Stockholm").getID()); assertEquals("Europe/Amsterdam", DateTimeZone.forID("Europe/Amsterdam").getID());