Bump version to v3.1.0-rc1
Change-Id: I7dca20ef063f6347b04c071575bb01f87955f9c1
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6d6c247..09c55f9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,15 @@
# Changelog
+## [v3.1.0-rc1] - 2025-12-01
+
+### Fixed
+
+- `-o` option for CoNLL-U output
+
+### Added
+
+- integrated support for TreeTagger (`-T treetagger`) and spaCy (`-T spacy`) annotations
+
## [v3.0.0] - 2025-11-27
### Fixed
diff --git a/Readme.md b/Readme.md
index af21c59..99d37f5 100644
--- a/Readme.md
+++ b/Readme.md
@@ -41,9 +41,9 @@
the executable `korapxmltool`, as well as the symbolic link shortcuts `korapxml2conllu` and `korapxml2krill`, will
be available at `./build/bin/`.
-## Command Line Options (v3.0)
+## Command Line Options (v3.1)
-Key options for korapxmltool v3.0:
+Key options for korapxmltool v3.1:
- `-t FORMAT`, `--to FORMAT`: Output format (`zip`, `conllu`, `w2v`, `now`, `krill`)
- `-j N`, `--jobs N`, `--threads N`: Number of threads/jobs to use
@@ -181,25 +181,26 @@
./build/bin/korapxmltool -t zip -T opennlp:/usr/local/kl/korap/Ingestion/lib/models/opennlp/de-pos-maxent.bin /tmp/zca24.zip
```
-### Tag and lemmatize with TreeTagger
+### Tag and lemmatize with integrated TreeTagger
+
+(Requires Docker)
```shell script
-./build/bin/korapxmltool -A "docker run --rm -i korap/conllu-treetagger -l french" -t zip app/src/test/resources/wdf19.zip
+./build/bin/korapxmltool -T treetagger:german -t zip app/src/test/resources/wdf19.zip
```
See [TreeTagger Docker Image with CoNLL-U Support](https://github.com/KorAP/conllu-treetagger-docker).
-### Tag and lemmatize with spaCy directly to a new KorAP-XML ZIP file
+### Tag and lemmatize with integrated spaCy to CoNLL-U
-This requires the [spaCy Docker Image with CoNLL-U Support](https://gitlab.ids-mannheim.de/KorAP/sota-pos-lemmatizers) and is only available for German.
-
+(Requires Docker)
```shell script
-./build/bin/korapxmltool -j4 -A "docker run -e SPACY_USE_DEPENDENCIES=False --rm -i korap/conllu2spacy:latest" -t zip ./app/src/test/resources/goe.zip
+./build/bin/korapxmltool -j 1 -T spacy ./app/src/test/resources/goe.zip | less
```
### Tag, lemmatize and dependency parse with spaCy directly to a new KorAP-XML ZIP file
```shell script
-./build/bin/korapxmltool -j4 -A "docker run -e SPACY_USE_DEPENDENCIES=True --rm -i korap/conllu2spacy:latest" -t zip ./app/src/test/resources/goe.zip
+./build/bin/korapxmltool -P spacy -t zip ./app/src/test/resources/goe.zip
```
### Tag, lemmatize and constituency parse with CoreNLP (3.X) directly to a new KorAP-XML ZIP file
diff --git a/app/src/main/kotlin/de/ids_mannheim/korapxmltools/KorapXmlTool.kt b/app/src/main/kotlin/de/ids_mannheim/korapxmltools/KorapXmlTool.kt
index 01cf7dc..646980c 100644
--- a/app/src/main/kotlin/de/ids_mannheim/korapxmltools/KorapXmlTool.kt
+++ b/app/src/main/kotlin/de/ids_mannheim/korapxmltools/KorapXmlTool.kt
@@ -61,7 +61,7 @@
@Command(
name = "korapxmltool",
mixinStandardHelpOptions = true,
- version = ["korapxmltool v3.0.0"],
+ version = ["korapxmltool v3.1.0-rc1"],
usageHelpAutoWidth = false,
usageHelpWidth = 200,
description = ["Converts between KorAP-XML ZIP format and formats like CoNLL-U, Krill, word2vec, NOW\n"+
diff --git a/build.gradle b/build.gradle
index f905e80..5574fe3 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,4 +5,4 @@
}
// Zentrale Projektversion für korapxmltool
-version = '3.0.0'
+version = '3.1.0-rc1'