Merge branch 'master' into bug5912

This commit is contained in:
Axel Uhl committed 2024-05-02 15:45:58 +02:00
commit 10e05a8d61
14 files changed
+410 -311

No files matched your search

+6
View File
@@ -125,3 +125,9 @@ fi
if [ -n ${GOOGLE_MAPS_AUTHENTICATION_PARAMS} ]; then
ADDITIONAL_JAVA_ARGS="${ADDITIONAL_JAVA_ARGS} -Dgoogle.maps.authenticationparams=${GOOGLE_MAPS_AUTHENTICATION_PARAMS}"
fi
if [ -n ${WINDESTIMATION_BEARER_TOKEN} ]; then
ADDITIONAL_JAVA_ARGS="${ADDITIONAL_JAVA_ARGS} -Dwindestimation.source.bearertoken=${WINDESTIMATION_BEARER_TOKEN}"
fi
if [ -n ${POLAR_DATA_BEARER_TOKEN} ]; then
ADDITIONAL_JAVA_ARGS="${ADDITIONAL_JAVA_ARGS} -Dpolardata.source.bearertoken=${POLAR_DATA_BEARER_TOKEN}"
fi