Merge branch 'master' of github.com:assaabloy-ppi/salt-channel

build.xml

@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!-- 
 Build file to build jar file and javadoc. 
-NOTE: compile with Java 7!
-Do not use Java 8 or 9 (mainly due to Android).
+NOTE: compile with Java 7! (mainly due to Android).
 -->
 
 <project name="salt-channel" default="build" basedir=".">
@@ -17,8 +16,8 @@ Do not use Java 8 or 9 (mainly due to Android).
     </tstamp>
 
     <!-- VERSION, first line below is for DEV build, second for _RELEASE build. -->
-    <property name="version" value="1.9.${date}"/> 
-    <!-- <property name="version" value="2.0"/> -->
+    <property name="version" value="2.1.${date}"/>
+    <!-- <property name="version" value="2.1"/> -->
 
     <property name="time" value="${dateAndMinute}"/>
 
@@ -112,7 +111,7 @@ Do not use Java 8 or 9 (mainly due to Android).
     </copy>
 </target>
 
-<target name="jarx" description="creates jarx file, includes src-x" depends="clean, compilex">
+<target name="jarx" description="creates jarx file, includes src-x" depends="compilex">
     <delete file="out/salt-channel-x-${version}.jar"/>    
     <jar destfile="out/salt-channel-x-${version}.jar">
         <fileset dir="out/classes"/>

files/spec/spec-salt-channel-v1.md → files/spec/salt-channel-v1.md

@@ -1,5 +1,5 @@
-spec-salt-channel-v1.md
-=======================
+salt-channel-v1.md
+==================
 
 About this document
 -------------------

files/spec/spec-salt-channel-v2-draft1.md → files/spec/salt-channel-v2-draft1.md

@@ -1,12 +1,12 @@
-spec-salt-channel-v2-draft1.md
-==============================
+salt-channel-v2-draft1.md
+=========================
 
 About this document
 -------------------
 
 *Date*: 2017-02-22
 
-*Status*: DRAFT1.
+*Status*: DRAFT.
 
 *Author*: Frans Lundberg. ASSA ABLOY AB, Shared Technologies, Stockholm,
 frans.lundberg@assaabloy.com, phone: +46707601861.

files/spec/spec-salt-channel-v2-draft2.md → files/spec/salt-channel-v2-draft2.md

@@ -1,12 +1,12 @@
-spec-salt-channel-v2-draft1.md
-==============================
+salt-channel-v2-draft1.md
+=========================
 
 About this document
 -------------------
 
 *Date*: 2017-03-26
 
-*Status*: Work on progress for "draft2".
+*Status*: Work in progress.
 
 *Author*: Frans Lundberg. ASSA ABLOY AB, Shared Technologies, Stockholm,
 frans.lundberg@assaabloy.com, phone: +46707601861.

files/spec/spec-salt-channel-v2-draft3.md → files/spec/salt-channel-v2-draft3.md

@@ -1,12 +1,12 @@
-spec-salt-channel-v2-draft3.md
-==============================
+salt-channel-v2-draft3.md
+=========================
 
 About this document
 -------------------
 
 *Date*: 2017-03-29
 
-*Status*: Work on progress for Salt Channel v2.
+*Status*: Work in progress for Salt Channel v2.
 
 *Author*: Frans Lundberg. ASSA ABLOY AB, Shared Technologies, Stockholm,
 frans.lundberg@assaabloy.com, phone: +46707601861.

files/spec/spec-salt-channel-v2-draft4.md → files/spec/salt-channel-v2-draft4.md

@@ -1,5 +1,5 @@
-spec-salt-channel-v2-draft4.md
-==============================
+salt-channel-v2-draft4.md
+=========================
 
 About
 -----

files/spec/spec-salt-channel-v2-draft5.md → files/spec/salt-channel-v2-draft5.md

@@ -1,5 +1,5 @@
-spec-salt-channel-v2-draft5.md
-==============================
+salt-channel-v2-draft5.md
+=========================
 
 About
 -----

files/spec/spec-salt-channel-v2-draft6.md → files/spec/salt-channel-v2-draft6.md

@@ -1,5 +1,5 @@
-spec-salt-channel-v2-draft6.md
-==============================
+salt-channel-v2-draft6.md
+=========================
 
 About
 -----

files/spec/spec-salt-channel-v2-draft7.md → files/spec/salt-channel-v2-draft7.md

@@ -1,5 +1,5 @@
-spec-salt-channel-v2-draft7.md
-==============================
+salt-channel-v2-draft7.md
+=========================
 
 About
 -----