From 08626c967de7d16e4d6e33517578da708ebc5d59 Mon Sep 17 00:00:00 2001
From: Thomas Krause <thomas.krause@hu-berlin.de>
Date: Thu, 4 Jul 2024 17:40:03 +0200
Subject: [PATCH 1/2] Update to graphANNIS 3.3.2

---
 CHANGELOG.md | 2 ++
 pom.xml      | 8 ++++----
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f9ead5fc5e..d4703952a3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   when the "layer" is not specified in the resolver configuration. Before this
   fix, the layer name was not checked, but the node still needed to be part of a
   layer.
+- Updated to graphANNIS 3.3.2 which fixes an issue where a backup folder in the
+  database might not be loaded correctly.
 
 ## [4.12.2] - 2024-06-04
 
diff --git a/pom.xml b/pom.xml
index 73930e935d..7c55adf542 100644
--- 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.1</graphannis.version>
+        <graphannis.version>3.3.2</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>63cd880aee2eda2fe95f5dff74dc3dd7162b042e893c51925bee56c094c89e4c</sha256>
+                            <sha256>be451a640653d267d9d1fc8bdb66d5793ae4412523288a90da41a0b54cb34cb3</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>28884c784073b407e692b55873f60f59d687f5241af1d09b1fcdc1e77af8cd99</sha256>
+                            <sha256>d8433a00ffe985ff2147d103061d113c6efc185f682f07dd1b6069362c013fd5</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>ac9d33f70865781c956d977e952ab5051360137811179dddb715fc496556539d</sha256>
+                            <sha256>bab9dc86c413fd85c369ff8d4feeb9c76ef1adb81343a2edb8b5633794c6b0a2</sha256>
                             <unpack>true</unpack>
                         </configuration>
                     </execution>

From a3c0e892528360ab087f4488252177d2c1e0864e Mon Sep 17 00:00:00 2001
From: Thomas Krause <thomas.krause@hu-berlin.de>
Date: Thu, 4 Jul 2024 17:41:26 +0200
Subject: [PATCH 2/2] Recompiled CSS files

---
 src/main/webapp/VAADIN/help/css/general.css   |  1 -
 src/main/webapp/VAADIN/help/css/print.css     |  8 ++++++++
 src/main/webapp/VAADIN/help/css/variables.css | 10 ----------
 3 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/src/main/webapp/VAADIN/help/css/general.css b/src/main/webapp/VAADIN/help/css/general.css
index a6db6805a9..344b53eb7f 100644
--- a/src/main/webapp/VAADIN/help/css/general.css
+++ b/src/main/webapp/VAADIN/help/css/general.css
@@ -5,7 +5,6 @@
 :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
index 27d05e9285..5e690f7559 100644
--- a/src/main/webapp/VAADIN/help/css/print.css
+++ b/src/main/webapp/VAADIN/help/css/print.css
@@ -22,6 +22,14 @@
     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
index 59fcda88f4..21bf8e55e0 100644
--- a/src/main/webapp/VAADIN/help/css/variables.css
+++ b/src/main/webapp/VAADIN/help/css/variables.css
@@ -50,8 +50,6 @@
     --searchresults-border-color: #888;
     --searchresults-li-bg: #252932;
     --search-mark-bg: #e3b171;
-
-    --color-scheme: dark;
 }
 
 .coal {
@@ -92,8 +90,6 @@
     --searchresults-border-color: #98a3ad;
     --searchresults-li-bg: #2b2b2f;
     --search-mark-bg: #355c7d;
-
-    --color-scheme: dark;
 }
 
 .light {
@@ -134,8 +130,6 @@
     --searchresults-border-color: #888;
     --searchresults-li-bg: #e4f2fe;
     --search-mark-bg: #a2cff5;
-
-    --color-scheme: light;
 }
 
 .navy {
@@ -176,8 +170,6 @@
     --searchresults-border-color: #5c5c68;
     --searchresults-li-bg: #242430;
     --search-mark-bg: #a2cff5;
-
-    --color-scheme: dark;
 }
 
 .rust {
@@ -218,8 +210,6 @@
     --searchresults-border-color: #888;
     --searchresults-li-bg: #dec2a2;
     --search-mark-bg: #e69f67;
-
-    --color-scheme: light;
 }
 
 @media (prefers-color-scheme: dark) {