From 98ee96256075719c5189005f8da49110e0684136 Mon Sep 17 00:00:00 2001
From: nickAS21 <nick@thingsboard.io>
Date: Tue, 28 Mar 2023 13:42:19 +0300
Subject: [PATCH 1/4] tbel: - ver 1.0.6 - public interface ExecutionObject     
  -> int getId(); to int getExecutionObjectId();

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index b577bf4142..fb1aafd6b6 100755
--- a/pom.xml
+++ b/pom.xml
@@ -78,7 +78,7 @@
         <zookeeper.version>3.5.5</zookeeper.version>
         <protobuf.version>3.21.9</protobuf.version>
         <grpc.version>1.42.1</grpc.version>
-        <tbel.version>1.0.5</tbel.version>
+        <tbel.version>1.0.6</tbel.version>
         <lombok.version>1.18.18</lombok.version>
         <paho.client.version>1.2.4</paho.client.version>
         <paho.mqttv5.client.version>1.2.5</paho.mqttv5.client.version>

From 6b93de8bef4a1ddc427be28a57570912cb8dac7a Mon Sep 17 00:00:00 2001
From: Andrew Shvayka <ashvayka@thingsboard.io>
Date: Tue, 4 Apr 2023 18:10:19 +0300
Subject: [PATCH 2/4] Update pom.xml

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index fb1aafd6b6..91bc3832b1 100755
--- a/pom.xml
+++ b/pom.xml
@@ -78,7 +78,7 @@
         <zookeeper.version>3.5.5</zookeeper.version>
         <protobuf.version>3.21.9</protobuf.version>
         <grpc.version>1.42.1</grpc.version>
-        <tbel.version>1.0.6</tbel.version>
+        <tbel.version>1.0.7</tbel.version>
         <lombok.version>1.18.18</lombok.version>
         <paho.client.version>1.2.4</paho.client.version>
         <paho.mqttv5.client.version>1.2.5</paho.mqttv5.client.version>

From 09b3299015703ba18af4d99c282bad66f1d07010 Mon Sep 17 00:00:00 2001
From: Andrew Shvayka <ashvayka@thingsboard.io>
Date: Tue, 4 Apr 2023 18:15:21 +0300
Subject: [PATCH 3/4] Revert "[Fix bug][3.5] tbel json decode id"

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 91bc3832b1..b577bf4142 100755
--- a/pom.xml
+++ b/pom.xml
@@ -78,7 +78,7 @@
         <zookeeper.version>3.5.5</zookeeper.version>
         <protobuf.version>3.21.9</protobuf.version>
         <grpc.version>1.42.1</grpc.version>
-        <tbel.version>1.0.7</tbel.version>
+        <tbel.version>1.0.5</tbel.version>
         <lombok.version>1.18.18</lombok.version>
         <paho.client.version>1.2.4</paho.client.version>
         <paho.mqttv5.client.version>1.2.5</paho.mqttv5.client.version>

From 19e58193b52da1afe5b6eda55c95729faa5559f6 Mon Sep 17 00:00:00 2001
From: nickAS21 <nick@thingsboard.io>
Date: Wed, 5 Apr 2023 13:32:57 +0300
Subject: [PATCH 4/4] sparkplug: change locale

---
 ui-ngx/src/assets/locale/locale.constant-en_US.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/ui-ngx/src/assets/locale/locale.constant-en_US.json b/ui-ngx/src/assets/locale/locale.constant-en_US.json
index 7d9eed195b..c4e9b7f46b 100644
--- a/ui-ngx/src/assets/locale/locale.constant-en_US.json
+++ b/ui-ngx/src/assets/locale/locale.constant-en_US.json
@@ -1396,10 +1396,10 @@
         "create-new-device-profile": "Create a new one!",
         "mqtt-device-topic-filters": "MQTT device topic filters",
         "mqtt-device-topic-filters-unique": "MQTT device topic filters need to be unique.",
-        "mqtt-device-topic-filters-spark-plug": "MQTT device topic filters SparkPlug.",
-        "mqtt-device-topic-filters-spark-plug-hint": "Default - telemetry. Example: namespace/group_id/message_type/edge_node_id/[device_id].",
-        "mqtt-device-topic-filters-spark-plug-attribute-metric-names": "SparkPlug attributes metric names",
-        "mqtt-device-topic-filters-spark-plug-attribute-metric-names-hint": "Names of SparkPlug metrics that will be stored as device attributes. All other metrics will be stored as device telemetry",
+        "mqtt-device-topic-filters-spark-plug": "MQTT Sparkplug B Edge of Network (EoN) node.",
+        "mqtt-device-topic-filters-spark-plug-hint": "Allow connections from EoN nodes with Sparkplug B payload and topic format.",
+        "mqtt-device-topic-filters-spark-plug-attribute-metric-names": "SparkPlug metrics to store as attributes.",
+        "mqtt-device-topic-filters-spark-plug-attribute-metric-names-hint": "Names of SparkPlug metrics that will be stored as device attributes. All other metrics will be stored as device telemetry.",
         "mqtt-device-payload-type": "MQTT device payload",
         "mqtt-device-payload-type-json": "JSON",
         "mqtt-device-payload-type-proto": "Protobuf",