From a08c716ad28a01d2e226aaa7002e4818182162aa Mon Sep 17 00:00:00 2001
From: Sergey Matvienko <smatvienko@thingsboard.io>
Date: Tue, 1 Nov 2022 20:11:41 +0200
Subject: [PATCH] upgrade for JwtSetting targeted from 3.4.1 to 3.4.2

---
 .../server/install/ThingsboardInstallService.java            | 4 ----
 .../service/install/update/DefaultDataUpdateService.java     | 5 +----
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/application/src/main/java/org/thingsboard/server/install/ThingsboardInstallService.java b/application/src/main/java/org/thingsboard/server/install/ThingsboardInstallService.java
index 52de6c91fb..10f6d38430 100644
--- a/application/src/main/java/org/thingsboard/server/install/ThingsboardInstallService.java
+++ b/application/src/main/java/org/thingsboard/server/install/ThingsboardInstallService.java
@@ -238,10 +238,6 @@ public class ThingsboardInstallService {
                             log.info("Updating system data...");
                             systemDataLoaderService.updateSystemWidgets();
                             break;
-                        case "3.4.0":
-                            log.info("Upgrading ThingsBoard from version 3.4.0 to 3.5.0 ...");
-                            dataUpdateService.updateData("3.4.0");
-                            break;
 
                         //TODO update CacheCleanupService on the next version upgrade
 
diff --git a/application/src/main/java/org/thingsboard/server/service/install/update/DefaultDataUpdateService.java b/application/src/main/java/org/thingsboard/server/service/install/update/DefaultDataUpdateService.java
index 4909df84e8..d00d8f2768 100644
--- a/application/src/main/java/org/thingsboard/server/service/install/update/DefaultDataUpdateService.java
+++ b/application/src/main/java/org/thingsboard/server/service/install/update/DefaultDataUpdateService.java
@@ -181,6 +181,7 @@ public class DefaultDataUpdateService implements DataUpdateService {
                 }
                 break;
             case "3.4.1":
+                systemDataLoaderService.createJwtAdminSettings();
                 boolean skipAuditLogsMigration = getEnv("TB_SKIP_AUDIT_LOGS_MIGRATION", false);
                 if (!skipAuditLogsMigration) {
                     log.info("Updating data from version 3.4.1 to 3.4.2 ...");
@@ -190,10 +191,6 @@ public class DefaultDataUpdateService implements DataUpdateService {
                     log.info("Skipping audit logs migration");
                 }
                 break;
-            case "3.4.0":
-                log.info("Updating data from version 3.4.0 to 3.5.0 ...");
-                systemDataLoaderService.createJwtAdminSettings();
-                break;
             default:
                 throw new RuntimeException("Unable to update data, unsupported fromVersion: " + fromVersion);
         }