This is an automated email from the ASF dual-hosted git repository.
ronny pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/couchdb-glazier.git
The following commit(s) were added to refs/heads/main by this push:
new f06a860 Remove Java 8 with the deprecation of Clouseau 2.x
f06a860 is described below
commit f06a8608759251573cdcb1042bb63de2dda815df
Author: Gabor Pali <[email protected]>
AuthorDate: Tue Nov 25 23:18:47 2025 +0100
Remove Java 8 with the deprecation of Clouseau 2.x
The use of Clouseau 2.x is not recommended any longer. We are in
the transition over to Clouseau 3.x instead, which works with Java
21 at the moment. See [1] for further information.
[1] https://github.com/apache/couchdb/pull/5761
---
bin/install_dependencies.ps1 | 6 ------
bin/shell.ps1 | 7 +++++--
bin/variables.ps1 | 7 -------
3 files changed, 5 insertions(+), 15 deletions(-)
diff --git a/bin/install_dependencies.ps1 b/bin/install_dependencies.ps1
index afb8fe7..becc38b 100644
--- a/bin/install_dependencies.ps1
+++ b/bin/install_dependencies.ps1
@@ -89,12 +89,6 @@ Invoke-WebRequest -Uri $smBuildUri -OutFile $smBuildFile
Write-Output "Installing SpiderMonkey ..."
arc unarchive $smBuildFile $toolsDir
-# Download and install Java 8
-Write-Output "Downloading OpenJDK 8 ..."
-Invoke-WebRequest -Uri $java8BuildUri -OutFile $java8BuildFile
-Write-Output "Installing OpenJDK 8 ..."
-arc unarchive $java8BuildFile "${toolsDir}"
-
# Download and install Java 21
Write-Output "Downloading OpenJDK 21 ..."
Invoke-WebRequest -Uri $java21BuildUri -OutFile $java21BuildFile
diff --git a/bin/shell.ps1 b/bin/shell.ps1
index 64973b9..ef0f45c 100644
--- a/bin/shell.ps1
+++ b/bin/shell.ps1
@@ -45,5 +45,8 @@ $env:LIBPATH = "${vcpkgBase}\lib;${smInstallPath}\lib;" +
$env:LIBPATH
$env:JAVA_HOME = "${toolsDir}\${java21Build}"
$env:PATH += ";${env:JAVA_HOME}\bin"
-# Needed for Closeau
-$env:CLOUSEAU_JAVA_HOME = "${toolsDir}\${java8Build}"
+# Needed for Closeau:
+# This is the same as for Nouveau for the moment, but perhaps it is better to
+# keep it separate as there is no guarantee that they will be bumped at the
+# same pace.
+$env:CLOUSEAU_JAVA_HOME = "${toolsDir}\${java21Build}"
diff --git a/bin/variables.ps1 b/bin/variables.ps1
index 1b55d2c..0e0e7d8 100644
--- a/bin/variables.ps1
+++ b/bin/variables.ps1
@@ -50,13 +50,6 @@ $smBuildUri =
"https://github.com/big-r81/couchdb-sm/releases/download/v${smBuil
$smBuildFile = "${artifactDir}\$(Split-Path $smBuildUri -Leaf)"
$smInstallPath = "${toolsDir}\${smBuild}"
-# JAVA 8 SETTINGS
-
-# Donwload location of OpenJDK 8 for Windows (x64)
-$java8Build = "zulu8.86.0.25-ca-jdk8.0.452-win_x64"
-$java8BuildUri = "https://cdn.azul.com/zulu/bin/$java8Build.zip";
-$java8BuildFile = "${artifactDir}\$(Split-Path $java8BuildUri -Leaf)"
-
# JAVA 21 SETTINGS
# Donwload location of OpenJDK 21 for Windows (x64)
