From a738640b8b57a764af943c95af97d4cf5b9d9d57 Mon Sep 17 00:00:00 2001
From: Tim Bernhard <tim@bernhard-webstudio.ch>
Date: Sun, 13 Sep 2020 19:19:18 +0200
Subject: [PATCH] Update changelog to publish Version v1.1.4

---
 CHANGELOG.md | 30 ++++++++++++++++++++++++++++++
 pom.xml      |  2 +-
 2 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e69de29..749d911 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -0,0 +1,30 @@
+# Changelog
+
+## v1.1.4
+* [[`2aac2b6ac9`](https://github.com/BernhardWebstudio/DataShot_DesktopApp/commit/2aac2b6ac9)] - Fix tests (Tim Bernhard)
+* [[`ff5dcc17dd`](https://github.com/BernhardWebstudio/DataShot_DesktopApp/commit/ff5dcc17dd)] - Use memoization to speed up generation of scientific names on long taxon list (Tim Bernhard)
+* [[`0b5ef818b5`](https://github.com/BernhardWebstudio/DataShot_DesktopApp/commit/0b5ef818b5)] - Adjust test matrix (Tim Bernhard)
+* [[`17e47b515f`](https://github.com/BernhardWebstudio/DataShot_DesktopApp/commit/17e47b515f)] - Use BoofCV for QR Codes in attempt to compress them (Tim Bernhard)
+* [[`d879cd2c98`](https://github.com/BernhardWebstudio/DataShot_DesktopApp/commit/d879cd2c98)] - Add id-Date field (Tim Bernhard)
+* [[`98c9b19010`](https://github.com/BernhardWebstudio/DataShot_DesktopApp/commit/98c9b19010)] - Fix tests (Tim Bernhard)
+* [[`39c51e1e16`](https://github.com/BernhardWebstudio/DataShot_DesktopApp/commit/39c51e1e16)] - Slight speed improvement by using StringBuilder instead of Buffer (Tim Bernhard)
+* [[`859ce0364e`](https://github.com/BernhardWebstudio/DataShot_DesktopApp/commit/859ce0364e)] - Remove unused files (Tim Bernhard)
+* [[`8562df71a9`](https://github.com/BernhardWebstudio/DataShot_DesktopApp/commit/8562df71a9)] - Reduce to one log file only. Add indices (Tim Bernhard)
+* [[`403c99550a`](https://github.com/BernhardWebstudio/DataShot_DesktopApp/commit/403c99550a)] - Correct Look & Feel to be native, analogous to DataShot (Tim Bernhard)
+* [[`412dddfdf6`](https://github.com/BernhardWebstudio/DataShot_DesktopApp/commit/412dddfdf6)] - Remove ignored file: log (Tim Bernhard)
+* [[`8f7391f886`](https://github.com/BernhardWebstudio/DataShot_DesktopApp/commit/8f7391f886)] - Potentially fix prerelease builds (Tim Bernhard)
+* [[`2a42d08968`](https://github.com/BernhardWebstudio/DataShot_DesktopApp/commit/2a42d08968)] - Fix tests (Tim Bernhard)
+* [[`edb2c4cd54`](https://github.com/BernhardWebstudio/DataShot_DesktopApp/commit/edb2c4cd54)] - Implement 'Sex' field for ETHZ & Remove ignored files (Tim Bernhard)
+* [[`69d9d8cce7`](https://github.com/BernhardWebstudio/DataShot_DesktopApp/commit/69d9d8cce7)] - Merge branch 'master' of github.com:BernhardWebstudio/PreCapture into master (Tim Bernhard)
+* [[`bf445a1357`](https://github.com/BernhardWebstudio/DataShot_DesktopApp/commit/bf445a1357)] - Get project compiling with new dependencies (Tim Bernhard)
+* [[`a6d5ff1026`](https://github.com/BernhardWebstudio/DataShot_DesktopApp/commit/a6d5ff1026)] - Upgrade to compatible version of pdfbox (1.8.16) without security vulnerability (Althea Parker)
+* [[`93b62949dd`](https://github.com/BernhardWebstudio/DataShot_DesktopApp/commit/93b62949dd)] - Move files to Entocoll Repository (Althea Parker)
+* [[`d43d7796e6`](https://github.com/BernhardWebstudio/DataShot_DesktopApp/commit/d43d7796e6)] - **ISSUE**: PURPOSE: Updating pdfbox version. DESCRIPTION: Switching to 1.8.16 pdfbox. (Paul J. Morris)
+* [[`141344181a`](https://github.com/BernhardWebstudio/DataShot_DesktopApp/commit/141344181a)] - **ISSUE**: PURPOSE: Updating pdfbox version. DESCRIPTION: Switching from 1.7 to newer 1.8.12 pdfbox. (Paul J. Morris)
+* [[`11832adaac`](https://github.com/BernhardWebstudio/DataShot_DesktopApp/commit/11832adaac)] - **ISSUE**: PURPOSE: Address build problems where javax.xml.bind isn't available in the java-se classpath. DESCRIPTION: Incrementing version to 1.1.3-SNAPSHOT, changing target build level to java 8, adding dependencies for java xml binding (removed from java-se in java 11, just in java-ee) to the pom. (Paul J. Morris)
+* [[`57006cfdd5`](https://github.com/BernhardWebstudio/DataShot_DesktopApp/commit/57006cfdd5)] - Fix for sp. (parkera)
+* [[`13dd35cb1b`](https://github.com/BernhardWebstudio/DataShot_DesktopApp/commit/13dd35cb1b)] - Set default print setting configuration (parkera)
+* [[`24e807e096`](https://github.com/BernhardWebstudio/DataShot_DesktopApp/commit/24e807e096)] - Swapped values infraspecificRank and infraspecificEpithet (parkera)
+* [[`f3c8c6eca8`](https://github.com/BernhardWebstudio/DataShot_DesktopApp/commit/f3c8c6eca8)] - Quadrinomials fix (parkera)
+* [[`324d699962`](https://github.com/BernhardWebstudio/DataShot_DesktopApp/commit/324d699962)] - initial commit (parkera)
+* [[`c24712fd9b`](https://github.com/BernhardWebstudio/DataShot_DesktopApp/commit/c24712fd9b)] - **ISSUE**: PURPOSE: Merging readme files. DESCRIPTION: Merging into markdown README.md, reflecting move of repository from svn in SourceForge to git in github. (Paul J. Morris)
diff --git a/pom.xml b/pom.xml
index a3b5e1d..b0f2f8e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>MCZDataShot</groupId>
 	<artifactId>PreCaptureApp</artifactId>
-	<version>1.1.4-SNAPSHOT</version>
+	<version>1.1.4</version>
 	<name>precapture</name>
 	<description>MCZ DataShot Collection Precapture Label Application</description>
 	<packaging>jar</packaging>