Upgrade to graphANNIS 3.2.1

.github/workflows/test.yml

@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-20.04
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
       - name: Cache local Maven repository
         uses: actions/cache@v2
         with:
@@ -20,13 +20,13 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-maven-8-
       - name: Cache test corpora
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         with:
           path: "*.zip"
           key: ${{ runner.os }}-corpora-${{ hashFiles('misc/import-test-corpora.sh') }}
       - name: Set JAVA_HOME to included JDK 8
         run: echo JAVA_HOME=$JAVA_HOME_8_X64 >> $GITHUB_ENV
-      - run: misc/download-annis-cli.sh 3.0.0
+      - run: misc/download-annis-cli.sh
         env:
           OS_NAME: linux
       - run: misc/import-test-corpora.sh
@@ -37,7 +37,7 @@ jobs:
     runs-on: ubuntu-20.04
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           # Otherwise the new code can't be determined or code coverage is less informing
           fetch-depth: 0
@@ -55,15 +55,15 @@ jobs:
           key: ${{ runner.os }}-corpora-${{ hashFiles('misc/import-test-corpora.sh') }}
       - name: Set JAVA_HOME to included JDK 11
         run: echo JAVA_HOME=$JAVA_HOME_11_X64 >> $GITHUB_ENV
-      - run: misc/download-annis-cli.sh 3.0.0
+      - run: misc/download-annis-cli.sh
         env:
           OS_NAME: linux
       - run: misc/import-test-corpora.sh
       - name: Run Maven install (includes tests)
         run: mvn install
   test_jdk17:
     name: Execute all automated tests on JDK 17
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     steps:
       - name: Checkout
         uses: actions/checkout@v2
@@ -84,7 +84,7 @@ jobs:
           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: misc/download-annis-cli.sh 3.0.0
+      - run: misc/download-annis-cli.sh
         env:
           OS_NAME: linux
       - run: misc/import-test-corpora.sh

CHANGELOG.md

@@ -8,6 +8,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Fixed
 
 - Use plural form when there is no match in result status: "0 matches".
+- Upgraded to graphANNIS 3.2.1 which fixes an issue in the subgraph generation.
 
 ## [4.11.1] - 2024-03-13
 

misc/download-annis-cli.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-GRAPHANNIS_VERSION=${1:-3.0.0}
+GRAPHANNIS_VERSION=${1:-3.2.1}
 
 install_graphannis_cli=false
 
@@ -24,7 +24,8 @@ if [ "$install_graphannis_cli" = true ] ; then
 
         rm -f $HOME/.cargo/bin/annis
         curl -L -o annis.tar.xz https://github.com/korpling/graphANNIS/releases/download/v${GRAPHANNIS_VERSION}/graphannis-cli-x86_64-unknown-linux-gnu.tar.xz
-        tar xf annis.tar.xz 
+        tar xf annis.tar.xz
+	mkdir -p $HOME/.cargo/bin
         mv graphannis-cli-x86_64-unknown-linux-gnu/annis $HOME/.cargo/bin/
 fi
 

misc/import-test-corpora.sh

@@ -6,6 +6,7 @@ curl -L -o aeschylus.zip https://corpus-tools.org/corpora/Aeschylus.Persae.L1-18
 curl -L -o shenoute.zip https://corpus-tools.org/corpora/shenoute.a22_ANNIS.zip 
 curl -L -o parallelsample.zip https://corpus-tools.org/corpora/parallel.sample_relAnnis.zip
 mkdir -p  $HOME/.annis/v4/
+export PATH=$PATH:$HOME/.cargo/bin
 annis $HOME/.annis/v4/ -c "import pcc2.zip"
 annis $HOME/.annis/v4/ -c "import dialog.zip"
 annis $HOME/.annis/v4/ -c "import aeschylus.zip"

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>3.2.0</graphannis.version>
+        <graphannis.version>3.2.1</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>
@@ -91,7 +91,7 @@
                 <plugin>
                     <groupId>org.jacoco</groupId>
                     <artifactId>jacoco-maven-plugin</artifactId>
-                    <version>0.8.6</version>
+                    <version>0.8.11</version>
                     <configuration>
                         <excludes>
                             <exclude>VAADIN/**</exclude>
@@ -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>a22a26f2af3e3c9971a2f657ef41a20ae8759f1572a57ab2a5ad7b55940dc1b9</sha256>
+                            <sha256>5e1e9a80cbf9530395b41138cfee93c902c919974b4189eaedb0c49e86cb758a</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>9d5eb40fa008d8228260a91cadf5eeee372ff85b6acd416df55f96b475a1f874</sha256>
+                            <sha256>203d6921dd5c7330ee962d75f06d94e59f81561e55dec96c48fc11a9f2faedd5</sha256>
                             <unpack>true</unpack>
                         </configuration>
                     </execution>
@@ -291,7 +291,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>a2c0741409c381930a7cb566465fa8ba29343f5654cfe8db91fa1f7e56fdd9e4</sha256>
+                            <sha256>3811b5447d9fb7614bfe72d08f4b93dd202fc168142dd535594021d3a6b09595</sha256>
                             <unpack>true</unpack>
                         </configuration>
                     </execution>

src/main/java/org/corpus_tools/annis/gui/ServiceStarter.java

@@ -35,16 +35,19 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.config.ConfigurableBeanFactory;
 import org.springframework.boot.context.event.ApplicationReadyEvent;
 import org.springframework.context.ApplicationListener;
 import org.springframework.context.annotation.Profile;
+import org.springframework.context.annotation.Scope;
 import org.springframework.core.io.Resource;
 import org.springframework.core.io.ResourceLoader;
 import org.springframework.security.core.Authentication;
 import org.springframework.stereotype.Component;
 
 @Component
 @Profile("!desktop")
+@Scope(value = ConfigurableBeanFactory.SCOPE_SINGLETON)
 public class ServiceStarter implements ApplicationListener<ApplicationReadyEvent> {
 
 

src/main/java/org/corpus_tools/annis/gui/ServiceStarterDesktop.java

@@ -38,8 +38,10 @@
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.beans.factory.config.ConfigurableBeanFactory;
 import org.springframework.boot.context.event.ApplicationReadyEvent;
 import org.springframework.context.annotation.Profile;
+import org.springframework.context.annotation.Scope;
 import org.springframework.core.env.Environment;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.GrantedAuthority;
@@ -49,6 +51,7 @@
 
 @Component
 @Profile("desktop")
+@Scope(value = ConfigurableBeanFactory.SCOPE_SINGLETON)
 public class ServiceStarterDesktop extends ServiceStarter { // NO_UCD (unused code)
 
   private static final String USER_NAME = "desktop";

src/main/webapp/VAADIN/help/css/general.css

@@ -5,6 +5,7 @@
 :root {
     /* Browser default font-size is 16px, this way 1 rem = 10px */
     font-size: 62.5%;
+    color-scheme: var(--color-scheme);
 }
 
 html {

src/main/webapp/VAADIN/help/css/print.css

@@ -22,14 +22,6 @@
     overflow-y: initial;
 }
 
-code {
-    background-color: #666666;
-    border-radius: 5px;
-
-    /* Force background to be printed in Chrome */
-    -webkit-print-color-adjust: exact;
-}
-
 pre > .buttons {
     z-index: 2;
 }

src/main/webapp/VAADIN/help/css/variables.css

@@ -50,6 +50,8 @@
     --searchresults-border-color: #888;
     --searchresults-li-bg: #252932;
     --search-mark-bg: #e3b171;
+
+    --color-scheme: dark;
 }
 
 .coal {
@@ -90,6 +92,8 @@
     --searchresults-border-color: #98a3ad;
     --searchresults-li-bg: #2b2b2f;
     --search-mark-bg: #355c7d;
+
+    --color-scheme: dark;
 }
 
 .light {
@@ -130,6 +134,8 @@
     --searchresults-border-color: #888;
     --searchresults-li-bg: #e4f2fe;
     --search-mark-bg: #a2cff5;
+
+    --color-scheme: light;
 }
 
 .navy {
@@ -170,6 +176,8 @@
     --searchresults-border-color: #5c5c68;
     --searchresults-li-bg: #242430;
     --search-mark-bg: #a2cff5;
+
+    --color-scheme: dark;
 }
 
 .rust {
@@ -210,6 +218,8 @@
     --searchresults-border-color: #888;
     --searchresults-li-bg: #dec2a2;
     --search-mark-bg: #e69f67;
+
+    --color-scheme: light;
 }
 
 @media (prefers-color-scheme: dark) {

src/test/java/org/corpus_tools/annis/gui/ServiceStarterTest.java

@@ -9,6 +9,7 @@
 import java.nio.file.Files;
 import java.util.Collections;
 import java.util.List;
+import javax.annotation.concurrent.NotThreadSafe;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.BeanFactory;
@@ -22,6 +23,7 @@
 @SpringBootTest
 @ActiveProfiles({"test", "headless"})
 @WebAppConfiguration
+@NotThreadSafe
 class ServiceStarterTest {
 
   @Autowired

src/test/resources/junit-platform.properties

@@ -0,0 +1 @@
+junit.jupiter.execution.parallel.enabled = false