From 31fec42c0b6f09c51a0fd9a6bb0bf6af6db0b385 Mon Sep 17 00:00:00 2001 From: Thomas Krause Date: Fri, 17 Apr 2026 15:50:52 +0200 Subject: [PATCH 1/4] Update to graphANNIS 4.1.3 --- CHANGELOG.md | 5 +++++ pom.xml | 10 +++++----- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b6a8d43548..ba9f67cc62 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,11 @@ ANNIS is a frontend to the graphANNIS webservice, which has its [own changelog]( ## [Unreleased] +### Fixed + +- Update to graphANNIS 4.1.3 which includes a bugfix for including token in subgraph even if the + token is not covered by a segmentation node + ## [4.15.1] - 2025-10-10 ### Fixed diff --git a/pom.xml b/pom.xml index 160ca6085e..10c17d138b 100644 --- a/pom.xml +++ b/pom.xml @@ -39,7 +39,7 @@ 8.14.3 true org.corpus_tools.annis.gui.AnnisUiApplication - 4.0.1 + 4.1.3 4.7.2 server 1.5.24 @@ -261,7 +261,7 @@ https://github.com/korpling/graphANNIS/releases/download/v${graphannis.version}/graphannis-webservice-x86_64-unknown-linux-gnu.tar.xz ${project.build.directory}/native/ - bbd0a6456f24c1b6594e569267302f54a142775b86ff63d2d9e4ea3b12f835de + b64c63cf721ed40c9e59dd7cba464f9ede588a2d3ae544b889e67228b6e9c7a7 true @@ -276,7 +276,7 @@ https://github.com/korpling/graphANNIS/releases/download/v${graphannis.version}/graphannis-webservice-x86_64-pc-windows-msvc.zip ${project.build.directory}/native/win32-x86-64/ - 3d553737863c3dabf9fc80cbdec3aa3b909b42616ca75baa93547b24e79672df + 3c3a259999e6b988836ee42f301364fcc4b9da995eeb4e0bab29b05523e3cb81 true @@ -291,7 +291,7 @@ https://github.com/korpling/graphANNIS/releases/download/v${graphannis.version}/graphannis-webservice-aarch64-apple-darwin.tar.xz ${project.build.directory}/native/ - 9c7a7bb65b3467a77330fa04856bc1169213b0c34584db6bd52ef9bc4f12d990 + 0595e02f2446315564a22982803cf05dbd6ebe4f055c6ebf0f7674e952dfd97f true @@ -306,7 +306,7 @@ https://github.com/korpling/graphANNIS/releases/download/v${graphannis.version}/graphannis-webservice-x86_64-apple-darwin.tar.xz ${project.build.directory}/native/ - 659258a57a8c175910e1c3120211e732d5909a1e1cd57e822289c0535be20d9f + 92adb2cd4e548a4316f8c6960073a5b931aa2bcf913f1e493a511195f54a90b7 true From 8e633f6309eb474e3c5bc6d7d9aa4bb6b594a42c Mon Sep 17 00:00:00 2001 From: Thomas Krause Date: Fri, 17 Apr 2026 15:54:06 +0200 Subject: [PATCH 2/4] Remove unused multilingual configuration variable and recompile documentation with mdbook v0.5.2 --- .github/workflows/deploy.yml | 2 +- .github/workflows/test.yml | 2 +- docs/developer-guide/book.toml | 1 - docs/online-help/book.toml | 1 - docs/user-guide/book.toml | 1 - src/main/webapp/VAADIN/help/404.html | 108 +- .../help/FontAwesome/css/font-awesome.css | 4 - .../help/FontAwesome/fonts/FontAwesome.ttf | Bin 165548 -> 0 bytes .../FontAwesome/fonts/fontawesome-webfont.eot | Bin 165742 -> 0 bytes .../FontAwesome/fonts/fontawesome-webfont.svg | 2671 ----------------- .../FontAwesome/fonts/fontawesome-webfont.ttf | Bin 165548 -> 0 bytes .../fonts/fontawesome-webfont.woff | Bin 98024 -> 0 bytes .../fonts/fontawesome-webfont.woff2 | Bin 77160 -> 0 bytes .../webapp/VAADIN/help/aql/annotations.html | 120 +- .../VAADIN/help/aql/compatibility-mode.html | 114 +- src/main/webapp/VAADIN/help/aql/export.html | 130 +- .../webapp/VAADIN/help/aql/frequency.html | 128 +- src/main/webapp/VAADIN/help/aql/index.html | 116 +- src/main/webapp/VAADIN/help/aql/negation.html | 118 +- .../webapp/VAADIN/help/aql/operators.html | 177 +- src/main/webapp/VAADIN/help/aql/pointing.html | 142 +- src/main/webapp/VAADIN/help/aql/regex.html | 152 +- src/main/webapp/VAADIN/help/aql/trees.html | 126 +- .../webapp/VAADIN/help/aql/word-forms.html | 134 +- ...ghlight.css => ayu-highlight-3fdfc3ac.css} | 1 - .../VAADIN/help/{book.js => book-a0b12cfe.js} | 72 +- ...board.min.js => clipboard-1626706a.min.js} | 0 .../css/{chrome.css => chrome-ae938929.css} | 153 +- .../css/{general.css => general-2459343d.css} | 132 +- .../css/{print.css => print-9e4910d8.css} | 8 +- .../{variables.css => variables-8adf115d.css} | 52 + ...unr.min.js => elasticlunr-ef4e11c1.min.js} | 0 .../{favicon.png => favicon-8114d1fc.png} | Bin .../{favicon.svg => favicon-de23e50b.svg} | 0 .../fonts/{fonts.css => fonts-9644e21d.css} | 22 +- ...-sans-v17-all-charsets-300-7736aa35.woff2} | Bin ...v17-all-charsets-300italic-2c7b95c0.woff2} | Bin ...-sans-v17-all-charsets-600-486c6759.woff2} | Bin ...v17-all-charsets-600italic-1a3e8659.woff2} | Bin ...-sans-v17-all-charsets-700-c22fe8c7.woff2} | Bin ...v17-all-charsets-700italic-238ae959.woff2} | Bin ...-sans-v17-all-charsets-800-3d2c812a.woff2} | Bin ...v17-all-charsets-800italic-ba1521ec.woff2} | Bin ...ns-v17-all-charsets-italic-6c9463f7.woff2} | Bin ...s-v17-all-charsets-regular-2e3b1d34.woff2} | Bin ...e-pro-v11-all-charsets-500-2bdd9410.woff2} | Bin .../{highlight.css => highlight-493f70e1.css} | 0 .../{highlight.js => highlight-abc7f01d.js} | 0 src/main/webapp/VAADIN/help/index.html | 112 +- .../webapp/VAADIN/help/interface/index.html | 118 +- .../VAADIN/help/interface/query-builder.html | 128 +- .../VAADIN/help/interface/result-window.html | 122 +- .../VAADIN/help/interface/search-form.html | 132 +- .../{mark.min.js => mark-09e88c2c.min.js} | 0 src/main/webapp/VAADIN/help/print.html | 378 +-- .../{searcher.js => searcher-c2a407aa.js} | 25 +- .../VAADIN/help/searchindex-eb721271.js | 1 + src/main/webapp/VAADIN/help/searchindex.js | 1 - src/main/webapp/VAADIN/help/toc-51bdbdf8.js | 454 +++ src/main/webapp/VAADIN/help/toc.html | 13 +- src/main/webapp/VAADIN/help/toc.js | 70 - ...-night.css => tomorrow-night-4c0ae647.css} | 0 62 files changed, 2139 insertions(+), 4102 deletions(-) delete mode 100644 src/main/webapp/VAADIN/help/FontAwesome/css/font-awesome.css delete mode 100644 src/main/webapp/VAADIN/help/FontAwesome/fonts/FontAwesome.ttf delete mode 100644 src/main/webapp/VAADIN/help/FontAwesome/fonts/fontawesome-webfont.eot delete mode 100644 src/main/webapp/VAADIN/help/FontAwesome/fonts/fontawesome-webfont.svg delete mode 100644 src/main/webapp/VAADIN/help/FontAwesome/fonts/fontawesome-webfont.ttf delete mode 100644 src/main/webapp/VAADIN/help/FontAwesome/fonts/fontawesome-webfont.woff delete mode 100644 src/main/webapp/VAADIN/help/FontAwesome/fonts/fontawesome-webfont.woff2 rename src/main/webapp/VAADIN/help/{ayu-highlight.css => ayu-highlight-3fdfc3ac.css} (97%) rename src/main/webapp/VAADIN/help/{book.js => book-a0b12cfe.js} (92%) rename src/main/webapp/VAADIN/help/{clipboard.min.js => clipboard-1626706a.min.js} (100%) rename src/main/webapp/VAADIN/help/css/{chrome.css => chrome-ae938929.css} (83%) rename src/main/webapp/VAADIN/help/css/{general.css => general-2459343d.css} (65%) rename src/main/webapp/VAADIN/help/css/{print.css => print-9e4910d8.css} (87%) rename src/main/webapp/VAADIN/help/css/{variables.css => variables-8adf115d.css} (84%) rename src/main/webapp/VAADIN/help/{elasticlunr.min.js => elasticlunr-ef4e11c1.min.js} (100%) rename src/main/webapp/VAADIN/help/{favicon.png => favicon-8114d1fc.png} (100%) rename src/main/webapp/VAADIN/help/{favicon.svg => favicon-de23e50b.svg} (100%) rename src/main/webapp/VAADIN/help/fonts/{fonts.css => fonts-9644e21d.css} (74%) rename src/main/webapp/VAADIN/help/fonts/{open-sans-v17-all-charsets-300.woff2 => open-sans-v17-all-charsets-300-7736aa35.woff2} (100%) rename src/main/webapp/VAADIN/help/fonts/{open-sans-v17-all-charsets-300italic.woff2 => open-sans-v17-all-charsets-300italic-2c7b95c0.woff2} (100%) rename src/main/webapp/VAADIN/help/fonts/{open-sans-v17-all-charsets-600.woff2 => open-sans-v17-all-charsets-600-486c6759.woff2} (100%) rename src/main/webapp/VAADIN/help/fonts/{open-sans-v17-all-charsets-600italic.woff2 => open-sans-v17-all-charsets-600italic-1a3e8659.woff2} (100%) rename src/main/webapp/VAADIN/help/fonts/{open-sans-v17-all-charsets-700.woff2 => open-sans-v17-all-charsets-700-c22fe8c7.woff2} (100%) rename src/main/webapp/VAADIN/help/fonts/{open-sans-v17-all-charsets-700italic.woff2 => open-sans-v17-all-charsets-700italic-238ae959.woff2} (100%) rename src/main/webapp/VAADIN/help/fonts/{open-sans-v17-all-charsets-800.woff2 => open-sans-v17-all-charsets-800-3d2c812a.woff2} (100%) rename src/main/webapp/VAADIN/help/fonts/{open-sans-v17-all-charsets-800italic.woff2 => open-sans-v17-all-charsets-800italic-ba1521ec.woff2} (100%) rename src/main/webapp/VAADIN/help/fonts/{open-sans-v17-all-charsets-italic.woff2 => open-sans-v17-all-charsets-italic-6c9463f7.woff2} (100%) rename src/main/webapp/VAADIN/help/fonts/{open-sans-v17-all-charsets-regular.woff2 => open-sans-v17-all-charsets-regular-2e3b1d34.woff2} (100%) rename src/main/webapp/VAADIN/help/fonts/{source-code-pro-v11-all-charsets-500.woff2 => source-code-pro-v11-all-charsets-500-2bdd9410.woff2} (100%) rename src/main/webapp/VAADIN/help/{highlight.css => highlight-493f70e1.css} (100%) rename src/main/webapp/VAADIN/help/{highlight.js => highlight-abc7f01d.js} (100%) rename src/main/webapp/VAADIN/help/{mark.min.js => mark-09e88c2c.min.js} (100%) rename src/main/webapp/VAADIN/help/{searcher.js => searcher-c2a407aa.js} (95%) create mode 100644 src/main/webapp/VAADIN/help/searchindex-eb721271.js delete mode 100644 src/main/webapp/VAADIN/help/searchindex.js create mode 100644 src/main/webapp/VAADIN/help/toc-51bdbdf8.js delete mode 100644 src/main/webapp/VAADIN/help/toc.js rename src/main/webapp/VAADIN/help/{tomorrow-night.css => tomorrow-night-4c0ae647.css} (100%) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index dcf25d0737..f232506c87 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -39,7 +39,7 @@ jobs: uses: actions/checkout@v1 - name: Get the release version from the GITHUB_REF variable as new SHORT_VERSION variable run: echo "SHORT_VERSION=$(echo ${GITHUB_REF} | sed -E 's/^refs\/heads\/.*/develop/' | sed -E 's/^(refs\/tags\/v)?(.*)(\.[0-9]+\.[0-9]+)$/\2/')" >> $GITHUB_ENV - - run: misc/download-mdbook.sh 0.4.17 + - run: misc/download-mdbook.sh 0.5.2 env: OS_NAME: linux - name: Generate the user documentation diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 74d4d4200c..1af7d40448 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -100,7 +100,7 @@ jobs: steps: - name: Checkout uses: actions/checkout@v2 - - run: misc/download-mdbook.sh 0.4.17 + - run: misc/download-mdbook.sh 0.5.2 env: OS_NAME: linux - run: mdbook build docs/user-guide/ diff --git a/docs/developer-guide/book.toml b/docs/developer-guide/book.toml index eedf79ca88..899c998d23 100644 --- a/docs/developer-guide/book.toml +++ b/docs/developer-guide/book.toml @@ -1,5 +1,4 @@ [book] authors = ["Thomas Krause"] -multilingual = false src = "src" title = "ANNIS Developer Guide" diff --git a/docs/online-help/book.toml b/docs/online-help/book.toml index a9caf09e56..1cc18c34e1 100644 --- a/docs/online-help/book.toml +++ b/docs/online-help/book.toml @@ -1,5 +1,4 @@ [book] authors = ["Thomas Krause"] -multilingual = false src = "src" title = "ANNIS Help" diff --git a/docs/user-guide/book.toml b/docs/user-guide/book.toml index 74755b9686..dab03e1d16 100644 --- a/docs/user-guide/book.toml +++ b/docs/user-guide/book.toml @@ -1,6 +1,5 @@ [book] authors = ["Thomas Krause"] -multilingual = false src = "src" title = "ANNIS User Guide" diff --git a/src/main/webapp/VAADIN/help/404.html b/src/main/webapp/VAADIN/help/404.html index fc5fb0d917..eecee409d1 100644 --- a/src/main/webapp/VAADIN/help/404.html +++ b/src/main/webapp/VAADIN/help/404.html @@ -13,21 +13,20 @@ - - - - - - + + + + + + - - + - - - + + + @@ -37,10 +36,10 @@ const path_to_root = ""; const default_light_theme = "light"; const default_dark_theme = "navy"; - window.path_to_searchindex_js = "searchindex.js"; + window.path_to_searchindex_js = "searchindex-eb721271.js"; - +
@@ -54,7 +53,7 @@

Keyboard shortcuts

-
+
- + -