Skip to content

Issue 613 java17 #622

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Open
TatianaBurek wants to merge 13 commits into
base: develop
Choose a base branch
from
Open

Issue 613 java17 #622

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
41b3e45
updated libraries to work with Java 17/ Tomcat 10 #613
TatianaBurek Sep 30, 2025
2780160
use new libraries #613
TatianaBurek Sep 30, 2025
f2e7e7a
update j2ee schema version #613
TatianaBurek Sep 30, 2025
a4bcb53
use jakarta servlet 5 library #613
TatianaBurek Sep 30, 2025
dd2557b
remove Serial annotation #613
TatianaBurek Sep 30, 2025
c7947da
updated jackson libraries to v2.20 #613
TatianaBurek Oct 1, 2025
688b734
add PRE_LOAD_CHROME env to teh Python execution #613
TatianaBurek Oct 2, 2025
518eadd
add PRE_LOAD_CHROME env to teh Python execution #613
TatianaBurek Oct 2, 2025
6c64b08
libraries
TatianaBurek Oct 14, 2025
01047a7
Merge branch 'develop' into issue_613_java17
TatianaBurek Oct 14, 2025
9151e75
update Java libraries for classpath values in the mv_* scripts #613
TatianaBurek Oct 14, 2025
2647012
do not attempt to set the environment variables if they are null #613
TatianaBurek Oct 14, 2025
63e1d1c
Update Dockerfile
bikegeek Oct 17, 2025
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
18 changes: 9 additions & 9 deletions bin/mv_batch.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,19 +16,19 @@ DIR="$( cd -P "$( dirname "$SOURCE" )" >/dev/null 2>&1 && pwd )"
MV_HOME="$(dirname "$DIR")"

# construct the classpath for MVBatch
CLASSPATH=$CLASSPATH:$MV_HOME/lib/mariadb-java-client-2.7.1.jar
CLASSPATH=$CLASSPATH:$MV_HOME/lib/mariadb-java-client-3.5.6.jar
CLASSPATH=$CLASSPATH:$MV_HOME/lib/xercesImpl.jar
CLASSPATH=$CLASSPATH:$MV_HOME/lib/xml-apis.jar
CLASSPATH=$CLASSPATH:$MV_HOME/lib/tomcat-jdbc-8.5.61.jar
CLASSPATH=$CLASSPATH:$MV_HOME/lib/tomcat-jdbc-10.1.46.jar
CLASSPATH=$CLASSPATH:$MV_HOME/lib/juli-6.0.53.jar
CLASSPATH=$CLASSPATH:$MV_HOME/lib/slf4j-api-1.7.5.jar
CLASSPATH=$CLASSPATH:$MV_HOME/lib/slf4j-log4j12-1.7.5.jar
CLASSPATH=$CLASSPATH:$MV_HOME/lib/slf4j-api-2.0.17.jar
CLASSPATH=$CLASSPATH:$MV_HOME/lib/slf4j-log4j12-2.0.17.jar
CLASSPATH=$CLASSPATH:$MV_HOME/lib/guava-33.4.8.jar
CLASSPATH=$CLASSPATH:$MV_HOME/lib/log4j-api-2.17.1.jar
CLASSPATH=$CLASSPATH:$MV_HOME/lib/log4j-core-2.17.1.jar
CLASSPATH=$CLASSPATH:$MV_HOME/lib/log4j-iostreams-2.17.1.jar
CLASSPATH=$CLASSPATH:$MV_HOME/lib/servlet-api.jar
CLASSPATH=$CLASSPATH:$MV_HOME/lib/snakeyaml-2.0.jar
CLASSPATH=$CLASSPATH:$MV_HOME/lib/log4j-api-2.25.2.jar
CLASSPATH=$CLASSPATH:$MV_HOME/lib/log4j-core-2.25.2.jar
CLASSPATH=$CLASSPATH:$MV_HOME/lib/log4j-iostreams-2.25.2.jar
CLASSPATH=$CLASSPATH:$MV_HOME/lib/jakarta.servlet-api-5.0.0.jar
CLASSPATH=$CLASSPATH:$MV_HOME/lib/snakeyaml-2.5.jar
CLASSPATH=$CLASSPATH:$MV_HOME/dist/lib/metviewer.jar

PYTHON_ENV=<path_to_python_env>
Expand Down
21 changes: 11 additions & 10 deletions bin/mv_compare.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,27 +71,28 @@ fi
CLASSPATH=${MV_HOME}/lib/xercesImpl.jar
CLASSPATH=$CLASSPATH:${MV_HOME}/lib/xml-apis.jar
CLASSPATH=$CLASSPATH:${MV_HOME}/lib/juli-6.0.53.jar
CLASSPATH=$CLASSPATH:${MV_HOME}/lib/slf4j-api-1.7.5.jar
CLASSPATH=$CLASSPATH:${MV_HOME}/lib/slf4j-log4j12-1.7.5.jar
CLASSPATH=$CLASSPATH:${MV_HOME}/lib/slf4j-api-2.0.17.jar
CLASSPATH=$CLASSPATH:${MV_HOME}/lib/slf4j-log4j12-2.0.17.jar
CLASSPATH=$CLASSPATH:${MV_HOME}/lib/guava-33.4.8.jar
CLASSPATH=$CLASSPATH:${MV_HOME}/lib/junit-4.11.jar
CLASSPATH=$CLASSPATH:${MV_HOME}/lib/hamcrest-core-1.3.jar
CLASSPATH=$CLASSPATH:${MV_HOME}/lib/commons-io-2.20.0.jar
CLASSPATH=$CLASSPATH:${MV_HOME}/lib/mockito-all-1.9.5.jar
CLASSPATH=$CLASSPATH:${MV_HOME}/lib/servlet-api-4.0.1.jar
CLASSPATH=$CLASSPATH:${MV_HOME}/lib/commons-fileupload-1.6.0.jar
CLASSPATH=$CLASSPATH:${MV_HOME}/lib/jakarta.servlet-api-5.0.0.jar
CLASSPATH=$CLASSPATH:${MV_HOME}/lib/commons-fileupload2-core-2.0.0-M4.jar
CLASSPATH=$CLASSPATH:${MV_HOME}/lib/commons-fileupload2-jakarta-servlet5-2.0.0-M4.jar
CLASSPATH=$CLASSPATH:${MV_HOME}/dist/lib/metviewer_all.jar
CLASSPATH=$CLASSPATH:$MV_HOME/lib/j2html-1.4.0.jar
CLASSPATH=$CLASSPATH:$MV_HOME/lib/jackson-core-2.20.0.jar
CLASSPATH=$CLASSPATH:$MV_HOME/lib/jackson-databind-2.20.0.jar
CLASSPATH=$CLASSPATH:$MV_HOME/lib/commons-lang3-3.11.jar
CLASSPATH=$CLASSPATH:$MV_HOME/lib/commons-lang3-3.19.0.jar

CLASSPATH=$CLASSPATH:$MV_HOME/lib/mariadb-java-client-2.7.1.jar
CLASSPATH=$CLASSPATH:$MV_HOME/lib/tomcat-jdbc-8.5.61.jar
CLASSPATH=$CLASSPATH:$MV_HOME/lib/log4j-api-2.17.1.jar
CLASSPATH=$CLASSPATH:$MV_HOME/lib/log4j-core-2.17.1.jar
CLASSPATH=$CLASSPATH:$MV_HOME/lib/mariadb-java-client-3.5.6.jar
CLASSPATH=$CLASSPATH:$MV_HOME/lib/tomcat-jdbc-10.1.46.jar
CLASSPATH=$CLASSPATH:$MV_HOME/lib/log4j-api-2.25.2.jar
CLASSPATH=$CLASSPATH:$MV_HOME/lib/log4j-core-2.25.2.jar
CLASSPATH=$CLASSPATH:$MV_HOME/lib/log4j-iostreams-2.17.0.jar
CLASSPATH=$CLASSPATH:$MV_HOME/lib/snakeyaml-2.0.jar
CLASSPATH=$CLASSPATH:$MV_HOME/lib/snakeyaml-2.5.jar

echo "Running allRestRunner"
#/Users/pierce/test_data all
Expand Down
16 changes: 8 additions & 8 deletions bin/mv_load_mvload.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,18 +19,18 @@ DIR="$( cd -P "$( dirname "$SOURCE" )" >/dev/null 2>&1 && pwd )"
MV_HOME="$(dirname "$DIR")"

# construct the classpath for MVLoad
CLASSPATH=$CLASSPATH:$MV_HOME/lib/mariadb-java-client-2.7.1.jar
CLASSPATH=$CLASSPATH:$MV_HOME/lib/mariadb-java-client-3.5.6.jar
CLASSPATH=$CLASSPATH:$MV_HOME/lib/xercesImpl.jar
CLASSPATH=$CLASSPATH:$MV_HOME/lib/xml-apis.jar
CLASSPATH=$CLASSPATH:$MV_HOME/lib/tomcat-jdbc-8.5.61.jar
CLASSPATH=$CLASSPATH:$MV_HOME/lib/tomcat-jdbc-10.1.46.jar
CLASSPATH=$CLASSPATH:$MV_HOME/lib/juli-6.0.53.jar
CLASSPATH=$CLASSPATH:$MV_HOME/lib/slf4j-api-1.7.5.jar
CLASSPATH=$CLASSPATH:$MV_HOME/lib/slf4j-log4j12-1.7.5.jar
CLASSPATH=$CLASSPATH:$MV_HOME/lib/slf4j-api-2.0.17.jar
CLASSPATH=$CLASSPATH:$MV_HOME/lib/slf4j-log4j12-2.0.17.jar
CLASSPATH=$CLASSPATH:$MV_HOME/lib/guava-33.4.8.jar
CLASSPATH=$CLASSPATH:$MV_HOME/lib/log4j-api-2.17.1.jar
CLASSPATH=$CLASSPATH:$MV_HOME/lib/log4j-core-2.17.1.jar
CLASSPATH=$CLASSPATH:$MV_HOME/lib/log4j-iostreams-2.17.1.jar
CLASSPATH=$CLASSPATH:$MV_HOME/lib/servlet-api.jar
CLASSPATH=$CLASSPATH:$MV_HOME/lib/log4j-api-2.25.2.jar
CLASSPATH=$CLASSPATH:$MV_HOME/lib/log4j-core-2.25.2.jar
CLASSPATH=$CLASSPATH:$MV_HOME/lib/log4j-iostreams-2.25.2.jar
CLASSPATH=$CLASSPATH:$MV_HOME/lib/jakarta.servlet-api-5.0.0.jar
CLASSPATH=$CLASSPATH:$MV_HOME/dist/lib/metviewer.jar

java -classpath $CLASSPATH -Xmx2048M edu.ucar.metviewer.MVLoad $@
16 changes: 8 additions & 8 deletions bin/mv_prune.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,18 +17,18 @@ DIR="$( cd -P "$( dirname "$SOURCE" )" >/dev/null 2>&1 && pwd )"
MV_HOME="$(dirname "$DIR")"

# construct the classpath for MVPruneDB
CLASSPATH=$CLASSPATH:$MV_HOME/lib/mariadb-java-client-2.7.1.jar
CLASSPATH=$CLASSPATH:$MV_HOME/lib/mariadb-java-client-3.5.6.jar
CLASSPATH=$CLASSPATH:$MV_HOME/lib/xercesImpl.jar
CLASSPATH=$CLASSPATH:$MV_HOME/lib/xml-apis.jar
CLASSPATH=$CLASSPATH:$MV_HOME/lib/tomcat-jdbc-8.5.61.jar
CLASSPATH=$CLASSPATH:$MV_HOME/lib/tomcat-jdbc-10.1.46.jar
CLASSPATH=$CLASSPATH:$MV_HOME/lib/juli-6.0.53.jar
CLASSPATH=$CLASSPATH:$MV_HOME/lib/slf4j-api-1.7.5.jar
CLASSPATH=$CLASSPATH:$MV_HOME/lib/slf4j-log4j12-1.7.5.jar
CLASSPATH=$CLASSPATH:$MV_HOME/lib/slf4j-api-2.0.17.jar
CLASSPATH=$CLASSPATH:$MV_HOME/lib/slf4j-log4j12-2.0.17.jar
CLASSPATH=$CLASSPATH:$MV_HOME/lib/guava-33.4.8.jar
CLASSPATH=$CLASSPATH:$MV_HOME/lib/log4j-api-2.17.1.jar
CLASSPATH=$CLASSPATH:$MV_HOME/lib/log4j-core-2.17.1.0.jar
CLASSPATH=$CLASSPATH:$MV_HOME/lib/log4j-iostreams-2.17.1.jar
CLASSPATH=$CLASSPATH:$MV_HOME/lib/servlet-api.jar
CLASSPATH=$CLASSPATH:$MV_HOME/lib/log4j-api-2.25.2.jar
CLASSPATH=$CLASSPATH:$MV_HOME/lib/log4j-core-2.25.2.0.jar
CLASSPATH=$CLASSPATH:$MV_HOME/lib/log4j-iostreams-2.25.2.jar
CLASSPATH=$CLASSPATH:$MV_HOME/lib/jakarta.servlet-api-5.0.0.jar
CLASSPATH=$CLASSPATH:$MV_HOME/dist/lib/metviewer.jar

java -classpath $CLASSPATH -Xmx2048M edu.ucar.metviewer.prune.MVPruneDB $@
20 changes: 10 additions & 10 deletions bin/mv_scorecard.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,23 +17,23 @@ DIR="$( cd -P "$( dirname "$SOURCE" )" >/dev/null 2>&1 && pwd )"
MV_HOME="$(dirname "$DIR")"

# construct the classpath for MVBatch
CLASSPATH=$CLASSPATH:$MV_HOME/lib/mariadb-java-client-2.7.1.jar
CLASSPATH=$CLASSPATH:$MV_HOME/lib/mariadb-java-client-3.5.6.jar
CLASSPATH=$CLASSPATH:$MV_HOME/lib/xercesImpl.jar
CLASSPATH=$CLASSPATH:$MV_HOME/lib/xml-apis.jar
CLASSPATH=$CLASSPATH:$MV_HOME/lib/tomcat-jdbc-8.5.61.jar
CLASSPATH=$CLASSPATH:$MV_HOME/lib/tomcat-jdbc-10.1.46.jar
CLASSPATH=$CLASSPATH:$MV_HOME/lib/juli-6.0.53.jar
CLASSPATH=$CLASSPATH:$MV_HOME/lib/slf4j-api-1.7.5.jar
CLASSPATH=$CLASSPATH:$MV_HOME/lib/slf4j-log4j12-1.7.5.jar
CLASSPATH=$CLASSPATH:$MV_HOME/lib/slf4j-api-2.0.17.jar
CLASSPATH=$CLASSPATH:$MV_HOME/lib/slf4j-log4j12-2.0.17.jar
CLASSPATH=$CLASSPATH:$MV_HOME/lib/guava-33.4.8.jar
CLASSPATH=$CLASSPATH:$MV_HOME/lib/j2html-1.4.0.jar
CLASSPATH=$CLASSPATH:$MV_HOME/lib/jackson-core-2.20.0.jar
CLASSPATH=$CLASSPATH:$MV_HOME/lib/jackson-databind-2.20.0.jar
CLASSPATH=$CLASSPATH:$MV_HOME/lib/commons-lang3-3.11.jar
CLASSPATH=$CLASSPATH:$MV_HOME/lib/log4j-api-2.17.1.jar
CLASSPATH=$CLASSPATH:$MV_HOME/lib/log4j-core-2.17.1.jar
CLASSPATH=$CLASSPATH:$MV_HOME/lib/log4j-iostreams-2.17.1.jar
CLASSPATH=$CLASSPATH:$MV_HOME/lib/servlet-api.jar
CLASSPATH=$CLASSPATH:$MV_HOME/lib/snakeyaml-2.0.jar
CLASSPATH=$CLASSPATH:$MV_HOME/lib/commons-lang3-3.19.0.jar
CLASSPATH=$CLASSPATH:$MV_HOME/lib/log4j-api-2.25.2.jar
CLASSPATH=$CLASSPATH:$MV_HOME/lib/log4j-core-2.25.2.jar
CLASSPATH=$CLASSPATH:$MV_HOME/lib/log4j-iostreams-2.25.2.jar
CLASSPATH=$CLASSPATH:$MV_HOME/lib/jakarta.servlet-api-5.0.0.jar
CLASSPATH=$CLASSPATH:$MV_HOME/lib/snakeyaml-2.5.jar
CLASSPATH=$CLASSPATH:$MV_HOME/dist/lib/metviewer.jar

PYTHON_ENV=<path_to_python_env>
Expand Down
25 changes: 13 additions & 12 deletions bin/mv_test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,27 +160,28 @@ fi
CLASSPATH=${MV_HOME}/lib/xercesImpl.jar
CLASSPATH=$CLASSPATH:${MV_HOME}/lib/xml-apis.jar
CLASSPATH=$CLASSPATH:${MV_HOME}/lib/juli-6.0.53.jar
CLASSPATH=$CLASSPATH:${MV_HOME}/lib/slf4j-api-1.7.5.jar
CLASSPATH=$CLASSPATH:${MV_HOME}/lib/slf4j-log4j12-1.7.5.jar
CLASSPATH=$CLASSPATH:${MV_HOME}/lib/slf4j-api-2.0.17.jar
CLASSPATH=$CLASSPATH:${MV_HOME}/lib/slf4j-log4j12-2.0.17.jar
CLASSPATH=$CLASSPATH:${MV_HOME}/lib/guava-33.4.8.jar
CLASSPATH=$CLASSPATH:${MV_HOME}/lib/junit-4.11.jar
CLASSPATH=$CLASSPATH:${MV_HOME}/lib/hamcrest-core-1.3.jar
CLASSPATH=$CLASSPATH:${MV_HOME}/lib/commons-io-2.20.0.jar
CLASSPATH=$CLASSPATH:${MV_HOME}/lib/mockito-all-1.9.5.jar
CLASSPATH=$CLASSPATH:${MV_HOME}/lib/servlet-api-4.0.1.jar
CLASSPATH=$CLASSPATH:${MV_HOME}/lib/commons-fileupload-1.6.0.jar
CLASSPATH=$CLASSPATH:${MV_HOME}/lib/jakarta.servlet-api-5.0.0.jar
CLASSPATH=$CLASSPATH:${MV_HOME}/lib/commons-fileupload2-core-2.0.0-M4.jar
CLASSPATH=$CLASSPATH:${MV_HOME}/lib/commons-fileupload2-jakarta-servlet5-2.0.0-M4.jar
CLASSPATH=$CLASSPATH:${MV_HOME}/dist/lib/metviewer_all.jar
CLASSPATH=$CLASSPATH:$MV_HOME/lib/j2html-1.4.0.jar
CLASSPATH=$CLASSPATH:$MV_HOME/lib/jackson-core-2.20.0.jar
CLASSPATH=$CLASSPATH:$MV_HOME/lib/jackson-databind-2.20.0.jar
CLASSPATH=$CLASSPATH:$MV_HOME/lib/commons-lang3-3.11.jar

CLASSPATH=$CLASSPATH:$MV_HOME/lib/mariadb-java-client-2.7.1.jar
CLASSPATH=$CLASSPATH:$MV_HOME/lib/tomcat-jdbc-8.5.61.jar
CLASSPATH=$CLASSPATH:$MV_HOME/lib/log4j-api-2.17.1.jar
CLASSPATH=$CLASSPATH:$MV_HOME/lib/log4j-core-2.17.1.jar
CLASSPATH=$CLASSPATH:$MV_HOME/lib/log4j-iostreams-2.17.1.jar
CLASSPATH=$CLASSPATH:$MV_HOME/lib/snakeyaml-2.0.jar
CLASSPATH=$CLASSPATH:$MV_HOME/lib/commons-lang3-3.19.0.jar

CLASSPATH=$CLASSPATH:$MV_HOME/lib/mariadb-java-client-3.5.6.jar
CLASSPATH=$CLASSPATH:$MV_HOME/lib/tomcat-jdbc-10.1.46.jar
CLASSPATH=$CLASSPATH:$MV_HOME/lib/log4j-api-2.25.2.jar
CLASSPATH=$CLASSPATH:$MV_HOME/lib/log4j-core-2.25.2.jar
CLASSPATH=$CLASSPATH:$MV_HOME/lib/log4j-iostreams-2.25.2.jar
CLASSPATH=$CLASSPATH:$MV_HOME/lib/snakeyaml-2.5.jar



Expand Down
Loading
Loading