Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

jstl fix with COMPAT option. #670

Merged
merged 1 commit into from
Mar 19, 2021
Merged

jstl fix with COMPAT option. #670

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions docker/jstltck.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,11 @@ cd $TCK_HOME/$GF_TOPLEVEL_DIR/glassfish/bin
./asadmin create-jvm-options -Djavax.xml.accessExternalStylesheet=all
./asadmin create-jvm-options -Djavax.xml.accessExternalSchema=all
./asadmin create-jvm-options -Djavax.xml.accessExternalDTD=file,http
#https://github.com/eclipse-ee4j/jakartaee-tck/issues/631
if [[ "$JDK" == "JDK11" || "$JDK" == "jdk11" ]]; then
./asadmin create-jvm-options -Djava.locale.providers=COMPAT
fi

./asadmin stop-domain
./asadmin start-domain

Expand Down
8 changes: 6 additions & 2 deletions docker/run_jakartaeetck.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
#!/bin/bash -x

#
# Copyright (c) 2018, 2020 Oracle and/or its affiliates. All rights reserved.
# Copyright (c) 2019, 2020 Payara Foundation and/or its affiliates. All rights reserved.
# Copyright (c) 2018, 2021 Oracle and/or its affiliates. All rights reserved.
# Copyright (c) 2019, 2021 Payara Foundation and/or its affiliates. All rights reserved.
#
# This program and the accompanying materials are made available under the
# terms of the Eclipse Public License v. 2.0, which is available at
Expand Down Expand Up @@ -273,6 +273,10 @@ ${CTS_HOME}/vi/$GF_VI_TOPLEVEL_DIR/glassfish/bin/asadmin --user admin --password
${CTS_HOME}/vi/$GF_VI_TOPLEVEL_DIR/glassfish/bin/asadmin --user admin --passwordfile ${ADMIN_PASSWORD_FILE} start-domain
${CTS_HOME}/vi/$GF_VI_TOPLEVEL_DIR/glassfish/bin/asadmin --user admin --passwordfile ${ADMIN_PASSWORD_FILE} version
${CTS_HOME}/vi/$GF_VI_TOPLEVEL_DIR/glassfish/bin/asadmin --user admin --passwordfile ${ADMIN_PASSWORD_FILE} create-jvm-options -Djava.security.manager
#https://github.com/eclipse-ee4j/jakartaee-tck/issues/631
if [[ ("$JDK" == "JDK11" || "$JDK" == "jdk11") && $test_suite == jstl ]]; then
${CTS_HOME}/vi/$GF_VI_TOPLEVEL_DIR/glassfish/bin/asadmin --user admin --passwordfile ${ADMIN_PASSWORD_FILE} create-jvm-options -Djava.locale.providers=COMPAT
fi
${CTS_HOME}/vi/$GF_VI_TOPLEVEL_DIR/glassfish/bin/asadmin --user admin --passwordfile ${ADMIN_PASSWORD_FILE} stop-domain

sleep 5
Expand Down