summaryrefslogtreecommitdiff
path: root/jvmfwk/distributions/OpenOfficeorg
diff options
context:
space:
mode:
authorAriel Constenla-Haile <arielch@apache.org>2012-06-10 22:31:42 +0000
committerCaolán McNamara <caolanm@redhat.com>2013-05-02 13:37:26 +0100
commit55d2d982d0722e2ede96811d2a38ad3d70fc9d62 (patch)
tree0565e906bbaf0c6a5e88101a13209bc27c686c99 /jvmfwk/distributions/OpenOfficeorg
parent7d528592ac756f5495b2fb300f4302cce89ca017 (diff)
Resolves: #i66923# Add support for JRockit JVM
(cherry picked from commit cb38ee0da6fa928118fbc1da118a707d7799cb40) Conflicts: jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx Change-Id: Iffd413ba1d74ae3b7da58df7b092c43c4f64a7c9
Diffstat (limited to 'jvmfwk/distributions/OpenOfficeorg')
-rw-r--r--jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml4
-rw-r--r--jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml4
2 files changed, 4 insertions, 4 deletions
diff --git a/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml b/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml
index 97c25507a5b6..2ff994675229 100644
--- a/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml
+++ b/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml
@@ -20,14 +20,14 @@
<javaSelection xmlns="http://openoffice.org/2004/java/framework/1.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <updated>2012-07-12</updated>
+ <updated>2013-05-02</updated>
<vendorInfos>
<vendor name="Sun Microsystems Inc.">
<minVersion>1.5.0</minVersion>
</vendor>
<vendor name="Oracle Corporation">
- <minVersion>1.7.0</minVersion>
+ <minVersion>1.6.0</minVersion>
</vendor>
<vendor name="IBM Corporation">
<minVersion>1.5.0</minVersion>
diff --git a/jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml b/jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml
index 3ad59c32193e..e48037f697df 100644
--- a/jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml
+++ b/jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml
@@ -20,14 +20,14 @@
<javaSelection xmlns="http://openoffice.org/2004/java/framework/1.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <updated>2012-07-12</updated>
+ <updated>2013-05-02</updated>
<vendorInfos>
<vendor name="Sun Microsystems Inc.">
<minVersion>1.5.0</minVersion>
</vendor>
<vendor name="Oracle Corporation">
- <minVersion>1.7.0</minVersion>
+ <minVersion>1.6.0</minVersion>
</vendor>
<vendor name="IBM Corporation">
<minVersion>1.5.0</minVersion>