From d95b7d6ae4d09be7ca565909eb36a2b5272da6ef Mon Sep 17 00:00:00 2001
From: Stephen Colebourne <scolebourne@joda.org>
Date: Sat, 6 Jan 2024 23:23:35 +0000
Subject: [PATCH] Release v2.12.6

---
 README.md                  |  6 +++---
 pom.xml                    |  2 +-
 src/changes/changes.xml    |  4 ++++
 src/conf/MANIFEST.MF       | 18 +++++++++---------
 src/site/markdown/index.md |  4 ++--
 5 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/README.md b/README.md
index 8fa19c426..0ca2fc9b9 100644
--- a/README.md
+++ b/README.md
@@ -54,7 +54,7 @@ Various documentation is available:
 
 
 ### Releases
-[Release 2.12.5](https://www.joda.org/joda-time/download.html) is the current latest release.
+[Release 2.12.6](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.
 
@@ -65,13 +65,13 @@ Available in the [Maven Central repository](https://search.maven.org/search?q=g:
 <dependency>
   <groupId>joda-time</groupId>
   <artifactId>joda-time</artifactId>
-  <version>2.12.5</version>
+  <version>2.12.6</version>
 </dependency>
 ```
 
 **Gradle configuration:**
 ```groovy
-compile 'joda-time:joda-time:2.12.5'
+compile 'joda-time:joda-time:2.12.6'
 ```
 
 
diff --git a/pom.xml b/pom.xml
index 2a35d6881..20b9f7fbf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -8,7 +8,7 @@
   <artifactId>joda-time</artifactId>
   <packaging>jar</packaging>
   <name>Joda-Time</name>
-  <version>2.12.5</version>
+  <version>2.12.6</version>
   <description>Date and time library to replace JDK date handling</description>
   <url>https://www.joda.org/joda-time/</url>
 
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 1823f02ae..c407ca7e5 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -9,6 +9,10 @@
 
     <!-- types are add, fix, remove, update -->
     <release version="2.12.6" date="2024-01-06" description="v2.12.6">
+      <action dev="jodastephen" type="update">
+        Enhance DateTimeZone.forID() to better match java.time.
+        Fixes #733, #717.
+      </action>
       <action dev="cyrilou242" type="update">
         Better error message in DateTimeFormat.
         Fixes #731.
diff --git a/src/conf/MANIFEST.MF b/src/conf/MANIFEST.MF
index 08456ce8c..76e4b16f0 100644
--- a/src/conf/MANIFEST.MF
+++ b/src/conf/MANIFEST.MF
@@ -5,19 +5,19 @@ Specification-Vendor: Joda.org
 Specification-Version: 2.12
 Implementation-Vendor: Joda.org
 Implementation-Title: org.joda.time
-Implementation-Version: 2.12.5
+Implementation-Version: 2.12.6
 Implementation-Vendor-Id: org.joda
 Bundle-ManifestVersion: 2
 Bundle-Vendor: Joda.org
 Bundle-Name: Joda-Time
 Bundle-SymbolicName: joda-time
-Bundle-Version: 2.12.5
-Export-Package: org.joda.time;version=2.12.5,
- org.joda.time.base;version=2.12.5,
- org.joda.time.chrono;version=2.12.5,
- org.joda.time.convert;version=2.12.5,
- org.joda.time.field;version=2.12.5,
- org.joda.time.format;version=2.12.5,
- org.joda.time.tz;version=2.12.5
+Bundle-Version: 2.12.6
+Export-Package: org.joda.time;version=2.12.6,
+ org.joda.time.base;version=2.12.6,
+ org.joda.time.chrono;version=2.12.6,
+ org.joda.time.convert;version=2.12.6,
+ org.joda.time.field;version=2.12.6,
+ org.joda.time.format;version=2.12.6,
+ org.joda.time.tz;version=2.12.6
 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 126adc7f9..634c3d735 100644
--- a/src/site/markdown/index.md
+++ b/src/site/markdown/index.md
@@ -131,7 +131,7 @@ Joda-Time is licenced under the business friendly <a href="licenses.html">Apache
 
 ## <i></i> Releases
 
-[Release 2.12.5](download.html) is the current latest release.
+[Release 2.12.6](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.
 
@@ -145,7 +145,7 @@ Available in [Maven Central](https://search.maven.org/search?q=g:joda-time%20AND
 <dependency>
   <groupId>joda-time</groupId>
   <artifactId>joda-time</artifactId>
-  <version>2.12.5</version>
+  <version>2.12.6</version>
 </dependency>
 ```