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

2 years ago · c0507e75f7
18 changed files with 20 additions and 20 deletions
--- a/msa/monitoring/docker/start-tb-monitoring.sh
+++ b/msa/monitoring/docker/start-tb-monitoring.sh
@ -28,4 +28,4 @@ cd ${pkg.installFolder}/bin
 exec java -cp ${jarfile} $JAVA_OPTS -Dloader.main=org.thingsboard.monitoring.ThingsboardMonitoringApplication \
                    -Dspring.jpa.hibernate.ddl-auto=none \
                    -Dlogging.config=$CONF_FOLDER/logback.xml \
-                    org.springframework.boot.loader.PropertiesLauncher
+                    org.springframework.boot.loader.launch.PropertiesLauncher
--- a/msa/tb-node/docker/start-tb-node.sh
+++ b/msa/tb-node/docker/start-tb-node.sh
@ -41,7 +41,7 @@ if [ "$INSTALL_TB" == "true" ]; then
                        -Dspring.jpa.hibernate.ddl-auto=none \
                        -Dinstall.upgrade=false \
                        -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

@ -59,7 +59,7 @@ elif [ "$UPGRADE_TB" == "true" ]; then
                    -Dinstall.upgrade=true \
                    -Dinstall.upgrade.from_version=${fromVersion} \
                    -Dlogging.config=/usr/share/thingsboard/bin/install/logback.xml \
-                    org.springframework.boot.loader.PropertiesLauncher
+                    org.springframework.boot.loader.launch.PropertiesLauncher

 else

@ -68,6 +68,6 @@ else
    exec java -cp ${jarfile} $JAVA_OPTS -Dloader.main=org.thingsboard.server.ThingsboardServerApplication \
                        -Dspring.jpa.hibernate.ddl-auto=none \
                        -Dlogging.config=/config/logback.xml \
-                        org.springframework.boot.loader.PropertiesLauncher
+                        org.springframework.boot.loader.launch.PropertiesLauncher

 fi
--- a/msa/tb/docker/install-tb.sh
+++ b/msa/tb/docker/install-tb.sh
@ -53,6 +53,6 @@ java -cp ${jarfile} $JAVA_OPTS -Dloader.main=org.thingsboard.server.ThingsboardI
                    -Dspring.jpa.hibernate.ddl-auto=none \
                    -Dinstall.upgrade=false \
                    -Dlogging.config=/usr/share/thingsboard/bin/install/logback.xml \
-                    org.springframework.boot.loader.PropertiesLauncher
+                    org.springframework.boot.loader.launch.PropertiesLauncher

 echo "${pkg.upgradeVersion}" > ${upgradeversion}
--- a/msa/tb/docker/start-tb.sh
+++ b/msa/tb/docker/start-tb.sh
@ -34,7 +34,7 @@ if [ -f ${firstlaunch} ]; then
    java -cp ${jarfile} $JAVA_OPTS -Dloader.main=org.thingsboard.server.ThingsboardServerApplication \
                        -Dspring.jpa.hibernate.ddl-auto=none \
                        -Dlogging.config=${CONF_FOLDER}/logback.xml \
-                        org.springframework.boot.loader.PropertiesLauncher
+                        org.springframework.boot.loader.launch.PropertiesLauncher
 else
    echo "ERROR: ThingsBoard is not installed"
 fi
--- a/msa/tb/docker/upgrade-tb.sh
+++ b/msa/tb/docker/upgrade-tb.sh
@ -40,7 +40,7 @@ java -cp ${jarfile} $JAVA_OPTS -Dloader.main=org.thingsboard.server.ThingsboardI
                -Dinstall.upgrade=true \
                -Dinstall.upgrade.from_version=${fromVersion} \
                -Dlogging.config=/usr/share/thingsboard/bin/install/logback.xml \
-                org.springframework.boot.loader.PropertiesLauncher
+                org.springframework.boot.loader.launch.PropertiesLauncher

 echo "${pkg.upgradeVersion}" > ${upgradeversion}

--- a/msa/transport/coap/docker/start-tb-coap-transport.sh
+++ b/msa/transport/coap/docker/start-tb-coap-transport.sh
@ -30,4 +30,4 @@ cd ${pkg.installFolder}/bin
 exec java -cp ${jarfile} $JAVA_OPTS -Dloader.main=org.thingsboard.server.coap.ThingsboardCoapTransportApplication \
                    -Dspring.jpa.hibernate.ddl-auto=none \
                    -Dlogging.config=/config/logback.xml \
-                    org.springframework.boot.loader.PropertiesLauncher
+                    org.springframework.boot.loader.launch.PropertiesLauncher
--- a/msa/transport/http/docker/start-tb-http-transport.sh
+++ b/msa/transport/http/docker/start-tb-http-transport.sh
@ -30,4 +30,4 @@ cd ${pkg.installFolder}/bin
 exec java -cp ${jarfile} $JAVA_OPTS -Dloader.main=org.thingsboard.server.http.ThingsboardHttpTransportApplication \
                    -Dspring.jpa.hibernate.ddl-auto=none \
                    -Dlogging.config=/config/logback.xml \
-                    org.springframework.boot.loader.PropertiesLauncher
+                    org.springframework.boot.loader.launch.PropertiesLauncher
--- a/msa/transport/lwm2m/docker/start-tb-lwm2m-transport.sh
+++ b/msa/transport/lwm2m/docker/start-tb-lwm2m-transport.sh
@ -30,4 +30,4 @@ cd ${pkg.installFolder}/bin
 exec java -cp ${jarfile} $JAVA_OPTS -Dloader.main=org.thingsboard.server.lwm2m.ThingsboardLwm2mTransportApplication \
                    -Dspring.jpa.hibernate.ddl-auto=none \
                    -Dlogging.config=/config/logback.xml \
-                    org.springframework.boot.loader.PropertiesLauncher
+                    org.springframework.boot.loader.launch.PropertiesLauncher
--- a/msa/transport/mqtt/docker/start-tb-mqtt-transport.sh
+++ b/msa/transport/mqtt/docker/start-tb-mqtt-transport.sh
@ -30,4 +30,4 @@ cd ${pkg.installFolder}/bin
 exec java -cp ${jarfile} $JAVA_OPTS -Dloader.main=org.thingsboard.server.mqtt.ThingsboardMqttTransportApplication \
                    -Dspring.jpa.hibernate.ddl-auto=none \
                    -Dlogging.config=/config/logback.xml \
-                    org.springframework.boot.loader.PropertiesLauncher
+                    org.springframework.boot.loader.launch.PropertiesLauncher
--- a/msa/transport/snmp/docker/start-tb-snmp-transport.sh
+++ b/msa/transport/snmp/docker/start-tb-snmp-transport.sh
@ -30,4 +30,4 @@ cd ${pkg.installFolder}/bin
 exec java -cp ${jarfile} $JAVA_OPTS -Dloader.main=org.thingsboard.server.snmp.ThingsboardSnmpTransportApplication \
                    -Dspring.jpa.hibernate.ddl-auto=none \
                    -Dlogging.config=/config/logback.xml \
-                    org.springframework.boot.loader.PropertiesLauncher
+                    org.springframework.boot.loader.launch.PropertiesLauncher
--- a/msa/vc-executor-docker/docker/start-tb-vc-executor.sh
+++ b/msa/vc-executor-docker/docker/start-tb-vc-executor.sh
@ -30,4 +30,4 @@ cd ${pkg.installFolder}/bin
 exec java -cp ${jarfile} $JAVA_OPTS -Dloader.main=org.thingsboard.server.vc.ThingsboardVersionControlExecutorApplication \
                    -Dspring.jpa.hibernate.ddl-auto=none \
                    -Dlogging.config=/config/logback.xml \
-                    org.springframework.boot.loader.PropertiesLauncher
+                    org.springframework.boot.loader.launch.PropertiesLauncher
--- a/packaging/java/scripts/install/install.sh
+++ b/packaging/java/scripts/install/install.sh
@ -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 \
                    -Dinstall.upgrade=false \
                    -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
    echo "ThingsBoard installation failed!"
--- a/packaging/java/scripts/install/install_dev_db.sh
+++ b/packaging/java/scripts/install/install_dev_db.sh
@ -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 \
                    -Dinstall.upgrade=false \
                    -Dlogging.config=logback.xml \
-                    org.springframework.boot.loader.PropertiesLauncher"
+                    org.springframework.boot.loader.launch.PropertiesLauncher"

 if [ $? -ne 0 ]; then
    echo "ThingsBoard DB installation failed!"
--- a/packaging/java/scripts/install/upgrade.sh
+++ b/packaging/java/scripts/install/upgrade.sh
@ -51,7 +51,7 @@ su -s /bin/sh -c "java -cp ${jarfile} $JAVA_OPTS -Dloader.main=org.thingsboard.s
                    -Dinstall.upgrade=true \
                    -Dinstall.upgrade.from_version=${fromVersion} \
                    -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
    echo "ThingsBoard upgrade failed!"
--- a/packaging/java/scripts/install/upgrade_dev_db.sh
+++ b/packaging/java/scripts/install/upgrade_dev_db.sh
@ -57,7 +57,7 @@ sudo -u "$run_user" -s /bin/sh -c "java -cp ${jarfile} $JAVA_OPTS -Dloader.main=
                    -Dinstall.upgrade=true \
                    -Dinstall.upgrade.from_version=${fromVersion} \
                    -Dlogging.config=logback.xml \
-                    org.springframework.boot.loader.PropertiesLauncher"
+                    org.springframework.boot.loader.launch.PropertiesLauncher"

 if [ $? -ne 0 ]; then
    echo "ThingsBoard DB installation failed!"
--- a/packaging/java/scripts/windows/install.bat
+++ b/packaging/java/scripts/windows/install.bat
@ -34,7 +34,7 @@ java -cp "%jarfile%" -Dloader.main=org.thingsboard.server.ThingsboardInstallAppl
                    -Dspring.jpa.hibernate.ddl-auto=none^
                    -Dinstall.upgrade=false^
                    -Dlogging.config="%BASE%\install\logback.xml"^
-                    org.springframework.boot.loader.PropertiesLauncher
+                    org.springframework.boot.loader.launch.PropertiesLauncher

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

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

 if errorlevel 1 (
   @echo ThingsBoard upgrade failed!