Update CI and Readme
Change-Id: Iba7c62774750c4de67bcd65e22cc68bd8284805e
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a4dbda2..a727426 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -17,10 +17,10 @@
build:
stage: build
script:
- - ./gradlew --build-cache clean test shadowJar
+ - ./gradlew --build-cache clean build
artifacts:
paths:
- - app/build/libs/korapxmltool.jar
+ - app/build/libs/korapxmltool-*.jar
cache:
key: "$CI_COMMIT_REF_NAME"
policy: push
diff --git a/Readme.md b/Readme.md
index d761074..1a987d6 100644
--- a/Readme.md
+++ b/Readme.md
@@ -13,7 +13,7 @@
## Build it yourself
```shell script
-./gradlew shadowJar
+./gradlew build
```
## Conversion to [CoNLL-U format](https://universaldependencies.org/format.html)
@@ -129,17 +129,21 @@
java -jar app/build/libs/korapxmltool.jar app/src/test/resources/wdf19.zip | docker run --rm -i korap/conllu2treetagger -l french | conllu2korapxml
```
-### Tag and lemmatize with spaCy
+### Tag and lemmatize with spaCy directly to a new KorAP-XML ZIP file
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.
```shell script
+java -jar app/build/libs/korapxmltool.jar -T4 -A "docker run -e SPACY_USE_DEPENDENCIES=False --rm -i korap/conllu2spacy:latest 2> /dev/null" -f zip ./app/src/test/resources/goe.zip
+```
+
+### Tag, lemmatize and dependency parse with spaCy directly to a new KorAP-XML ZIP file
+
+```shell script
java -jar app/build/libs/korapxmltool.jar -T4 -A "docker run -e SPACY_USE_DEPENDENCIES=True --rm -i korap/conllu2spacy:latest 2> /dev/null" -f zip ./app/src/test/resources/goe.zip
```
-## Parsing
-
-### Using the integrated Maltparser
+### Parse using the integrated Maltparser directly to a new KorAP-XML ZIP file
You need to download the pre-trained MaltParser models from the [MaltParser model repository](http://www.maltparser.org/mco/mco.html).
Note that parsers take POS tagged input.
@@ -148,6 +152,11 @@
java -jar ./app/build/libs/korapxmltool.jar -f zip -T2 -P malt:libs/german.mco goe.tree_tagger.zip
```
+### Tag with MarMoT and parse with Maltparser in one run directly to a new KorAP-XML ZIP file
+```shell script
+java -jar ./app/build/libs/korapxmltool.jar -f zip -t marmot:models/de.marmot -P malt:libs/german.mco goe.zip
+```
+
## Development and License
**Author**: