You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by rn...@apache.org on 2024/02/14 23:22:45 UTC
(couchdb) branch nouveau-jdk-21-compat created (now b66440c84)
This is an automated email from the ASF dual-hosted git repository.
rnewson pushed a change to branch nouveau-jdk-21-compat
in repository https://gitbox.apache.org/repos/asf/couchdb.git
at b66440c84 nouveau: jdk 21 compatibility
This branch includes the following new commits:
new b66440c84 nouveau: jdk 21 compatibility
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
(couchdb) 01/01: nouveau: jdk 21 compatibility
Posted by rn...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rnewson pushed a commit to branch nouveau-jdk-21-compat
in repository https://gitbox.apache.org/repos/asf/couchdb.git
commit b66440c84ebbc184e391a0da3bd541acd607cc98
Author: Robert Newson <rn...@apache.org>
AuthorDate: Wed Feb 14 22:25:46 2024 +0000
nouveau: jdk 21 compatibility
* upgrade gradle to 8.6
* upgrade spotless to 6.25.0
* rename 'permits' as its a (new) reserved keyword (for sealed packages)
---
.gitattributes | 3 +++
nouveau/.gitattributes | 1 -
nouveau/build.gradle | 2 +-
nouveau/gradle/wrapper/gradle-wrapper.jar | Bin 62076 -> 43461 bytes
nouveau/gradle/wrapper/gradle-wrapper.properties | 3 ++-
nouveau/gradlew | 22 ++++++++++++---------
nouveau/gradlew.bat | 20 +++++++++----------
.../org/apache/couchdb/nouveau/core/Index.java | 10 +++++-----
8 files changed, 34 insertions(+), 27 deletions(-)
diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 000000000..e2fe1e567
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,3 @@
+nouveau/** text eol=lf
+nouveau/**/*.bat text eof=crlf
+nouveau/**/*.jar binary
diff --git a/nouveau/.gitattributes b/nouveau/.gitattributes
deleted file mode 100644
index fcadb2cf9..000000000
--- a/nouveau/.gitattributes
+++ /dev/null
@@ -1 +0,0 @@
-* text eol=lf
diff --git a/nouveau/build.gradle b/nouveau/build.gradle
index c34ca0108..8ccaeed52 100644
--- a/nouveau/build.gradle
+++ b/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'
}
diff --git a/nouveau/gradle/wrapper/gradle-wrapper.jar b/nouveau/gradle/wrapper/gradle-wrapper.jar
index c1962a79e..933486d82 100644
Binary files a/nouveau/gradle/wrapper/gradle-wrapper.jar and b/nouveau/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/nouveau/gradle/wrapper/gradle-wrapper.properties b/nouveau/gradle/wrapper/gradle-wrapper.properties
index c30b486a8..a80b22ce5 100644
--- a/nouveau/gradle/wrapper/gradle-wrapper.properties
+++ b/nouveau/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,7 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
networkTimeout=10000
+validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
diff --git a/nouveau/gradlew b/nouveau/gradlew
index aeb74cbb4..1aa94a426 100755
--- a/nouveau/gradlew
+++ b/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,10 +131,13 @@ 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.
@@ -141,7 +145,7 @@ 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
@@ -149,7 +153,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
'' | 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" \
diff --git a/nouveau/gradlew.bat b/nouveau/gradlew.bat
index 93e3f59f1..25da30dbd 100644
--- a/nouveau/gradlew.bat
+++ b/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
diff --git a/nouveau/src/main/java/org/apache/couchdb/nouveau/core/Index.java b/nouveau/src/main/java/org/apache/couchdb/nouveau/core/Index.java
index bc56cd7ff..8bb2ffc4e 100644
--- a/nouveau/src/main/java/org/apache/couchdb/nouveau/core/Index.java
+++ b/nouveau/src/main/java/org/apache/couchdb/nouveau/core/Index.java
@@ -39,7 +39,7 @@ 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;
@@ -47,11 +47,11 @@ public abstract class Index implements Closeable {
}
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,7 +130,7 @@ public abstract class Index implements Closeable {
@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.
}
@@ -146,7 +146,7 @@ public abstract class Index implements Closeable {
}
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)