From 8266100ec23abd56c117401c1da01cabe1be0ee7 Mon Sep 17 00:00:00 2001 From: Gregor Middell Date: Sat, 14 Mar 2015 09:30:38 +0100 Subject: [PATCH] Release 1.6.1 --- changelog.txt | 3 +++ collatex-core/pom.xml | 4 ++-- collatex-tools/pom.xml | 4 ++-- pom.xml | 2 +- site/grunt/jade.js | 2 +- site/htdocs/doc/index.html | 2 +- site/htdocs/download/index.html | 4 ++-- site/htdocs/index.html | 2 +- 8 files changed, 13 insertions(+), 10 deletions(-) diff --git a/changelog.txt b/changelog.txt index e71dc079e..af5970151 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,3 +1,6 @@ +Release 1.6.1 +- JSON processing: fix regression bug due to which "tokenComparator" and "algorithm" turned into mandatory fields + Release 1.6 - new aligorithm based on Greedy String Tiling - Java 8 now required diff --git a/collatex-core/pom.xml b/collatex-core/pom.xml index 843ffde91..f6a711e8c 100644 --- a/collatex-core/pom.xml +++ b/collatex-core/pom.xml @@ -5,10 +5,10 @@ eu.interedition collatex - 1.7-SNAPSHOT + 1.6.1 collatex-core - 1.7-SNAPSHOT + 1.6.1 CollateX Core A Java library for collating textual sources, for example, to produce an apparatus. diff --git a/collatex-tools/pom.xml b/collatex-tools/pom.xml index 5e55228f5..5c2d99de0 100644 --- a/collatex-tools/pom.xml +++ b/collatex-tools/pom.xml @@ -5,10 +5,10 @@ eu.interedition collatex - 1.7-SNAPSHOT + 1.6.1 collatex-tools - 1.7-SNAPSHOT + 1.6.1 CollateX Tools CollateX Tool Suite including a command line interface and a HTTP service diff --git a/pom.xml b/pom.xml index a60af0f48..b121d4ca2 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 eu.interedition collatex - 1.7-SNAPSHOT + 1.6.1 pom CollateX Software for collating textual sources, for example, to produce an apparatus. diff --git a/site/grunt/jade.js b/site/grunt/jade.js index 07eac0fa3..a361f22b8 100644 --- a/site/grunt/jade.js +++ b/site/grunt/jade.js @@ -7,7 +7,7 @@ module.exports = { ext: '.html', options: { data: { - version: "1.6" + version: "1.6.1" } } } diff --git a/site/htdocs/doc/index.html b/site/htdocs/doc/index.html index f411bf7ea..c3d43af6f 100644 --- a/site/htdocs/doc/index.html +++ b/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()'

ECMA/JavaScript Callbacks

The RESTful Web Service

java -jar collatex-tools-1.6.jar --http

The CollateX service is callable via + '//text()'

ECMA/JavaScript Callbacks

The RESTful Web Service

java -jar collatex-tools-1.6.1.jar --http

The CollateX service is callable via HTTP POST requests to /collate.

It expects input formatted in JavaScript Object Notation (JSON) as the request body; diff --git a/site/htdocs/download/index.html b/site/htdocs/download/index.html index f04828a32..10adb406e 100644 --- a/site/htdocs/download/index.html +++ b/site/htdocs/download/index.html @@ -5,8 +5,8 @@

1. Core

For embedding CollateX into your JVM-based application, please use Maven Central:

<dependency>
   <groupId>eu.interedition</groupId>
   <artifactId>collatex-core</artifactId>
-  <version>1.6</version>
-</dependency>

2. Tools

For using CollateX as a standalone tool, please download the following Java Archive and execute it on the command line:

» collatex-tools-1.6.jar

java -jar collatex-tools-1.6.jar -h

Depending on how you would like to use CollateX, you can opt for two ways to download it:

  1. Should you target the Java Virtual Machine as your runtime environment and would like to embed CollateX + <version>1.6.1</version> +</dependency>

    2. Tools

    For using CollateX as a standalone tool, please download the following Java Archive and execute it on the command line:

    » collatex-tools-1.6.1.jar

    java -jar collatex-tools-1.6.1.jar -h

    Depending on how you would like to use CollateX, you can opt for two ways to download it:

    1. Should you target the Java Virtual Machine as your runtime environment and would like to embed CollateX in your application, we provide Apache-Maven-compatible artifacts of CollateX' core for download.
    2. 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 tool suite comprised of a diff --git a/site/htdocs/index.html b/site/htdocs/index.html index 47c1b2985..76cdc0f19 100644 --- a/site/htdocs/index.html +++ b/site/htdocs/index.html @@ -8,5 +8,5 @@ of Textual Criticism where the assessment of findings is based on interpretation and therefore can be supported by computational means but is not necessarily computable. -

      Latest Version

      » collatex-tools-1.6.jar

      Please refer to the documentation for detailed information +

      Latest Version

      » collatex-tools-1.6.1.jar

      Please refer to the documentation for detailed information about CollateX like its underlying concepts or usage instructions.

      For alternative packages and license terms, please read the download section.

      Variant Graph

      Snippet of a Variant Graph produced by CollateX

      Fork me on GitHub \ No newline at end of file