/hg/release/icedtea6-1.10: 2 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Wed Mar 2 10:35:51 PST 2011
changeset 787b1537342a in /hg/release/icedtea6-1.10
details: http://icedtea.classpath.org/hg/release/icedtea6-1.10?cmd=changeset;node=787b1537342a
author: Andrew John Hughes <ahughes at redhat.com>
date: Wed Mar 02 18:34:51 2011 +0000
Revert serialversionUID changes in public JAXP API classes that
occurred between 1.9 and 1.10.
2011-03-02 Andrew John Hughes <ahughes at redhat.com>
* patches/jaxp-serial-version-uid.patch: Rejigged to
work post-b22 update.
2011-03-02 Pavel Tisnovsky <ptisnovs at redhat.com>
* Makefile.am: Added patch jaxp-serial-version-
uid.patch
* patches/jaxp-serial-version-uid.patch: Patch which fixes
class UID for various JAXP classes to allow IcedTea6 to pass
TCK.
changeset 1ad2d765dd39 in /hg/release/icedtea6-1.10
details: http://icedtea.classpath.org/hg/release/icedtea6-1.10?cmd=changeset;node=1ad2d765dd39
author: Andrew John Hughes <ahughes at redhat.com>
date: Wed Mar 02 18:35:41 2011 +0000
Prepare for 1.10 release.
2011-03-02 Andrew John Hughes <ahughes at redhat.com>
* NEWS: Set release date.
* configure.ac: Bump to 1.10 proper.
diffstat:
5 files changed, 51 insertions(+), 2 deletions(-)
ChangeLog | 10 ++++++++++
Makefile.am | 1 -
configure.ac | 2 +-
patches/jaxp-serial-version-uid.patch | 26 ++++++++++++++++++++++++++
private | 14 ++++++++++++++
diffs (116 lines):
diff -r 853d361c406a -r 1ad2d765dd39 ChangeLog
--- a/ChangeLog Wed Mar 02 15:54:21 2011 +0000
+++ b/ChangeLog Wed Mar 02 18:35:41 2011 +0000
@@ -1,3 +1,21 @@ 2011-03-02 Andrew John Hughes <ahughes
+2011-03-02 Andrew John Hughes <ahughes at redhat.com>
+
+ * NEWS: Set release date.
+ * configure.ac: Bump to 1.10 proper.
+
+2011-03-02 Andrew John Hughes <ahughes at redhat.com>
+
+ * patches/jaxp-serial-version-uid.patch:
+ Rejigged to work post-b22 update.
+
+2011-03-02 Pavel Tisnovsky <ptisnovs at redhat.com>
+
+ * Makefile.am:
+ Added patch jaxp-serial-version-uid.patch
+ * patches/jaxp-serial-version-uid.patch:
+ Patch which fixes class UID for various JAXP classes
+ to allow IcedTea6 to pass TCK.
+
2011-03-02 Andrew John Hughes <ahughes at redhat.com>
* NEWS:
diff -r 853d361c406a -r 1ad2d765dd39 Makefile.am
--- a/Makefile.am Wed Mar 02 15:54:21 2011 +0000
+++ b/Makefile.am Wed Mar 02 18:35:41 2011 +0000
@@ -317,7 +317,8 @@ ICEDTEA_PATCHES = \
patches/openjdk/6663040-com.sun.awt.patch \
patches/openjdk/6775317-non-AA-simple-shape-performance.patch \
patches/openjdk/6766342-AA-simple-shape-performance.patch \
- patches/pr600-arm-jvm.cfg.patch
+ patches/pr600-arm-jvm.cfg.patch \
+ patches/jaxp-serial-version-uid.patch
if !WITH_ALT_HSBUILD
ICEDTEA_PATCHES += \
diff -r 853d361c406a -r 1ad2d765dd39 NEWS
--- a/NEWS Wed Mar 02 15:54:21 2011 +0000
+++ b/NEWS Wed Mar 02 18:35:41 2011 +0000
@@ -8,7 +8,7 @@ GX - http://bugs.gentoo.org/show_bug.cg
CVE-XXXX-YYYY: http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=XXXX-YYYY
-New in release 1.10 (2011-XX-XX):
+New in release 1.10 (2011-03-02):
* NetX and the plugin moved to the IcedTea-Web project with a separate
release cycle.
diff -r 853d361c406a -r 1ad2d765dd39 configure.ac
--- a/configure.ac Wed Mar 02 15:54:21 2011 +0000
+++ b/configure.ac Wed Mar 02 18:35:41 2011 +0000
@@ -1,4 +1,4 @@ AC_INIT([icedtea6],[1.10pre],[distro-pkg
-AC_INIT([icedtea6],[1.10pre],[distro-pkg-dev at openjdk.java.net])
+AC_INIT([icedtea6],[1.10],[distro-pkg-dev at openjdk.java.net])
AM_INIT_AUTOMAKE([1.9 tar-pax foreign])
AC_CONFIG_FILES([Makefile])
diff -r 853d361c406a -r 1ad2d765dd39 patches/jaxp-serial-version-uid.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/jaxp-serial-version-uid.patch Wed Mar 02 18:35:41 2011 +0000
@@ -0,0 +1,53 @@
+diff -Nru openjdk.orig/jaxp/build.properties openjdk/jaxp/build.properties
+--- openjdk.orig/jaxp/build.properties 2011-02-28 16:03:34.000000000 +0000
++++ openjdk/jaxp/build.properties 2011-03-02 17:46:39.609899609 +0000
+@@ -77,6 +77,9 @@
+ # Where patches to drop bundle sources live
+ patches.dir=patches
+
++# Patches to apply
++jaxp_src.patch.list=6927050.patch serialversionuid.patch
++
+ # Sanity information
+ sanity.info= Sanity Settings:${line.separator}\
+ ant.home=${ant.home}${line.separator}\
+diff -Nru openjdk.orig/jaxp/patches/jaxp_src/serialversionuid.patch openjdk/jaxp/patches/jaxp_src/serialversionuid.patch
+--- openjdk.orig/jaxp/patches/jaxp_src/serialversionuid.patch 1970-01-01 01:00:00.000000000 +0100
++++ openjdk/jaxp/patches/jaxp_src/serialversionuid.patch 2011-03-02 17:46:17.322764393 +0000
+@@ -0,0 +1,36 @@
++--- src/javax/xml/stream/FactoryConfigurationError.java 2010-06-04 01:51:47.000000000 +0200
+++++ src/javax/xml/stream/FactoryConfigurationError.java 2010-06-04 01:51:47.000000000 +0200
++@@ -37,6 +37,9 @@
++ */
++ public class FactoryConfigurationError extends Error {
++
+++ // explicitly defined serial version ID to match JDK 6.
+++ private static final long serialVersionUID = -2994412584589975744L;
+++
++ Exception nested;
++
++ /**
++--- src/javax/xml/transform/TransformerFactoryConfigurationError.java 2011-03-01 14:18:52.000000000 +0100
+++++ src/javax/xml/transform/TransformerFactoryConfigurationError.java 2011-03-02 14:06:02.000000000 +0100
++@@ -33,6 +33,9 @@
++ */
++ public class TransformerFactoryConfigurationError extends Error {
++
+++ // explicitly defined serial version ID to match JDK 6.
+++ private static final long serialVersionUID = -6527718720676281516L;
+++
++ /**
++ * <code>Exception</code> for the
++ * <code>TransformerFactoryConfigurationError</code>.
++--- src/javax/xml/parsers/FactoryConfigurationError.java 2011-03-01 14:18:52.000000000 +0100
+++++ src/javax/xml/parsers/FactoryConfigurationError.java 2011-03-02 15:12:22.000000000 +0100
++@@ -37,6 +37,9 @@
++
++ public class FactoryConfigurationError extends Error {
++
+++ // explicitly defined serial version ID to match JDK 6.
+++ private static final long serialVersionUID = -827108682472263355L;
+++
++ /**
++ *<code>Exception</code> that represents the error.
++ */
More information about the distro-pkg-dev
mailing list