From 0d0ba71bf4b6953ccb4670c8643a64a3b9840605 Mon Sep 17 00:00:00 2001 From: Gregor Middell Date: Thu, 17 Dec 2015 12:41:42 +0100 Subject: [PATCH] Release of version 1.7.1 --- RELEASE-HOWTO.md | 6 +++++- changelog.txt | 3 +++ collatex-core/pom.xml | 4 ++-- collatex-servlet/pom.xml | 2 +- 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 +- 10 files changed, 19 insertions(+), 12 deletions(-) diff --git a/RELEASE-HOWTO.md b/RELEASE-HOWTO.md index 42b134908..438138d29 100644 --- a/RELEASE-HOWTO.md +++ b/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 diff --git a/changelog.txt b/changelog.txt index 2aef7c519..5aa3d5984 100644 --- a/changelog.txt +++ b/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 diff --git a/collatex-core/pom.xml b/collatex-core/pom.xml index 130216c31..89cd9a8fc 100644 --- a/collatex-core/pom.xml +++ b/collatex-core/pom.xml @@ -4,10 +4,10 @@ eu.interedition collatex - 1.7.1-SNAPSHOT + 1.7.1 collatex-core - 1.7.1-SNAPSHOT + 1.7.1 CollateX Core A Java library for collating textual sources, for example, to produce an apparatus. diff --git a/collatex-servlet/pom.xml b/collatex-servlet/pom.xml index f790ed03e..2decd28dd 100644 --- a/collatex-servlet/pom.xml +++ b/collatex-servlet/pom.xml @@ -3,7 +3,7 @@ eu.interedition collatex - 1.7.1-SNAPSHOT + 1.7.1 collatex-servlet CollateX Servlet diff --git a/collatex-tools/pom.xml b/collatex-tools/pom.xml index f7db4f9fb..ddcba840d 100644 --- a/collatex-tools/pom.xml +++ b/collatex-tools/pom.xml @@ -4,10 +4,10 @@ eu.interedition collatex - 1.7.1-SNAPSHOT + 1.7.1 collatex-tools - 1.7.1-SNAPSHOT + 1.7.1 CollateX Tools CollateX Tool Suite including a command line interface and a HTTP service diff --git a/pom.xml b/pom.xml index b1f9be6ae..3f35afced 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 eu.interedition collatex - 1.7.1-SNAPSHOT + 1.7.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 2f036d6f5..d812a3251 100644 --- a/site/grunt/jade.js +++ b/site/grunt/jade.js @@ -7,7 +7,7 @@ module.exports = { ext: '.html', options: { data: { - version: "1.7.0" + version: "1.7.1" } } } diff --git a/site/htdocs/doc/index.html b/site/htdocs/doc/index.html index c95658518..3898ddc50 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.7.0.jar --http

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

ECMA/JavaScript Callbacks

The RESTful Web Service

java -jar collatex-tools-1.7.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 18b2c4807..c9d05b42e 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.7.0</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.7.0.jar

java -jar collatex-tools-1.7.0.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.7.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.7.1.jar

    java -jar collatex-tools-1.7.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 a9e3c2aa7..38b3e45a3 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.7.0.jar

      Please refer to the documentation for detailed information +

      Latest Version

      » collatex-tools-1.7.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