summaryrefslogtreecommitdiff
path: root/jvmfwk
diff options
context:
space:
mode:
authorPedro Giffuni <pfg@apache.org>2012-05-02 18:35:08 +0000
committerMichael Stahl <mstahl@redhat.com>2013-05-18 00:54:56 +0200
commitcb5000280e292042f36b07f2484026a4382899f9 (patch)
treecc03eaa1ecda0cb86f43addaaf815698a722b879 /jvmfwk
parente4088a68aa3d69da60f5a1e93c06ca8be3ff764f (diff)
Add Oracle as a Java vendor for Solaris.
Conflicts: jvmfwk/distributions/OpenOfficeorg/javavendors_unx.xml Change-Id: Ifaa60fafb0db62ed60ba4080b6bb3713d8d9e3be
Diffstat (limited to 'jvmfwk')
-rw-r--r--jvmfwk/distributions/OpenOfficeorg/javavendors_unx.xml6
1 files changed, 5 insertions, 1 deletions
diff --git a/jvmfwk/distributions/OpenOfficeorg/javavendors_unx.xml b/jvmfwk/distributions/OpenOfficeorg/javavendors_unx.xml
index 8294db9ffdda..8430a010b867 100644
--- a/jvmfwk/distributions/OpenOfficeorg/javavendors_unx.xml
+++ b/jvmfwk/distributions/OpenOfficeorg/javavendors_unx.xml
@@ -20,15 +20,19 @@
<javaSelection xmlns="http://openoffice.org/2004/java/framework/1.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <updated>2004-01-30</updated>
+ <updated>2011-01-07</updated>
<vendorInfos>
+ <vendor name="Oracle Corporation">
+ <minVersion>1.7.0</minVersion>
+ </vendor>
<vendor name="Sun Microsystems Inc.">
<minVersion>1.5.0</minVersion>
</vendor>
</vendorInfos>
<plugins>
+ <library vendor="Oracle Corporation">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/libsunjavaplugin.so</library>
<library vendor="Sun Microsystems Inc.">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/libsunjavaplugin.so</library>
</plugins>
</javaSelection>