Merge branch 'develop'

eclipse-tahu · Jun 20, 2023 · 83be02a · 83be02a
2 parents 28af7d8 + 2fe32c5
commit 83be02a
Show file tree

Hide file tree

Showing 21 changed files with 61 additions and 59 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.4</version>
+    <version>1.0.5-SNAPSHOT</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.4</version>
+    <version>1.0.5-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 

diff --git a/java/examples/device_timestamp/pom.xml b/java/examples/device_timestamp/pom.xml
@@ -18,12 +18,11 @@
   <parent>
     <groupId>org.eclipse.tahu</groupId>
     <artifactId>tahu-examples</artifactId>
-    <version>1.0.4</version>
+    <version>1.0.5-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
   <artifactId>example_device_timestamp</artifactId>
-  <version>1.0.4</version>
   <packaging>jar</packaging>
   <name>Sparkplug B Device Timestamp Example</name>
 

diff --git a/java/examples/edge_node_control/pom.xml b/java/examples/edge_node_control/pom.xml
@@ -18,12 +18,11 @@
   <parent>
     <groupId>org.eclipse.tahu</groupId>
     <artifactId>tahu-examples</artifactId>
-    <version>1.0.4</version>
+    <version>1.0.5-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
   <artifactId>example_edge_node_control</artifactId>
-  <version>1.0.4</version>
   <packaging>jar</packaging>
   <name>Sparkplug B Edge Node Control Example</name>
 

diff --git a/java/examples/host_file/pom.xml b/java/examples/host_file/pom.xml
@@ -18,12 +18,11 @@
   <parent>
     <groupId>org.eclipse.tahu</groupId>
     <artifactId>tahu-examples</artifactId>
-    <version>1.0.4</version>
+    <version>1.0.5-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
   <artifactId>example_host_file</artifactId>
-  <version>1.0.4</version>
   <packaging>jar</packaging>
   <name>Sparkplug B Host File Example</name>
 

diff --git a/java/examples/listener/pom.xml b/java/examples/listener/pom.xml
@@ -18,12 +18,11 @@
   <parent>
     <groupId>org.eclipse.tahu</groupId>
     <artifactId>tahu-examples</artifactId>
-    <version>1.0.4</version>
+    <version>1.0.5-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
   <artifactId>example_listener</artifactId>
-  <version>1.0.4</version>
   <packaging>jar</packaging>
   <name>Sparkplug B Listener Example</name>
 

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.4</version>
+  <version>1.0.5-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>Eclipse Tahu</name>
@@ -111,7 +111,9 @@
     <module>simple/pom.xml</module>
     <module>device_timestamp/pom.xml</module>
     <module>udt/pom.xml</module>
+<!--
     <module>raspberry_pi/pom.xml</module>
+-->
     <module>host_file/pom.xml</module>
   </modules>
 

diff --git a/java/examples/raspberry_pi/pom.xml b/java/examples/raspberry_pi/pom.xml
@@ -18,12 +18,11 @@
   <parent>
     <groupId>org.eclipse.tahu</groupId>
     <artifactId>tahu-examples</artifactId>
-    <version>1.0.4</version>
+    <version>1.0.5-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
   <artifactId>example_raspberry_pi</artifactId>
-  <version>1.0.4</version>
   <packaging>jar</packaging>
   <name>Sparkplug B Raspberry Pi Example</name>
 

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.4</version>
+    <version>1.0.5-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/java/examples/simple/pom.xml b/java/examples/simple/pom.xml
@@ -18,12 +18,11 @@
   <parent>
     <groupId>org.eclipse.tahu</groupId>
     <artifactId>tahu-examples</artifactId>
-    <version>1.0.4</version>
+    <version>1.0.5-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
   <artifactId>example_simple</artifactId>
-  <version>1.0.4</version>
   <packaging>jar</packaging>
   <name>Sparkplug B Simple Example</name>
 

diff --git a/java/examples/udt/pom.xml b/java/examples/udt/pom.xml
@@ -18,12 +18,11 @@
   <parent>
     <groupId>org.eclipse.tahu</groupId>
     <artifactId>tahu-examples</artifactId>
-    <version>1.0.4</version>
+    <version>1.0.5-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
   <artifactId>sparkplug_b_udt_example</artifactId>
-  <version>1.0.4</version>
   <packaging>jar</packaging>
   <name>Sparkplug B UDT Example</name>
 

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.4</version>
+    <version>1.0.5-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 

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.4</version>
+    <version>1.0.5-SNAPSHOT</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.4</version>
+    <version>1.0.5-SNAPSHOT</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.4</version>
+  <version>1.0.5-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>Eclipse Tahu</name>

diff --git a/javascript/core/sparkplug-client/README.md b/javascript/core/sparkplug-client/README.md
@@ -432,14 +432,15 @@ client.on('close', function () {
         ping rescheduling within the client.
 * 3.2.1 Updated License and repo links, cleaned up logging.
 * 3.2.2 Bug Fixes
+* 3.2.3 Bug Fixes, added typescript
 
 ## License
 
-Copyright (c) 2016-2018 Cirrus Link Solutions
+Copyright (c) 2016-2023 Cirrus Link Solutions and others
 
 All rights reserved. This program and the accompanying materials
 are made available under the terms of the Eclipse Public License v1.0
 which accompanies this distribution, and is available at
 http://www.eclipse.org/legal/epl-v10.html
 
-Contributors: Cirrus Link Solutions
+Contributors: Cirrus Link Solutions and others
diff --git a/javascript/core/sparkplug-client/package-lock.json b/javascript/core/sparkplug-client/package-lock.json
diff --git a/javascript/core/sparkplug-client/package.json b/javascript/core/sparkplug-client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "sparkplug-client",
-  "version": "3.2.2",
+  "version": "3.2.3",
   "description": "A client module for MQTT communication using the Sparkplug specification from Cirrus Link Solutions",
   "main": "index.js",
   "scripts": {
@@ -34,7 +34,7 @@
     "debug": "^4.3.4",
     "mqtt": "^4.2.8",
     "pako": "^2.0.4",
-    "sparkplug-payload": "^1.0.1"
+    "sparkplug-payload": "^1.0.2"
   },
   "devDependencies": {
     "@types/debug": "^4.1.7",

diff --git a/javascript/core/sparkplug-payload/README.md b/javascript/core/sparkplug-payload/README.md
@@ -50,14 +50,16 @@ var decoded = sparkplug.decodePayload(encoded);
 ## Release History
 
 * 1.0.0 Initial release
+* 1.0.1 Bug fixes
+* 1.0.2 Bug fixes, added typescript
 
 ## License
 
-Copyright (c) 2017 Cirrus Link Solutions
+Copyright (c) 2017-2023 Cirrus Link Solutions and others
 
 All rights reserved. This program and the accompanying materials
 are made available under the terms of the Eclipse Public License v1.0
 which accompanies this distribution, and is available at
 http://www.eclipse.org/legal/epl-v10.html
 
-Contributors: Cirrus Link Solutions
+Contributors: Cirrus Link Solutions and others