diff options
| author | Petr Mladek <pmladek@suse.cz> | 2013-05-17 19:23:09 +0200 |
|---|---|---|
| committer | Petr Mladek <pmladek@suse.cz> | 2013-05-17 19:28:59 +0200 |
| commit | e97bfb164a3fa1e12c80f2e17f4e760df4c2b1ee (patch) | |
| tree | 546eca9590905ede3f399824347c564ebf4a564e /jvmfwk | |
| parent | fab41537089f63d37bd60082bf8592f7a6dc79b1 (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.
Change-Id: I80bc6bfa0abaec3c050ee2ed8ccfa6344a0c0cba
Diffstat (limited to 'jvmfwk')
| -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 97c25507a5b6..fb948dd7de10 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>2012-07-12</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 3ad59c32193e..e9c1c9c02ee8 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>2012-07-12</updated> + <updated>2004-01-30</updated> <vendorInfos> <vendor name="Sun Microsystems Inc."> |