summaryrefslogtreecommitdiff
path: root/setup_native/source/java/javaversion2.dat
diff options
context:
space:
mode:
authorOliver Bolte <obo@openoffice.org>2009-02-19 14:20:37 +0000
committerOliver Bolte <obo@openoffice.org>2009-02-19 14:20:37 +0000
commit3e308f4b734481a86e10c8cc1cfde903673c2bcf (patch)
tree20d117aafe4e422a249ec7498460c01afa930d48 /setup_native/source/java/javaversion2.dat
parent2eae26bd04bfd8ef43c388a62fbf23c933eb9301 (diff)
CWS-TOOLING: integrate CWS native218
2009-02-05 15:43:50 +0100 is r267429 : #i98921# new jre6u12 2009-02-05 15:43:09 +0100 is r267428 : #i98921# new jre6u12 2009-01-30 12:16:37 +0100 is r267192 : #i98066# new process for different jres for Unix and Windows 2009-01-30 12:14:28 +0100 is r267191 : #i98066# Windows installation sets only get jre6i7 because of broken /qb 2009-01-23 18:12:43 +0100 is r266847 : #159080# fix problem in custom action position 2009-01-23 18:06:48 +0100 is r266845 : #159080# fix problem in custom action position 2009-01-23 18:05:45 +0100 is r266844 : #159080# fix problem in custom action position 2009-01-23 10:55:06 +0100 is r266794 : #158090# adding removere.idt to remove registry entries 2009-01-23 10:54:18 +0100 is r266791 : #158090# adding removere.idt to remove registry entries 2009-01-16 16:58:27 +0100 is r266436 : #158880# preparing msp hotfix after servicepack release 2009-01-16 16:25:00 +0100 is r266431 : #158880# preparing msp hotfix after servicepack release 2009-01-14 16:34:29 +0100 is r266317 : #i52744# rtl support for Java GUI Installer 2009-01-14 12:39:29 +0100 is r266284 : #i98066# jre6u11 for all products 2009-01-14 12:17:59 +0100 is r266279 : #i98062# jre always has to have the same name of the executable 2009-01-13 14:45:59 +0100 is r266224 : #i98026# copyright till 2009 2009-01-13 14:39:11 +0100 is r266223 : #i98026# copyright till 2009 2009-01-13 14:26:51 +0100 is r266221 : #i52744# right to left for windows installer 2009-01-13 11:23:26 +0100 is r266201 : #6777669# default language in nsis has to be English 2009-01-13 11:20:17 +0100 is r266200 : #i98021# using correct syntax for comments 2009-01-12 16:49:36 +0100 is r266168 : #i97715# fixing problem with rpm 4.6
Diffstat (limited to 'setup_native/source/java/javaversion2.dat')
-rw-r--r--setup_native/source/java/javaversion2.dat25
1 files changed, 13 insertions, 12 deletions
diff --git a/setup_native/source/java/javaversion2.dat b/setup_native/source/java/javaversion2.dat
index 490e2854a..93ef7a7be 100644
--- a/setup_native/source/java/javaversion2.dat
+++ b/setup_native/source/java/javaversion2.dat
@@ -30,29 +30,30 @@
#*************************************************************************
# GUI String in the installer ("Java Runtime Environment (${JAVAVERSION})")
-JAVAVERSION=Java 6 Update 11
+JAVAVERSION=Java 6 Update 12
+WINDOWSJAVAVERSION=Java 6 Update 12
# Windows (scp2 and downloadtemplate.nsi)
-WINDOWSJAVAFILENAME=jre-6u7-windows-i586-p.exe
-WINDOWSJAVAREGISTRYENTRY=1.6.0_11
+WINDOWSJAVAFILENAME=jre-6u12-windows-i586-p.exe
+WINDOWSJAVAREGISTRYENTRY=1.6.0_12
# Linux (scp2)
-LINUXJAVAFILENAME=jre-6u11-linux-i586.rpm
+LINUXJAVAFILENAME=jre-6u12-linux-i586.rpm
# Linux (rpmUnit.xml, rpm -qp <filename> )
-LINUXJAVANAME=jre-1.6.0_11-fcs
+LINUXJAVANAME=jre-1.6.0_12-fcs
# Linux-x64 (scp2)
-LINUXX64JAVAFILENAME=jre-6u11-linux-amd64.rpm
+LINUXX64JAVAFILENAME=jre-6u12-linux-amd64.rpm
# Solaris Sparc (scp2)
-SOLSJAVARTPACKED=SUNWj6rt_1_6_0_11_sparc.tar.gz
-SOLSJAVACFGPACKED=SUNWj6cfg_1_6_0_11_sparc.tar.gz
-SOLSJAVAMANPACKED=SUNWj6man_1_6_0_11_sparc.tar.gz
+SOLSJAVARTPACKED=SUNWj6rt_1_6_0_12_sparc.tar.gz
+SOLSJAVACFGPACKED=SUNWj6cfg_1_6_0_12_sparc.tar.gz
+SOLSJAVAMANPACKED=SUNWj6man_1_6_0_12_sparc.tar.gz
# Solaris x86 (scp2)
-SOLIJAVARTPACKED=SUNWj6rt_1_6_0_11_x86.tar.gz
-SOLIJAVACFGPACKED=SUNWj6cfg_1_6_0_11_x86.tar.gz
-SOLIJAVAMANPACKED=SUNWj6man_1_6_0_11_x86.tar.gz
+SOLIJAVARTPACKED=SUNWj6rt_1_6_0_12_x86.tar.gz
+SOLIJAVACFGPACKED=SUNWj6cfg_1_6_0_12_x86.tar.gz
+SOLIJAVAMANPACKED=SUNWj6man_1_6_0_12_x86.tar.gz
# Solaris (pkgUnit.xml, needs only to be changed in major changes)
SOLARISJAVART=SUNWj6rt