Merge pull request #840 from korpling/feature/update-graphannis

Update to graphANNIS 3.0.0
korpling · Nov 28, 2023 · 1c6da59 · 1c6da59
2 parents 3c6be29 + 0c10083
commit 1c6da59
Show file tree

Hide file tree

Showing 6 changed files with 58 additions and 33 deletions.
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -12,7 +12,7 @@ jobs:
           uses: actions/checkout@v2
         - name: Set JAVA_HOME to included JDK 8
           run: echo JAVA_HOME=$JAVA_HOME_8_X64 >> $GITHUB_ENV
-        - run: misc/download-annis-cli.sh 2.2.0
+        - run: misc/download-annis-cli.sh 3.0.0
           env:
             OS_NAME: linux
         - run: misc/import-test-corpora.sh

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -26,7 +26,7 @@ jobs:
           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 2.2.0
+      - run: misc/download-annis-cli.sh 3.0.0
         env:
           OS_NAME: linux
       - run: misc/import-test-corpora.sh
@@ -55,7 +55,36 @@ 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 2.2.0
+      - run: misc/download-annis-cli.sh 3.0.0
+        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
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+        with:
+          # Otherwise the new code can't be determined or code coverage is less informing
+          fetch-depth: 0
+      - name: Cache local Maven repository
+        uses: actions/cache@v2
+        with:
+          path: ~/.m2/repository
+          key: ${{ runner.os }}-maven-11-${{ hashFiles('**/pom.xml') }}
+          restore-keys: |
+            ${{ runner.os }}-maven-11-
+      - name: Cache test corpora
+        uses: actions/cache@v2
+        with:
+          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: misc/download-annis-cli.sh 3.0.0
         env:
           OS_NAME: linux
       - run: misc/import-test-corpora.sh

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Fixed
+
+- Update to graphANNIS 3.0.0 with various bugfixes.
+- Polling the import status in the adminstration view fixed.
+
 ## [4.10.4] - 2023-11-01
 
 ### Fixed

diff --git a/misc/download-annis-cli.sh b/misc/download-annis-cli.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-GRAPHANNIS_VERSION=${1:-2.2.0}
+GRAPHANNIS_VERSION=${1:-3.0.0}
 
 install_graphannis_cli=false
 
@@ -21,23 +21,10 @@ fi
 if [ "$install_graphannis_cli" = true ] ; then
         echo "Installing graphANNIS CLI version ${GRAPHANNIS_VERSION}"
 
-        if [[ "$OS_NAME" == "linux" ]];
-        then
-            rm -f $HOME/.cargo/bin/annis
-            curl -L -o $HOME/.cargo/bin/annis https://github.com/korpling/graphANNIS/releases/download/v${GRAPHANNIS_VERSION}/annis
-            chmod u+x $HOME/.cargo/bin/annis
-        elif [[ "$OS_NAME" == "osx" ]];
-        then
-            rm -f $HOME/.cargo/bin/annis
-            curl -L -o $HOME/.cargo/bin/annis https://github.com/korpling/graphANNIS/releases/download/v${GRAPHANNIS_VERSION}/annis.osx
-            chmod u+x $HOME/.cargo/bin/annis
-        elif [[ "$OS_NAME" == "windows" ]];
-        then
-            del /s /q $HOME/.cargo/bin/annis.exe
-            curl -L -o $HOME/.cargo/bin/annis.exe https://github.com/korpling/graphANNIS/releases/download/v${GRAPHANNIS_VERSION}/annis.exe
-        else
-            >&2 echo "Unknown value \"${OS_NAME}\" for environment variable OS_NAME"
-        	exit 1
-        fi
+
+        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 
+        mv graphannis-cli-x86_64-unknown-linux-gnu/annis $HOME/.cargo/bin/
 fi
 
diff --git a/pom.xml b/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>2.4.8</graphannis.version>
+        <graphannis.version>3.0.0</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>
@@ -258,11 +258,12 @@
                         </goals>
                         <configuration>
                             <url>
-                                https://github.com/korpling/graphANNIS/releases/download/v${graphannis.version}/graphannis-webservice</url>
+                                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/linux-x86-64/</outputDirectory>
+                                ${project.build.directory}/native/</outputDirectory>
                             <sha256>
-                                fd55847babf274d9aece5cf9d6dc2fe1e7c72e6d7f5b821a878d291603f0acef</sha256>
+                                afe76eb683a999202fa7ea2d6e34b89c11a2620bb69ceb29157379c9205b1425</sha256>
+                            <unpack>true</unpack>
                         </configuration>
                     </execution>
                     <execution>
@@ -273,11 +274,12 @@
                         </goals>
                         <configuration>
                             <url>
-                                https://github.com/korpling/graphANNIS/releases/download/v${graphannis.version}/graphannis-webservice.exe</url>
+                                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>
-                                ec47440ef06041443cd084895d02ff2ef8325c247e0ea6b6d73e6aac86176a49</sha256>
+                                cbae1a43e059477fa02e36d37623dfe52656de4885929e8cc150528d4b3a6d6b</sha256>
+                            <unpack>true</unpack>
                         </configuration>
                     </execution>
                     <execution>
@@ -288,11 +290,12 @@
                         </goals>
                         <configuration>
                             <url>
-                                https://github.com/korpling/graphANNIS/releases/download/v${graphannis.version}/graphannis-webservice.osx</url>
+                                https://github.com/korpling/graphANNIS/releases/download/v${graphannis.version}/graphannis-webservice-x86_64-apple-darwin.tar.xz</url>
                             <outputDirectory>
-                                ${project.build.directory}/native/darwin/</outputDirectory>
+                                ${project.build.directory}/native/</outputDirectory>
                             <sha256>
-                                dfd2324ad19db52050dba8edbdac472f6ccd03fc83340715766d603ca82da4a0</sha256>
+                                a6b46be4e2fc7ed96f0c51e0625eeeadb577105267677626d43c4bf04af82c10</sha256>
+                            <unpack>true</unpack>
                         </configuration>
                     </execution>
                 </executions>

diff --git a/src/main/java/org/corpus_tools/annis/gui/ServiceStarter.java b/src/main/java/org/corpus_tools/annis/gui/ServiceStarter.java
@@ -161,10 +161,11 @@ private void startService() {
   private Optional<String> executablePathForSystem() {
     Optional<String> execPath = Optional.empty();
     if (SystemUtils.IS_OS_MAC_OSX) {
-      execPath = Optional.of("darwin/graphannis-webservice.osx");
+      execPath = Optional.of("graphannis-webservice-x86_64-apple-darwin/graphannis-webservice");
     } else if ("amd64".equals(SystemUtils.OS_ARCH) || "x86_64".equals(SystemUtils.OS_ARCH)) {
       if (SystemUtils.IS_OS_LINUX) {
-        execPath = Optional.of("linux-x86-64/graphannis-webservice");
+        execPath =
+            Optional.of("graphannis-webservice-x86_64-unknown-linux-gnu/graphannis-webservice");
       } else if (SystemUtils.IS_OS_WINDOWS) {
         execPath = Optional.of("win32-x86-64/graphannis-webservice.exe");
       }