Upgrade Java on Windows (#10965)

* Upgrade Java on Windows No reason to be stuck on an older patch release. changelog_begin changelog_end * . changelog_begin changelog_end * . changelog_begin changelog_end * . changelog_begin changelog_end * . changelog_begin changelog_end * . changelog_begin changelog_end * . changelog_begin changelog_end * . changelog_begin changelog_end * . changelog_begin changelog_end * . changelog_begin changelog_end
digital-asset · Sep 22, 2021 · bdad7d5 · bdad7d5
1 parent 34390f7
commit bdad7d5
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/.dadew b/.dadew
@@ -6,7 +6,7 @@
         "bazel",
         "cacert",
         "curl",
-        "java-openjdk-8u201",
+        "java-openjdk-8u302",
         "maven-3.6.1",
         "msys2",
         "nodejs-12.17.0",

diff --git a/bazel_tools/java.bzl b/bazel_tools/java.bzl
@@ -27,6 +27,7 @@ def _java_home_runtime_impl(ctx):
 java_home_runtime = repository_rule(
     implementation = _java_home_runtime_impl,
     doc = "Define a `java_runtime` pointing to the JAVA_HOME environment variable.",
+    environ = ["JAVA_HOME"],
 )
 
 def da_java_library(

diff --git a/...windows/manifests/java-openjdk-8u201.json → ...windows/manifests/java-openjdk-8u302.json b/...windows/manifests/java-openjdk-8u201.json → ...windows/manifests/java-openjdk-8u302.json
@@ -1,11 +1,11 @@
 {
   "description": "OpenJDK 8 binaries built using source code from the CentOS project",
   "homepage": "https://github.com/ojdkbuild/ojdkbuild",
-  "version": "1.8.0.201-1.b09",
+  "version": "1.8.0.302-1.b08",
   "license": "GPL-2.0-with-classpath-exception",
-  "url": "https://github.com/ojdkbuild/ojdkbuild/releases/download/1.8.0.201-1/java-1.8.0-openjdk-1.8.0.201-1.b09.ojdkbuild.windows.x86_64.zip",
-  "hash": "d74066dc7d6e017388b1eeeb4f4cc0af20337aa6eea8e3a818017ae8d15b988a",
-  "extract_dir": "java-1.8.0-openjdk-1.8.0.201-1.b09.ojdkbuild.windows.x86_64",
+  "url": "https://github.com/ojdkbuild/ojdkbuild/releases/download/java-1.8.0-openjdk-1.8.0.302-1.b08/java-1.8.0-openjdk-1.8.0.302-1.b08.ojdkbuild.windows.x86_64.zip",
+  "hash": "9f0953218662a3dbe32ce63d6944c95a90393aa4682aa0b1ca8c5da8f5c92eb7",
+  "extract_dir": "java-1.8.0-openjdk-1.8.0.302-1.b08.ojdkbuild.windows.x86_64",
   "env_set": {
     "JAVA_HOME": "$dir"
   },
@@ -18,4 +18,4 @@
     "bin\\jstat.exe",
     "bin\\keytool.exe"
   ]
-}
+}