Mercurial > hg > release > icedtea7-forest-2.2 > hotspot

changeset 3455:ad6f5eaa165e jdk7u4-b20

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author jcoomes
date Tue, 10 Apr 2012 16:54:22 -0700
parents 30e3475c1a45 (diff) bf81dbf47dec (current diff)
children c7c6b00122cf
files .hgtags make/hotspot_version
diffstat 5 files changed, 67 insertions(+), 16 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Tue Apr 10 14:43:11 2012 -0700
+++ b/.hgtags	Tue Apr 10 16:54:22 2012 -0700
@@ -174,6 +174,15 @@
 9ad1548c6b63d596c411afc35147ffd5254426d9 hs21-b12
 c149193c768b8b7233da4c3a3fdc0756b975848e hs21-b13
 c149193c768b8b7233da4c3a3fdc0756b975848e jdk7-b143
+fe189d4a44e9e8f0c7d78fcbd1c63701745752ca jdk7-b144
+62f39d40ebf176306a916812729df586f9d10f43 hs21-b14
+82a81d5c5700a69333e12532bf0c4d33e885c7fc jdk7-b145
+82a81d5c5700a69333e12532bf0c4d33e885c7fc hs21-b15
+38fa55e5e79232d48f1bb8cf27d88bc094c9375a jdk7-b146
+38fa55e5e79232d48f1bb8cf27d88bc094c9375a hs21-b16
+81d815b05abb564aa1f4100ae13491c949b9a07e jdk7-b147
+81d815b05abb564aa1f4100ae13491c949b9a07e hs21-b17
+9b0ca45cd756d538c4c30afab280a91868eee1a5 jdk7u2-b01
 0cc8a70952c368e06de2adab1f2649a408f5e577 jdk8-b01
 31e253c1da429124bb87570ab095d9bc89850d0a jdk8-b02
 3a2fb61165dfc72e398179a2796d740c8da5b8c0 jdk8-b03
@@ -185,14 +194,34 @@
 7c29742c41b44fb0cd5a13c7ac8834f3f2ca649e hs22-b02
 3a2fb61165dfc72e398179a2796d740c8da5b8c0 hs22-b03
 ce9bde819dcba4a5d2822229d9183e69c74326ca hs22-b04
+8580b4f22e294cc1392a472e3ee263bca74751ce jdk7u2-b04
+2c820a7d4f304ebb6d310187eae20c15d6ced3b0 jdk7u2-b05
+43252bd4c09d30254de3b35148e5ea05e15f2cfb jdk7u2-b06
+8bab8fb7adb060d2dfcf4bb6b19281905fc0edb3 jdk7u2-b07
 513a84dd0f8b56dc0836b4e0bdd5dd0a778fc634 hs22-b05
 650d15d8f37255d3b805aa00c5bd1c30984b203d hs22-b06
+8035e71ac3f6c8a453f7e9483e7144731388b14e jdk7u2-b08
+cd3d4ec354fd040c1f47614991b3fe6d5cc5e9da hs22-b07
+b93bc193d73bd4d07150a3e8f85a8ca4bb18157c jdk7u2-b09
+623aec2a90f721fd0de9877bf7be8624874fd557 hs22-b08
+482e282037d780ca48a0eaaa4015b8ae20f0e0a9 jdk7u2-b11
+c8abdaa56b471195aefbac6ee385d7d35b8aec74 hs22-b09
+4061b13e3e6be63b6f157ef773f374f2355fdb48 jdk7u2-b12
+3ba0bb2e7c8ddac172f5b995aae57329cdd2dafa hs22-b10
+f17fe2f4b6aacc19cbb8ee39476f2f13a1c4d3cd jdk7u2-b13
+0744602f85c6fe62255326df595785eb2b32166d jdk7u2-b21
+a40d238623e5b1ab1224ea6b36dc5b23d0a53880 jdk7u3-b02
+6986bfb4c82e00b938c140f2202133350e6e73f8 jdk7u3-b03
+8e6375b46717d74d4885f839b4e72d03f357a45f jdk7u3-b04
+366e6ba09c99d8ec26c6d4b71e079189674a58fe jdk7u3-b20
+4c62237db349e5e151ca60a743b323ef63305947 jdk7u3-b05
 da883b9e6d3788057f9577e72712998ed82c9b7e hs23-b01
 49ed7eacfd16616166ff066493143889741097af jdk8-b08
 7c20d272643f47195478708eff593a9cce40fec4 jdk8-b09
 e4f412d2b75d2c797acff965aa2c420e3d358f09 hs23-b02
 d815de2e85e511b7deab2a83cf80c0224d011da9 jdk8-b10
 4d3850d9d326ac3a9bee2d867727e954322d014e hs23-b03
+7e508fbcb95078cc7513e2af93463c0e2616eea4 jdk7u4-b01
 4538caeef7b6cbd4302bebced805d65e68ccf301 jdk8-b11
 6534482ff68ad79066dfe15dfb6d8905f09681bd hs23-b04
 1d3900713a67a0a39faf4e12c9c158d55aebef87 jdk8-b12
@@ -200,32 +229,50 @@
 b92ca8e229d29004f840c67e620833d23a346761 jdk8-b13
 088d09a130ff02d8f5f05e92256baabe412f0439 jdk8-b14
 6c2a55d4902f202e1c2de1df17b7da083a2c31e8 hs23-b06
+35aadd2e739b7231dd4c2a26d9fc24b286afc576 jdk7u4-b03
+278a1c1706f0e83c1c3401cde5bf4cf814adbc9d jdk7u4-b04
+35aadd2e739b7231dd4c2a26d9fc24b286afc576 jdk7u4-b02
 fde2a39ed7f39233b287fbc278f437aac06c275b jdk8-b15
 d1f29d4e0bc60e8bd7ae961f1306d8ab33290212 jdk8-b17
 d1f29d4e0bc60e8bd7ae961f1306d8ab33290212 jdk8-b16
 6de8c9ba5907e4c5ca05ac4b8d84a8e2cbd92399 hs23-b07
 a2fef924d8e6f37dac2a887315e3502876cc8e24 hs23-b08
+1647361df7ba31c6fa8e838d5061b9930673e26c jdk7u4-b05
 61165f53f1656b9f99e4fb806429bf98b99d59c3 jdk8-b18
 4bcf61041217f8677dcec18e90e9196acc945bba hs23-b09
+b09b616c066f4837dea9dcf1eb0edb85640e03a3 jdk7u4-b06
 9232e0ecbc2cec54dcc8f93004fb00c214446460 jdk8-b19
 fe2c8764998112b7fefcd7d41599714813ae4327 jdk8-b20
 9952d1c439d64c5fd4ad1236a63a62bd5a49d4c3 jdk8-b21
 513351373923f74a7c91755748b95c9771e59f96 hs23-b10
+3804879a5ea02b8dfe24faf5a4c2d70acbcdb95b jdk7u4-b07
+899ddc704d9faed9733dd43fd81c87fa6a4362cf jdk7u4-b08
 24727fb37561779077fdfa5a33342246f20e5c0f jdk8-b22
 dcc292399a39113957eebbd3e487b7e05e2c79fc hs23-b11
+c5695e7d2e4fcd11f176533ae04a78896d538e96 jdk7u4-b09
 e850d8e7ea54b91c7aa656e297f0f9f38dd4c296 jdk8-b23
 9e177d44b10fe92ecffa965fef9c5ac5433c1b46 hs23-b12
+305636960fa422e05784179b887b44814c4fb9fe jdk7u4-b10
 a80fd4f45d7aaa154ed2f86a129f3c9c4035ec7a jdk8-b24
 b22de824749922986ce4d442bed029916b832807 hs23-b13
 64b46f975ab82948c1e021e17775ff4fab8bc40e hs23-b14
+acb171a8d7d60eba19660168398b49ea556f02d7 jdk7u4-b11
 9ad8feb5afbddec46d3cfe29fb5f73c2e99d5a43 jdk8-b25
 d71e662fe03741b6de498ca2077220148405a978 hs23-b15
+87b4042571ef6245fa2163f2c3ca5176f1d1856c jdk7u4-b12
 fd3060701216a11c0df6dcd053c6fd7c2b17a42c jdk8-b26
 f92a171cf0071ca6c3fa8231d7d570377f8b2f4d hs23-b16
 f92a171cf0071ca6c3fa8231d7d570377f8b2f4d hs23-b16
 931e5f39e365a0d550d79148ff87a7f9e864d2e1 hs23-b16
+efb5f2662c96c472caa3327090268c75a86dd9c0 jdk7u4-b13
+82e719a2e6416838b4421637646cbfd7104c7716 jdk7u4-b14
+1c483d994a78e46c4656b6f3773c7014346d0f19 jdk7u4-b15
 34a4f7687460b1b2bfb1d87191919c5f101aa988 hs23-b17
+c6a96f7a781dd23d2b9fd6353fcd87493616c803 jdk7u4-b16
 418bcab91d2c07c720190d39e1b7f7e39b214994 hs23-b18
+e266ffd6a7d7ccd6e06a442155c5e2457c1884de jdk7u4-b17
 ad5eb0a72fb1d6d7aa6ec7e9cfd06045aef51728 hs23-b19
+f1b786625e0c2ce215d70dda637a127edb2688f2 jdk7u4-b18
 1834c6835b75ed0c0f6fdb55a4ae56cc82e0f15c hs23-b20
+a1292d4e07097cf68addadca35553fd1255dc555 jdk7u4-b19
 34fce1d343b0d9f5e1e5ea30d93e840d260f3dce hs23-b21
--- a/.jcheck/conf	Tue Apr 10 14:43:11 2012 -0700
+++ b/.jcheck/conf	Tue Apr 10 16:54:22 2012 -0700
@@ -1,1 +1,2 @@
-project=jdk8
+project=jdk7
+bugids=dup
--- a/THIRD_PARTY_README	Tue Apr 10 14:43:11 2012 -0700
+++ b/THIRD_PARTY_README	Tue Apr 10 16:54:22 2012 -0700
@@ -216,15 +216,16 @@
 is included with JRE 7, JDK 7, and OpenJDK 7.
 
 You are receiving a copy of the Elliptic Curve Cryptography library in source
-form with the JDK 7 source distribution and object code in the JRE 7 & JDK 7
-runtime.
-
-The terms of the Oracle license do NOT apply to the Elliptic Curve
-Cryptography library program; it is licensed under the following license,
-separately from the Oracle programs you receive. If you do not wish to install
-this program, you may delete the library named libsunec.so (on Solaris and
-Linux systems) or sunec.dll (on Windows systems) from the JRE bin directory
-reserved for native libraries.
+form with the JDK 7 and OpenJDK7 source distributions, and as object code in
+the JRE 7 & JDK 7 runtimes.
+
+In the case of the JRE 7 & JDK 7 runtimes, the terms of the Oracle license do
+NOT apply to the Elliptic Curve Cryptography library; it is licensed under the
+following license, separately from Oracle's JDK & JRE.  If you do not wish to
+install the Elliptic Curve Cryptography library, you may delete the library
+named libsunec.so (on Solaris and Linux systems) or sunec.dll (on Windows
+systems) from the JRE bin directory reserved for native libraries.
+
 
 --- begin of LICENSE ---
 
@@ -1000,7 +1001,7 @@
 
 -------------------------------------------------------------------------------
 
-%% This notice is provided with respect to libpng 1.2.18, which is 
+%% This notice is provided with respect to libpng 1.5.4, which is 
 included with JRE 7, JDK 7, and OpenJDK 7.
 
 --- begin of LICENSE ---
@@ -1014,8 +1015,10 @@
 If you modify libpng you may insert additional notices immediately following
 this sentence.
 
-libpng versions 1.2.6, August 15, 2004, through 1.2.18, May 15, 2007, are
-Copyright (c) 2004, 2006-2007 Glenn Randers-Pehrson, and are
+This code is released under the libpng license.
+
+libpng versions 1.2.6, August 15, 2004, through 1.5.4, July 7, 2011, are
+Copyright (c) 2004, 2006-2011 Glenn Randers-Pehrson, and are
 distributed according to the same disclaimer and license as libpng-1.2.5
 with the following individual added to the list of Contributing Authors
 
@@ -1112,7 +1115,7 @@
 
 Glenn Randers-Pehrson
 glennrp at users.sourceforge.net
-May 15, 2007
+July 7, 2011
 
 --- end of LICENSE ---
 
--- a/make/hotspot_version	Tue Apr 10 14:43:11 2012 -0700
+++ b/make/hotspot_version	Tue Apr 10 16:54:22 2012 -0700
@@ -38,8 +38,8 @@
 HS_BUILD_NUMBER=21
 
 JDK_MAJOR_VER=1
-JDK_MINOR_VER=8
+JDK_MINOR_VER=7
 JDK_MICRO_VER=0
 
 # Previous (bootdir) JDK version
-JDK_PREVIOUS_VERSION=1.7.0
+JDK_PREVIOUS_VERSION=1.6.0
Binary file test/runtime/7020373/testcase.jar has changed