Release of version 1.7.1

RELEASE-HOWTO.md

@@ -27,7 +27,11 @@ Edit `changelog.txt`.
 
     mvn versions:set -DnewVersion=1.2.3
 
-Edit `site/grunt/jade.js` and update `dist.options.data.version`.
+Edit `site/grunt/jade.js`, update `dist.options.data.version` and regenerate site via
+
+    grunt deploy
+
+from the `site/` directory.
 
 ## Deploy artifacts to staging area
 

changelog.txt

@@ -1,3 +1,6 @@
+Release 1.7.1
+- Bug fix for the "non progressive alignment" exception in the command-line tool
+
 Release 1.7
 - Major rewrite of the matching phase of the Dekker algorithm. The MatchTable approach used in versions 1.2 - 1.6 of
  CollateX would match the tokens of the witness to be aligned against the tokens present on the vertices of the variant

collatex-core/pom.xml

@@ -4,10 +4,10 @@
     <parent>
         <groupId>eu.interedition</groupId>
         <artifactId>collatex</artifactId>
-        <version>1.7.1-SNAPSHOT</version>
+        <version>1.7.1</version>
     </parent>
     <artifactId>collatex-core</artifactId>
-    <version>1.7.1-SNAPSHOT</version>
+    <version>1.7.1</version>
     <name>CollateX Core</name>
     <description>A Java library for collating textual sources, for example, to produce an apparatus.</description>
 </project>

collatex-servlet/pom.xml

@@ -3,7 +3,7 @@
   <parent>
     <groupId>eu.interedition</groupId>
     <artifactId>collatex</artifactId>
-    <version>1.7.1-SNAPSHOT</version>
+    <version>1.7.1</version>
   </parent>
   <artifactId>collatex-servlet</artifactId>
   <name>CollateX Servlet</name> 

collatex-tools/pom.xml

@@ -4,10 +4,10 @@
     <parent>
         <groupId>eu.interedition</groupId>
         <artifactId>collatex</artifactId>
-        <version>1.7.1-SNAPSHOT</version>
+        <version>1.7.1</version>
     </parent>
     <artifactId>collatex-tools</artifactId>
-    <version>1.7.1-SNAPSHOT</version>
+    <version>1.7.1</version>
     <name>CollateX Tools</name>
     <description>CollateX Tool Suite including a command line interface and a HTTP service</description>
     <dependencies>

pom.xml

@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>eu.interedition</groupId>
     <artifactId>collatex</artifactId>
-    <version>1.7.1-SNAPSHOT</version>
+    <version>1.7.1</version>
     <packaging>pom</packaging>
     <name>CollateX</name>
     <description>Software for collating textual sources, for example, to produce an apparatus.</description>

site/grunt/jade.js

@@ -7,7 +7,7 @@ module.exports = {
         ext: '.html',
         options: {
             data: {
-                version: "1.7.0"
+                version: "1.7.1"
             }
         }
     }

site/htdocs/doc/index.html

@@ -388,7 +388,7 @@
                                           documents
   -xp,--xpath <arg>                       XPath 1.0 expression evaluating to
                                           tokens of XML witnesses; default:
-                                          '//text()'</pre><h3 id="cli-js-callbacks">ECMA/JavaScript Callbacks</h3><h2 id="rest-service">The RESTful Web Service</h2><pre class="prettyprint lang-xml">java -jar collatex-tools-1.7.0.jar --http</pre><p>The CollateX service is callable via
+                                          '//text()'</pre><h3 id="cli-js-callbacks">ECMA/JavaScript Callbacks</h3><h2 id="rest-service">The RESTful Web Service</h2><pre class="prettyprint lang-xml">java -jar collatex-tools-1.7.1.jar --http</pre><p>The CollateX service is callable via
 <a href="http://www.w3.org/Protocols/rfc2616/rfc2616-sec9.html" title="RFC">HTTP POST requests</a> to
 <a href="${cp}/collate" title="REST-API Endpoint">/collate</a>.
 </p><p>It expects <strong>input</strong> formatted in <a href="http://json.org/" title="Website">JavaScript Object Notation (JSON)</a> as the request body;

site/htdocs/download/index.html

@@ -5,8 +5,8 @@
 </p><div class="yui3-g"><div class="yui3-u-1-2"><div class="content download-option"><h3>1. Core</h3><p>For embedding CollateX into your JVM-based application, please use <a href="http://search.maven.org/" title="Maven Central">Maven Central</a>:</p><pre class="prettyprint">&lt;dependency>
   &lt;groupId>eu.interedition&lt;/groupId>
   &lt;artifactId>collatex-core&lt;/artifactId>
-  &lt;version>1.7.0&lt;/version>
-&lt;/dependency></pre></div></div><div class="yui3-u-1-2"><div class="content download-option"><h3>2. Tools</h3><p>For using CollateX as a standalone tool, please download the following <a href="http://en.wikipedia.org/wiki/JAR_%28file_format%29" title="Java Archive - Wikipedia">Java Archive</a> and execute it on the command line:</p><p class="download-link">» <a href="https://oss.sonatype.org/service/local/repositories/releases/content/eu/interedition/collatex-tools/1.7.0/collatex-tools-1.7.0.jar">collatex-tools-1.7.0.jar</a></p><pre class="prettyprint lang-xml">java -jar collatex-tools-1.7.0.jar -h</pre></div></div><div class="yui3-u-1-2"><div class="content"></div></div></div><p>Depending on how you would like to use CollateX, you can opt for two ways to download it:</p><ol><li>Should you target the <em>Java Virtual Machine</em> as your runtime environment and would like to <strong>embed CollateX</strong>
+  &lt;version>1.7.1&lt;/version>
+&lt;/dependency></pre></div></div><div class="yui3-u-1-2"><div class="content download-option"><h3>2. Tools</h3><p>For using CollateX as a standalone tool, please download the following <a href="http://en.wikipedia.org/wiki/JAR_%28file_format%29" title="Java Archive - Wikipedia">Java Archive</a> and execute it on the command line:</p><p class="download-link">» <a href="https://oss.sonatype.org/service/local/repositories/releases/content/eu/interedition/collatex-tools/1.7.1/collatex-tools-1.7.1.jar">collatex-tools-1.7.1.jar</a></p><pre class="prettyprint lang-xml">java -jar collatex-tools-1.7.1.jar -h</pre></div></div><div class="yui3-u-1-2"><div class="content"></div></div></div><p>Depending on how you would like to use CollateX, you can opt for two ways to download it:</p><ol><li>Should you target the <em>Java Virtual Machine</em> as your runtime environment and would like to <strong>embed CollateX</strong>
 in your application, we provide <a href="http://maven.apache.org/" title="Homepage">Apache-Maven</a>-compatible artifacts of
 CollateX' core for download.</li><li>Should you be in need for a collation component that integrates with your software system independent of its
 runtime and development environment, we offer a <strong>tool suite</strong> comprised of a

site/htdocs/index.html

@@ -8,5 +8,5 @@
 of <a href="http://en.wikipedia.org/wiki/Textual_criticism" title="Wikipedia Article">Textual Criticism</a> where the assessment
 of findings is based on interpretation and therefore can be supported by computational means but is not necessarily
 computable.
-</p></div></div><div class="yui3-u-1-2"><div class="content"><div class="download-option"><h3>Latest Version</h3><p class="download-link">» <a href="https://oss.sonatype.org/service/local/repositories/releases/content/eu/interedition/collatex-tools/1.7.0/collatex-tools-1.7.0.jar">collatex-tools-1.7.0.jar</a></p><p>Please refer to the <a href="/doc/" title="Documentation">documentation</a> for detailed information
+</p></div></div><div class="yui3-u-1-2"><div class="content"><div class="download-option"><h3>Latest Version</h3><p class="download-link">» <a href="https://oss.sonatype.org/service/local/repositories/releases/content/eu/interedition/collatex-tools/1.7.1/collatex-tools-1.7.1.jar">collatex-tools-1.7.1.jar</a></p><p>Please refer to the <a href="/doc/" title="Documentation">documentation</a> for detailed information
 about CollateX like its underlying concepts or usage instructions.</p><p>For alternative packages and license terms, please read the <a href="/download/" title="Download">download section</a>.</p></div><div style="margin: 1em 0" class="figure"><img src="/images/variant-graph-snippet.png" alt="Variant Graph"><p class="caption">Snippet of a Variant Graph produced by CollateX</p></div></div></div></div></div><div id="footer">Copyright &copy; 2010-2013 <a href="/about/">The Interedition Development Group</a>. All rights reserved.</div><a href="https://github.com/interedition/collatex"><img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_gray_6d6d6d.png" alt="Fork me on GitHub"></a><script type="text/javascript" src="http://yui.yahooapis.com/combo?3.8.1/build/yui-base/yui-base-min.js&amp;3.8.1/build/oop/oop-min.js&amp;3.8.1/build/event-custom-base/event-custom-base-min.js&amp;3.8.1/build/features/features-min.js&amp;3.8.1/build/dom-core/dom-core-min.js&amp;3.8.1/build/dom-base/dom-base-min.js&amp;3.8.1/build/selector-native/selector-native-min.js&amp;3.8.1/build/selector/selector-min.js&amp;3.8.1/build/node-core/node-core-min.js&amp;3.8.1/build/node-base/node-base-min.js&amp;3.8.1/build/event-base/event-base-min.js&amp;3.8.1/build/event-delegate/event-delegate-min.js&amp;3.8.1/build/node-event-delegate/node-event-delegate-min.js&amp;3.8.1/build/pluginhost-base/pluginhost-base-min.js&amp;3.8.1/build/pluginhost-config/pluginhost-config-min.js&amp;3.8.1/build/node-pluginhost/node-pluginhost-min.js&amp;3.8.1/build/dom-style/dom-style-min.js&amp;3.8.1/build/dom-screen/dom-screen-min.js&amp;3.8.1/build/node-screen/node-screen-min.js&amp;3.8.1/build/node-style/node-style-min.js&amp;3.8.1/build/event-custom-complex/event-custom-complex-min.js&amp;3.8.1/build/event-synthetic/event-synthetic-min.js"></script><script type="text/javascript" src="http://yui.yahooapis.com/combo?3.8.1/build/event-mousewheel/event-mousewheel-min.js&amp;3.8.1/build/event-mouseenter/event-mouseenter-min.js&amp;3.8.1/build/event-key/event-key-min.js&amp;3.8.1/build/event-focus/event-focus-min.js&amp;3.8.1/build/event-resize/event-resize-min.js&amp;3.8.1/build/event-hover/event-hover-min.js&amp;3.8.1/build/event-outside/event-outside-min.js&amp;3.8.1/build/event-touch/event-touch-min.js&amp;3.8.1/build/event-move/event-move-min.js&amp;3.8.1/build/event-flick/event-flick-min.js&amp;3.8.1/build/event-valuechange/event-valuechange-min.js&amp;3.8.1/build/event-tap/event-tap-min.js"></script><script type="text/javascript" src="/collatex.js"></script></body></html>