Merge branch '16-release-1-2' into 'master'

Resolve "Release 1.2"

Closes #16

See merge request !14

CHANGELOG.md

-# changelog
+# Changelog
+
+## Anno 1.2
+
+- fdab4f0 Column background colors updated
+- 2f184e0 Repaint table view if RDF term changes
+- b646529 Use Java 8
+- 3156922 Improved Excel source
+- ca43613 Client ID label
+- 70fa3e1 Repaint SheetView after Automap/Unmap
+- 16ab91b Reset mapping button
+- 58b20e9 Fixed jump-bug on column selection
+- 38729c9 Highlight selected column
+- e61372b Troubleshooting: JRE auto-detection on Windows
+- bd97471 Include INSTCODE and ACCENUMB in error message
+- 4eee61d Anno manual updates by Paul Cox, Scriptoria
 
 ## Anno 1.1
 

anno-docs/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.genesys-pgr</groupId>
     <artifactId>anno</artifactId>
-    <version>1.2-SNAPSHOT</version>
+    <version>1.3-SNAPSHOT</version>
   </parent>
   <artifactId>anno-docs</artifactId>
   <name>Genesys Uploader documentation</name>

anno-gui-macosx/pom.xml

@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>org.genesys-pgr</groupId>
 		<artifactId>anno</artifactId>
-		<version>1.2-SNAPSHOT</version>
+		<version>1.3-SNAPSHOT</version>
 	</parent>
 	<artifactId>anno-gui-macosx</artifactId>
 	<name>Anno for MacOSX</name>
@@ -12,7 +12,7 @@
 		<dependency>
 			<groupId>org.genesys-pgr</groupId>
 			<artifactId>anno-gui</artifactId>
-			<version>1.2-SNAPSHOT</version>
+			<version>1.3-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.eclipse.swt</groupId>

anno-gui-package/pom.xml

@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>org.genesys-pgr</groupId>
 		<artifactId>anno</artifactId>
-		<version>1.2-SNAPSHOT</version>
+		<version>1.3-SNAPSHOT</version>
 	</parent>
 	<artifactId>anno-gui-package</artifactId>
 	<build>
@@ -49,7 +49,7 @@
 		<dependency>
 			<groupId>org.genesys-pgr</groupId>
 			<artifactId>anno-gui</artifactId>
-			<version>1.2-SNAPSHOT</version>
+			<version>1.3-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.eclipse.swt</groupId>

anno-gui/pom.xml

@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>org.genesys-pgr</groupId>
 		<artifactId>anno</artifactId>
-		<version>1.2-SNAPSHOT</version>
+		<version>1.3-SNAPSHOT</version>
 	</parent>
 	<artifactId>anno-gui</artifactId>
 	<name>Data annotator GUI</name>

pom.xml

@@ -2,7 +2,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.genesys-pgr</groupId>
 	<artifactId>anno</artifactId>
-	<version>1.2-SNAPSHOT</version>
+	<version>1.3-SNAPSHOT</version>
 	<packaging>pom</packaging>
 	<name>Data annotator</name>