[ooo-build-commit] Branch 'ooo/OOO320' - setup_native/source

[Jan Holesovsky]

 setup_native/source/java/javaversion.dat  |   26 +++++++++++++-------------
 setup_native/source/java/javaversion2.dat |   26 +++++++++++++-------------
 2 files changed, 26 insertions(+), 26 deletions(-)

New commits:
commit 0dad59e3b3f78c138192cf67e0a7091f425b04ba
Author: Oliver Bolte <obo at openoffice.org>
Date:   Wed Nov 11 12:52:54 2009 +0000

    CWS-TOOLING: integrate CWS jl141
    2009-11-09 13:03:02 +0100 is  r277408 : #i106624# new jre6u17

diff --git a/setup_native/source/java/javaversion.dat b/setup_native/source/java/javaversion.dat
index 87172c3..7ff47b4 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 16
-WINDOWSJAVAVERSION=Java 6 Update 16
+JAVAVERSION=Java 6 Update 17
+WINDOWSJAVAVERSION=Java 6 Update 17
 
 # Windows (scp2 and downloadtemplate.nsi)
-WINDOWSJAVAFILENAME=jre-6u16-windows-i586.exe
-WINDOWSJAVAREGISTRYENTRY=1.6.0_16
+WINDOWSJAVAFILENAME=jre-6u17-windows-i586.exe
+WINDOWSJAVAREGISTRYENTRY=1.6.0_17
 
 # Linux (scp2)
-LINUXJAVAFILENAME=jre-6u16-linux-i586.rpm
+LINUXJAVAFILENAME=jre-6u17-linux-i586.rpm
 # Linux (rpmUnit.xml, rpm -qp <filename> )
-LINUXJAVANAME=jre-1.6.0_16-fcs
+LINUXJAVANAME=jre-1.6.0_17-fcs
 
 # Linux-x64 (scp2)
-LINUXX64JAVAFILENAME=jre-6u16-linux-amd64.rpm
+LINUXX64JAVAFILENAME=jre-6u17-linux-amd64.rpm
 
 # Solaris Sparc (scp2)
-SOLSJAVARTPACKED=SUNWj6rt_1_6_0_16_sparc.tar.gz
-SOLSJAVACFGPACKED=SUNWj6cfg_1_6_0_16_sparc.tar.gz
-SOLSJAVAMANPACKED=SUNWj6man_1_6_0_16_sparc.tar.gz
+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
 
 # Solaris x86 (scp2)
-SOLIJAVARTPACKED=SUNWj6rt_1_6_0_16_x86.tar.gz
-SOLIJAVACFGPACKED=SUNWj6cfg_1_6_0_16_x86.tar.gz
-SOLIJAVAMANPACKED=SUNWj6man_1_6_0_16_x86.tar.gz
+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
 
 # 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 87172c3..7ff47b4 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 16
-WINDOWSJAVAVERSION=Java 6 Update 16
+JAVAVERSION=Java 6 Update 17
+WINDOWSJAVAVERSION=Java 6 Update 17
 
 # Windows (scp2 and downloadtemplate.nsi)
-WINDOWSJAVAFILENAME=jre-6u16-windows-i586.exe
-WINDOWSJAVAREGISTRYENTRY=1.6.0_16
+WINDOWSJAVAFILENAME=jre-6u17-windows-i586.exe
+WINDOWSJAVAREGISTRYENTRY=1.6.0_17
 
 # Linux (scp2)
-LINUXJAVAFILENAME=jre-6u16-linux-i586.rpm
+LINUXJAVAFILENAME=jre-6u17-linux-i586.rpm
 # Linux (rpmUnit.xml, rpm -qp <filename> )
-LINUXJAVANAME=jre-1.6.0_16-fcs
+LINUXJAVANAME=jre-1.6.0_17-fcs
 
 # Linux-x64 (scp2)
-LINUXX64JAVAFILENAME=jre-6u16-linux-amd64.rpm
+LINUXX64JAVAFILENAME=jre-6u17-linux-amd64.rpm
 
 # Solaris Sparc (scp2)
-SOLSJAVARTPACKED=SUNWj6rt_1_6_0_16_sparc.tar.gz
-SOLSJAVACFGPACKED=SUNWj6cfg_1_6_0_16_sparc.tar.gz
-SOLSJAVAMANPACKED=SUNWj6man_1_6_0_16_sparc.tar.gz
+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
 
 # Solaris x86 (scp2)
-SOLIJAVARTPACKED=SUNWj6rt_1_6_0_16_x86.tar.gz
-SOLIJAVACFGPACKED=SUNWj6cfg_1_6_0_16_x86.tar.gz
-SOLIJAVAMANPACKED=SUNWj6man_1_6_0_16_x86.tar.gz
+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
 
 # Solaris (pkgUnit.xml, needs only to be changed in major changes)
 SOLARISJAVART=SUNWj6rt