This is an automated email from the ASF dual-hosted git repository.
liuxiaoyu pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/cloudberry-pxf.git
The following commit(s) were added to refs/heads/main by this push:
new c064f7b1 Add Java 17 support (#72)
c064f7b1 is described below
commit c064f7b1f528118da5af98e9b1f122f025f4bf31
Author: Nikolay Antonov <[email protected]>
AuthorDate: Mon Mar 23 19:13:40 2026 +0500
Add Java 17 support (#72)
* Upgrade Gradle from 6.8.2 to 7.6.6
* Replace gradle-lombok plugin with io.freefair.lombok 6.6.3
* Upgrade io.spring.dependency-management to 1.0.15.RELEASE
* Add -Xlint:-removal to suppress Security Manager deprecation warnings
on Java 17+
* Add --add-opens JVM flags for JEP 486 module access (build and runtime)
* Add CI matrix job for Java 8, 11, 17 compatibility testing
* Remove server test group from automation (covered by
java-compatibility-test)
* Refactor build_pxf.sh to use per-component install targets
---
.github/workflows/pxf-ci.yml | 18 +-
ci/docker/pxf-cbdb-dev/ubuntu/script/build_pxf.sh | 10 +-
pom.xml | 2 +-
server/build.gradle | 12 +-
.../gradle/wrapper/gradle-6.8.2-wrapper.jar.sha256 | 1 -
.../gradle/wrapper/gradle-7.6.6-wrapper.jar.sha256 | 1 +
server/gradle/wrapper/gradle-wrapper.properties | 5 +-
server/gradlew | 269 +++++++++++++--------
server/gradlew-install.sh | 2 +-
server/gradlew.bat | 15 +-
server/pxf-api/build.gradle | 6 +
server/pxf-hive/build.gradle | 6 +
server/pxf-service/src/scripts/pxf | 10 +
13 files changed, 232 insertions(+), 125 deletions(-)
diff --git a/.github/workflows/pxf-ci.yml b/.github/workflows/pxf-ci.yml
index 3666ab8e..660c47d4 100644
--- a/.github/workflows/pxf-ci.yml
+++ b/.github/workflows/pxf-ci.yml
@@ -113,6 +113,23 @@ jobs:
path: /tmp/singlecluster-image.tar
retention-days: 1
+ java-compatibility-test:
+ name: build-and-test with java v${{ matrix.java }}
+ runs-on: ubuntu-latest
+ strategy:
+ matrix:
+ java: [ '8', '11', '17' ]
+ fail-fast: false
+ steps:
+ - uses: actions/checkout@v4
+ - uses: actions/setup-java@v4
+ with:
+ java-version: ${{ matrix.java }}
+ distribution: 'corretto'
+ - name: Assemble and test with Gradle
+ working-directory: ./server
+ run: make test
+
# Stage 2: Parallel test jobs using matrix strategy
pxf-test:
name: Test PXF - ${{ matrix.test_group }}
@@ -125,7 +142,6 @@ jobs:
- cli
- external-table
- fdw
- - server
- sanity
- smoke
- hdfs
diff --git a/ci/docker/pxf-cbdb-dev/ubuntu/script/build_pxf.sh
b/ci/docker/pxf-cbdb-dev/ubuntu/script/build_pxf.sh
index 6d6475ce..b48cbc9e 100755
--- a/ci/docker/pxf-cbdb-dev/ubuntu/script/build_pxf.sh
+++ b/ci/docker/pxf-cbdb-dev/ubuntu/script/build_pxf.sh
@@ -68,11 +68,11 @@ export PXF_HOME=/usr/local/pxf
sudo mkdir -p "$PXF_HOME"
sudo chown -R gpadmin:gpadmin "$PXF_HOME"
-# Build all PXF components
-make all
-
-# Install PXF
-make install
+# Build and Install PXF
+make -C external-table install
+make -C fdw install
+make -C cli install
+make -C server install-server
# Set up PXF environment
diff --git a/pom.xml b/pom.xml
index cdd90f4f..4863ada7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1369,7 +1369,7 @@
-->
<exclude>.github/pull_request_template.md</exclude>
-
<exclude>server/gradle/wrapper/gradle-6.8.2-wrapper.jar.sha256</exclude>
+
<exclude>server/gradle/wrapper/gradle-7.6.6-wrapper.jar.sha256</exclude>
</excludes>
diff --git a/server/build.gradle b/server/build.gradle
index 3eb6b087..e530d872 100644
--- a/server/build.gradle
+++ b/server/build.gradle
@@ -24,9 +24,9 @@ buildscript {
}
plugins {
- id "io.franzbecker.gradle-lombok" version "3.3.0"
+ id "io.freefair.lombok" version "6.6.3"
id "org.springframework.boot" version "${springBootVersion}" apply false
- id 'io.spring.dependency-management' version '1.0.11.RELEASE'
+ id 'io.spring.dependency-management' version '1.0.15.RELEASE'
}
// override Spring Framework version to pick the Spring MVC 5.3.33 with the
async race condition fix
@@ -59,7 +59,7 @@ idea {
configure(javaProjects) {
apply plugin: 'java'
apply plugin: 'io.spring.dependency-management'
- apply plugin: "io.franzbecker.gradle-lombok"
+ apply plugin: "io.freefair.lombok"
group = 'org.apache.cloudberry.pxf'
version = "${version}"
@@ -258,6 +258,9 @@ configure(javaProjects) {
"-Xlint:empty", "-Xlint:finally", "-Xlint:overrides",
"-Xlint:path", "-Xlint:-processing", "-Xlint:static",
"-Xlint:try", "-Xlint:fallthrough", "-Xlint:unchecked",
"-Xlint:-options", "-Werror"
]
+ // JEP 411 (Java 17) - java.security.AccessController is deprecated.
+ // Note, in JEP 486 (Java 24) Security Manager is completely disabled,
however Java-API is not broken.
+ options.compilerArgs +=
JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_17) ?
["-Xlint:-removal"] : []
}
compileTestJava {
@@ -266,6 +269,9 @@ configure(javaProjects) {
"-Xlint:empty", "-Xlint:finally", "-Xlint:overrides",
"-Xlint:path", "-Xlint:-processing", "-Xlint:static",
"-Xlint:try", "-Xlint:fallthrough", "-Xlint:unchecked",
"-Xlint:-options", "-Werror"
]
+ // JEP 411 (Java 17) - java.security.AccessController is deprecated.
+ // Note, in JEP 486 (Java 24) Security Manager is completely disabled,
however Java-API is not broken.
+ options.compilerArgs +=
JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_17) ?
["-Xlint:-removal"] : []
}
configurations {
diff --git a/server/gradle/wrapper/gradle-6.8.2-wrapper.jar.sha256
b/server/gradle/wrapper/gradle-6.8.2-wrapper.jar.sha256
deleted file mode 100644
index 46143fb0..00000000
--- a/server/gradle/wrapper/gradle-6.8.2-wrapper.jar.sha256
+++ /dev/null
@@ -1 +0,0 @@
-e996d452d2645e70c01c11143ca2d3742734a28da2bf61f25c82bdc288c9e637
\ No newline at end of file
diff --git a/server/gradle/wrapper/gradle-7.6.6-wrapper.jar.sha256
b/server/gradle/wrapper/gradle-7.6.6-wrapper.jar.sha256
new file mode 100644
index 00000000..c957e1d4
--- /dev/null
+++ b/server/gradle/wrapper/gradle-7.6.6-wrapper.jar.sha256
@@ -0,0 +1 @@
+14dfa961b6704bb3decdea06502781edaa796a82e6da41cd2e1962b14fbe21a3
\ No newline at end of file
diff --git a/server/gradle/wrapper/gradle-wrapper.properties
b/server/gradle/wrapper/gradle-wrapper.properties
index 9027973d..92df30b1 100644
--- a/server/gradle/wrapper/gradle-wrapper.properties
+++ b/server/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,7 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.6-bin.zip
+networkTimeout=10000
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionSha256Sum=8de6efc274ab52332a9c820366dd5cf5fc9d35ec7078fd70c8ec6913431ee610
+distributionSha256Sum=673d9776f303bc7048fc3329d232d6ebf1051b07893bd9d11616fad9a8673be0
diff --git a/server/gradlew b/server/gradlew
index 4f906e0c..65dcd68d 100755
--- a/server/gradlew
+++ b/server/gradlew
@@ -1,7 +1,7 @@
-#!/usr/bin/env sh
+#!/bin/sh
#
-# Copyright 2015 the original author or authors.
+# Copyright © 2015-2021 the original authors.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -17,67 +17,101 @@
#
##############################################################################
-##
-## Gradle start up script for UN*X
-##
+#
+# Gradle start up script for POSIX generated by Gradle.
+#
+# Important for running:
+#
+# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
+# noncompliant, but you have some other compliant shell such as ksh or
+# bash, then to run this script, type that shell name before the whole
+# command line, like:
+#
+# ksh Gradle
+#
+# Busybox and similar reduced shells will NOT work, because this script
+# requires all of these POSIX shell features:
+# * functions;
+# * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
+# «${var#prefix}», «${var%suffix}», and «$( cmd )»;
+# * compound commands having a testable exit status, especially «case»;
+# * various built-in commands including «command», «set», and «ulimit».
+#
+# Important for patching:
+#
+# (2) This script targets any POSIX shell, so it avoids extensions provided
+# by Bash, Ksh, etc; in particular arrays are avoided.
+#
+# The "traditional" practice of packing multiple parameters into a
+# space-separated string is a well documented source of bugs and security
+# problems, so this is (mostly) avoided, by progressively accumulating
+# options in "$@", and eventually passing that to Java.
+#
+# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
+# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
+# see the in-line comments for details.
+#
+# There are tweaks for specific operating systems such as AIX, CygWin,
+# Darwin, MinGW, and NonStop.
+#
+# (3) This script is generated from the Groovy template
+#
https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+# within the Gradle project.
+#
+# You can find Gradle at https://github.com/gradle/gradle/.
+#
##############################################################################
# Attempt to set APP_HOME
+
# Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
- ls=`ls -ld "$PRG"`
- link=`expr "$ls" : '.*-> \(.*\)$'`
- if expr "$link" : '/.*' > /dev/null; then
- PRG="$link"
- else
- PRG=`dirname "$PRG"`"/$link"
- fi
+app_path=$0
+
+# Need this for daisy-chained symlinks.
+while
+ APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no
leading path
+ [ -h "$app_path" ]
+do
+ ls=$( ls -ld "$app_path" )
+ link=${ls#*' -> '}
+ case $link in #(
+ /*) app_path=$link ;; #(
+ *) app_path=$APP_HOME$link ;;
+ esac
done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >/dev/null
-APP_HOME="`pwd -P`"
-cd "$SAVED" >/dev/null
-APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
+# This is normally unused
+# shellcheck disable=SC2034
+APP_BASE_NAME=${0##*/}
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
# 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"'
# Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
+MAX_FD=maximum
warn () {
echo "$*"
-}
+} >&2
die () {
echo
echo "$*"
echo
exit 1
-}
+} >&2
# OS specific support (must be 'true' or 'false').
cygwin=false
msys=false
darwin=false
nonstop=false
-case "`uname`" in
- CYGWIN* )
- cygwin=true
- ;;
- Darwin* )
- darwin=true
- ;;
- MINGW* )
- msys=true
- ;;
- NONSTOP* )
- nonstop=true
- ;;
+case "$( uname )" in #(
+ CYGWIN* ) cygwin=true ;; #(
+ Darwin* ) darwin=true ;; #(
+ MSYS* | MINGW* ) msys=true ;; #(
+ NONSTOP* ) nonstop=true ;;
esac
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
@@ -87,9 +121,9 @@ CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
if [ -n "$JAVA_HOME" ] ; then
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
# IBM's JDK on AIX uses strange locations for the executables
- JAVACMD="$JAVA_HOME/jre/sh/java"
+ JAVACMD=$JAVA_HOME/jre/sh/java
else
- JAVACMD="$JAVA_HOME/bin/java"
+ JAVACMD=$JAVA_HOME/bin/java
fi
if [ ! -x "$JAVACMD" ] ; then
die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
@@ -98,7 +132,7 @@ Please set the JAVA_HOME variable in your environment to
match the
location of your Java installation."
fi
else
- JAVACMD="java"
+ 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.
Please set the JAVA_HOME variable in your environment to match the
@@ -106,80 +140,105 @@ location of your Java installation."
fi
# Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ;
then
- MAX_FD_LIMIT=`ulimit -H -n`
- if [ $? -eq 0 ] ; then
- if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
- MAX_FD="$MAX_FD_LIMIT"
- fi
- ulimit -n $MAX_FD
- if [ $? -ne 0 ] ; then
- warn "Could not set maximum file descriptor limit: $MAX_FD"
- fi
- else
- warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
- fi
+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
+ 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
+ ulimit -n "$MAX_FD" ||
+ warn "Could not set maximum file descriptor limit to $MAX_FD"
+ esac
fi
-# For Darwin, add options to specify how the application appears in the dock
-if $darwin; then
- GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\"
\"-Xdock:icon=$APP_HOME/media/gradle.icns\""
-fi
+# Collect all arguments for the java command, stacking in reverse order:
+# * args from the command line
+# * the main class name
+# * -classpath
+# * -D...appname settings
+# * --module-path (only if needed)
+# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
# For Cygwin or MSYS, switch paths to Windows format before running java
-if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
- APP_HOME=`cygpath --path --mixed "$APP_HOME"`
- CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-
- JAVACMD=`cygpath --unix "$JAVACMD"`
-
- # We build the pattern for arguments to be converted via cygpath
- ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
- SEP=""
- for dir in $ROOTDIRSRAW ; do
- ROOTDIRS="$ROOTDIRS$SEP$dir"
- SEP="|"
- done
- OURCYGPATTERN="(^($ROOTDIRS))"
- # Add a user-defined pattern to the cygpath arguments
- if [ "$GRADLE_CYGPATTERN" != "" ] ; then
- OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
- fi
+if "$cygwin" || "$msys" ; then
+ APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+ CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
+
+ JAVACMD=$( cygpath --unix "$JAVACMD" )
+
# Now convert the arguments - kludge to limit ourselves to /bin/sh
- i=0
- for arg in "$@" ; do
- CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
- CHECK2=`echo "$arg"|egrep -c "^-"` ###
Determine if an option
-
- if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ###
Added a condition
- eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
- else
- eval `echo args$i`="\"$arg\""
+ for arg do
+ if
+ case $arg in #(
+ -*) false ;; # don't mess with
options #(
+ /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX
filepath
+ [ -e "$t" ] ;; #(
+ *) false ;;
+ esac
+ then
+ arg=$( cygpath --path --ignore --mixed "$arg" )
fi
- i=`expr $i + 1`
+ # Roll the args list around exactly as many times as the number of
+ # args, so each arg winds up back in the position where it started, but
+ # possibly modified.
+ #
+ # NB: a `for` loop captures its iteration list before it begins, so
+ # changing the positional parameters here affects neither the number of
+ # iterations, nor the values presented in `arg`.
+ shift # remove old arg
+ set -- "$@" "$arg" # push replacement arg
done
- case $i in
- 0) set -- ;;
- 1) set -- "$args0" ;;
- 2) set -- "$args0" "$args1" ;;
- 3) set -- "$args0" "$args1" "$args2" ;;
- 4) set -- "$args0" "$args1" "$args2" "$args3" ;;
- 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
- 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
- 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5"
"$args6" ;;
- 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5"
"$args6" "$args7" ;;
- 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5"
"$args6" "$args7" "$args8" ;;
- esac
fi
-# Escape application args
-save () {
- for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ;
done
- echo " "
-}
-APP_ARGS=`save "$@"`
+# 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.
+
+set -- \
+ "-Dorg.gradle.appname=$APP_BASE_NAME" \
+ -classpath "$CLASSPATH" \
+ org.gradle.wrapper.GradleWrapperMain \
+ "$@"
+
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+ die "xargs is not available"
+fi
+
+# Use "xargs" to parse quoted args.
+#
+# With -n1 it outputs one arg per line, with the quotes and backslashes
removed.
+#
+# In Bash we could simply go:
+#
+# readarray ARGS < <( xargs -n1 <<<"$var" ) &&
+# set -- "${ARGS[@]}" "$@"
+#
+# but POSIX shell has neither arrays nor command substitution, so instead we
+# post-process each arg (as a line of input to sed) to backslash-escape any
+# character that might be a shell metacharacter, then use eval to reverse
+# that process (while maintaining the separation between arguments), and wrap
+# the whole thing up as a single "set" statement.
+#
+# This will of course break if any of these variables contains a newline or
+# an unmatched quote.
+#
-# Collect all arguments for the java command, following the shell quoting and
substitution rules
-eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
"\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\""
org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+eval "set -- $(
+ printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
+ xargs -n1 |
+ sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
+ tr '\n' ' '
+ )" '"$@"'
exec "$JAVACMD" "$@"
diff --git a/server/gradlew-install.sh b/server/gradlew-install.sh
index e91a675f..510fa2ad 100755
--- a/server/gradlew-install.sh
+++ b/server/gradlew-install.sh
@@ -26,7 +26,7 @@ fi
# Extract the Gradle version from gradle-wrapper.properties.
GRADLE_DIST_VERSION="$(grep distributionUrl=
"$APP_HOME/gradle/wrapper/gradle-wrapper.properties" | sed
's/^.*gradle-\([0-9.]*\)-[a-z]*.zip$/\1/')"
-GRADLE_WRAPPER_SHA256="$APP_HOME/gradle/wrapper/gradle-wrapper-${GRADLE_DIST_VERSION}.jar.sha256"
+GRADLE_WRAPPER_SHA256="$APP_HOME/gradle/wrapper/gradle-${GRADLE_DIST_VERSION}-wrapper.jar.sha256"
GRADLE_WRAPPER_JAR="$APP_HOME/gradle/wrapper/gradle-wrapper.jar"
if [ -x "$(command -v sha256sum)" ] ; then
SHASUM="sha256sum"
diff --git a/server/gradlew.bat b/server/gradlew.bat
index ac1b06f9..6689b85b 100644
--- a/server/gradlew.bat
+++ b/server/gradlew.bat
@@ -14,7 +14,7 @@
@rem limitations under the License.
@rem
-@if "%DEBUG%" == "" @echo off
+@if "%DEBUG%"=="" @echo off
@rem ##########################################################################
@rem
@rem Gradle startup script for Windows
@@ -25,7 +25,8 @@
if "%OS%"=="Windows_NT" setlocal
set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
+if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
set APP_BASE_NAME=%~n0
set APP_HOME=%DIRNAME%
@@ -40,7 +41,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
set JAVA_EXE=java.exe
%JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
+if %ERRORLEVEL% equ 0 goto execute
echo.
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your
PATH.
@@ -75,13 +76,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
:end
@rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
+if %ERRORLEVEL% equ 0 goto mainEnd
:fail
rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code
instead of
rem the _cmd.exe /c_ return code!
-if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
:mainEnd
if "%OS%"=="Windows_NT" endlocal
diff --git a/server/pxf-api/build.gradle b/server/pxf-api/build.gradle
index 64cc81b7..e4800084 100644
--- a/server/pxf-api/build.gradle
+++ b/server/pxf-api/build.gradle
@@ -57,5 +57,11 @@ dependencies {
}
test {
+ if (JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_17)) {
+ jvmArgs += [
+ // JEP486 removes access to `sun.*` API
+ '--add-opens=java.security.jgss/sun.security.krb5=ALL-UNNAMED',
+ ]
+ }
useJUnitPlatform()
}
diff --git a/server/pxf-hive/build.gradle b/server/pxf-hive/build.gradle
index 6ed9c2b0..764815a9 100644
--- a/server/pxf-hive/build.gradle
+++ b/server/pxf-hive/build.gradle
@@ -76,5 +76,11 @@ dependencies {
}
test {
+ if (JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_17)) {
+ jvmArgs += [
+ // JEP486 removes reflective access to `java.net.URI` private
fields
+ '--add-opens=java.base/java.net=ALL-UNNAMED',
+ ]
+ }
useJUnitPlatform()
}
diff --git a/server/pxf-service/src/scripts/pxf
b/server/pxf-service/src/scripts/pxf
index 5e3f0905..522d1eda 100755
--- a/server/pxf-service/src/scripts/pxf
+++ b/server/pxf-service/src/scripts/pxf
@@ -380,6 +380,16 @@ function do_start() {
JAVA_OPTS=($PXF_JVM_OPTS "${PXF_OPTS[@]}")
RUN_ARGS=(--spring.config.location=classpath:/application.properties,file:${PXF_BASE}/conf/pxf-application.properties)
+ # Detect Java major version and add --add-opens flags for Java 11+
+ local java_major_version
+ java_major_version=$("$javaexe" -version 2>&1 | grep version | head -1 |
sed -E 's/.*version "([0-9]+).*/\1/')
+ if [[ "$java_major_version" -ge 11 ]] 2>/dev/null; then
+ JAVA_OPTS+=(
+ '--add-opens=java.security.jgss/sun.security.krb5=ALL-UNNAMED'
+ '--add-opens=java.base/java.net=ALL-UNNAMED'
+ )
+ fi
+
local arguments=(-Dsun.misc.URLClassPath.disableJarChecking=true
"${JAVA_OPTS[@]}" -jar "$jarfile" $RUN_ARGS)
working_dir=$(dirname "$jarfile")
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
