diff --git a/application/pom.xml b/application/pom.xml
index 49806cfbe..ae4920175 100644
--- a/application/pom.xml
+++ b/application/pom.xml
@@ -20,7 +20,7 @@
4.0.0
org.thingsboard.mqtt-broker
- 1.3.0-SNAPSHOT
+ 1.3.1-SNAPSHOT
mqtt-broker
application
diff --git a/application/src/main/java/org/thingsboard/mqtt/broker/install/ThingsboardMqttBrokerInstallService.java b/application/src/main/java/org/thingsboard/mqtt/broker/install/ThingsboardMqttBrokerInstallService.java
index 62b38139a..7a85a025f 100644
--- a/application/src/main/java/org/thingsboard/mqtt/broker/install/ThingsboardMqttBrokerInstallService.java
+++ b/application/src/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/application/src/main/java/org/thingsboard/mqtt/broker/service/install/SqlDatabaseUpgradeService.java b/application/src/main/java/org/thingsboard/mqtt/broker/service/install/SqlDatabaseUpgradeService.java
index d6e946c23..c2ef70a11 100644
--- a/application/src/main/java/org/thingsboard/mqtt/broker/service/install/SqlDatabaseUpgradeService.java
+++ b/application/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
index ec720b80e..77cc99565 100644
--- 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">
org.thingsboard.mqtt-broker
- 1.3.0-SNAPSHOT
+ 1.3.1-SNAPSHOT
common
4.0.0
diff --git a/common/cache/pom.xml b/common/cache/pom.xml
index a2cf52353..26e2717fd 100644
--- a/common/cache/pom.xml
+++ b/common/cache/pom.xml
@@ -20,7 +20,7 @@
4.0.0
org.thingsboard.mqtt-broker
- 1.3.0-SNAPSHOT
+ 1.3.1-SNAPSHOT
common
org.thingsboard.mqtt-broker.common
diff --git a/common/dao-api/pom.xml b/common/dao-api/pom.xml
index 6f0a52901..5b8392a9a 100644
--- a/common/dao-api/pom.xml
+++ b/common/dao-api/pom.xml
@@ -20,7 +20,7 @@
4.0.0
org.thingsboard.mqtt-broker
- 1.3.0-SNAPSHOT
+ 1.3.1-SNAPSHOT
common
org.thingsboard.mqtt-broker.common
diff --git a/common/data/pom.xml b/common/data/pom.xml
index 29f6a2358..51e1cfccc 100644
--- a/common/data/pom.xml
+++ b/common/data/pom.xml
@@ -20,7 +20,7 @@
4.0.0
org.thingsboard.mqtt-broker
- 1.3.0-SNAPSHOT
+ 1.3.1-SNAPSHOT
common
org.thingsboard.mqtt-broker.common
diff --git a/common/pom.xml b/common/pom.xml
index 1d45907f0..761f93c5a 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -20,7 +20,7 @@
4.0.0
org.thingsboard.mqtt-broker
- 1.3.0-SNAPSHOT
+ 1.3.1-SNAPSHOT
mqtt-broker
common
diff --git a/common/queue/pom.xml b/common/queue/pom.xml
index e5af16579..69b80a8ef 100644
--- a/common/queue/pom.xml
+++ b/common/queue/pom.xml
@@ -20,7 +20,7 @@
4.0.0
org.thingsboard.mqtt-broker
- 1.3.0-SNAPSHOT
+ 1.3.1-SNAPSHOT
common
org.thingsboard.mqtt-broker.common
diff --git a/common/stats/pom.xml b/common/stats/pom.xml
index 560eb81e0..b40b3b314 100644
--- a/common/stats/pom.xml
+++ b/common/stats/pom.xml
@@ -22,7 +22,7 @@
common
org.thingsboard.mqtt-broker
- 1.3.0-SNAPSHOT
+ 1.3.1-SNAPSHOT
4.0.0
diff --git a/common/util/pom.xml b/common/util/pom.xml
index c5d3dd452..b6a82072b 100644
--- 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">
org.thingsboard.mqtt-broker
- 1.3.0-SNAPSHOT
+ 1.3.1-SNAPSHOT
common
4.0.0
diff --git a/dao/pom.xml b/dao/pom.xml
index 642788752..6382eda44 100644
--- a/dao/pom.xml
+++ b/dao/pom.xml
@@ -20,7 +20,7 @@
4.0.0
org.thingsboard.mqtt-broker
- 1.3.0-SNAPSHOT
+ 1.3.1-SNAPSHOT
mqtt-broker
dao
diff --git a/dao/src/main/resources/sql/schema-entities.sql b/dao/src/main/resources/sql/schema-entities.sql
index ac59ed9ac..acc610ee1 100644
--- 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
index 2031df355..8ce66dd87 100644
--- a/msa/black-box-tests/pom.xml
+++ b/msa/black-box-tests/pom.xml
@@ -22,7 +22,7 @@
msa
org.thingsboard.mqtt-broker
- 1.3.0-SNAPSHOT
+ 1.3.1-SNAPSHOT
4.0.0
diff --git a/msa/mqtt-broker/pom.xml b/msa/mqtt-broker/pom.xml
index 41c3eccd0..90a52afd3 100644
--- a/msa/mqtt-broker/pom.xml
+++ b/msa/mqtt-broker/pom.xml
@@ -22,7 +22,7 @@
msa
org.thingsboard.mqtt-broker
- 1.3.0-SNAPSHOT
+ 1.3.1-SNAPSHOT
4.0.0
diff --git a/msa/pom.xml b/msa/pom.xml
index 142fd07ae..dc3da84fc 100644
--- a/msa/pom.xml
+++ b/msa/pom.xml
@@ -22,7 +22,7 @@
mqtt-broker
org.thingsboard.mqtt-broker
- 1.3.0-SNAPSHOT
+ 1.3.1-SNAPSHOT
4.0.0
diff --git a/msa/tbmq/pom.xml b/msa/tbmq/pom.xml
index d839f6d98..9de989369 100644
--- a/msa/tbmq/pom.xml
+++ b/msa/tbmq/pom.xml
@@ -20,7 +20,7 @@
4.0.0
org.thingsboard.mqtt-broker
- 1.3.0-SNAPSHOT
+ 1.3.1-SNAPSHOT
msa
org.thingsboard.mqtt-broker.msa
@@ -37,7 +37,7 @@
thingsboard-mqtt-broker
tbmq
/usr/share/${pkg.name}
- 1.3.0
+ 1.3.1
diff --git a/pom.xml b/pom.xml
index adb1a9387..3b6fcb44c 100755
--- a/pom.xml
+++ b/pom.xml
@@ -20,7 +20,7 @@
4.0.0
org.thingsboard.mqtt-broker
mqtt-broker
- 1.3.0-SNAPSHOT
+ 1.3.1-SNAPSHOT
pom
TBMQ
diff --git a/ui-ngx/package.json b/ui-ngx/package.json
index 3dc3d557b..f83e51ce8 100644
--- 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
index 4c82a64b4..ae875ffba 100644
--- a/ui-ngx/pom.xml
+++ b/ui-ngx/pom.xml
@@ -20,7 +20,7 @@
4.0.0
org.thingsboard.mqtt-broker
- 1.3.0-SNAPSHOT
+ 1.3.1-SNAPSHOT
mqtt-broker
ui-ngx