diff options
| author | Petr Mladek <pmladek@suse.cz> | 2013-05-17 19:23:09 +0200 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2013-10-24 16:36:03 +0200 |
| commit | cc73638cdaf139f018d83a191006f627f10ec9e2 (patch) | |
| tree | 27594a9a6002a997e903059524ec2a0b59bda8fc | |
| parent | 6574446e58763e72fec152624d015bb03206e670 (diff) | |
do not invalidate existing java setting just because license (bnc#820196)
The date of the last modification was updated when the license text was
added to the list of acceptable java vendors. Unfortuantely, this invalidates
the existing user java configuration. It is not necessary becary because
the list of valid vendors is the same.
The easiest solution and puts bac the original modification date.
We should also fix LO to automatically detect the java when the
automatic detection is enabled. Sigh, I have fixed many years
ago it is broken again. Let's fix this when we really bump the date.
Conflicts:
jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml
jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml
Change-Id: I80bc6bfa0abaec3c050ee2ed8ccfa6344a0c0cba
| -rw-r--r-- | jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml | 2 | ||||
| -rw-r--r-- | jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml b/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml index 311bf8146c0f..fcfdcd85167d 100644 --- a/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml +++ b/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml @@ -20,7 +20,7 @@ <javaSelection xmlns="http://openoffice.org/2004/java/framework/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <updated>2013-05-02</updated> + <updated>2004-01-30</updated> <vendorInfos> <vendor name="Sun Microsystems Inc."> diff --git a/jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml b/jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml index 5b33aad6a777..cbe32dadce4b 100644 --- a/jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml +++ b/jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml @@ -20,7 +20,7 @@ <javaSelection xmlns="http://openoffice.org/2004/java/framework/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <updated>2013-05-02</updated> + <updated>2004-01-30</updated> <vendorInfos> <vendor name="Sun Microsystems Inc."> |