Merge pull request #855 from korpling/feature/upgrade-graphannis

Upgrade to graphANNIS 3.3.1
korpling · Jun 4, 2024 · 9062c28 · 9062c28
2 parents b232f4d + 3b71a33
commit 9062c28
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 12 deletions.
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
+
+- Upgraded to graphANNIS 3.3.1 which fixes queries where optional nodes are
+  located not at the end but somewhere in between the query.
+
 ## [4.12.1] - 2024-05-29
 
 ### Fixed

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>3.3.0</graphannis.version>
+        <graphannis.version>3.3.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>
@@ -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>65acdfd05d0ba4a85fba402478edb7a8251e479e8eabf65655ee6ef9952f4e7b</sha256>
+                            <sha256>63cd880aee2eda2fe95f5dff74dc3dd7162b042e893c51925bee56c094c89e4c</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>52000d8145531de97f3a71beb9c91d4b309c4aec80a2ad7f6d737a5229e5e15a</sha256>
+                            <sha256>28884c784073b407e692b55873f60f59d687f5241af1d09b1fcdc1e77af8cd99</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>90446e8525408c8aaafd346b8389bab2a6673dc73a1189eac9fb204d71c88b8d</sha256>
+                            <sha256>ac9d33f70865781c956d977e952ab5051360137811179dddb715fc496556539d</sha256>
                             <unpack>true</unpack>
                         </configuration>
                     </execution>

diff --git a/src/main/webapp/VAADIN/help/css/general.css b/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 {

diff --git a/src/main/webapp/VAADIN/help/css/print.css b/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;
 }

diff --git a/src/main/webapp/VAADIN/help/css/variables.css b/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) {