diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index dcf25d0737..3eb5afb9cc 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -6,7 +6,7 @@ name: Deploy ANNIS jobs: deploy_release_binaries: name: Deploy release binaries - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 steps: - name: Checkout uses: actions/checkout@v2 @@ -33,13 +33,13 @@ jobs: env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} deploy_documentation: - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 steps: - name: Checkout 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..22cac13865 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -8,7 +8,7 @@ on: jobs: test_jdk8: name: Execute all automated tests JDK 8 - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 steps: - name: Checkout uses: actions/checkout@v4 @@ -34,7 +34,7 @@ jobs: run: mvn install test_jdk11: name: Execute all automated tests on JDK 11 - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 steps: - name: Checkout uses: actions/checkout@v4 @@ -62,8 +62,8 @@ jobs: - name: Run Maven install (includes tests) run: mvn install test_jdk17: - name: Execute all automated tests on JDK 17 - runs-on: ubuntu-22.04 + name: Execute all automated tests on JDK 21 + runs-on: ubuntu-24.04 steps: - name: Checkout uses: actions/checkout@v2 @@ -83,24 +83,24 @@ jobs: path: "*.zip" key: ${{ runner.os }}-corpora-${{ hashFiles('misc/import-test-corpora.sh') }} - name: Set JAVA_HOME to included JDK 17 - run: echo JAVA_HOME=$JAVA_HOME_17_X64 >> $GITHUB_ENV + run: echo JAVA_HOME=$JAVA_HOME_21_X64 >> $GITHUB_ENV - run: misc/download-annis-cli.sh env: OS_NAME: linux - run: misc/import-test-corpora.sh - name: Run Maven Tests with enabled code coverage and upload results to SonarCloud - run: mvn -Pcoverage install sonar:sonar -Dsonar.projectKey=korpling_ANNIS -Dsonar.organization=korpling -Dsonar.host.url=https://sonarcloud.io -Dsonar.login=$SONAR_TOKEN + run: mvn -Pcoverage install sonar:sonar -Dsonar.projectKey=korpling_ANNIS -Dsonar.organization=korpling -Dsonar.host.url=https://sonarcloud.io -Dsonar.token=$SONAR_TOKEN env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} test_docs: name: Test documentation - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 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/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/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/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 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

-
+
- + -