diff options
| author | himajin100000 <himajin100000@gmail.com> | 2019-01-19 14:25:50 +0900 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-01-25 07:59:18 +0100 |
| commit | d801075217375a79ca037df96b3adff5eee5ebd2 (patch) | |
| tree | bf95caf59c7fef1b07b6d869c2bf90c8e89bf86c | |
| parent | 30f1620f708beb7a3f213deda62b39d4c8d57eed (diff) | |
Support AdoptOpenJDK
Change-Id: Idcfd542c6caede3d987e9b8219cf48114800daa5
Reviewed-on: https://gerrit.libreoffice.org/66634
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
(cherry picked from commit 61c4f96d6ae6a80370774e53287edb27cbce8067)
Reviewed-on: https://gerrit.libreoffice.org/66716
Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
(cherry picked from commit b9176c5bfa49e565bae4c7f129df59560110242d)
Reviewed-on: https://gerrit.libreoffice.org/66866
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
6 files changed, 21 insertions, 5 deletions
diff --git a/jvmfwk/distributions/OpenOfficeorg/javavendors_freebsd.xml b/jvmfwk/distributions/OpenOfficeorg/javavendors_freebsd.xml index c603575f3cb8..b05b6c797ea8 100644 --- a/jvmfwk/distributions/OpenOfficeorg/javavendors_freebsd.xml +++ b/jvmfwk/distributions/OpenOfficeorg/javavendors_freebsd.xml @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> <javaSelection xmlns="http://openoffice.org/2004/java/framework/1.0"> - <updated>2012-07-12</updated> + <updated>2019-01-19</updated> <vendorInfos> <vendor name="Oracle Corporation"> <minVersion>1.7.0</minVersion> @@ -31,5 +31,8 @@ <vendor name="Free Software Foundation, Inc."> <minVersion>1.5.0</minVersion> </vendor> + <vendor name="AdoptOpenJdk"> + <minVersion>1.8.0</minVersion> + </vendor> </vendorInfos> </javaSelection> diff --git a/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml b/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml index 969ed01c6c21..b008bb1fc0f7 100644 --- a/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml +++ b/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> <javaSelection xmlns="http://openoffice.org/2004/java/framework/1.0"> - <updated>2013-05-02</updated> + <updated>2019-01-19</updated> <vendorInfos> <vendor name="Sun Microsystems Inc."> <minVersion>1.5.0</minVersion> @@ -40,5 +40,8 @@ <vendor name="Azul Systems, Inc."> <minVersion>1.6.0</minVersion> </vendor> + <vendor name="AdoptOpenJdk"> + <minVersion>1.8.0</minVersion> + </vendor> </vendorInfos> </javaSelection> diff --git a/jvmfwk/distributions/OpenOfficeorg/javavendors_macosx.xml b/jvmfwk/distributions/OpenOfficeorg/javavendors_macosx.xml index c2416582a793..1fe7547d2919 100644 --- a/jvmfwk/distributions/OpenOfficeorg/javavendors_macosx.xml +++ b/jvmfwk/distributions/OpenOfficeorg/javavendors_macosx.xml @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> <javaSelection xmlns="http://openoffice.org/2004/java/framework/1.0"> - <updated>2013-04-09</updated> + <updated>2019-01-19</updated> <vendorInfos> <vendor name="Oracle Corporation"> <minVersion>1.7.0</minVersion> @@ -31,5 +31,8 @@ <vendor name="Azul Systems, Inc."> <minVersion>1.6.0</minVersion> </vendor> + <vendor name="AdoptOpenJdk"> + <minVersion>1.8.0</minVersion> + </vendor> </vendorInfos> </javaSelection> diff --git a/jvmfwk/distributions/OpenOfficeorg/javavendors_unx.xml b/jvmfwk/distributions/OpenOfficeorg/javavendors_unx.xml index fb79c003196e..7771d81527df 100644 --- a/jvmfwk/distributions/OpenOfficeorg/javavendors_unx.xml +++ b/jvmfwk/distributions/OpenOfficeorg/javavendors_unx.xml @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> <javaSelection xmlns="http://openoffice.org/2004/java/framework/1.0"> - <updated>2011-01-07</updated> + <updated>2019-01-19</updated> <vendorInfos> <vendor name="Oracle Corporation"> <minVersion>1.7.0</minVersion> @@ -25,5 +25,8 @@ <vendor name="Sun Microsystems Inc."> <minVersion>1.5.0</minVersion> </vendor> + <vendor name="AdoptOpenJdk"> + <minVersion>1.8.0</minVersion> + </vendor> </vendorInfos> </javaSelection> diff --git a/jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml b/jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml index 0a37a4ea88a7..429831121f7b 100644 --- a/jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml +++ b/jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> <javaSelection xmlns="http://openoffice.org/2004/java/framework/1.0"> - <updated>2013-05-02</updated> + <updated>2019-01-19</updated> <vendorInfos> <vendor name="Oracle Corporation"> <minVersion>1.6.0</minVersion> @@ -31,5 +31,8 @@ <vendor name="Azul Systems, Inc."> <minVersion>1.6.0</minVersion> </vendor> + <vendor name="AdoptOpenJdk"> + <minVersion>1.8.0</minVersion> + </vendor> </vendorInfos> </javaSelection> diff --git a/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx b/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx index 2960d118cf38..56ec3a4e5a43 100644 --- a/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx +++ b/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx @@ -41,6 +41,7 @@ BEGIN_VENDOR_MAP() #endif VENDOR_MAP_ENTRY("Sun Microsystems Inc.", SunInfo) VENDOR_MAP_ENTRY("Oracle Corporation", SunInfo) + VENDOR_MAP_ENTRY("AdoptOpenJdk", SunInfo) #ifndef MACOSX VENDOR_MAP_ENTRY("IBM Corporation", OtherInfo) VENDOR_MAP_ENTRY("Blackdown Java-Linux Team", OtherInfo) |