From 780f9626fd473e20ea6bcf65a917fcbcb92cff29 Mon Sep 17 00:00:00 2001
From: Stephen Colebourne <scolebourne@joda.org>
Date: Mon, 12 Jan 2015 00:20:35 +0000
Subject: [PATCH] Release v2.7

---
 README.md                      |  4 +-
 pom.xml                        |  2 +-
 src/conf/MANIFEST.MF           | 20 +++----
 src/site/markdown/index.md     |  8 +--
 src/site/xdoc/installation.xml |  1 +
 src/site/xdoc/upgradeto270.xml | 96 ++++++++++++++++++++++++++++++++++
 6 files changed, 114 insertions(+), 17 deletions(-)
 create mode 100644 src/site/xdoc/upgradeto270.xml

diff --git a/README.md b/README.md
index 5ca4d2db5..b7059a367 100644
--- a/README.md
+++ b/README.md
@@ -46,11 +46,11 @@ Various documentation is available:
 
 
 ### Releases
-[Release 2.6](http://www.joda.org/joda-time/download.html) is the current latest release.
+[Release 2.7](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.6|jar)
+Available in the [Maven Central repository](http://search.maven.org/#artifactdetails|joda-time|joda-time|2.7|jar)
 
 
 ### Related projects
diff --git a/pom.xml b/pom.xml
index 6752a54ba..c411a2856 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
   <artifactId>joda-time</artifactId>
   <packaging>jar</packaging>
   <name>Joda-Time</name>
-  <version>2.7-SNAPSHOT</version>
+  <version>2.7</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 9a308438d..2440984dd 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.6
+Specification-Version: 2.7
 Implementation-Vendor: Joda.org
 Implementation-Title: org.joda.time
-Implementation-Version: 2.6
+Implementation-Version: 2.7
 Implementation-Vendor-Id: org.joda
 Bundle-ManifestVersion: 2
 Bundle-Vendor: Joda.org
 Bundle-Name: Joda-Time
 Bundle-SymbolicName: joda-time
-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-Version: 2.7
+Export-Package: org.joda.time;version=2.7,
+ org.joda.time.base;version=2.7,
+ org.joda.time.chrono;version=2.7,
+ org.joda.time.convert;version=2.7,
+ org.joda.time.field;version=2.7,
+ org.joda.time.format;version=2.7,
+ org.joda.time.tz;version=2.7
 Bundle-License: Apache 2.0
 Bundle-DocURL: http://www.joda.org/joda-time/
diff --git a/src/site/markdown/index.md b/src/site/markdown/index.md
index 23cd384a7..033707bf2 100644
--- a/src/site/markdown/index.md
+++ b/src/site/markdown/index.md
@@ -125,21 +125,21 @@ Joda-Time is licenced under the business friendly <a href="license.html">Apache
 
 ## <i></i> Releases
 
-[Release 2.6](download.html) is the current latest release.
+[Release 2.7](download.html) is the current latest release.
 This release is considered stable and worthy of the 2.x tag.
-See the [upgrade notes](upgradeto260.html) for full details.
+See the [upgrade notes](upgradeto270.html) for full details.
 
 Joda-Time requires Java SE 5 or later and has [no dependencies](dependencies.html).
 There is a *compile-time* dependency on [Joda-Convert](http://www.joda.org/joda-convert/),
 but this is not required at runtime thanks to the magic of annotations.
 
-Available in [Maven Central](http://search.maven.org/#artifactdetails%7Cjoda-time%7Cjoda-time%7C2.6%7Cjar).
+Available in [Maven Central](http://search.maven.org/#artifactdetails%7Cjoda-time%7Cjoda-time%7C2.7%7Cjar).
 
 ```xml
 <dependency>
   <groupId>joda-time</groupId>
   <artifactId>joda-time</artifactId>
-  <version>2.6</version>
+  <version>2.7</version>
 </dependency>
 ```
 
diff --git a/src/site/xdoc/installation.xml b/src/site/xdoc/installation.xml
index 5a15eddf1..53723e196 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="upgradeto270.html">Version 2.7</a> - upgrade from Version 2.6</li>
 <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>
diff --git a/src/site/xdoc/upgradeto270.xml b/src/site/xdoc/upgradeto270.xml
new file mode 100644
index 000000000..45bfd0324
--- /dev/null
+++ b/src/site/xdoc/upgradeto270.xml
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<document>
+ <properties>
+  <title>Java date and time API - Upgrade from 2.6 to 2.7</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.6 to version 2.7.
+<source>
+Joda-Time version 2.7
+---------------------
+
+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.6
+----------------------
+- Add DateTime.withDate(LocalDate) and DateTime.withTime(LocalTime) [#213]
+  This was possible using DateTime.withFields(ReadablePartial) but the new methods are clearer
+
+- Added new system property for time-zone loading [#37]
+  Added system property "org.joda.time.DateTimeZone.Folder".
+  If set, then it is treated as a file system folder to load time-zone data from.
+  The folder is loaded using ZoneInfoProvider and must be the unzipped output of ZoneInfoCompiler.
+  The default behaviour is unchanged, with default time-zone data included in the jar file.
+
+- Produce jar file without time-zone data [#220]
+  A second jar file is now located in Maven Central with the classifier "no-tzdb".
+  This is the same as the main joda-time jar file, except that the tzdb data and ZoneInfoCompiler are omitted.
+  This is intended for use by Android, but could be used in other environments.
+  If using this alternative jar, a time-zone system property must be set, either
+  "org.joda.time.DateTimeZone.Provider" or "org.joda.time.DateTimeZone.Folder".
+  The default behaviour in the standard jar file is unchanged, with time-zone data included in the jar file.
+
+
+Compatibility with 2.6
+----------------------
+Build system - Yes
+
+Binary compatible - Yes
+
+Source compatible - Yes
+
+Serialization compatible - Yes
+
+Data compatible - Yes
+ - DateTimeZone data still at version 2014j
+
+Semantic compatible - Yes
+
+
+Deprecations since 2.6
+----------------------
+
+
+Bug fixes since 2.6
+-------------------
+- Fix Asia/Dhaka time-zone [#208]
+  Problem caused by time-zone ending at 24:00 on December 31st
+  Model change as being as 23:59:59.999
+
+- Fix PeriodFormatter.withLocale to operate on word-based formatting [#187, #191]
+  Previously, PeriodFormatter.withLocale() had no effect on word-based formatting
+  Now, the locale used when calling PeriodFormat.wordBased(locale) is passed to the PeriodFormatter.
+  In addition, if PeriodFormatter.withLocale(locale) is called, then the word-based pattern will
+  change to a pattern appropriate for that locale.
+
+
+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>