dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Spring 3.2 notes: Relocate launcher classes: org.springframework.boot.loader.launch.PropertiesLauncher https://github.com/spring-projects/spring-boot/wiki/Spring-Boot-3.2-Release-Notes#nested-jar-support

Browse Source
This commit is contained in:
Sergey Matvienko 2024-04-20 12:08:55 +02:00
parent ee589386cd
commit c0507e75f7
18 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
msa/monitoring/docker/start-tb-monitoring.sh
View File

@ -28,4 +28,4 @@ cd ${pkg.installFolder}/bin
exec java -cp ${jarfile} $JAVA_OPTS -Dloader.main=org.thingsboard.monitoring.ThingsboardMonitoringApplication \ exec java -cp ${jarfile} $JAVA_OPTS -Dloader.main=org.thingsboard.monitoring.ThingsboardMonitoringApplication \
-Dspring.jpa.hibernate.ddl-auto=none \ -Dspring.jpa.hibernate.ddl-auto=none \
-Dlogging.config=$CONF_FOLDER/logback.xml \ -Dlogging.config=$CONF_FOLDER/logback.xml \
org.springframework.boot.loader.PropertiesLauncher org.springframework.boot.loader.launch.PropertiesLauncher

6
msa/tb-node/docker/start-tb-node.sh
View File

@ -41,7 +41,7 @@ if [ "$INSTALL_TB" == "true" ]; then
-Dspring.jpa.hibernate.ddl-auto=none \ -Dspring.jpa.hibernate.ddl-auto=none \
-Dinstall.upgrade=false \ -Dinstall.upgrade=false \
-Dlogging.config=/usr/share/thingsboard/bin/install/logback.xml \ -Dlogging.config=/usr/share/thingsboard/bin/install/logback.xml \
org.springframework.boot.loader.PropertiesLauncher org.springframework.boot.loader.launch.PropertiesLauncher
elif [ "$UPGRADE_TB" == "true" ]; then elif [ "$UPGRADE_TB" == "true" ]; then
@ -59,7 +59,7 @@ elif [ "$UPGRADE_TB" == "true" ]; then
-Dinstall.upgrade=true \ -Dinstall.upgrade=true \
-Dinstall.upgrade.from_version=${fromVersion} \ -Dinstall.upgrade.from_version=${fromVersion} \
-Dlogging.config=/usr/share/thingsboard/bin/install/logback.xml \ -Dlogging.config=/usr/share/thingsboard/bin/install/logback.xml \
org.springframework.boot.loader.PropertiesLauncher org.springframework.boot.loader.launch.PropertiesLauncher
else else
@ -68,6 +68,6 @@ else
exec java -cp ${jarfile} $JAVA_OPTS -Dloader.main=org.thingsboard.server.ThingsboardServerApplication \ exec java -cp ${jarfile} $JAVA_OPTS -Dloader.main=org.thingsboard.server.ThingsboardServerApplication \
-Dspring.jpa.hibernate.ddl-auto=none \ -Dspring.jpa.hibernate.ddl-auto=none \
-Dlogging.config=/config/logback.xml \ -Dlogging.config=/config/logback.xml \
org.springframework.boot.loader.PropertiesLauncher org.springframework.boot.loader.launch.PropertiesLauncher
fi fi

2
msa/tb/docker/install-tb.sh
View File

@ -53,6 +53,6 @@ java -cp ${jarfile} $JAVA_OPTS -Dloader.main=org.thingsboard.server.ThingsboardI
-Dspring.jpa.hibernate.ddl-auto=none \ -Dspring.jpa.hibernate.ddl-auto=none \
-Dinstall.upgrade=false \ -Dinstall.upgrade=false \
-Dlogging.config=/usr/share/thingsboard/bin/install/logback.xml \ -Dlogging.config=/usr/share/thingsboard/bin/install/logback.xml \
org.springframework.boot.loader.PropertiesLauncher org.springframework.boot.loader.launch.PropertiesLauncher
echo "${pkg.upgradeVersion}" > ${upgradeversion} echo "${pkg.upgradeVersion}" > ${upgradeversion}

2
msa/tb/docker/start-tb.sh
View File

@ -34,7 +34,7 @@ if [ -f ${firstlaunch} ]; then
java -cp ${jarfile} $JAVA_OPTS -Dloader.main=org.thingsboard.server.ThingsboardServerApplication \ java -cp ${jarfile} $JAVA_OPTS -Dloader.main=org.thingsboard.server.ThingsboardServerApplication \
-Dspring.jpa.hibernate.ddl-auto=none \ -Dspring.jpa.hibernate.ddl-auto=none \
-Dlogging.config=${CONF_FOLDER}/logback.xml \ -Dlogging.config=${CONF_FOLDER}/logback.xml \
org.springframework.boot.loader.PropertiesLauncher org.springframework.boot.loader.launch.PropertiesLauncher
else else
echo "ERROR: ThingsBoard is not installed" echo "ERROR: ThingsBoard is not installed"
fi fi

2
msa/tb/docker/upgrade-tb.sh
View File

@ -40,7 +40,7 @@ java -cp ${jarfile} $JAVA_OPTS -Dloader.main=org.thingsboard.server.ThingsboardI
-Dinstall.upgrade=true \ -Dinstall.upgrade=true \
-Dinstall.upgrade.from_version=${fromVersion} \ -Dinstall.upgrade.from_version=${fromVersion} \
-Dlogging.config=/usr/share/thingsboard/bin/install/logback.xml \ -Dlogging.config=/usr/share/thingsboard/bin/install/logback.xml \
org.springframework.boot.loader.PropertiesLauncher org.springframework.boot.loader.launch.PropertiesLauncher
echo "${pkg.upgradeVersion}" > ${upgradeversion} echo "${pkg.upgradeVersion}" > ${upgradeversion}

2
msa/transport/coap/docker/start-tb-coap-transport.sh
View File

@ -30,4 +30,4 @@ cd ${pkg.installFolder}/bin
exec java -cp ${jarfile} $JAVA_OPTS -Dloader.main=org.thingsboard.server.coap.ThingsboardCoapTransportApplication \ exec java -cp ${jarfile} $JAVA_OPTS -Dloader.main=org.thingsboard.server.coap.ThingsboardCoapTransportApplication \
-Dspring.jpa.hibernate.ddl-auto=none \ -Dspring.jpa.hibernate.ddl-auto=none \
-Dlogging.config=/config/logback.xml \ -Dlogging.config=/config/logback.xml \
org.springframework.boot.loader.PropertiesLauncher org.springframework.boot.loader.launch.PropertiesLauncher

2
msa/transport/http/docker/start-tb-http-transport.sh
View File

@ -30,4 +30,4 @@ cd ${pkg.installFolder}/bin
exec java -cp ${jarfile} $JAVA_OPTS -Dloader.main=org.thingsboard.server.http.ThingsboardHttpTransportApplication \ exec java -cp ${jarfile} $JAVA_OPTS -Dloader.main=org.thingsboard.server.http.ThingsboardHttpTransportApplication \
-Dspring.jpa.hibernate.ddl-auto=none \ -Dspring.jpa.hibernate.ddl-auto=none \
-Dlogging.config=/config/logback.xml \ -Dlogging.config=/config/logback.xml \
org.springframework.boot.loader.PropertiesLauncher org.springframework.boot.loader.launch.PropertiesLauncher

2
msa/transport/lwm2m/docker/start-tb-lwm2m-transport.sh
View File

@ -30,4 +30,4 @@ cd ${pkg.installFolder}/bin
exec java -cp ${jarfile} $JAVA_OPTS -Dloader.main=org.thingsboard.server.lwm2m.ThingsboardLwm2mTransportApplication \ exec java -cp ${jarfile} $JAVA_OPTS -Dloader.main=org.thingsboard.server.lwm2m.ThingsboardLwm2mTransportApplication \
-Dspring.jpa.hibernate.ddl-auto=none \ -Dspring.jpa.hibernate.ddl-auto=none \
-Dlogging.config=/config/logback.xml \ -Dlogging.config=/config/logback.xml \
org.springframework.boot.loader.PropertiesLauncher org.springframework.boot.loader.launch.PropertiesLauncher

2
msa/transport/mqtt/docker/start-tb-mqtt-transport.sh
View File

@ -30,4 +30,4 @@ cd ${pkg.installFolder}/bin
exec java -cp ${jarfile} $JAVA_OPTS -Dloader.main=org.thingsboard.server.mqtt.ThingsboardMqttTransportApplication \ exec java -cp ${jarfile} $JAVA_OPTS -Dloader.main=org.thingsboard.server.mqtt.ThingsboardMqttTransportApplication \
-Dspring.jpa.hibernate.ddl-auto=none \ -Dspring.jpa.hibernate.ddl-auto=none \
-Dlogging.config=/config/logback.xml \ -Dlogging.config=/config/logback.xml \
org.springframework.boot.loader.PropertiesLauncher org.springframework.boot.loader.launch.PropertiesLauncher

2
msa/transport/snmp/docker/start-tb-snmp-transport.sh
View File

@ -30,4 +30,4 @@ cd ${pkg.installFolder}/bin
exec java -cp ${jarfile} $JAVA_OPTS -Dloader.main=org.thingsboard.server.snmp.ThingsboardSnmpTransportApplication \ exec java -cp ${jarfile} $JAVA_OPTS -Dloader.main=org.thingsboard.server.snmp.ThingsboardSnmpTransportApplication \
-Dspring.jpa.hibernate.ddl-auto=none \ -Dspring.jpa.hibernate.ddl-auto=none \
-Dlogging.config=/config/logback.xml \ -Dlogging.config=/config/logback.xml \
org.springframework.boot.loader.PropertiesLauncher org.springframework.boot.loader.launch.PropertiesLauncher

2
msa/vc-executor-docker/docker/start-tb-vc-executor.sh
View File

@ -30,4 +30,4 @@ cd ${pkg.installFolder}/bin
exec java -cp ${jarfile} $JAVA_OPTS -Dloader.main=org.thingsboard.server.vc.ThingsboardVersionControlExecutorApplication \ exec java -cp ${jarfile} $JAVA_OPTS -Dloader.main=org.thingsboard.server.vc.ThingsboardVersionControlExecutorApplication \
-Dspring.jpa.hibernate.ddl-auto=none \ -Dspring.jpa.hibernate.ddl-auto=none \
-Dlogging.config=/config/logback.xml \ -Dlogging.config=/config/logback.xml \
org.springframework.boot.loader.PropertiesLauncher org.springframework.boot.loader.launch.PropertiesLauncher

2
packaging/java/scripts/install/install.sh
View File

@ -52,7 +52,7 @@ su -s /bin/sh -c "java -cp ${jarfile} $JAVA_OPTS -Dloader.main=org.thingsboard.s
-Dspring.jpa.hibernate.ddl-auto=none \ -Dspring.jpa.hibernate.ddl-auto=none \
-Dinstall.upgrade=false \ -Dinstall.upgrade=false \
-Dlogging.config=${pkg.installFolder}/bin/install/logback.xml \ -Dlogging.config=${pkg.installFolder}/bin/install/logback.xml \
org.springframework.boot.loader.PropertiesLauncher" "$run_user" org.springframework.boot.loader.launch.PropertiesLauncher" "$run_user"
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
echo "ThingsBoard installation failed!" echo "ThingsBoard installation failed!"

2
packaging/java/scripts/install/install_dev_db.sh
View File

@ -36,7 +36,7 @@ sudo -u "$run_user" -s /bin/sh -c "java -cp ${jarfile} $JAVA_OPTS -Dloader.main=
-Dspring.jpa.hibernate.ddl-auto=none \ -Dspring.jpa.hibernate.ddl-auto=none \
-Dinstall.upgrade=false \ -Dinstall.upgrade=false \
-Dlogging.config=logback.xml \ -Dlogging.config=logback.xml \
org.springframework.boot.loader.PropertiesLauncher" org.springframework.boot.loader.launch.PropertiesLauncher"
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
echo "ThingsBoard DB installation failed!" echo "ThingsBoard DB installation failed!"

2
packaging/java/scripts/install/upgrade.sh
View File

@ -51,7 +51,7 @@ su -s /bin/sh -c "java -cp ${jarfile} $JAVA_OPTS -Dloader.main=org.thingsboard.s
-Dinstall.upgrade=true \ -Dinstall.upgrade=true \
-Dinstall.upgrade.from_version=${fromVersion} \ -Dinstall.upgrade.from_version=${fromVersion} \
-Dlogging.config=${pkg.installFolder}/bin/install/logback.xml \ -Dlogging.config=${pkg.installFolder}/bin/install/logback.xml \
org.springframework.boot.loader.PropertiesLauncher" "$run_user" org.springframework.boot.loader.launch.PropertiesLauncher" "$run_user"
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
echo "ThingsBoard upgrade failed!" echo "ThingsBoard upgrade failed!"

2
packaging/java/scripts/install/upgrade_dev_db.sh
View File

@ -57,7 +57,7 @@ sudo -u "$run_user" -s /bin/sh -c "java -cp ${jarfile} $JAVA_OPTS -Dloader.main=
-Dinstall.upgrade=true \ -Dinstall.upgrade=true \
-Dinstall.upgrade.from_version=${fromVersion} \ -Dinstall.upgrade.from_version=${fromVersion} \
-Dlogging.config=logback.xml \ -Dlogging.config=logback.xml \
org.springframework.boot.loader.PropertiesLauncher" org.springframework.boot.loader.launch.PropertiesLauncher"
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
echo "ThingsBoard DB installation failed!" echo "ThingsBoard DB installation failed!"

2
packaging/java/scripts/windows/install.bat
View File

@ -34,7 +34,7 @@ java -cp "%jarfile%" -Dloader.main=org.thingsboard.server.ThingsboardInstallAppl
-Dspring.jpa.hibernate.ddl-auto=none^ -Dspring.jpa.hibernate.ddl-auto=none^
-Dinstall.upgrade=false^ -Dinstall.upgrade=false^
-Dlogging.config="%BASE%\install\logback.xml"^ -Dlogging.config="%BASE%\install\logback.xml"^
org.springframework.boot.loader.PropertiesLauncher org.springframework.boot.loader.launch.PropertiesLauncher
if errorlevel 1 ( if errorlevel 1 (
@echo ThingsBoard installation failed! @echo ThingsBoard installation failed!

2
packaging/java/scripts/windows/install_dev_db.bat
View File

@ -19,7 +19,7 @@ java -cp %jarfile% -Dloader.main=org.thingsboard.server.ThingsboardInstallApplic
-Dspring.jpa.hibernate.ddl-auto=none^ -Dspring.jpa.hibernate.ddl-auto=none^
-Dinstall.upgrade=false^ -Dinstall.upgrade=false^
-Dlogging.config=%BASE%\windows\install\logback.xml^ -Dlogging.config=%BASE%\windows\install\logback.xml^
org.springframework.boot.loader.PropertiesLauncher org.springframework.boot.loader.launch.PropertiesLauncher
if errorlevel 1 ( if errorlevel 1 (
@echo ThingsBoard DB installation failed! @echo ThingsBoard DB installation failed!

2
packaging/java/scripts/windows/upgrade.bat
View File

@ -34,7 +34,7 @@ java -cp "%jarfile%" -Dloader.main=org.thingsboard.server.ThingsboardInstallAppl
-Dinstall.upgrade=true^ -Dinstall.upgrade=true^
-Dinstall.upgrade.from_version=%fromVersion%^ -Dinstall.upgrade.from_version=%fromVersion%^
-Dlogging.config="%BASE%\install\logback.xml"^ -Dlogging.config="%BASE%\install\logback.xml"^
org.springframework.boot.loader.PropertiesLauncher org.springframework.boot.loader.launch.PropertiesLauncher
if errorlevel 1 ( if errorlevel 1 (
@echo ThingsBoard upgrade failed! @echo ThingsBoard upgrade failed!