Kaydet (Commit) 61c4f96d authored tarafından himajin100000's avatar himajin100000 Kaydeden (comit) Stephan Bergmann

Support AdoptOpenJDK

Change-Id: Idcfd542c6caede3d987e9b8219cf48114800daa5
Reviewed-on: https://gerrit.libreoffice.org/66634
Tested-by: Jenkins
Reviewed-by: 's avatarAdolfo Jayme Barrientos <fitojb@ubuntu.com>
Reviewed-by: 's avatarSamuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
Reviewed-by: 's avatarStephan Bergmann <sbergman@redhat.com>
üst 0c64df24
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 . * the License at http://www.apache.org/licenses/LICENSE-2.0 .
--> -->
<javaSelection xmlns="http://openoffice.org/2004/java/framework/1.0"> <javaSelection xmlns="http://openoffice.org/2004/java/framework/1.0">
<updated>2012-07-12</updated> <updated>2019-01-19</updated>
<vendorInfos> <vendorInfos>
<vendor name="Oracle Corporation"> <vendor name="Oracle Corporation">
<minVersion>1.7.0</minVersion> <minVersion>1.7.0</minVersion>
...@@ -31,5 +31,8 @@ ...@@ -31,5 +31,8 @@
<vendor name="Free Software Foundation, Inc."> <vendor name="Free Software Foundation, Inc.">
<minVersion>1.5.0</minVersion> <minVersion>1.5.0</minVersion>
</vendor> </vendor>
<vendor name="AdoptOpenJdk">
<minVersion>1.8.0</minVersion>
</vendor>
</vendorInfos> </vendorInfos>
</javaSelection> </javaSelection>
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 . * the License at http://www.apache.org/licenses/LICENSE-2.0 .
--> -->
<javaSelection xmlns="http://openoffice.org/2004/java/framework/1.0"> <javaSelection xmlns="http://openoffice.org/2004/java/framework/1.0">
<updated>2013-05-02</updated> <updated>2019-01-19</updated>
<vendorInfos> <vendorInfos>
<vendor name="Sun Microsystems Inc."> <vendor name="Sun Microsystems Inc.">
<minVersion>1.5.0</minVersion> <minVersion>1.5.0</minVersion>
...@@ -40,5 +40,8 @@ ...@@ -40,5 +40,8 @@
<vendor name="Azul Systems, Inc."> <vendor name="Azul Systems, Inc.">
<minVersion>1.6.0</minVersion> <minVersion>1.6.0</minVersion>
</vendor> </vendor>
<vendor name="AdoptOpenJdk">
<minVersion>1.8.0</minVersion>
</vendor>
</vendorInfos> </vendorInfos>
</javaSelection> </javaSelection>
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 . * the License at http://www.apache.org/licenses/LICENSE-2.0 .
--> -->
<javaSelection xmlns="http://openoffice.org/2004/java/framework/1.0"> <javaSelection xmlns="http://openoffice.org/2004/java/framework/1.0">
<updated>2013-04-09</updated> <updated>2019-01-19</updated>
<vendorInfos> <vendorInfos>
<vendor name="Oracle Corporation"> <vendor name="Oracle Corporation">
<minVersion>1.7.0</minVersion> <minVersion>1.7.0</minVersion>
...@@ -31,5 +31,8 @@ ...@@ -31,5 +31,8 @@
<vendor name="Azul Systems, Inc."> <vendor name="Azul Systems, Inc.">
<minVersion>1.6.0</minVersion> <minVersion>1.6.0</minVersion>
</vendor> </vendor>
<vendor name="AdoptOpenJdk">
<minVersion>1.8.0</minVersion>
</vendor>
</vendorInfos> </vendorInfos>
</javaSelection> </javaSelection>
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 . * the License at http://www.apache.org/licenses/LICENSE-2.0 .
--> -->
<javaSelection xmlns="http://openoffice.org/2004/java/framework/1.0"> <javaSelection xmlns="http://openoffice.org/2004/java/framework/1.0">
<updated>2011-01-07</updated> <updated>2019-01-19</updated>
<vendorInfos> <vendorInfos>
<vendor name="Oracle Corporation"> <vendor name="Oracle Corporation">
<minVersion>1.7.0</minVersion> <minVersion>1.7.0</minVersion>
...@@ -25,5 +25,8 @@ ...@@ -25,5 +25,8 @@
<vendor name="Sun Microsystems Inc."> <vendor name="Sun Microsystems Inc.">
<minVersion>1.5.0</minVersion> <minVersion>1.5.0</minVersion>
</vendor> </vendor>
<vendor name="AdoptOpenJdk">
<minVersion>1.8.0</minVersion>
</vendor>
</vendorInfos> </vendorInfos>
</javaSelection> </javaSelection>
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 . * the License at http://www.apache.org/licenses/LICENSE-2.0 .
--> -->
<javaSelection xmlns="http://openoffice.org/2004/java/framework/1.0"> <javaSelection xmlns="http://openoffice.org/2004/java/framework/1.0">
<updated>2013-05-02</updated> <updated>2019-01-19</updated>
<vendorInfos> <vendorInfos>
<vendor name="Oracle Corporation"> <vendor name="Oracle Corporation">
<minVersion>1.6.0</minVersion> <minVersion>1.6.0</minVersion>
...@@ -31,5 +31,8 @@ ...@@ -31,5 +31,8 @@
<vendor name="Azul Systems, Inc."> <vendor name="Azul Systems, Inc.">
<minVersion>1.6.0</minVersion> <minVersion>1.6.0</minVersion>
</vendor> </vendor>
<vendor name="AdoptOpenJdk">
<minVersion>1.8.0</minVersion>
</vendor>
</vendorInfos> </vendorInfos>
</javaSelection> </javaSelection>
...@@ -42,6 +42,7 @@ BEGIN_VENDOR_MAP() ...@@ -42,6 +42,7 @@ BEGIN_VENDOR_MAP()
#endif #endif
VENDOR_MAP_ENTRY("Sun Microsystems Inc.", SunInfo) VENDOR_MAP_ENTRY("Sun Microsystems Inc.", SunInfo)
VENDOR_MAP_ENTRY("Oracle Corporation", SunInfo) VENDOR_MAP_ENTRY("Oracle Corporation", SunInfo)
VENDOR_MAP_ENTRY("AdoptOpenJdk", SunInfo)
#ifndef MACOSX #ifndef MACOSX
VENDOR_MAP_ENTRY("IBM Corporation", OtherInfo) VENDOR_MAP_ENTRY("IBM Corporation", OtherInfo)
VENDOR_MAP_ENTRY("Blackdown Java-Linux Team", OtherInfo) VENDOR_MAP_ENTRY("Blackdown Java-Linux Team", OtherInfo)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment