diff --git a/.env_versions b/.env_versions index 53593b6c3d..ef4904e61d 100644 --- a/.env_versions +++ b/.env_versions @@ -3,9 +3,9 @@ GLPK_VERSION=4.64 LIBOAUTHCPP_VERSION=0.1.0 LIBPHONENUMBER_VERSION=8.12.39 LIBPOSTAL_VERSION=1.1 -NODE_VERSION=14.16.1 -NPM_VERSION=6.14.12 -V8_VERSION=8.4.371.19 +NODE_VERSION=16.20.2 +NPM_VERSION=8.19.4 +V8_VERSION=9.4.146.26 STXXL_VERSION=1.3.1 ARMADILLO_VERSION=10.8.2 GDAL_VERSION=3.8.0 diff --git a/.gitignore b/.gitignore index faebaca57e..ccf1d414c1 100644 --- a/.gitignore +++ b/.gitignore @@ -12,6 +12,7 @@ conf/services/importHoot2Ops.json **/.project *.gcov *.autosave +*.so *~ *.kate-swp aclocal.m4 @@ -19,6 +20,8 @@ autom4te.cache BuildDate.txt bin/ bw-output/ +.cache/* +apndTest/* callgrind.* conf/database/DatabaseConfigLocal.sh conf/LocalHoot.json diff --git a/Makefile.hoot b/Makefile.hoot index 5b275fda42..36cf6212b5 100644 --- a/Makefile.hoot +++ b/Makefile.hoot @@ -395,7 +395,7 @@ ifeq ($(BUILD_UI_TESTS),uitests) ifeq ($(BUILD_SERVICES),services) scripts/database/AddKarmaTestUser.sh cd $$HOOT_HOME/hoot-ui-2x && \ - npm i && \ + npm i --legacy-peer-deps && \ npm test else echo "UI tests must specify both --with-services and --with-uitests." diff --git a/VagrantProvisionVars.sh b/VagrantProvisionVars.sh index d64da56b86..e7955165e7 100644 --- a/VagrantProvisionVars.sh +++ b/VagrantProvisionVars.sh @@ -7,9 +7,9 @@ export GLPK_VERSION=4.64 export LIBOAUTHCPP_VERSION=0.1.0 export LIBPHONENUMBER_VERSION=8.12.39 export LIBPOSTAL_VERSION=1.1 -export NODE_VERSION=16.0.0 -export NPM_VERSION=6.14.12 -export V8_VERSION=8.4.371.19 +export NODE_VERSION=16.20.2 +export NPM_VERSION=8.19.4 +export V8_VERSION=9.4.146.26 export STXXL_VERSION=1.3.1 export GOOGLE_CHROME_VERSION=91.0.4472.114 diff --git a/hoot-core/src/main/cpp/hoot/core/cmd/VersionCmd.cpp b/hoot-core/src/main/cpp/hoot/core/cmd/VersionCmd.cpp index bf2b3c3c9c..623d4497fe 100644 --- a/hoot-core/src/main/cpp/hoot/core/cmd/VersionCmd.cpp +++ b/hoot-core/src/main/cpp/hoot/core/cmd/VersionCmd.cpp @@ -22,7 +22,7 @@ * This will properly maintain the copyright information. Maxar * copyrights will be updated automatically. * - * @copyright Copyright (C) 2015-2023 Maxar (http://www.maxar.com/) + * @copyright Copyright (C) 2015-2024 Maxar (http://www.maxar.com/) */ // Boost @@ -57,7 +57,7 @@ #include // v8 -#include +#include // tgs #include @@ -122,7 +122,7 @@ class VersionCmd : public BaseCommand LOG_DEBUG("CppUnit Version:\t" << CPPUNIT_VERSION); # endif LOG_DEBUG("NodeJs Version:\t" << NODE_VERSION_STRING); - LOG_DEBUG("v8 Version: \t" << V8_VERSION_STRING); + LOG_DEBUG("v8 Version: \t" << V8_MAJOR_VERSION << "." << V8_MINOR_VERSION << "." << V8_BUILD_NUMBER << "." << V8_PATCH_LEVEL); LOG_DEBUG("Python Version:\t" << PY_VERSION); LOG_DEBUG("Protobuf Version:\t" << QString("%1.%2.%3") .arg(GOOGLE_PROTOBUF_VERSION / 1000000) diff --git a/scripts/jenkins/Jenkinsfile b/scripts/jenkins/Jenkinsfile index bd2989a9bc..8ed59362f3 100644 --- a/scripts/jenkins/Jenkinsfile +++ b/scripts/jenkins/Jenkinsfile @@ -9,7 +9,7 @@ pipeline { triggers { // Set nightly trigger - // cron((BRANCH_NAME == "master") ? "H H(4-5) * * 1-5" : "") + cron((BRANCH_NAME == "master") ? "H H(4-5) * * 1-5" : "") } // Configurable parameters for users to skip steps and control pipeline behavior @@ -216,7 +216,8 @@ pipeline { sh "vagrant ssh ${params.Box} -c 'cd hoot; make -s ui2x-test'" } } - stage("Sonar") { + // Reenable this stage when migrated to EL9 + /* stage("Sonar") { when { anyOf { expression { return params.Sonar } @@ -239,7 +240,7 @@ pipeline { } } } - } + }*/ } post { // always runs first so halting on non-release VM should happen at the end in cleanup