From cb775f8e88421db60cbb64dfdcbfc0c434630967 Mon Sep 17 00:00:00 2001
From: Gregor Middell <gregor@middell.net>
Date: Sat, 21 Feb 2015 13:13:07 +0100
Subject: [PATCH] Release 1.6

---
 changelog.txt          | 10 +++++++++-
 collatex-core/pom.xml  |  4 ++--
 collatex-tools/pom.xml |  4 ++--
 pom.xml                |  2 +-
 4 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/changelog.txt b/changelog.txt
index 60a51116c..e71dc079e 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,11 @@
+Release 1.6
+- new aligorithm based on Greedy String Tiling
+- Java 8 now required
+- provide our own implementation of variant graphs
+- remove optional and seldomly used integrations with Neo4j and Apache Cocoon
+- turn collatex-core into a self-contained library, independent of other components
+- package collatex-tools as a self-contained, shaded JAR
+
 Release 1.5.1
 - Extended the normalization in the javascript alignment table rendering to not only trim
  whitespace but also lowercase the tokens.
@@ -8,7 +16,7 @@ Release 1.5
 - Feature: Punctuation is now treated as separate tokens by default in the web-service and command-line tool.
 - Transposition limiter is moved from the Transposition Detector class to the DekkerAlgorithm class.
 - The transposition detector is rewritten. It no longer works from left to right, but from largest
- moved distance to smallest moved distance. This improves the alignment result in case of longer witnesses. 
+ moved distance to smallest moved distance. This improves the alignment result in case of longer witnesses.
 - Improved handling of competing blocks of text in the IslandConflictResolver.
 - Fix: When splitting island in the IslandConflictResolver resulting islands were only
 kept if there were of size two and up. Now they are kept if they are of size one and up.
diff --git a/collatex-core/pom.xml b/collatex-core/pom.xml
index 0ff4e14be..c4ddb7337 100644
--- a/collatex-core/pom.xml
+++ b/collatex-core/pom.xml
@@ -5,10 +5,10 @@
     <parent>
         <groupId>eu.interedition</groupId>
         <artifactId>collatex</artifactId>
-        <version>1.5.2-SNAPSHOT</version>
+        <version>1.6</version>
     </parent>
     <artifactId>collatex-core</artifactId>
-    <version>1.5.2-SNAPSHOT</version>
+    <version>1.6</version>
     <name>CollateX Core</name>
     <description>A Java library for collating textual sources, for example, to produce an apparatus.</description>
 </project>
diff --git a/collatex-tools/pom.xml b/collatex-tools/pom.xml
index ba33dac9d..becb8c591 100644
--- a/collatex-tools/pom.xml
+++ b/collatex-tools/pom.xml
@@ -5,10 +5,10 @@
     <parent>
         <groupId>eu.interedition</groupId>
         <artifactId>collatex</artifactId>
-        <version>1.5.2-SNAPSHOT</version>
+        <version>1.6</version>
     </parent>
     <artifactId>collatex-tools</artifactId>
-    <version>1.5.2-SNAPSHOT</version>
+    <version>1.6</version>
     <name>CollateX Tools</name>
     <description>CollateX Tool Suite including a command line interface and a HTTP service</description>
     <dependencies>
diff --git a/pom.xml b/pom.xml
index 81c0fe897..069693cd6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>eu.interedition</groupId>
     <artifactId>collatex</artifactId>
-    <version>1.5.2-SNAPSHOT</version>
+    <version>1.6</version>
     <packaging>pom</packaging>
     <name>CollateX</name>
     <description>Software for collating textual sources, for example, to produce an apparatus.</description>