MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-03-22 15:19:59 +07:00
Code Issues Packages Projects Releases Wiki Activity

[java] Recognise latest Oracle GraalVM

Browse Source 
#IDEA-345663 Fixed

GitOrigin-RevId: e8d94ca0edd211122652fd53a17bea9a48f9902d
This commit is contained in:
Louis Vignier
2024-02-09 15:43:52 +01:00
committed by intellij-monorepo-bot
parent 05c3cfb52f
commit 3a35cef9bb
3 changed files with 32 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
jps/model-api/src/org/jetbrains/jps/model/java/JdkVersionDetector.java
View File

@@ -27,6 +27,7 @@ public abstract class JdkVersionDetector {
Semeru("semeru", "IBM Semeru"),
Corretto("corretto", "Amazon Corretto"),
GraalVM("graalvm", "GraalVM"),
GraalVMCE("graalvm-ce", "GraalVM CE"),
IBM("ibm", "IBM JDK"),
JBR("jbr", "JetBrains Runtime"),
Liberica("liberica", "BellSoft Liberica"),

7
jps/model-impl/src/org/jetbrains/jps/model/java/impl/JdkVersionDetectorImpl.java
View File

@@ -168,7 +168,12 @@ public class JdkVersionDetectorImpl extends JdkVersionDetector {
String variant = unquoteProperty(p, "JVM_VARIANT");
return "OpenJ9".equalsIgnoreCase(variant) ? Variant.AdoptOpenJdk_J9 : Variant.AdoptOpenJdk_HS;
}
if (implementor.startsWith("GraalVM")) return Variant.GraalVM;
if (p.getProperty("GRAALVM_VERSION") != null) {
if (implementor.startsWith("GraalVM")) return Variant.GraalVMCE;
return Variant.GraalVM;
}
return detectVendor(implementor);
}

38
jps/model-impl/testSrc/org/jetbrains/jps/model/JdkVariantDetectorTest.kt
View File

@@ -11,6 +11,7 @@ import java.util.jar.Attributes
import java.util.jar.JarOutputStream
import java.util.jar.Manifest
@Suppress("SpellCheckingInspection")
class JdkVariantDetectorTest {
private val RELEASE_ORACLE_OPEN_1_8_0_41 =
"""|JAVA_VERSION="1.8.0_41"
@@ -51,7 +52,7 @@ class JdkVariantDetectorTest {
|Specification-Version: 1.8
""".trimMargin()
@Suppress("SpellCheckingInspection") private val RELEASE_ORACLE_16_0_1 =
private val RELEASE_ORACLE_16_0_1 =
"""|IMPLEMENTOR="Oracle Corporation"
|JAVA_VERSION="16.0.1"
|JAVA_VERSION_DATE="2021-04-20"
@@ -62,7 +63,7 @@ class JdkVariantDetectorTest {
|SOURCE=".:git:ba7c640201ba"
""".trimMargin()
@Suppress("SpellCheckingInspection") private val RELEASE_ADOPT_HOTSPOT_1_8_0_282 =
private val RELEASE_ADOPT_HOTSPOT_1_8_0_282 =
"""|JAVA_VERSION="1.8.0_282"
|OS_NAME="Darwin"
|OS_VERSION="11.2"
@@ -78,7 +79,7 @@ class JdkVariantDetectorTest {
|IMAGE_TYPE="JDK"
""".trimMargin()
@Suppress("SpellCheckingInspection") private val RELEASE_ADOPT_J9_11_0_10 =
private val RELEASE_ADOPT_J9_11_0_10 =
"""|IMPLEMENTOR="AdoptOpenJDK"
|IMPLEMENTOR_VERSION="AdoptOpenJDK"
|JAVA_VERSION="11.0.10"
@@ -97,7 +98,7 @@ class JdkVariantDetectorTest {
|IMAGE_TYPE="JDK"
""".trimMargin()
@Suppress("SpellCheckingInspection") private val RELEASE_CORRETTO_1_8_0_292 =
private val RELEASE_CORRETTO_1_8_0_292 =
"""|JAVA_VERSION="1.8.0_292"
|OS_NAME="Windows"
|OS_VERSION="5.2"
@@ -117,7 +118,7 @@ class JdkVariantDetectorTest {
|Implementation-Vendor: Amazon.com Inc.
""".trimMargin()
@Suppress("SpellCheckingInspection") private val RELEASE_CORRETTO_11_0_8_10_1 =
private val RELEASE_CORRETTO_11_0_8_10_1 =
"""|IMPLEMENTOR="Amazon.com Inc."
|IMPLEMENTOR_VERSION="Corretto-11.0.8.10.1"
|JAVA_VERSION="11.0.8"
@@ -150,7 +151,7 @@ class JdkVariantDetectorTest {
|SOURCE=".:git:21ef36a0f46a+"
""".trimMargin()
@Suppress("SpellCheckingInspection") private val RELEASE_ZULU_11_0_8 =
private val RELEASE_ZULU_11_0_8 =
"""|IMPLEMENTOR="Azul Systems, Inc."
|IMPLEMENTOR_VERSION="Zulu11.41+23-CA"
|JAVA_VERSION="11.0.8"
@@ -162,7 +163,7 @@ class JdkVariantDetectorTest {
|SOURCE=".:hg:5b0e54350bbc"
""".trimMargin()
@Suppress("SpellCheckingInspection") private val RELEASE_ZULU_1_8_0_292 =
private val RELEASE_ZULU_1_8_0_292 =
"""|JAVA_VERSION="1.8.0_292"
|OS_NAME="Windows"
|OS_VERSION="5.2"
@@ -212,7 +213,7 @@ class JdkVariantDetectorTest {
|Build-level: 20210507_01
""".trimMargin()
@Suppress("SpellCheckingInspection") private val RELEASE_IBM_11_0_11 =
private val RELEASE_IBM_11_0_11 =
"""|IMPLEMENTOR="IBM Corporation"
|IMPLEMENTOR_VERSION="11.0.11.0-IBM"
|JAVA_VERSION="11.0.11"
@@ -231,7 +232,7 @@ class JdkVariantDetectorTest {
|IMAGE_TYPE="JDK"
""".trimMargin()
@Suppress("SpellCheckingInspection") private val RELEASE_GRAALVM_1_8_0_292 =
private val RELEASE_GRAALVM_1_8_0_292 =
"""|JAVA_VERSION="1.8.0_292"
|OS_NAME="Windows"
|OS_VERSION="5.2"
@@ -242,7 +243,17 @@ class JdkVariantDetectorTest {
|component_catalog="..."
""".trimMargin()
@Suppress("SpellCheckingInspection") private val RELEASE_GRAALVM_16_0_1 =
private val RELEASE_GRAALVM_21_0_2 =
"""|IMPLEMENTOR="Oracle Corporation"
|JAVA_RUNTIME_VERSION="21.0.2+13-LTS-jvmci-23.1-b30"
|JAVA_VERSION="21.0.2"
|JAVA_VERSION_DATE="2024-01-16"
|OS_ARCH="aarch64"
|OS_NAME="Darwin"
|GRAALVM_VERSION="23.1.2"
""".trimMargin()
private val RELEASE_GRAALVM_CE_16_0_1 =
"""|IMPLEMENTOR="GraalVM Community"
|JAVA_VERSION="16.0.1"
|JAVA_VERSION_DATE="2021-04-20"
@@ -256,7 +267,7 @@ class JdkVariantDetectorTest {
|component_catalog="..."
""".trimMargin()
@Suppress("SpellCheckingInspection") private val RELEASE_SEMERU_16_0_2 =
private val RELEASE_SEMERU_16_0_2 =
"""|IMPLEMENTOR="International Business Machines Corporation"
|IMPLEMENTOR_VERSION="16.0.2.0"
|JAVA_VERSION="16.0.2"
@@ -276,7 +287,7 @@ class JdkVariantDetectorTest {
|IMAGE_TYPE="JDK"
""".trimMargin()
@Suppress("SpellCheckingInspection") private val RELEASE_TEMURIN_17_0_1 =
private val RELEASE_TEMURIN_17_0_1 =
"""|IMPLEMENTOR="Eclipse Adoptium"
|IMPLEMENTOR_VERSION="Temurin-17.0.1+12"
|JAVA_VERSION="17.0.1"
@@ -312,7 +323,8 @@ class JdkVariantDetectorTest {
@Test fun `IBM JDK 8`() = assertVariant(IBM, RELEASE_IBM_1_8_0_291, MANIFEST_IBM_1_8_0_291)
@Test fun `IBM JDK 11`() = assertVariant(IBM, RELEASE_IBM_11_0_11)
@Test fun `GraalVM 8`() = assertVariant(GraalVM, RELEASE_GRAALVM_1_8_0_292)
@Test fun `GraalVM 16`() = assertVariant(GraalVM, RELEASE_GRAALVM_16_0_1)
@Test fun `GraalVM 21`() = assertVariant(GraalVM, RELEASE_GRAALVM_21_0_2)
@Test fun `GraalVM CE 16`() = assertVariant(GraalVMCE, RELEASE_GRAALVM_CE_16_0_1)
@Test fun `Semeru 16`() = assertVariant(Semeru, RELEASE_SEMERU_16_0_2)
@Test fun `Temurin 17`() = assertVariant(Temurin, RELEASE_TEMURIN_17_0_1)