Merge branch '3.x' into master-3.x

eclipse-tahu · Nov 12, 2024 · c294d60 · c294d60
2 parents b3c5b97 + 3d7a425
commit c294d60
Show file tree

Hide file tree

Showing 17 changed files with 21 additions and 20 deletions.
diff --git a/java/compat_impl/edge/pom.xml b/java/compat_impl/edge/pom.xml
@@ -18,7 +18,7 @@
   <parent>
     <groupId>org.eclipse.tahu</groupId>
     <artifactId>tahu</artifactId>
-    <version>1.0.11</version>
+    <version>1.0.12</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 

diff --git a/java/compat_impl/host/pom.xml b/java/compat_impl/host/pom.xml
@@ -18,7 +18,7 @@
   <parent>
     <groupId>org.eclipse.tahu</groupId>
     <artifactId>tahu</artifactId>
-    <version>1.0.11</version>
+    <version>1.0.12</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 

diff --git a/java/examples/device_timestamp/pom.xml b/java/examples/device_timestamp/pom.xml
@@ -18,7 +18,7 @@
   <parent>
     <groupId>org.eclipse.tahu</groupId>
     <artifactId>tahu-examples</artifactId>
-    <version>1.0.11</version>
+    <version>1.0.12</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/java/examples/edge_node_control/pom.xml b/java/examples/edge_node_control/pom.xml
@@ -18,7 +18,7 @@
   <parent>
     <groupId>org.eclipse.tahu</groupId>
     <artifactId>tahu-examples</artifactId>
-    <version>1.0.11</version>
+    <version>1.0.12</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/java/examples/host_file/pom.xml b/java/examples/host_file/pom.xml
@@ -18,7 +18,7 @@
   <parent>
     <groupId>org.eclipse.tahu</groupId>
     <artifactId>tahu-examples</artifactId>
-    <version>1.0.11</version>
+    <version>1.0.12</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/java/examples/listener/pom.xml b/java/examples/listener/pom.xml
@@ -18,7 +18,7 @@
   <parent>
     <groupId>org.eclipse.tahu</groupId>
     <artifactId>tahu-examples</artifactId>
-    <version>1.0.11</version>
+    <version>1.0.12</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/java/examples/pom.xml b/java/examples/pom.xml
@@ -29,7 +29,7 @@
 
   <groupId>org.eclipse.tahu</groupId>
   <artifactId>tahu-examples</artifactId>
-  <version>1.0.11</version>
+  <version>1.0.12</version>
   <packaging>pom</packaging>
 
   <name>Eclipse Tahu</name>

diff --git a/java/examples/raspberry_pi/pom.xml b/java/examples/raspberry_pi/pom.xml
@@ -18,7 +18,7 @@
   <parent>
     <groupId>org.eclipse.tahu</groupId>
     <artifactId>tahu-examples</artifactId>
-    <version>1.0.11</version>
+    <version>1.0.12</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/java/examples/records/pom.xml b/java/examples/records/pom.xml
@@ -18,7 +18,7 @@
   <parent>
     <groupId>org.eclipse.tahu</groupId>
     <artifactId>tahu-examples</artifactId>
-    <version>1.0.11</version>
+    <version>1.0.12</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/java/examples/simple/pom.xml b/java/examples/simple/pom.xml
@@ -18,7 +18,7 @@
   <parent>
     <groupId>org.eclipse.tahu</groupId>
     <artifactId>tahu-examples</artifactId>
-    <version>1.0.11</version>
+    <version>1.0.12</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/java/examples/udt/pom.xml b/java/examples/udt/pom.xml
@@ -18,7 +18,7 @@
   <parent>
     <groupId>org.eclipse.tahu</groupId>
     <artifactId>tahu-examples</artifactId>
-    <version>1.0.11</version>
+    <version>1.0.12</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/java/lib/core/pom.xml b/java/lib/core/pom.xml
@@ -18,7 +18,7 @@
   <parent>
     <groupId>org.eclipse.tahu</groupId>
     <artifactId>tahu</artifactId>
-    <version>1.0.11</version>
+    <version>1.0.12</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 

diff --git a/java/lib/core/src/main/java/org/eclipse/tahu/message/model/Metric.java b/java/lib/core/src/main/java/org/eclipse/tahu/message/model/Metric.java
@@ -66,14 +66,15 @@ public class Metric {
 	private Boolean isTransient;
 
 	@JsonProperty("metaData")
+	@JsonInclude(Include.NON_EMPTY)
 	private MetaData metaData;
 
 	@JsonProperty("properties")
 	@JsonInclude(Include.NON_EMPTY)
 	private PropertySet properties;
 
 	@JsonProperty("value")
-	@JsonInclude(Include.NON_EMPTY)
+	@JsonInclude(Include.ALWAYS)
 	private Object value;
 
 	private Boolean isNull = null;

diff --git a/java/lib/core/src/main/java/org/eclipse/tahu/mqtt/TahuClient.java b/java/lib/core/src/main/java/org/eclipse/tahu/mqtt/TahuClient.java
@@ -85,13 +85,13 @@ public class TahuClient implements MqttCallbackExtended {
 	/*
 	 * Other standard MQTT parameters.
 	 */
-	private MqttServerUrl mqttServerUrl;
-	private MqttServerName mqttServerName;
+	private final MqttServerUrl mqttServerUrl;
+	private final MqttServerName mqttServerName;
 	private final MqttClientId clientId;
 	private String username;
 	private String password;
-	private boolean cleanSession;
-	private int keepAlive;
+	private final boolean cleanSession;
+	private final int keepAlive;
 
 	/*
 	 * The callback client

diff --git a/java/lib/edge/pom.xml b/java/lib/edge/pom.xml
@@ -18,7 +18,7 @@
   <parent>
     <groupId>org.eclipse.tahu</groupId>
     <artifactId>tahu</artifactId>
-    <version>1.0.11</version>
+    <version>1.0.12</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 

diff --git a/java/lib/host/pom.xml b/java/lib/host/pom.xml
@@ -18,7 +18,7 @@
   <parent>
     <groupId>org.eclipse.tahu</groupId>
     <artifactId>tahu</artifactId>
-    <version>1.0.11</version>
+    <version>1.0.12</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 

diff --git a/java/pom.xml b/java/pom.xml
@@ -31,7 +31,7 @@
 
   <groupId>org.eclipse.tahu</groupId>
   <artifactId>tahu</artifactId>
-  <version>1.0.11</version>
+  <version>1.0.12</version>
   <packaging>pom</packaging>
 
   <name>Eclipse Tahu</name>