# HG changeset patch
# User wenzelm
# Date 1713388952 -7200
# Node ID ef2134570abb6090fa65107661ec8c3f4ffc06e0
# Parent  8262d4f63b58844651b406547a2b7403633a83f6# Parent  68fc6839679e6bd0841cd7461f89628406926f0e
merged

diff -r 8262d4f63b58 -r ef2134570abb Admin/components/components.sha1
--- a/Admin/components/components.sha1	Wed Apr 17 22:07:21 2024 +0100
+++ b/Admin/components/components.sha1	Wed Apr 17 23:22:32 2024 +0200
@@ -199,6 +199,7 @@
 ee31c8ac65d5828d8c426fa3eedeb467cfa497ab jdk-17.0.7.tar.gz
 d4b43d1be10c9cffb406faeb36e9d46027834980 jdk-21.0.1.tar.gz
 94f27b086cf6a2fb305cc961fe2932d8ea3634af jdk-21.0.2.tar.gz
+c4e05634d371a305c982b6ce5478df42fd1ad9c5 jdk-21.0.3.tar.gz
 8d83e433c1419e0c0cc5fd1762903d11b4a5752c jdk-6u31.tar.gz
 38d2d2a91c66714c18430e136e7e5191af3996e6 jdk-7u11.tar.gz
 d765bc4ad2f34d494429b2a8c1563c49db224944 jdk-7u13.tar.gz
diff -r 8262d4f63b58 -r ef2134570abb Admin/components/main
--- a/Admin/components/main	Wed Apr 17 22:07:21 2024 +0100
+++ b/Admin/components/main	Wed Apr 17 23:22:32 2024 +0200
@@ -13,7 +13,7 @@
 isabelle_fonts-20211004
 isabelle_setup-20240327
 javamail-20240109
-jdk-21.0.2
+jdk-21.0.3
 jedit-20231120
 jfreechart-1.5.3
 jortho-1.0-2
diff -r 8262d4f63b58 -r ef2134570abb src/Pure/Admin/component_jdk.scala
--- a/src/Pure/Admin/component_jdk.scala	Wed Apr 17 22:07:21 2024 +0100
+++ b/src/Pure/Admin/component_jdk.scala	Wed Apr 17 23:22:32 2024 +0200
@@ -33,8 +33,8 @@
   /* build jdk */
 
   val default_base_url = "https://cdn.azul.com/zulu/bin"
-  val default_jdk_version = "21.0.2"
-  val default_zulu_version = "21.32.17-ca"
+  val default_jdk_version = "21.0.3"
+  val default_zulu_version = "21.34.19-ca"
 
   def build_jdk(
     target_dir: Path = Path.current,
diff -r 8262d4f63b58 -r ef2134570abb src/Pure/ROOT.ML
--- a/src/Pure/ROOT.ML	Wed Apr 17 22:07:21 2024 +0100
+++ b/src/Pure/ROOT.ML	Wed Apr 17 23:22:32 2024 +0200
@@ -372,4 +372,3 @@
 ML_file "Tools/jedit.ML";
 ML_file "Tools/ghc.ML";
 ML_file "Tools/generated_files.ML";
-
diff -r 8262d4f63b58 -r ef2134570abb src/Pure/ROOT.scala
--- a/src/Pure/ROOT.scala	Wed Apr 17 22:07:21 2024 +0100
+++ b/src/Pure/ROOT.scala	Wed Apr 17 23:22:32 2024 +0200
@@ -29,3 +29,4 @@
   def if_proper[A](x: Iterable[A], body: => String): String = Library.if_proper(x, body)
   def if_proper(b: Boolean, body: => String): String = Library.if_proper(b, body)
 }
+