Set version to 1.3.1-SNAPSHOT. Update migration script

thingsboard · Apr 3, 2024 · 29613e3 · 29613e3
1 parent 1b189a0
commit 29613e3
Show file tree

Hide file tree

Showing 20 changed files with 34 additions and 19 deletions.
diff --git a/application/pom.xml b/application/pom.xml
@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard.mqtt-broker</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.3.1-SNAPSHOT</version>
         <artifactId>mqtt-broker</artifactId>
     </parent>
     <artifactId>application</artifactId>

diff --git a/...rc/main/java/org/thingsboard/mqtt/broker/install/ThingsboardMqttBrokerInstallService.java b/...rc/main/java/org/thingsboard/mqtt/broker/install/ThingsboardMqttBrokerInstallService.java
@@ -64,6 +64,9 @@ public void performInstall() {
 
                         systemDataLoaderService.createWebSocketMqttClientCredentials();
                         systemDataLoaderService.createDefaultWebSocketConnections();
+                    case "1.3.0":
+                        log.info("Upgrading TBMQ from version 1.3.0 to 1.3.1 ...");
+                        databaseEntitiesUpgradeService.upgradeDatabase("1.3.0");
                         break;
                     default:
                         throw new RuntimeException("Unable to upgrade TBMQ, unsupported fromVersion: " + upgradeFromVersion);

diff --git a/.../src/main/java/org/thingsboard/mqtt/broker/service/install/SqlDatabaseUpgradeService.java b/.../src/main/java/org/thingsboard/mqtt/broker/service/install/SqlDatabaseUpgradeService.java
@@ -124,6 +124,18 @@ public void upgradeDatabase(String fromVersion) throws Exception {
                     log.info("Schema updated.");
                 }
                 break;
+            case "1.3.0":
+                try (Connection conn = DriverManager.getConnection(dbUrl, dbUserName, dbPassword)) {
+                    log.info("Updating schema ...");
+                    if (isOldSchema(conn, 1003000)) {
+                        try {
+                            conn.createStatement().execute("UPDATE tb_schema_settings SET schema_version = 1003001;");
+                        } catch (Exception ignored) {
+                        }
+                    }
+                    log.info("Schema updated.");
+                }
+                break;
             default:
                 throw new RuntimeException("Unable to upgrade SQL database, unsupported fromVersion: " + fromVersion);
         }

diff --git a/common/actor/pom.xml b/common/actor/pom.xml
@@ -21,7 +21,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <groupId>org.thingsboard.mqtt-broker</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.3.1-SNAPSHOT</version>
         <artifactId>common</artifactId>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/common/cache/pom.xml b/common/cache/pom.xml
@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard.mqtt-broker</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.3.1-SNAPSHOT</version>
         <artifactId>common</artifactId>
     </parent>
     <groupId>org.thingsboard.mqtt-broker.common</groupId>

diff --git a/common/dao-api/pom.xml b/common/dao-api/pom.xml
@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard.mqtt-broker</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.3.1-SNAPSHOT</version>
         <artifactId>common</artifactId>
     </parent>
     <groupId>org.thingsboard.mqtt-broker.common</groupId>

diff --git a/common/data/pom.xml b/common/data/pom.xml
@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard.mqtt-broker</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.3.1-SNAPSHOT</version>
         <artifactId>common</artifactId>
     </parent>
     <groupId>org.thingsboard.mqtt-broker.common</groupId>

diff --git a/common/pom.xml b/common/pom.xml
@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard.mqtt-broker</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.3.1-SNAPSHOT</version>
         <artifactId>mqtt-broker</artifactId>
     </parent>
     <artifactId>common</artifactId>

diff --git a/common/queue/pom.xml b/common/queue/pom.xml
@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard.mqtt-broker</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.3.1-SNAPSHOT</version>
         <artifactId>common</artifactId>
     </parent>
     <groupId>org.thingsboard.mqtt-broker.common</groupId>

diff --git a/common/stats/pom.xml b/common/stats/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>common</artifactId>
         <groupId>org.thingsboard.mqtt-broker</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.3.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/common/util/pom.xml b/common/util/pom.xml
@@ -21,7 +21,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <groupId>org.thingsboard.mqtt-broker</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.3.1-SNAPSHOT</version>
         <artifactId>common</artifactId>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/dao/pom.xml b/dao/pom.xml
@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard.mqtt-broker</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.3.1-SNAPSHOT</version>
         <artifactId>mqtt-broker</artifactId>
     </parent>
     <artifactId>dao</artifactId>

diff --git a/dao/src/main/resources/sql/schema-entities.sql b/dao/src/main/resources/sql/schema-entities.sql
@@ -27,7 +27,7 @@ BEGIN
     IF (SELECT COUNT(*) FROM tb_schema_settings) = 0 THEN
         INSERT
         INTO tb_schema_settings (schema_version)
-        VALUES (1003000);
+        VALUES (1003001);
     END IF;
 END;
 $$;

diff --git a/msa/black-box-tests/pom.xml b/msa/black-box-tests/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>msa</artifactId>
         <groupId>org.thingsboard.mqtt-broker</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.3.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/msa/mqtt-broker/pom.xml b/msa/mqtt-broker/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>msa</artifactId>
         <groupId>org.thingsboard.mqtt-broker</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.3.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/msa/pom.xml b/msa/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>mqtt-broker</artifactId>
         <groupId>org.thingsboard.mqtt-broker</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.3.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/msa/tbmq/pom.xml b/msa/tbmq/pom.xml
@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard.mqtt-broker</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.3.1-SNAPSHOT</version>
         <artifactId>msa</artifactId>
     </parent>
     <groupId>org.thingsboard.mqtt-broker.msa</groupId>
@@ -37,7 +37,7 @@
         <pkg.name>thingsboard-mqtt-broker</pkg.name>
         <tbmq.docker.name>tbmq</tbmq.docker.name>
         <pkg.installFolder>/usr/share/${pkg.name}</pkg.installFolder>
-        <pkg.upgradeVersion>1.3.0</pkg.upgradeVersion>
+        <pkg.upgradeVersion>1.3.1</pkg.upgradeVersion>
     </properties>
 
     <dependencies>

diff --git a/pom.xml b/pom.xml
@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.thingsboard.mqtt-broker</groupId>
     <artifactId>mqtt-broker</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.3.1-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>TBMQ</name>

diff --git a/ui-ngx/package.json b/ui-ngx/package.json
@@ -1,6 +1,6 @@
 {
     "name": "tbmq",
-    "version": "1.3.0",
+    "version": "1.3.1",
     "scripts": {
         "ng": "ng",
         "start": "node --max_old_space_size=8048 ./node_modules/@angular/cli/bin/ng serve --configuration development --host 0.0.0.0 --open",

diff --git a/ui-ngx/pom.xml b/ui-ngx/pom.xml
@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard.mqtt-broker</groupId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.3.1-SNAPSHOT</version>
         <artifactId>mqtt-broker</artifactId>
     </parent>
     <artifactId>ui-ngx</artifactId>