From 60fd89df9d362047035484217b4c161a360e58a5 Mon Sep 17 00:00:00 2001
From: Stephen Colebourne <scolebourne@joda.org>
Date: Mon, 1 Dec 2014 14:26:40 +0000
Subject: [PATCH] Release v2.6

---
 README.md                      |  4 +-
 pom.xml                        |  2 +-
 src/conf/MANIFEST.MF           | 20 ++++----
 src/site/xdoc/index.xml        | 20 ++------
 src/site/xdoc/installation.xml |  1 +
 src/site/xdoc/upgradeto260.xml | 85 ++++++++++++++++++++++++++++++++++
 6 files changed, 104 insertions(+), 28 deletions(-)
 create mode 100644 src/site/xdoc/upgradeto260.xml

diff --git a/README.md b/README.md
index 9aa868de7..5ca4d2db5 100644
--- a/README.md
+++ b/README.md
@@ -46,11 +46,11 @@ Various documentation is available:
 
 
 ### Releases
-[Release 2.5](http://www.joda.org/joda-time/download.html) is the current latest release.
+[Release 2.6](http://www.joda.org/joda-time/download.html) is the current latest release.
 This release is considered stable and worthy of the 1.x tag.
 It depends on JDK 1.5 or later.
 
-Available in the [Maven Central repository](http://search.maven.org/#artifactdetails|joda-time|joda-time|2.5|jar)
+Available in the [Maven Central repository](http://search.maven.org/#artifactdetails|joda-time|joda-time|2.6|jar)
 
 
 ### Related projects
diff --git a/pom.xml b/pom.xml
index caeee3025..b4d61dd1d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
   <artifactId>joda-time</artifactId>
   <packaging>jar</packaging>
   <name>Joda-Time</name>
-  <version>2.6-SNAPSHOT</version>
+  <version>2.6</version>
   <description>Date and time library to replace JDK date handling</description>
   <url>http://www.joda.org/joda-time/</url>
 
diff --git a/src/conf/MANIFEST.MF b/src/conf/MANIFEST.MF
index 96eba7b3d..9a308438d 100644
--- a/src/conf/MANIFEST.MF
+++ b/src/conf/MANIFEST.MF
@@ -2,22 +2,22 @@ Package: org.joda.time
 Extension-Name: joda-time
 Specification-Title: Joda-Time
 Specification-Vendor: Joda.org
-Specification-Version: 2.5
+Specification-Version: 2.6
 Implementation-Vendor: Joda.org
 Implementation-Title: org.joda.time
-Implementation-Version: 2.5
+Implementation-Version: 2.6
 Implementation-Vendor-Id: org.joda
 Bundle-ManifestVersion: 2
 Bundle-Vendor: Joda.org
 Bundle-Name: Joda-Time
 Bundle-SymbolicName: joda-time
-Bundle-Version: 2.5
-Export-Package: org.joda.time;version=2.5,
- org.joda.time.base;version=2.5,
- org.joda.time.chrono;version=2.5,
- org.joda.time.convert;version=2.5,
- org.joda.time.field;version=2.5,
- org.joda.time.format;version=2.5,
- org.joda.time.tz;version=2.5
+Bundle-Version: 2.6
+Export-Package: org.joda.time;version=2.6,
+ org.joda.time.base;version=2.6,
+ org.joda.time.chrono;version=2.6,
+ org.joda.time.convert;version=2.6,
+ org.joda.time.field;version=2.6,
+ org.joda.time.format;version=2.6,
+ org.joda.time.tz;version=2.6
 Bundle-License: Apache 2.0
 Bundle-DocURL: http://www.joda.org/joda-time/
diff --git a/src/site/xdoc/index.xml b/src/site/xdoc/index.xml
index 0f098e719..4e425b979 100644
--- a/src/site/xdoc/index.xml
+++ b/src/site/xdoc/index.xml
@@ -44,17 +44,7 @@ public String getBirthMonthText(<a href="apidocs/org/joda/time/LocalDate.html"><
   return dateOfBirth.monthOfYear().getAsText(Locale.ENGLISH);
 }
 </source>
-<!--
-public boolean isDoubleShift(<a href="apidocs/org/joda/time/LocalTime.html"><b>LocalTime</b></a> startTime, <a href="apidocs/org/joda/time/LocalTime.html"><b>LocalTime</b></a> endTime) {
-  <a href="apidocs/org/joda/time/Hours.html"><b>Hours</b></a> hoursBetween = <a href="apidocs/org/joda/time/Hours.html"><b>Hours</b></a>.hoursBetween(time1, time2);
-  return hoursBetween.isGreaterThan(<a href="apidocs/org/joda/time/Hours.html"><b>Hours</b></a>.EIGHT);
-}
-public boolean isJoinedInLastThreeMonths(<a href="apidocs/org/joda/time/DateTime.html"><b>DateTime</b></a> datetimeJoined) {
-  <a href="apidocs/org/joda/time/Interval.html"><b>Interval</b></a> last3Months = new <a href="apidocs/org/joda/time/Interval.html"><b>Interval</b></a>(<a href="apidocs/org/joda/time/Months.html"><b>Months</b></a>.THREE, new <a href="apidocs/org/joda/time/DateTime.html"><b>DateTime</b></a>());
-  return last3Months.contains(datetimeJoined);
-}
--->
-Version 2.5 was released on 2014-10-03 -
+Version 2.6 was released on 2014-12-01 -
 <a href="download.html">Download now</a>
 </p>
 </section>
@@ -140,14 +130,14 @@ Various documentation is available:
 
 <section name="Releases">
 <p>
-<a href="download.html">Release 2.5</a>
+<a href="download.html">Release 2.6</a>
 is the current latest release.
 This release is an evolution of the 1.x codebase, not a major rewrite.
 It is considered stable and worthy of the 2.x tag.
 </p>
 <p>
-Version 2.5 is a bugfix release compatible with version 2.x.
-See the <a href="upgradeto250.html">upgrade notes</a> for full details.
+Version 2.6 is a bugfix release compatible with version 2.x.
+See the <a href="upgradeto260.html">upgrade notes</a> for full details.
 </p>
 <p>
 Version 2.x is almost completely source and binary compatible with version 1.x.
@@ -161,7 +151,7 @@ The main public API will remain backwards compatible for both source and binary
 The version number will change to 3.0 to indicate a significant change in compatibility.
 </p>
 <p>
-Available in <a href="http://search.maven.org/#artifactdetails|joda-time|joda-time|2.5|jar">Maven Central</a>.
+Available in <a href="http://search.maven.org/#artifactdetails|joda-time|joda-time|2.6|jar">Maven Central</a>.
 </p>
 
 <p>
diff --git a/src/site/xdoc/installation.xml b/src/site/xdoc/installation.xml
index 6b6270833..7d073321d 100644
--- a/src/site/xdoc/installation.xml
+++ b/src/site/xdoc/installation.xml
@@ -22,6 +22,7 @@ of the source code suitable for linking to the jar file in IDEs such as Eclipse.
 <p>
 The release notes for upgraders can be found here:
 <ul>
+<li><a href="upgradeto260.html">Version 2.6</a> - upgrade from Version 2.5</li>
 <li><a href="upgradeto250.html">Version 2.5</a> - upgrade from Version 2.4</li>
 <li><a href="upgradeto240.html">Version 2.4</a> - upgrade from Version 2.3</li>
 <li><a href="upgradeto230.html">Version 2.3</a> - upgrade from Version 2.2</li>
diff --git a/src/site/xdoc/upgradeto260.xml b/src/site/xdoc/upgradeto260.xml
new file mode 100644
index 000000000..796370e5d
--- /dev/null
+++ b/src/site/xdoc/upgradeto260.xml
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<document>
+ <properties>
+  <title>Java date and time API - Upgrade from 2.5 to 2.6</title>
+  <author>Stephen Colebourne</author>
+ </properties>
+
+<body>
+
+<section name="Upgrade">
+<p>
+These are the release notes and advice for upgrading Joda-Time from version 2.5 to version 2.6.
+<source>
+Joda-Time version 2.6
+---------------------
+
+Joda-Time is a date and time handling library that seeks to replace the JDK
+Date and Calendar classes.
+
+This release contains enhancements, bug fixes and a time zone update.
+The release runs on JDK 5 or later.
+
+Joda-Time is licensed under the business-friendly Apache License Version 2.
+This is the same license as all of Apache, plus other open source projects such as Spring.
+The intent is to make the code available to the Java community with the minimum
+of restrictions. If the license causes you problems please contact the mailing list.
+
+**  Please also check out our related projects   **
+** http://www.joda.org/joda-time/related.html **
+
+
+Enhancements since 2.5
+----------------------
+
+
+Compatibility with 2.5
+----------------------
+Build system - Yes
+
+Binary compatible - Yes
+
+Source compatible - Yes
+
+Serialization compatible - Yes
+
+Data compatible - Yes, except
+ - DateTimeZone data updated to version 2014j
+
+Semantic compatible - Yes
+
+
+Deprecations since 2.5
+----------------------
+
+
+Bug fixes since 2.5
+-------------------
+- Handle complex prefix/suffix combinations [#194, #203]
+  For example, 'M' for months and 'm' for minutes.
+  Parser is generally case insensitive, but handles this specific case sensitivity
+
+- Attempt to tackle an Android deadlock [#196]
+  Use dedicated lock objects instead of locking on the class object
+
+- Fix name provider [#176]
+  Name provider relied on tzdb short names matching JDK data names
+  This has ceased to be true due to recent changes in tzdb, so changed to a different algorithm
+  Data returned still depends on the JDK data, not the tzdb
+  Thus, tzdb may say AEST for Sydney Australia, but if the JDK still has EST, then that is what you get
+
+- Fix time-zone compilation tests
+
+
+Scala
+--------
+Joda-Time uses annotations from Joda-Convert.
+In the Java programming language, this dependency is optional, however in Scala it is not.
+Scala users must manually add the Joda-Convert v1.2 dependency.
+</source>
+</p>
+</section>
+
+</body>
+</document>