Merge pull request #4986 from apache/nouveau-jdk-21-compat

nouveau: jdk 21 compatibility

.gitattributes

@@ -0,0 +1,3 @@
+nouveau/**/* text eol=lf
+nouveau/**/*.bat text eol=crlf
+nouveau/**/*.jar binary

Makefile

@@ -557,7 +557,7 @@ nouveau-test: nouveau-test-gradle nouveau-test-elixir
 .PHONY: nouveau-test-gradle
 nouveau-test-gradle: couch nouveau
 ifeq ($(with_nouveau), true)
- @cd nouveau && ./gradlew test
+ @cd nouveau && ./gradlew test --info
 endif
 
 .PHONY: nouveau-test-elixir

Makefile.win

@@ -523,7 +523,7 @@ nouveau-test: nouveau-test-gradle nouveau-test-elixir
 .PHONY: nouveau-test-gradle
 nouveau-test-gradle: couch nouveau
 ifeq ($(with_nouveau), true)
- @cd nouveau && .\gradlew test
+ @cd nouveau && .\gradlew test --info
 endif
 
 .PHONY: nouveau-test-elixir

nouveau/build.gradle

@@ -1,6 +1,6 @@
 plugins {
  id 'application'
- id 'com.diffplug.spotless' version '6.18.0'
+ id 'com.diffplug.spotless' version '6.25.0'
  id 'jacoco'
 }
 

nouveau/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\:https://services.gradle.org/distributions/gradle-8.3-bin.zip
+distributionUrl=https\:https://services.gradle.org/distributions/gradle-8.6-bin.zip
 networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

nouveau/gradlew

@@ -83,7 +83,8 @@ done
 # This is normally unused
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -130,26 +131,29 @@ location of your Java installation."
  fi
 else
  JAVACMD=java
- which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+ if ! command -v java >/dev/null 2>&1
+ then
+ die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
+ fi
 fi
 
 # Increase the maximum file descriptors if we can.
 if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
  case $MAX_FD in #(
  max*)
  # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
- # shellcheck disable=SC3045
+ # shellcheck disable=SC2039,SC3045
  MAX_FD=$( ulimit -H -n ) ||
  warn "Could not query maximum file descriptor limit"
  esac
  case $MAX_FD in #(
  '' | soft) :;; #(
  *)
  # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
- # shellcheck disable=SC3045
+ # shellcheck disable=SC2039,SC3045
  ulimit -n "$MAX_FD" ||
  warn "Could not set maximum file descriptor limit to $MAX_FD"
  esac
@@ -198,11 +202,11 @@ fi
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
-# Collect all arguments for the java command;
-# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
-# shell script including quotes and variable substitutions, so put them in
-#  double quotes to make sure that they get re-expanded; and
-# * put everything else in single quotes, so that it's not re-expanded.
+# Collect all arguments for the java command:
+# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+# and any embedded shellness will be escaped.
+# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+#  treated as '${Hostname}' itself on the command line.
 
 set -- \
  "-Dorg.gradle.appname=$APP_BASE_NAME" \

nouveau/gradlew.bat

@@ -43,11 +43,11 @@ set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
 if %ERRORLEVEL% equ 0 goto execute
 
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
@@ -57,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
 if exist "%JAVA_EXE%" goto execute
 
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 

nouveau/src/main/java/org/apache/couchdb/nouveau/core/Index.java

@@ -39,19 +39,19 @@ public abstract class Index implements Closeable {
  private long updateSeq;
  private long purgeSeq;
  private boolean deleteOnClose = false;
- private final Semaphore permits = new Semaphore(Integer.MAX_VALUE);
+ private final Semaphore semaphore = new Semaphore(Integer.MAX_VALUE);
 
  protected Index(final long updateSeq, final long purgeSeq) {
  this.updateSeq = updateSeq;
  this.purgeSeq = purgeSeq;
  }
 
  public final boolean tryAcquire() {
- return permits.tryAcquire();
+ return semaphore.tryAcquire();
  }
 
  public final void release() {
- permits.release();
+ semaphore.release();
  }
 
  public final IndexInfo info() throws IOException {
@@ -130,9 +130,9 @@ public final synchronized void setPurgeSeq(final long matchSeq, final long purge
  @Override
  public final void close() throws IOException {
  // Ensures exclusive access to the index before closing.
- permits.acquireUninterruptibly(Integer.MAX_VALUE);
+ semaphore.acquireUninterruptibly(Integer.MAX_VALUE);
  doClose();
- // Never release permits.
+ // Never release semaphore.
  }
 
  protected abstract void doClose() throws IOException;
@@ -146,7 +146,7 @@ public synchronized void setDeleteOnClose(final boolean deleteOnClose) {
  }
 
  public final boolean isActive() {
- return permits.availablePermits() < Integer.MAX_VALUE || permits.hasQueuedThreads();
+ return semaphore.availablePermits() < Integer.MAX_VALUE || semaphore.hasQueuedThreads();
  }
 
  protected final void assertUpdateSeqProgress(final long matchSeq, final long updateSeq)