Skip to content

Commit

Permalink
Prepare for v2.1
Browse files Browse the repository at this point in the history
  • Loading branch information
jodastephen committed Feb 22, 2012
1 parent 0993b37 commit 67178f0
Show file tree
Hide file tree
Showing 6 changed files with 157 additions and 34 deletions.
29 changes: 15 additions & 14 deletions pom.xml
Expand Up @@ -8,7 +8,7 @@
<artifactId>joda-time</artifactId>
<packaging>jar</packaging>
<name>Joda time</name>
<version>2.1.alpha</version>
<version>2.1</version>
<description>Date and time library to replace JDK date handling</description>
<url>http://joda-time.sourceforge.net</url>
<issueManagement>
Expand Down Expand Up @@ -143,7 +143,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>2.3.1</version>
<version>2.3.2</version>
<configuration>
<verbose>true</verbose>
<fork>true</fork>
Expand All @@ -158,12 +158,12 @@
</plugin>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
<version>1.4</version>
<version>1.7</version>
<executions>
<execution>
<phase>compile</phase>
<configuration>
<tasks>
<target>
<property name="tz.src" value="${pom.build.sourceDirectory}/org/joda/time/tz/src" />
<property name="tz.dst" value="${pom.build.outputDirectory}/org/joda/time/tz/data" />
<!--uptodate property="tz.build.notneeded" targetfile="${tz.dst}/ZoneInfoMap" >
Expand All @@ -186,7 +186,7 @@
<arg value="backward" />
<arg value="systemv" />
</java>
</tasks>
</target>
</configuration>
<goals>
<goal>run</goal>
Expand All @@ -197,7 +197,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.5</version>
<version>2.12</version>
<configuration>
<includes>
<include>**/TestAllPackages.java</include>
Expand All @@ -207,7 +207,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>2.3.1</version>
<version>2.4</version>
<configuration>
<archive>
<manifestFile>src/conf/MANIFEST.MF</manifestFile>
Expand All @@ -217,7 +217,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>2.7</version>
<version>2.8.1</version>
<configuration>
<linksource>false</linksource>
<links>
Expand Down Expand Up @@ -268,7 +268,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
<version>2.1.1</version>
<version>2.3</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Expand All @@ -278,6 +278,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<version>2.3</version>
<configuration>
<descriptors>
<descriptor>src/main/assembly/dist.xml</descriptor>
Expand All @@ -299,7 +300,7 @@
<artifactId>clirr-maven-plugin</artifactId>
<version>2.3</version>
<configuration>
<comparisonVersion>1.6.2</comparisonVersion>
<comparisonVersion>2.0</comparisonVersion>
</configuration>
</plugin>
</plugins>
Expand Down Expand Up @@ -351,7 +352,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>2.7</version>
<version>2.8.1</version>
<configuration>
<linksource>true</linksource>
<links>
Expand All @@ -363,15 +364,15 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-report-plugin</artifactId>
<version>2.5</version>
<version>2.12</version>
<configuration>
<showSuccess>true</showSuccess>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jxr-plugin</artifactId>
<version>2.2</version>
<version>2.3</version>
</plugin>
<!--plugin>
<groupId>org.apache.maven.plugins</groupId>
Expand Down Expand Up @@ -442,7 +443,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
<version>1.1</version>
<version>1.4</version>
<executions>
<execution>
<id>sign-artifacts</id>
Expand Down
20 changes: 10 additions & 10 deletions src/conf/MANIFEST.MF
Expand Up @@ -2,22 +2,22 @@ Package: org.joda.time
Extension-Name: joda-time
Specification-Title: Joda-Time
Specification-Vendor: Joda.org
Specification-Version: 2.0
Specification-Version: 2.1
Implementation-Vendor: Joda.org
Implementation-Title: org.joda.time
Implementation-Version: 2.0
Implementation-Version: 2.1
Implementation-Vendor-Id: org.joda
Bundle-ManifestVersion: 2
Bundle-Vendor: Joda.org
Bundle-Name: Joda-Time
Bundle-SymbolicName: joda-time
Bundle-Version: 2.0
Export-Package: org.joda.time;version=2.0,
org.joda.time.base;version=2.0,
org.joda.time.chrono;version=2.0,
org.joda.time.convert;version=2.0,
org.joda.time.field;version=2.0,
org.joda.time.format;version=2.0,
org.joda.time.tz;version=2.0
Bundle-Version: 2.1
Export-Package: org.joda.time;version=2.1,
org.joda.time.base;version=2.1,
org.joda.time.chrono;version=2.1,
org.joda.time.convert;version=2.1,
org.joda.time.field;version=2.1,
org.joda.time.format;version=2.1,
org.joda.time.tz;version=2.1
Bundle-License: Apache 2.0
Bundle-DocURL: http://joda-time.sourceforge.net/
2 changes: 1 addition & 1 deletion src/site/site.xml
Expand Up @@ -28,7 +28,7 @@
<item name="Related projects" href="related.html"/>
<item name="Javadoc (Release)" href="api-release/index.html"/>
<item name="License" href="license.html"/>
<item name="Download" href="https://sourceforge.net/projects/joda-time/files/joda-time/2.0/"/>
<item name="Download" href="https://sourceforge.net/projects/joda-time/files/joda-time/2.1/"/>
</menu>

<menu name="Key concepts">
Expand Down
18 changes: 9 additions & 9 deletions src/site/xdoc/index.xml
Expand Up @@ -54,8 +54,8 @@ public boolean isJoinedInLastThreeMonths(<a href="api-release/org/joda/time/Date
return last3Months.contains(datetimeJoined);
}
-->
Version 2.0 was released on 2011-07-31 -
<a href="https://sourceforge.net/projects/joda-time/files/joda-time/2.0/">Download now</a>
Version 2.1 was released on 2012-02-22 -
<a href="https://sourceforge.net/projects/joda-time/files/joda-time/2.1/">Download now</a>
</p>
</section>

Expand Down Expand Up @@ -85,7 +85,7 @@ date formats, which are difficult to replicate with the JDK.</li>

<li><b>Up-to-date Time Zone calculations</b>.
The <a href="timezones.html">time zone implementation</a> is based on
the public <a href="http://www.twinsun.com/tz/tz-link.htm">tz database</a>, which is
the public <a href="http://www.iana.org/time-zones">tz database</a>, which is
updated several times a year. New Joda-Time releases incorporate all changes
made to this database. Should the changes be needed earlier,
<a href="tz_update.html">manually updating the zone data</a> is easy.</li>
Expand Down Expand Up @@ -139,20 +139,20 @@ Various documentation is available:

<section name="Releases">
<p>
<a href="https://sourceforge.net/projects/joda-time/files/joda-time/2.0/">Release 2.0</a>
<a href="https://sourceforge.net/projects/joda-time/files/joda-time/2.1/">Release 2.1</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.1 is a bugfix release compatible with version 2.0.
See the <a href="upgradeto210.html">upgrade notes</a> for full details.
</p>
<p>
Version 2.0 is almost completely source and binary compatible with version 1.x.
Key changes include the use of JDK 1.5 or later, generics, and the removal of some (but not all)
deprecated methods. See the <a href="upgradeto200.html">upgrade notes</a> for full details
including information on the corner cases that are not compatible.
Applications should be able to drop version 2.0 in place of an earlier version without any issues
providing they are using JDK 1.5 or later and are not using one of the deprecated methods.
Please let us know if a corner case hits you, especially if Joda-Time is a dependency of another
open source project.
</p>
<p>
We will support the 2.x product line using standard Java mechanisms.
Expand All @@ -164,7 +164,7 @@ The version number will change to 3.0 to indicate a significant change in compat
<a href="https://sourceforge.net/projects/joda-time/files/joda-time/1.6.2/">Release 1.6.2</a>
is the previous release.
It is compatible with JDK 1.4.
Given that v2.0 is essentially compatible with v1.6.2, there are no current plans for further
Given that v2.x is essentially compatible with v1.6.2, there are no current plans for further
releases in the v1.x product line.
</p>

Expand Down
1 change: 1 addition & 0 deletions src/site/xdoc/installation.xml
Expand Up @@ -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="upgradeto210.html">Version 2.0 to Version 2.1</a></li>
<li><a href="upgradeto200.html">Version 1.6 to Version 2.0</a></li>
<li><a href="upgradeto162.html">Version 1.6 to Version 1.6.2</a></li>
<li><a href="upgradeto161.html">Version 1.6 to Version 1.6.1</a></li>
Expand Down
121 changes: 121 additions & 0 deletions src/site/xdoc/upgradeto210.xml
@@ -0,0 +1,121 @@
<?xml version="1.0" encoding="ISO-8859-1"?>

<document>
<properties>
<title>Java date and time API - Upgrade from 1.6 to 1.6.1</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.0 to version 2.1.
<source>
Joda-Time version 2.1
---------------------

Joda-Time is a date and time handling library that seeks to replace the JDK
Date and Calendar classes.

This is the ninth release of Joda-Time.
This release contains enhancements, bug fixes and a time zone update.

We require JDK 1.5 or later as features such as generics are used.
It may be possible to use retroweaver to compile this under an earlier JDK but we haven't tried.

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://joda-time.sourceforge.net/related.html **


Enhancements since 2.0
----------------------
- Make DurationFieldType hash code deterministic

- Add Period.multipliedBy(int) and Period.negated()


Compatibility with 2.0
----------------------
Binary compatible - Yes

Source compatible - Yes

Serialization compatible - Yes

Data compatible - Yes, except
- DateTimeZone data updated to version 2011n

Semantic compatible - Yes, except
- Date-time for time-zones with DST based on an offset of 00:00 now pick summer time when ambiguous

- Time-zone names now return correct results on JDK1.6 for non-English locales

- Interval/MutableInterval toString() now contains the time-zone offset


Deprecations since 2.0
----------------------
None


Bug fixes since 2.0
-------------------
- Ambiguous date-time when in zone with offset of 00:00 [3424669]
A date-time constructor with an ambiguous time due to DST should choose summer time
but for a zone with an offset of 00:00 it chose winter time

- Fix GJChronology to allow some leap year dates in JulianChronology to be created [3446915]
Creating February 29th in Julian leap years was not always possible

- Fix PeriodType caching
The caching could go wrong if the DurationFieldType instances were in the wrong order

- Time-zone names [3412910]
Names now returned in locales other than English
The names may differ between JDK1.5 and 1.6 due to the underlying JDK data

- Time zone id parsing fixed for some longer time zones [3427389]
Time zones like "America/Dawson_Creek" were not parsed as "America/Dawson" was matched first

- Time zone later/earlier offset methods failed in Western hemisphere [3476684]
Previously, withLaterOffset() failed in the Americas, Now rewritten

- Time zone id parsing of GMT offsets failed on Dalvik
This may be related to a JDK specification change between Java 1.6 and 1.7

- Enhance readResolve() from LocalDate/LocalTime/LocalDateTime [3461008]
Handle even more weird deserialization problems with other tools

- Tweaks to cached time-zone to try and avoid a NPE [3470276]

- Fix multi-lingual period format for using English from another language default [3471414]
Previously, the word-based methods on PeriodFormat ignored the argument of English if the default
locale was non-English, now fixed

- Interval/MutableInterval toString() now contains the time-zone offset [https://github.com/JodaOrg/joda-time/pull/2]

- Fix multiplication of Long.MIN_VALUE by -1 in safeMultiply()

- Fix validation in BasicChronology.getDateTimeMillis
Previously this allowed a millisOfDay value one too large

- Javadoc fix to MutablePeriod [3413869]


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>

0 comments on commit 67178f0

Please sign in to comment.