summaryrefslogtreecommitdiff
path: root/setup_native/source
diff options
context:
space:
mode:
authorIngo Schmidt <is@openoffice.org>2010-01-14 14:23:50 +0000
committerIngo Schmidt <is@openoffice.org>2010-01-14 14:23:50 +0000
commit47f2782d29c156c888e8e9f0cd1b41b259a14206 (patch)
tree439a82657c3780c970287f132bc0a4ed2d85c74b /setup_native/source
parente2d9dd6fb86e50b45f2e7e838b5b0cd230bebef4 (diff)
#i108322# new java6u18
Diffstat (limited to 'setup_native/source')
-rwxr-xr-xsetup_native/source/java/javaversion.dat26
-rw-r--r--setup_native/source/java/javaversion2.dat26
2 files changed, 26 insertions, 26 deletions
diff --git a/setup_native/source/java/javaversion.dat b/setup_native/source/java/javaversion.dat
index 7ff47b499e45..6a18f1641eab 100755
--- a/setup_native/source/java/javaversion.dat
+++ b/setup_native/source/java/javaversion.dat
@@ -30,30 +30,30 @@
#*************************************************************************
# GUI String in the installer ("Java Runtime Environment (${JAVAVERSION})")
-JAVAVERSION=Java 6 Update 17
-WINDOWSJAVAVERSION=Java 6 Update 17
+JAVAVERSION=Java 6 Update 18
+WINDOWSJAVAVERSION=Java 6 Update 18
# Windows (scp2 and downloadtemplate.nsi)
-WINDOWSJAVAFILENAME=jre-6u17-windows-i586.exe
-WINDOWSJAVAREGISTRYENTRY=1.6.0_17
+WINDOWSJAVAFILENAME=jre-6u18-windows-i586.exe
+WINDOWSJAVAREGISTRYENTRY=1.6.0_18
# Linux (scp2)
-LINUXJAVAFILENAME=jre-6u17-linux-i586.rpm
+LINUXJAVAFILENAME=jre-6u18-linux-i586.rpm
# Linux (rpmUnit.xml, rpm -qp <filename> )
-LINUXJAVANAME=jre-1.6.0_17-fcs
+LINUXJAVANAME=jre-1.6.0_18-fcs
# Linux-x64 (scp2)
-LINUXX64JAVAFILENAME=jre-6u17-linux-amd64.rpm
+LINUXX64JAVAFILENAME=jre-6u18-linux-amd64.rpm
# Solaris Sparc (scp2)
-SOLSJAVARTPACKED=SUNWj6rt_1_6_0_17_sparc.tar.gz
-SOLSJAVACFGPACKED=SUNWj6cfg_1_6_0_17_sparc.tar.gz
-SOLSJAVAMANPACKED=SUNWj6man_1_6_0_17_sparc.tar.gz
+SOLSJAVARTPACKED=SUNWj6rt_1_6_0_18_sparc.tar.gz
+SOLSJAVACFGPACKED=SUNWj6cfg_1_6_0_18_sparc.tar.gz
+SOLSJAVAMANPACKED=SUNWj6man_1_6_0_18_sparc.tar.gz
# Solaris x86 (scp2)
-SOLIJAVARTPACKED=SUNWj6rt_1_6_0_17_x86.tar.gz
-SOLIJAVACFGPACKED=SUNWj6cfg_1_6_0_17_x86.tar.gz
-SOLIJAVAMANPACKED=SUNWj6man_1_6_0_17_x86.tar.gz
+SOLIJAVARTPACKED=SUNWj6rt_1_6_0_18_x86.tar.gz
+SOLIJAVACFGPACKED=SUNWj6cfg_1_6_0_18_x86.tar.gz
+SOLIJAVAMANPACKED=SUNWj6man_1_6_0_18_x86.tar.gz
# Solaris (pkgUnit.xml, needs only to be changed in major changes)
SOLARISJAVART=SUNWj6rt
diff --git a/setup_native/source/java/javaversion2.dat b/setup_native/source/java/javaversion2.dat
index 7ff47b499e45..6a18f1641eab 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 17
-WINDOWSJAVAVERSION=Java 6 Update 17
+JAVAVERSION=Java 6 Update 18
+WINDOWSJAVAVERSION=Java 6 Update 18
# Windows (scp2 and downloadtemplate.nsi)
-WINDOWSJAVAFILENAME=jre-6u17-windows-i586.exe
-WINDOWSJAVAREGISTRYENTRY=1.6.0_17
+WINDOWSJAVAFILENAME=jre-6u18-windows-i586.exe
+WINDOWSJAVAREGISTRYENTRY=1.6.0_18
# Linux (scp2)
-LINUXJAVAFILENAME=jre-6u17-linux-i586.rpm
+LINUXJAVAFILENAME=jre-6u18-linux-i586.rpm
# Linux (rpmUnit.xml, rpm -qp <filename> )
-LINUXJAVANAME=jre-1.6.0_17-fcs
+LINUXJAVANAME=jre-1.6.0_18-fcs
# Linux-x64 (scp2)
-LINUXX64JAVAFILENAME=jre-6u17-linux-amd64.rpm
+LINUXX64JAVAFILENAME=jre-6u18-linux-amd64.rpm
# Solaris Sparc (scp2)
-SOLSJAVARTPACKED=SUNWj6rt_1_6_0_17_sparc.tar.gz
-SOLSJAVACFGPACKED=SUNWj6cfg_1_6_0_17_sparc.tar.gz
-SOLSJAVAMANPACKED=SUNWj6man_1_6_0_17_sparc.tar.gz
+SOLSJAVARTPACKED=SUNWj6rt_1_6_0_18_sparc.tar.gz
+SOLSJAVACFGPACKED=SUNWj6cfg_1_6_0_18_sparc.tar.gz
+SOLSJAVAMANPACKED=SUNWj6man_1_6_0_18_sparc.tar.gz
# Solaris x86 (scp2)
-SOLIJAVARTPACKED=SUNWj6rt_1_6_0_17_x86.tar.gz
-SOLIJAVACFGPACKED=SUNWj6cfg_1_6_0_17_x86.tar.gz
-SOLIJAVAMANPACKED=SUNWj6man_1_6_0_17_x86.tar.gz
+SOLIJAVARTPACKED=SUNWj6rt_1_6_0_18_x86.tar.gz
+SOLIJAVACFGPACKED=SUNWj6cfg_1_6_0_18_x86.tar.gz
+SOLIJAVAMANPACKED=SUNWj6man_1_6_0_18_x86.tar.gz
# Solaris (pkgUnit.xml, needs only to be changed in major changes)
SOLARISJAVART=SUNWj6rt