From f861c29e4ce0d257adc66bf816b896fb89f9fb38 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Tue, 1 Nov 2016 22:28:37 +0100 Subject: Clean up javavendors_*.xml files ...and drop unnecessary javavendors_template.xml Change-Id: Ib7f2d595d2086c1d3bf324f19693b9032cf00cd7 --- .../OpenOfficeorg/javavendors_freebsd.xml | 37 +++++++-------- .../OpenOfficeorg/javavendors_linux.xml | 55 ++++++++++------------ .../OpenOfficeorg/javavendors_macosx.xml | 37 +++++++-------- .../OpenOfficeorg/javavendors_template.xml | 48 ------------------- .../OpenOfficeorg/javavendors_unx.xml | 25 ++++------ .../OpenOfficeorg/javavendors_wnt.xml | 37 +++++++-------- 6 files changed, 83 insertions(+), 156 deletions(-) delete mode 100644 jvmfwk/distributions/OpenOfficeorg/javavendors_template.xml (limited to 'jvmfwk/distributions') diff --git a/jvmfwk/distributions/OpenOfficeorg/javavendors_freebsd.xml b/jvmfwk/distributions/OpenOfficeorg/javavendors_freebsd.xml index 13089bca3000..c603575f3cb8 100644 --- a/jvmfwk/distributions/OpenOfficeorg/javavendors_freebsd.xml +++ b/jvmfwk/distributions/OpenOfficeorg/javavendors_freebsd.xml @@ -16,25 +16,20 @@ * except in compliance with the License. You may obtain a copy of * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> - - - - 2012-07-12 - - - - 1.7.0 - - - 1.5.0 - - - 1.6.0 - - - 1.5.0 - - - + + 2012-07-12 + + + 1.7.0 + + + 1.5.0 + + + 1.6.0 + + + 1.5.0 + + diff --git a/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml b/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml index 943b2ce1bf45..969ed01c6c21 100644 --- a/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml +++ b/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml @@ -16,34 +16,29 @@ * except in compliance with the License. You may obtain a copy of * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> - - - - 2013-05-02 - - - - 1.5.0 - - - 1.6.0 - - - 1.5.0 - - - 1.5.0 - - - 1.5.0 - - - 1.5.0 - - - 1.6.0 - - - + + 2013-05-02 + + + 1.5.0 + + + 1.6.0 + + + 1.5.0 + + + 1.5.0 + + + 1.5.0 + + + 1.5.0 + + + 1.6.0 + + diff --git a/jvmfwk/distributions/OpenOfficeorg/javavendors_macosx.xml b/jvmfwk/distributions/OpenOfficeorg/javavendors_macosx.xml index 61ab2e29a846..c2416582a793 100644 --- a/jvmfwk/distributions/OpenOfficeorg/javavendors_macosx.xml +++ b/jvmfwk/distributions/OpenOfficeorg/javavendors_macosx.xml @@ -16,25 +16,20 @@ * except in compliance with the License. You may obtain a copy of * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> - - - - 2013-04-09 - - - - 1.7.0 - - - 1.5.0 - - - 1.5.0 - - - 1.6.0 - - - + + 2013-04-09 + + + 1.7.0 + + + 1.5.0 + + + 1.5.0 + + + 1.6.0 + + diff --git a/jvmfwk/distributions/OpenOfficeorg/javavendors_template.xml b/jvmfwk/distributions/OpenOfficeorg/javavendors_template.xml deleted file mode 100644 index f4e5fb8306ba..000000000000 --- a/jvmfwk/distributions/OpenOfficeorg/javavendors_template.xml +++ /dev/null @@ -1,48 +0,0 @@ - - - - - - - - 2004-01-30 - - - - 1.3.1 - 1.5.0 - - 1.4.1 - - - - 1.4.2 - - 1.5.0 - 1.4.3 - - - - - diff --git a/jvmfwk/distributions/OpenOfficeorg/javavendors_unx.xml b/jvmfwk/distributions/OpenOfficeorg/javavendors_unx.xml index c7b0568c2d18..fb79c003196e 100644 --- a/jvmfwk/distributions/OpenOfficeorg/javavendors_unx.xml +++ b/jvmfwk/distributions/OpenOfficeorg/javavendors_unx.xml @@ -16,19 +16,14 @@ * except in compliance with the License. You may obtain a copy of * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> - - - - 2011-01-07 - - - - 1.7.0 - - - 1.5.0 - - - + + 2011-01-07 + + + 1.7.0 + + + 1.5.0 + + diff --git a/jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml b/jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml index 330461094180..0a37a4ea88a7 100644 --- a/jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml +++ b/jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml @@ -16,25 +16,20 @@ * except in compliance with the License. You may obtain a copy of * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> - - - - 2013-05-02 - - - - 1.6.0 - - - 1.5.0 - - - 1.5.0 - - - 1.6.0 - - - + + 2013-05-02 + + + 1.6.0 + + + 1.5.0 + + + 1.5.0 + + + 1.6.0 + + -- cgit