summaryrefslogtreecommitdiff
path: root/setup_native/source/java
diff options
context:
space:
mode:
authorRelease Engineers <releng@openoffice.org>2009-08-07 12:23:45 +0000
committerRelease Engineers <releng@openoffice.org>2009-08-07 12:23:45 +0000
commit1305be86333cfe211c358167e578b88ca3bc4ac6 (patch)
treee1283d805bd689dd25c9cbed33d2a62525e7058c /setup_native/source/java
parentf4ba26d7568062c21a569e987a9b3b93849c64ed (diff)
CWS-TOOLING: integrate CWS native261_DEV300
2009-08-04 10:37:13 +0200 is r274610 : #i103988# new jre6u15
Diffstat (limited to 'setup_native/source/java')
-rw-r--r--setup_native/source/java/javaversion2.dat26
1 files changed, 13 insertions, 13 deletions
diff --git a/setup_native/source/java/javaversion2.dat b/setup_native/source/java/javaversion2.dat
index 34e9257bb9ff..e997838421b6 100644
--- a/setup_native/source/java/javaversion2.dat
+++ b/setup_native/source/java/javaversion2.dat
@@ -30,30 +30,30 @@
#*************************************************************************
# GUI String in the installer ("Java Runtime Environment (${JAVAVERSION})")
-JAVAVERSION=Java 6 Update 14
-WINDOWSJAVAVERSION=Java 6 Update 14
+JAVAVERSION=Java 6 Update 15
+WINDOWSJAVAVERSION=Java 6 Update 15
# Windows (scp2 and downloadtemplate.nsi)
-WINDOWSJAVAFILENAME=jre-6u14-windows-i586.exe
-WINDOWSJAVAREGISTRYENTRY=1.6.0_14
+WINDOWSJAVAFILENAME=jre-6u15-windows-i586.exe
+WINDOWSJAVAREGISTRYENTRY=1.6.0_15
# Linux (scp2)
-LINUXJAVAFILENAME=jre-6u14-linux-i586.rpm
+LINUXJAVAFILENAME=jre-6u15-linux-i586.rpm
# Linux (rpmUnit.xml, rpm -qp <filename> )
-LINUXJAVANAME=jre-1.6.0_14-fcs
+LINUXJAVANAME=jre-1.6.0_15-fcs
# Linux-x64 (scp2)
-LINUXX64JAVAFILENAME=jre-6u14-linux-amd64.rpm
+LINUXX64JAVAFILENAME=jre-6u15-linux-amd64.rpm
# Solaris Sparc (scp2)
-SOLSJAVARTPACKED=SUNWj6rt_1_6_0_14_sparc.tar.gz
-SOLSJAVACFGPACKED=SUNWj6cfg_1_6_0_14_sparc.tar.gz
-SOLSJAVAMANPACKED=SUNWj6man_1_6_0_14_sparc.tar.gz
+SOLSJAVARTPACKED=SUNWj6rt_1_6_0_15_sparc.tar.gz
+SOLSJAVACFGPACKED=SUNWj6cfg_1_6_0_15_sparc.tar.gz
+SOLSJAVAMANPACKED=SUNWj6man_1_6_0_15_sparc.tar.gz
# Solaris x86 (scp2)
-SOLIJAVARTPACKED=SUNWj6rt_1_6_0_14_x86.tar.gz
-SOLIJAVACFGPACKED=SUNWj6cfg_1_6_0_14_x86.tar.gz
-SOLIJAVAMANPACKED=SUNWj6man_1_6_0_14_x86.tar.gz
+SOLIJAVARTPACKED=SUNWj6rt_1_6_0_15_x86.tar.gz
+SOLIJAVACFGPACKED=SUNWj6cfg_1_6_0_15_x86.tar.gz
+SOLIJAVAMANPACKED=SUNWj6man_1_6_0_15_x86.tar.gz
# Solaris (pkgUnit.xml, needs only to be changed in major changes)
SOLARISJAVART=SUNWj6rt