--- a/Admin/components/components.sha1 Wed Sep 22 21:20:36 2021 +0200
+++ b/Admin/components/components.sha1 Wed Sep 22 21:27:44 2021 +0200
@@ -148,6 +148,7 @@
71d19df63816e9be1c4c5eb44aea7a44cfadb319 jdk-11.tar.gz
72455a2fdb6cced9cd563f4d5d6134f7a6c34913 jdk-15.0.1+9.tar.gz
e8ae300e61b0b121018456d50010b555bc96ce10 jdk-15.0.2+7.tar.gz
+a426a32ad34014953c0f7d4cc6f44199572e1c38 jdk-17+35.tar.gz
8d83e433c1419e0c0cc5fd1762903d11b4a5752c jdk-6u31.tar.gz
38d2d2a91c66714c18430e136e7e5191af3996e6 jdk-7u11.tar.gz
d765bc4ad2f34d494429b2a8c1563c49db224944 jdk-7u13.tar.gz
--- a/Admin/components/main Wed Sep 22 21:20:36 2021 +0200
+++ b/Admin/components/main Wed Sep 22 21:27:44 2021 +0200
@@ -9,7 +9,7 @@
idea-icons-20210508
isabelle_fonts-20210322
isabelle_setup-20210922
-jdk-15.0.2+7
+jdk-17+35
jedit-20210802
jfreechart-1.5.1
jortho-1.0-2
--- a/src/Pure/Admin/build_jdk.scala Wed Sep 22 21:20:36 2021 +0200
+++ b/src/Pure/Admin/build_jdk.scala Wed Sep 22 21:27:44 2021 +0200
@@ -45,7 +45,7 @@
if (path.is_file) {
val file_descr = Isabelle_System.bash("file -b " + File.bash_path(path)).check.out
if (platform_regex.pattern.matcher(file_descr).matches) {
- val Version = ("^(" + major_version + """\.[0-9.]+\+\d+)(?:-LTS)?$""").r
+ val Version = ("^(" + major_version + """[0-9.+]+)(?:-LTS)?$""").r
val version_lines =
Isabelle_System.bash("strings " + File.bash_path(path)).check
.out_lines.flatMap({ case Version(s) => Some(s) case _ => None })
--- a/src/Pure/ROOT.scala Wed Sep 22 21:20:36 2021 +0200
+++ b/src/Pure/ROOT.scala Wed Sep 22 21:27:44 2021 +0200
@@ -21,4 +21,3 @@
val proper_string = Library.proper_string _
def proper_list[A](list: List[A]): Option[List[A]] = Library.proper_list(list)
}
-