From b2ad8a61470cc485bc501ebc7b5f3bff1d9d9e2c Mon Sep 17 00:00:00 2001
From: Stanislav Ochotnicky
Only formatting is supported, but all patterns are compatible with +- * SimpleDateFormat (except time zones - see below).
++ * SimpleDateFormat (except time zones and some year patterns - see below). + * + *Java 1.4 introduced a new pattern letter, 'Z'
, to represent
+ * time zones in RFC822 format (eg. +0800
or -1100
).
+@@ -60,6 +60,12 @@ import org.apache.commons.lang.text.StrBuilder;
+ * This introduces a minor incompatibility with Java 1.4, but at a gain of
+ * useful functionality.
Javadoc cites for the year pattern: For formatting, if the number of ++ * pattern letters is 2, the year is truncated to 2 digits; otherwise it is ++ * interpreted as a number. Starting with Java 1.7 a pattern of 'Y' or ++ * 'YYY' will be formatted as '2003', while it was '03' in former Java ++ * versions. FastDateFormat implements the behavior of Java 7.
++ * + * @author Apache Software Foundation + * @author TeaTrove project + * @author Brian S O'Neill +@@ -606,10 +612,10 @@ public class FastDateFormat extends Format { + rule = new TextField(Calendar.ERA, ERAs); + break; + case 'y': // year (number) +- if (tokenLen >= 4) { +- rule = selectNumberRule(Calendar.YEAR, tokenLen); +- } else { ++ if (tokenLen == 2) { + rule = TwoDigitYearField.INSTANCE; ++ } else { ++ rule = selectNumberRule(Calendar.YEAR, tokenLen < 4 ? 4 : tokenLen); + } + break; + case 'M': // month in year (text and number) +diff --git a/src/test/java/org/apache/commons/lang/time/FastDateFormatTest.java b/src/test/java/org/apache/commons/lang/time/FastDateFormatTest.java +index 8232747..bd4d664 100644 +--- a/src/test/java/org/apache/commons/lang/time/FastDateFormatTest.java ++++ b/src/test/java/org/apache/commons/lang/time/FastDateFormatTest.java +@@ -230,8 +230,9 @@ public class FastDateFormatTest extends TestCase { + " dddd ddd dd d DDDD DDD DD D EEEE EEE EE E aaaa aaa aa a zzzz zzz zz z"; + fdf = FastDateFormat.getInstance(pattern); + sdf = new SimpleDateFormat(pattern); +- assertEquals(sdf.format(date1), fdf.format(date1)); +- assertEquals(sdf.format(date2), fdf.format(date2)); ++ // SDF bug fix starting with Java 7 ++ assertEquals(sdf.format(date1).replaceAll("2003 03 03 03", "2003 2003 03 2003"), fdf.format(date1)); ++ assertEquals(sdf.format(date2).replaceAll("2003 03 03 03", "2003 2003 03 2003"), fdf.format(date2)); + + } finally { + Locale.setDefault(realDefaultLocale); +-- +1.7.7.6 + diff --git a/apache-commons-lang.spec b/apache-commons-lang.spec index 0c824b6..be1af18 100644 --- a/apache-commons-lang.spec +++ b/apache-commons-lang.spec @@ -4,13 +4,15 @@ Name: apache-%{short_name} Version: 2.6 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Provides a host of helper utilities for the java.lang API License: ASL 2.0 Group: Development/Libraries URL: http://commons.apache.org/%{base_name} Source0: http://archive.apache.org/dist/commons/%{base_name}/source/%{short_name}-%{version}-src.tar.gz Patch0: 0001-Make-source-version-1.3.patch +Patch1: 0002-Fix-FastDateFormat-for-Java-7-behaviour.patch + BuildArch: noarch BuildRequires: java-devel >= 1:1.6.0 BuildRequires: jpackage-utils >= 0:1.7.2 @@ -21,8 +23,6 @@ BuildRequires: maven-surefire-provider-junit Requires: java >= 1:1.6.0 Requires: jpackage-utils >= 0:1.6 -Requires(post): jpackage-utils -Requires(postun): jpackage-utils # This should go away with F-17 @@ -54,6 +54,7 @@ Obsoletes: jakarta-%{short_name}-javadoc <= 0:2.4 %prep %setup -q -n %{short_name}-%{version}-src %patch0 -p1 +%patch1 -p1 sed -i 's/\r//' *.txt %build @@ -82,15 +83,19 @@ rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || : %files %doc PROPOSAL.html LICENSE.txt RELEASE-NOTES.txt NOTICE.txt -%{_javadir}/* +%{_javadir}/%{name}.jar +%{_javadir}/%{short_name}.jar %{_mavenpomdir}/JPP-%{short_name}.pom -%{_mavendepmapfragdir}/* +%{_mavendepmapfragdir}/%{name} %files javadoc %doc LICENSE.txt NOTICE.txt %doc %{_javadocdir}/%{name} %changelog +* Wed Feb 22 2012 Stanislav Ochotnicky