Skip to content

Commit f2d07eb

Browse files
authored
KNOX-3262 Remove Java 17 message on Knox start-up (#1158)
1 parent 59a8fe9 commit f2d07eb

File tree

2 files changed

+0
-14
lines changed

2 files changed

+0
-14
lines changed

gateway-release-common/home/bin/knox-functions.sh

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -169,16 +169,6 @@ function addAppJavaOpts {
169169
done
170170
}
171171

172-
function addJdk17Properties {
173-
# Add properties to enable Knox to run on JDK 17
174-
JAVA_VERSION=$("$JAVA" -version 2>&1 | awk -F '"' '/version/ {print $2}')
175-
CHECK_VERSION_17="17"
176-
if [[ "$JAVA_VERSION" == *"$CHECK_VERSION_17"* ]]; then
177-
echo "Java version is $CHECK_VERSION_17. Adding properties to enable Knox to run on JDK 17"
178-
addAppJavaOpts "-Dcom.sun.xml.bind.v2.bytecode.ClassTailor.noOptimize=true --add-exports java.base/sun.security.x509=ALL-UNNAMED --add-exports java.base/sun.security.pkcs=ALL-UNNAMED --add-exports java.naming/com.sun.jndi.ldap=ALL-UNNAMED --add-opens java.base/sun.security.util=ALL-UNNAMED"
179-
fi
180-
}
181-
182172
function buildAppJavaOpts {
183173
if [ -n "$APP_MEM_OPTS" ]; then
184174
addAppJavaOpts "${APP_MEM_OPTS}"
@@ -196,8 +186,6 @@ function buildAppJavaOpts {
196186
addAppJavaOpts "${APP_JAVA_LIB_PATH}"
197187
fi
198188

199-
addJdk17Properties
200-
201189
# echo "APP_JAVA_OPTS =" "${APP_JAVA_OPTS[@]}"
202190
}
203191

gateway-release/home/bin/knoxcli.sh

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,6 @@ function buildAppJavaOpts {
6262
addAppJavaOpts "${APP_JAVA_LIB_PATH}"
6363
fi
6464

65-
addJdk17Properties
66-
6765
# echo "APP_JAVA_OPTS =" "${APP_JAVA_OPTS[@]}"
6866
}
6967

0 commit comments

Comments
 (0)