Update GraalVM to 17.0.7 (23.0.0 JDK17)

build.sbt

@@ -20,8 +20,11 @@ import java.io.File
 // ============================================================================
 
 val scalacVersion         = "2.13.11"
-val graalVersion          = "23.0.0"
-val javaVersion           = "17"
+// Since the release of GraalVM 23.0.0, the versioning is the same for Graal and Java
+val graalVersion          = "17.0.7"
+// Verwsion used for the Graal/Truffle related Maven packages
+val graalMavenVersion     = "23.0.0"
+val javaLangVersion       = "17"
 val defaultDevEnsoVersion = "0.0.0-dev"
 val ensoVersion = sys.env.getOrElse(
   "ENSO_VERSION",
@@ -153,8 +156,8 @@ analyzeDependency := GatherLicenses.analyzeDependency.evaluated
 
 val packageBuilder = new DistributionPackage.Builder(
   ensoVersion      = ensoVersion,
-  graalVersion     = graalVersion,
-  graalJavaVersion = javaVersion,
+  graalVersion     = graalMavenVersion,
+  graalJavaVersion = javaLangVersion,
   artifactRoot     = file("built-distribution")
 )
 
@@ -638,7 +641,7 @@ lazy val `akka-native` = project
       akkaActor
     ),
     // Note [Native Image Workaround for GraalVM 20.2]
-    libraryDependencies += "org.graalvm.nativeimage" % "svm" % graalVersion % "provided"
+    libraryDependencies += "org.graalvm.nativeimage" % "svm" % graalMavenVersion % "provided"
   )
 
 lazy val `profiling-utils` = project
@@ -692,7 +695,7 @@ lazy val `logging-service` = project
       "junit"                   % "junit"           % junitVersion     % Test,
       "com.novocode"            % "junit-interface" % junitIfVersion   % Test exclude ("junit", "junit-dep"),
       "org.scalatest"          %% "scalatest"       % scalatestVersion % Test,
-      "org.graalvm.nativeimage" % "svm"             % graalVersion     % "provided"
+      "org.graalvm.nativeimage" % "svm"             % graalMavenVersion     % "provided"
     )
   )
   .settings(
@@ -711,7 +714,7 @@ lazy val `logging-truffle-connector` = project
     version := "0.1",
     libraryDependencies ++= Seq(
       "org.slf4j"           % "slf4j-api"   % slf4jVersion,
-      "org.graalvm.truffle" % "truffle-api" % graalVersion % "provided"
+      "org.graalvm.truffle" % "truffle-api" % graalMavenVersion % "provided"
     )
   )
   .dependsOn(`logging-utils`)
@@ -760,7 +763,7 @@ lazy val `version-output` = (project in file("lib/scala/version-output"))
           defaultDevEnsoVersion = defaultDevEnsoVersion,
           ensoVersion           = ensoVersion,
           scalacVersion         = scalacVersion,
-          graalVersion          = graalVersion,
+          graalVersion          = graalMavenVersion,
           currentEdition        = currentEdition
         )
     }.taskValue
@@ -960,8 +963,8 @@ lazy val `interpreter-dsl-test` =
       ),
       commands += WithDebugCommand.withDebug,
       libraryDependencies ++= Seq(
-        "org.graalvm.truffle" % "truffle-api"           % graalVersion   % "provided",
-        "org.graalvm.truffle" % "truffle-dsl-processor" % graalVersion   % "provided",
+        "org.graalvm.truffle" % "truffle-api"           % graalMavenVersion   % "provided",
+        "org.graalvm.truffle" % "truffle-dsl-processor" % graalMavenVersion   % "provided",
         "junit"               % "junit"                 % junitVersion   % Test,
         "com.novocode"        % "junit-interface"       % junitIfVersion % Test exclude ("junit", "junit-dep")
       )
@@ -1014,8 +1017,8 @@ lazy val `polyglot-api` = project
       Seq(s"-Dtruffle.class.path.append=$runtimeClasspath")
     },
     libraryDependencies ++= Seq(
-      "org.graalvm.sdk"        % "polyglot-tck"     % graalVersion      % "provided",
-      "org.graalvm.truffle"    % "truffle-api"      % graalVersion      % "provided",
+      "org.graalvm.sdk"        % "polyglot-tck"     % graalMavenVersion      % "provided",
+      "org.graalvm.truffle"    % "truffle-api"      % graalMavenVersion      % "provided",
       "com.google.flatbuffers" % "flatbuffers-java" % flatbuffersVersion,
       "org.scalatest"         %% "scalatest"        % scalatestVersion  % Test,
       "org.scalacheck"        %% "scalacheck"       % scalacheckVersion % Test
@@ -1046,7 +1049,7 @@ lazy val `language-server` = (project in file("engine/language-server"))
       "com.typesafe.akka"          %% "akka-http-testkit"    % akkaHTTPVersion   % Test,
       "org.scalatest"              %% "scalatest"            % scalatestVersion  % Test,
       "org.scalacheck"             %% "scalacheck"           % scalacheckVersion % Test,
-      "org.graalvm.sdk"             % "polyglot-tck"         % graalVersion      % "provided",
+      "org.graalvm.sdk"             % "polyglot-tck"         % graalMavenVersion      % "provided",
       "org.eclipse.jgit"            % "org.eclipse.jgit"     % jgitVersion
     ),
     Test / testOptions += Tests
@@ -1134,7 +1137,7 @@ lazy val frgaalJavaCompilerSetting = Seq(
   Compile / compile / compilers := FrgaalJavaCompiler.compilers(
     (Compile / dependencyClasspath).value,
     compilers.value,
-    javaVersion
+    javaLangVersion
   ),
   // This dependency is needed only so that developers don't download Frgaal manually.
   // Sadly it cannot be placed under plugins either because meta dependencies are not easily
@@ -1160,8 +1163,8 @@ lazy val instrumentationSettings = frgaalJavaCompilerSetting ++ Seq(
     "--enable-preview"
   ),
   libraryDependencies ++= Seq(
-    "org.graalvm.truffle" % "truffle-api"           % graalVersion % "provided",
-    "org.graalvm.truffle" % "truffle-dsl-processor" % graalVersion % "provided"
+    "org.graalvm.truffle" % "truffle-api"           % graalMavenVersion % "provided",
+    "org.graalvm.truffle" % "truffle-dsl-processor" % graalMavenVersion % "provided"
   ),
   (Compile / javacOptions) ++= Seq(
     "-s",
@@ -1277,16 +1280,16 @@ lazy val runtime = (project in file("engine/runtime"))
     libraryDependencies ++= jmh ++ jaxb ++ circe ++ Seq(
       "org.apache.commons"  % "commons-lang3"         % commonsLangVersion,
       "org.apache.tika"     % "tika-core"             % tikaVersion,
-      "org.graalvm.sdk"     % "graal-sdk"             % graalVersion      % "provided",
-      "org.graalvm.sdk"     % "polyglot-tck"          % graalVersion      % "provided",
-      "org.graalvm.truffle" % "truffle-api"           % graalVersion      % "provided",
-      "org.graalvm.truffle" % "truffle-dsl-processor" % graalVersion      % "provided",
-      "org.graalvm.truffle" % "truffle-tck"           % graalVersion      % "provided",
-      "org.graalvm.truffle" % "truffle-tck-common"    % graalVersion      % "provided",
+      "org.graalvm.sdk"     % "graal-sdk"             % graalMavenVersion      % "provided",
+      "org.graalvm.sdk"     % "polyglot-tck"          % graalMavenVersion      % "provided",
+      "org.graalvm.truffle" % "truffle-api"           % graalMavenVersion      % "provided",
+      "org.graalvm.truffle" % "truffle-dsl-processor" % graalMavenVersion      % "provided",
+      "org.graalvm.truffle" % "truffle-tck"           % graalMavenVersion      % "provided",
+      "org.graalvm.truffle" % "truffle-tck-common"    % graalMavenVersion      % "provided",
       "org.scalacheck"     %% "scalacheck"            % scalacheckVersion % Test,
       "org.scalactic"      %% "scalactic"             % scalacticVersion  % Test,
       "org.scalatest"      %% "scalatest"             % scalatestVersion  % Test,
-      "org.graalvm.truffle" % "truffle-api"           % graalVersion      % Benchmark,
+      "org.graalvm.truffle" % "truffle-api"           % graalMavenVersion      % Benchmark,
       "org.typelevel"      %% "cats-core"             % catsVersion,
       "junit"               % "junit"                 % junitVersion      % Test,
       "com.novocode"        % "junit-interface"       % junitIfVersion    % Test exclude ("junit", "junit-dep"),
@@ -1306,8 +1309,8 @@ lazy val runtime = (project in file("engine/runtime"))
     ),
     bootstrap := CopyTruffleJAR.bootstrapJARs.value,
     Global / onLoad := EnvironmentCheck.addVersionCheck(
-      graalVersion,
-      javaVersion
+      graalMavenVersion,
+      javaLangVersion
     )((Global / onLoad).value)
   )
   .settings(
@@ -1450,8 +1453,8 @@ lazy val `runtime-with-instruments` =
       ),
       libraryDependencies ++= Seq(
         "org.scalatest"      %% "scalatest"             % scalatestVersion % Test,
-        "org.graalvm.truffle" % "truffle-api"           % graalVersion     % Test,
-        "org.graalvm.truffle" % "truffle-dsl-processor" % graalVersion     % Test
+        "org.graalvm.truffle" % "truffle-api"           % graalMavenVersion     % Test,
+        "org.graalvm.truffle" % "truffle-dsl-processor" % graalMavenVersion     % Test
       ),
       // Note [Unmanaged Classpath]
       Test / unmanagedClasspath += (baseDirectory.value / ".." / ".." / "app" / "gui" / "view" / "graph-editor" / "src" / "builtin" / "visualization" / "native" / "inc"),
@@ -1519,7 +1522,7 @@ lazy val `runtime-with-polyglot` =
         "ENSO_TEST_DISABLE_IR_CACHE" -> "false"
       ),
       libraryDependencies ++= Seq(
-        "org.graalvm.sdk" % "graal-sdk" % graalVersion     % "provided",
+        "org.graalvm.sdk" % "graal-sdk" % graalMavenVersion     % "provided",
         "org.scalatest"  %% "scalatest" % scalatestVersion % Test
       )
     )
@@ -1580,8 +1583,8 @@ lazy val `engine-runner` = project
     commands += WithDebugCommand.withDebug,
     inConfig(Compile)(truffleRunOptionsSettings),
     libraryDependencies ++= Seq(
-      "org.graalvm.sdk"     % "polyglot-tck" % graalVersion % "provided",
-      "org.graalvm.truffle" % "truffle-api"  % graalVersion % "provided",
+      "org.graalvm.sdk"     % "polyglot-tck" % graalMavenVersion % "provided",
+      "org.graalvm.truffle" % "truffle-api"  % graalMavenVersion % "provided",
       "commons-cli"         % "commons-cli"  % commonsCliVersion,
       "com.monovore"       %% "decline"      % declineVersion,
       "org.jline"           % "jline"        % jlineVersion,
@@ -1918,7 +1921,7 @@ lazy val `std-base` = project
     Compile / packageBin / artifactPath :=
       `base-polyglot-root` / "std-base.jar",
     libraryDependencies ++= Seq(
-      "org.graalvm.sdk"  % "graal-sdk"               % graalVersion       % "provided",
+      "org.graalvm.sdk"  % "graal-sdk"               % graalMavenVersion       % "provided",
       "org.netbeans.api" % "org-openide-util-lookup" % netbeansApiVersion % "provided"
     ),
     Compile / packageBin := Def.task {
@@ -1946,7 +1949,7 @@ lazy val `common-polyglot-core-utils` = project
       `base-polyglot-root` / "common-polyglot-core-utils.jar",
     libraryDependencies ++= Seq(
       "com.ibm.icu"     % "icu4j"     % icuVersion,
-      "org.graalvm.sdk" % "graal-sdk" % graalVersion % "provided"
+      "org.graalvm.sdk" % "graal-sdk" % graalMavenVersion % "provided"
     )
   )
 
@@ -1958,7 +1961,7 @@ lazy val `enso-test-java-helpers` = project
     Compile / packageBin / artifactPath :=
       file("test/Tests/polyglot/java/helpers.jar"),
     libraryDependencies ++= Seq(
-      "org.graalvm.sdk" % "graal-sdk" % graalVersion % "provided"
+      "org.graalvm.sdk" % "graal-sdk" % graalMavenVersion % "provided"
     ),
     Compile / packageBin := Def.task {
       val result          = (Compile / packageBin).value
@@ -1991,7 +1994,7 @@ lazy val `std-table` = project
       (Antlr4 / sourceManaged).value / "main" / "antlr4"
     },
     libraryDependencies ++= Seq(
-      "org.graalvm.sdk"     % "graal-sdk"               % graalVersion       % "provided",
+      "org.graalvm.sdk"     % "graal-sdk"               % graalMavenVersion       % "provided",
       "org.netbeans.api"    % "org-openide-util-lookup" % netbeansApiVersion % "provided",
       "com.univocity"       % "univocity-parsers"       % univocityParsersVersion,
       "org.apache.poi"      % "poi-ooxml"               % poiOoxmlVersion,
@@ -2069,7 +2072,7 @@ lazy val `std-database` = project
     Compile / packageBin / artifactPath :=
       `database-polyglot-root` / "std-database.jar",
     libraryDependencies ++= Seq(
-      "org.graalvm.sdk"  % "graal-sdk"               % graalVersion       % "provided",
+      "org.graalvm.sdk"  % "graal-sdk"               % graalMavenVersion       % "provided",
       "org.netbeans.api" % "org-openide-util-lookup" % netbeansApiVersion % "provided",
       "org.xerial"       % "sqlite-jdbc"             % sqliteVersion,
       "org.postgresql"   % "postgresql"              % "42.4.0"
@@ -2175,8 +2178,8 @@ buildEngineDistribution := {
     distributionRoot    = root,
     cacheFactory        = cacheFactory,
     log                 = log,
-    graalVersion        = graalVersion,
-    javaVersion         = javaVersion,
+    graalVersion        = graalMavenVersion,
+    javaVersion         = javaLangVersion,
     ensoVersion         = ensoVersion,
     editionName         = currentEdition,
     sourceStdlibVersion = stdLibVersion,
@@ -2199,8 +2202,8 @@ buildEngineDistributionNoIndex := {
     distributionRoot    = root,
     cacheFactory        = cacheFactory,
     log                 = log,
-    graalVersion        = graalVersion,
-    javaVersion         = javaVersion,
+    graalVersion        = graalMavenVersion,
+    javaVersion         = javaLangVersion,
     ensoVersion         = ensoVersion,
     editionName         = currentEdition,
     sourceStdlibVersion = stdLibVersion,

build/build/src/engine.rs

@@ -5,7 +5,6 @@
 use crate::prelude::*;
 
 use crate::get_graal_version;
-use crate::get_java_major_version;
 use crate::paths::generated;
 
 use artifact::IsArtifact;
@@ -304,7 +303,6 @@ pub async fn deduce_graal(
     Ok(ide_ci::cache::goodie::graalvm::GraalVM {
         client,
         graal_version: get_graal_version(&build_sbt_content)?,
-        java_version: get_java_major_version(&build_sbt_content)?,
         os: TARGET_OS,
         arch: TARGET_ARCH,
     })

build/build/src/engine/context.rs

@@ -201,7 +201,7 @@ impl RunContext {
         // Some GraalVM components depend on Sulong and are not available on all platforms (like
         // Windows or M1 macOS). Thus, we treat them as optional. See e.g.
         // https://github.com/oracle/graalpython/issues/156
-        let optional_components = [graal::ComponentId::Python, graal::ComponentId::R];
+        let optional_components = [graal::ComponentId::Python];
         graal::install_missing_components(required_components, optional_components).await?;
         prepare_simple_library_server.await??;
         Ok(())

build/ci_utils/src/cache/goodie/graalvm.rs

@@ -5,13 +5,12 @@ use crate::cache::goodie::Goodie;
 use crate::cache::Cache;
 use crate::env::known::PATH;
 use crate::github::RepoRef;
-use crate::programs::java;
 use crate::programs::java::JAVA_HOME;
 use crate::programs::Java;
 
 
 
-const PACKAGE_PREFIX: &str = "graalvm-ce";
+const PACKAGE_PREFIX: &str = "graalvm-community";
 
 pub const CE_BUILDS_REPOSITORY: RepoRef = RepoRef { owner: "graalvm", name: "graalvm-ce-builds" };
 
@@ -41,7 +40,6 @@ pub struct GraalVM {
     /// Used to query GitHub about releases.
     pub client:        Octocrab,
     pub graal_version: Version,
-    pub java_version:  java::LanguageVersion,
     pub os:            OS,
     pub arch:          Arch,
 }
@@ -54,17 +52,9 @@ impl Goodie for GraalVM {
 
     fn is_active(&self) -> BoxFuture<'static, Result<bool>> {
         let expected_graal_version = self.graal_version.clone();
-        let expected_java_language_version = self.java_version;
         async move {
             let found_version = find_graal_version().await?;
             ensure!(found_version == expected_graal_version, "GraalVM version mismatch. Expected {expected_graal_version}, found {found_version}.");
-
-            let found_java_version = Java.check_language_version().await?;
-            ensure!(
-                found_java_version == expected_java_language_version,
-                "Java language version mismatch. Expected {expected_java_language_version}, found {found_java_version}."
-            );
-
             Result::Ok(true)
         }
         .boxed()
@@ -98,26 +88,24 @@ impl GraalVM {
     }
 
     pub fn platform_string(&self) -> String {
-        let Self { graal_version: _graal_version, java_version, arch, os, client: _client } = &self;
+        let Self { graal_version: _graal_version, arch, os, client: _client } = &self;
         let os_name = match *os {
             OS::Linux => "linux",
             OS::Windows => "windows",
             OS::MacOS => "darwin",
             other_os => unimplemented!("System `{}` is not supported!", other_os),
         };
         let arch_name = match *arch {
-            Arch::X86_64 => "amd64",
-            // No Graal packages for Apple Silicon.
-            Arch::AArch64 if TARGET_OS == OS::MacOS => "amd64",
+            Arch::X86_64 => "x64",
             Arch::AArch64 => "aarch64",
             other_arch => unimplemented!("Architecture `{}` is not supported!", other_arch),
         };
-        let java_version = format!("java{}", java_version.0);
-        format!("{PACKAGE_PREFIX}-{java_version}-{os_name}-{arch_name}")
+        let java_version = format!("jdk-{}", _graal_version);
+        format!("{PACKAGE_PREFIX}-{java_version}_{os_name}-{arch_name}")
     }
 
     pub fn root_directory_name(&self) -> PathBuf {
-        PathBuf::from(format!("{}-{}-{}", PACKAGE_PREFIX, self.java_version, self.graal_version))
+        PathBuf::from(format!("{}-{}", PACKAGE_PREFIX, self.graal_version))
     }
 }
 
@@ -137,6 +125,7 @@ pub fn locate_graal() -> Result<PathBuf> {
 
 #[cfg(test)]
 mod tests {
+    use semver::{BuildMetadata, Prerelease};
     use super::*;
     use crate::cache;
     use crate::log::setup_logging;
@@ -147,12 +136,11 @@ mod tests {
     #[ignore]
     async fn test_is_enabled() -> Result {
         setup_logging()?;
-        let graal_version = Version::parse("22.3.1").unwrap();
-        let java_version = java::LanguageVersion(17);
+        let graal_version = Version::parse("17.0.7").unwrap();
         let os = TARGET_OS;
         let arch = Arch::X86_64;
         let client = Octocrab::default();
-        let graalvm = GraalVM { graal_version, java_version, os, arch, client };
+        let graalvm = GraalVM { graal_version, os, arch, client };
 
         graalvm.install_if_missing(&cache::Cache::new_default().await?).await?;
 
@@ -171,9 +159,30 @@ Java(TM) SE Runtime Environment Oracle GraalVM 17.0.7+8.1 (build 17.0.7+8-LTS-jv
 Java HotSpot(TM) 64-Bit Server VM Oracle GraalVM 17.0.7+8.1 (build 17.0.7+8-LTS-jvmci-23.0-b12, mixed mode, sharing)";
 
         let found_graal = graal_version_from_version_string(version_string).unwrap();
-        assert_eq!(found_graal, Version::new(23, 0, 0));
+        let expected_graal_version = Version {
+            major: 17,
+            minor: 0,
+            patch: 7,
+            pre: Prerelease::EMPTY,
+            build: BuildMetadata::new("8.1").unwrap()
+        };
+        assert_eq!(found_graal, expected_graal_version);
 
         let found_java = Java.parse_version(version_string).unwrap();
         assert_eq!(found_java, Version::new(17, 0, 7));
     }
+
+    #[test]
+    fn recognize_oneline_version() {
+        let version_line = "Java(TM) SE Runtime Environment Oracle GraalVM 17.0.7+8.1 (build 17.0.7+8-LTS-jvmci-23.0-b12)";
+        let graal_version = Version::find_in_text(version_line).unwrap();
+        let expected_graal_version = Version {
+            major: 17,
+            minor: 0,
+            patch: 7,
+            pre: Prerelease::EMPTY,
+            build: BuildMetadata::new("8.1").unwrap()
+        };
+        assert_eq!(graal_version, expected_graal_version);
+    }
 }