Merge pull request #902 from korpling/update-graphannis

Update to graphANNIS 4.1.3

Author: thomaskrause

.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

.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/

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

docs/developer-guide/book.toml

@@ -1,5 +1,4 @@
 [book]
 authors = ["Thomas Krause"]
-multilingual = false
 src = "src"
 title = "ANNIS Developer Guide"

docs/online-help/book.toml

@@ -1,5 +1,4 @@
 [book]
 authors = ["Thomas Krause"]
-multilingual = false
 src = "src"
 title = "ANNIS Help"

docs/user-guide/book.toml

@@ -1,6 +1,5 @@
 [book]
 authors = ["Thomas Krause"]
-multilingual = false
 src = "src"
 title = "ANNIS User Guide"
 

pom.xml

@@ -39,7 +39,7 @@
         <vaadin.version>8.14.3</vaadin.version>
         <vaadin.productionMode>true</vaadin.productionMode>
         <start-class>org.corpus_tools.annis.gui.AnnisUiApplication</start-class>
-        <graphannis.version>4.0.1</graphannis.version>
+        <graphannis.version>4.1.3</graphannis.version>
         <antlr4.version>4.7.2</antlr4.version>
         <spring.profiles.active>server</spring.profiles.active>
         <swagger-core-version>1.5.24</swagger-core-version>
@@ -261,7 +261,7 @@
                                 https://github.com/korpling/graphANNIS/releases/download/v${graphannis.version}/graphannis-webservice-x86_64-unknown-linux-gnu.tar.xz</url>
                             <outputDirectory>
                                 ${project.build.directory}/native/</outputDirectory>
-                            <sha256>bbd0a6456f24c1b6594e569267302f54a142775b86ff63d2d9e4ea3b12f835de</sha256>
+                            <sha256>b64c63cf721ed40c9e59dd7cba464f9ede588a2d3ae544b889e67228b6e9c7a7</sha256>
                             <unpack>true</unpack>
                         </configuration>
                     </execution>
@@ -276,7 +276,7 @@
                                 https://github.com/korpling/graphANNIS/releases/download/v${graphannis.version}/graphannis-webservice-x86_64-pc-windows-msvc.zip</url>
                             <outputDirectory>
                                 ${project.build.directory}/native/win32-x86-64/</outputDirectory>
-                            <sha256>3d553737863c3dabf9fc80cbdec3aa3b909b42616ca75baa93547b24e79672df</sha256>
+                            <sha256>3c3a259999e6b988836ee42f301364fcc4b9da995eeb4e0bab29b05523e3cb81</sha256>
                             <unpack>true</unpack>
                         </configuration>
                     </execution>
@@ -291,7 +291,7 @@
                                 https://github.com/korpling/graphANNIS/releases/download/v${graphannis.version}/graphannis-webservice-aarch64-apple-darwin.tar.xz</url>
                             <outputDirectory>
                                 ${project.build.directory}/native/</outputDirectory>
-                            <sha256>9c7a7bb65b3467a77330fa04856bc1169213b0c34584db6bd52ef9bc4f12d990</sha256>
+                            <sha256>0595e02f2446315564a22982803cf05dbd6ebe4f055c6ebf0f7674e952dfd97f</sha256>
                             <unpack>true</unpack>
                         </configuration>
                     </execution>
@@ -306,7 +306,7 @@
                                 https://github.com/korpling/graphANNIS/releases/download/v${graphannis.version}/graphannis-webservice-x86_64-apple-darwin.tar.xz</url>
                             <outputDirectory>
                                 ${project.build.directory}/native/</outputDirectory>
-                            <sha256>659258a57a8c175910e1c3120211e732d5909a1e1cd57e822289c0535be20d9f</sha256>
+                            <sha256>92adb2cd4e548a4316f8c6960073a5b931aa2bcf913f1e493a511195f54a90b7</sha256>
                             <unpack>true</unpack>
                         </configuration>
                     </execution>