* 0.6 - 2015/07/28 - owagner

  - include timestamps ("ts") in generated JSON objects
  - updated minimal-json to 0.9.4 and eclipse-paho to 1.0.2

README.md

@@ -138,6 +138,10 @@ See also
 
 Changelog
 ---------
+* 0.6 - 2015/07/28 - owagner
+  - include timestamps ("ts") in generated JSON objects
+  - updated minimal-json to 0.9.4 and eclipse-paho to 1.0.2
+
 * 0.5 - 2015/03/19 - owagner
   - now properly supports multiple ESP3 connections. Will filter duplicate messages within 500ms.
   - changed state handling: will now retry failed connections every 10 seconds. Will keep running

build.gradle

@@ -1,4 +1,4 @@
-version = '0.5'
+version = '0.6'
 
 apply plugin: 'java'
 apply plugin: 'eclipse'
@@ -14,8 +14,8 @@ repositories {
 }
 
 dependencies {
-	compile 'com.eclipsesource.minimal-json:minimal-json:0.9.1'
-	compile 'org.eclipse.paho:mqtt-client:0.4.0'
+	compile 'com.eclipsesource.minimal-json:minimal-json:0.9.4'
+	compile 'org.eclipse.paho:org.eclipse.paho.client.mqttv3:1.0.2'
 	compile 'org.bidib.com.neuronrobotics:nrjavaserial:3.9.3.1'
 }
 
@@ -24,7 +24,7 @@ task listJars << {
 }
 
 jar {
-	from { configurations.compile.collect { it.isDirectory() ? it : zipTree(it) } }
+	from { configurations.compile.collect { it.isDirectory() ? it : zipTree(it) } } { exclude "META-INF/**" }
 	archiveName 'eno2mqtt.jar'
 	manifest {
         attributes 	'Main-Class': 'com.tellerulam.eno2mqtt.Main',

src/main/java/com/tellerulam/eno2mqtt/MQTTHandler.java

@@ -152,6 +152,7 @@ else if(val instanceof Float)
 			jso.add("val",((Float)val).floatValue());
 		else
 			jso.add("val",val.toString());
+		jso.add("ts",System.currentTimeMillis());
 		jso.add("eno_srcid",src);
 		jso.add("eno_dbm",-dbm);
 		String txtmsg=jso.toString();