summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIvo Hinkelmann <ihi@openoffice.org>2009-04-02 14:00:20 +0000
committerIvo Hinkelmann <ihi@openoffice.org>2009-04-02 14:00:20 +0000
commit7bd3cbaa383f61f54a5f8cb94f8372e091ad4116 (patch)
tree80e0b7a8d51e4819cac1abe3aacb75d6267a5fa8
parentd3acfc2cd140bb78fe53f09db63e0ff25506345d (diff)
CWS-TOOLING: integrate CWS native239_DEV300
2009-03-24 12:02:50 +0100 is r269934 : #i100511# update to jre6u13
-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 93ef7a7bee78..120bed23d7bf 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 12
-WINDOWSJAVAVERSION=Java 6 Update 12
+JAVAVERSION=Java 6 Update 13
+WINDOWSJAVAVERSION=Java 6 Update 13
# Windows (scp2 and downloadtemplate.nsi)
-WINDOWSJAVAFILENAME=jre-6u12-windows-i586-p.exe
-WINDOWSJAVAREGISTRYENTRY=1.6.0_12
+WINDOWSJAVAFILENAME=jre-6u13-windows-i586-p.exe
+WINDOWSJAVAREGISTRYENTRY=1.6.0_13
# Linux (scp2)
-LINUXJAVAFILENAME=jre-6u12-linux-i586.rpm
+LINUXJAVAFILENAME=jre-6u13-linux-i586.rpm
# Linux (rpmUnit.xml, rpm -qp <filename> )
-LINUXJAVANAME=jre-1.6.0_12-fcs
+LINUXJAVANAME=jre-1.6.0_13-fcs
# Linux-x64 (scp2)
-LINUXX64JAVAFILENAME=jre-6u12-linux-amd64.rpm
+LINUXX64JAVAFILENAME=jre-6u13-linux-amd64.rpm
# Solaris Sparc (scp2)
-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
+SOLSJAVARTPACKED=SUNWj6rt_1_6_0_13_sparc.tar.gz
+SOLSJAVACFGPACKED=SUNWj6cfg_1_6_0_13_sparc.tar.gz
+SOLSJAVAMANPACKED=SUNWj6man_1_6_0_13_sparc.tar.gz
# Solaris x86 (scp2)
-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
+SOLIJAVARTPACKED=SUNWj6rt_1_6_0_13_x86.tar.gz
+SOLIJAVACFGPACKED=SUNWj6cfg_1_6_0_13_x86.tar.gz
+SOLIJAVAMANPACKED=SUNWj6man_1_6_0_13_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 93ef7a7bee78..120bed23d7bf 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 12
-WINDOWSJAVAVERSION=Java 6 Update 12
+JAVAVERSION=Java 6 Update 13
+WINDOWSJAVAVERSION=Java 6 Update 13
# Windows (scp2 and downloadtemplate.nsi)
-WINDOWSJAVAFILENAME=jre-6u12-windows-i586-p.exe
-WINDOWSJAVAREGISTRYENTRY=1.6.0_12
+WINDOWSJAVAFILENAME=jre-6u13-windows-i586-p.exe
+WINDOWSJAVAREGISTRYENTRY=1.6.0_13
# Linux (scp2)
-LINUXJAVAFILENAME=jre-6u12-linux-i586.rpm
+LINUXJAVAFILENAME=jre-6u13-linux-i586.rpm
# Linux (rpmUnit.xml, rpm -qp <filename> )
-LINUXJAVANAME=jre-1.6.0_12-fcs
+LINUXJAVANAME=jre-1.6.0_13-fcs
# Linux-x64 (scp2)
-LINUXX64JAVAFILENAME=jre-6u12-linux-amd64.rpm
+LINUXX64JAVAFILENAME=jre-6u13-linux-amd64.rpm
# Solaris Sparc (scp2)
-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
+SOLSJAVARTPACKED=SUNWj6rt_1_6_0_13_sparc.tar.gz
+SOLSJAVACFGPACKED=SUNWj6cfg_1_6_0_13_sparc.tar.gz
+SOLSJAVAMANPACKED=SUNWj6man_1_6_0_13_sparc.tar.gz
# Solaris x86 (scp2)
-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
+SOLIJAVARTPACKED=SUNWj6rt_1_6_0_13_x86.tar.gz
+SOLIJAVACFGPACKED=SUNWj6cfg_1_6_0_13_x86.tar.gz
+SOLIJAVAMANPACKED=SUNWj6man_1_6_0_13_x86.tar.gz
# Solaris (pkgUnit.xml, needs only to be changed in major changes)
SOLARISJAVART=SUNWj6rt