From bf0f692cd955ee2db0c996d72401e00fa7a9b9c3 Mon Sep 17 00:00:00 2001
From: eikek <eike.kettner@posteo.de>
Date: Sun, 5 Nov 2023 23:11:22 +0100
Subject: [PATCH] Update flyway and set jdk17 as requirement

---
 .github/workflows/ci.yml                    | 2 +-
 nix/checks/configuration-test.nix           | 2 +-
 nix/flake.nix                               | 8 ++++----
 project/Dependencies.scala                  | 3 ++-
 project/build.nix                           | 6 +++---
 website/site/content/docs/install/prereq.md | 6 +++---
 6 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 17f7b261..0748dfc0 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -9,7 +9,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        java: [ 'openjdk@1.11' ]
+        java: [ 'openjdk@1.17' ]
     steps:
       - uses: actions/checkout@v4.1.1
         with:
diff --git a/nix/checks/configuration-test.nix b/nix/checks/configuration-test.nix
index bdd3000a..b7dfb746 100644
--- a/nix/checks/configuration-test.nix
+++ b/nix/checks/configuration-test.nix
@@ -75,7 +75,7 @@ in
       pkgs.jq
       pkgs.inetutils
       pkgs.htop
-      pkgs.openjdk
+      pkgs.jdk17
     ];
 
 
diff --git a/nix/flake.nix b/nix/flake.nix
index 19338cce..582ccc73 100644
--- a/nix/flake.nix
+++ b/nix/flake.nix
@@ -34,7 +34,7 @@
           pname = "docspell-server";
 
           src = fetchzip current_version.server;
-          buildInputs = [ jdk11 ];
+          buildInputs = [ jdk17 ];
           buildPhase = "true";
 
           installPhase = ''
@@ -42,7 +42,7 @@
             cp -R * $out/docspell-restserver-${version}/
             cat > $out/bin/docspell-restserver <<-EOF
             #!${bash}/bin/bash
-            $out/docspell-restserver-${version}/bin/docspell-restserver -java-home ${jdk11} "\$@"
+            $out/docspell-restserver-${version}/bin/docspell-restserver -java-home ${jdk17} "\$@"
             EOF
             chmod 755 $out/bin/docspell-restserver
           '';
@@ -54,7 +54,7 @@
 
           src = fetchzip current_version.joex;
 
-          buildInputs = [ jdk11 ];
+          buildInputs = [ jdk17 ];
 
           buildPhase = "true";
 
@@ -63,7 +63,7 @@
             cp -R * $out/docspell-joex-${version}/
             cat > $out/bin/docspell-joex <<-EOF
             #!${bash}/bin/bash
-            $out/docspell-joex-${version}/bin/docspell-joex -java-home ${jdk11} "\$@"
+            $out/docspell-joex-${version}/bin/docspell-joex -java-home ${jdk17} "\$@"
             EOF
             chmod 755 $out/bin/docspell-joex
           '';
diff --git a/project/Dependencies.scala b/project/Dependencies.scala
index eadee9b1..fa7beffa 100644
--- a/project/Dependencies.scala
+++ b/project/Dependencies.scala
@@ -19,7 +19,7 @@ object Dependencies {
   val DoobieVersion = "1.0.0-RC2"
   val EmilVersion = "0.13.0"
   val FlexmarkVersion = "0.64.8"
-  val FlywayVersion = "9.22.3"
+  val FlywayVersion = "10.0.0"
   val Fs2Version = "3.9.2"
   val H2Version = "2.2.224"
   val Http4sVersion = "0.23.23"
@@ -311,6 +311,7 @@ object Dependencies {
   // ASL 2.0
   val flyway = Seq(
     "org.flywaydb" % "flyway-core" % FlywayVersion,
+    "org.flywaydb" % "flyway-database-postgresql" % FlywayVersion,
     "org.flywaydb" % "flyway-mysql" % FlywayVersion
   )
 
diff --git a/project/build.nix b/project/build.nix
index 2e447a0b..0693a950 100644
--- a/project/build.nix
+++ b/project/build.nix
@@ -1,19 +1,19 @@
 let
   nixpkgs = builtins.fetchTarball {
     #url = "https://github.com/NixOS/nixpkgs/archive/92e990a8d6bc35f1089c76dd8ba68b78da90da59.tar.gz";
-    url =  "channel:nixos-21.11";
+    url =  "channel:nixos-23.05";
   };
   pkgs = import nixpkgs { };
   initScript = pkgs.writeScript "docspell-build-init" ''
      export LD_LIBRARY_PATH=
-     ${pkgs.bash}/bin/bash -c "sbt -mem 4096 -java-home ${pkgs.openjdk11}/lib/openjdk"
+     ${pkgs.bash}/bin/bash -c "sbt -mem 4096 -java-home ${pkgs.openjdk17}/lib/openjdk"
   '';
 in with pkgs;
 
 buildFHSUserEnv {
   name = "docspell-sbt";
   targetPkgs = pkgs: with pkgs; [
-    netcat jdk11 wget which dpkg sbt git elmPackages.elm ncurses fakeroot mc
+    netcat jdk17 wget which dpkg sbt git elmPackages.elm ncurses fakeroot mc
     zola yarn
 
     # haskells http client needs this (to download elm packages)
diff --git a/website/site/content/docs/install/prereq.md b/website/site/content/docs/install/prereq.md
index bfcceca3..00d648cd 100644
--- a/website/site/content/docs/install/prereq.md
+++ b/website/site/content/docs/install/prereq.md
@@ -23,9 +23,9 @@ It is enough to install the JRE. The JDK is required, if you want to
 build docspell from source. For newer versions, the JRE is not shipped
 anymore, simply use JDK then.
 
-Docspell has been tested with Java 11 (or sometimes referred to as JDK
-11). The provided packages are build using JDK 11. However, it also
-works on newer java versions. The provided docker images use JDK11.
+Docspell has been tested with Java 17 (or sometimes referred to as JDK
+17). The provided packages are build using JDK 17. However, it also
+works on newer java versions. The provided docker images use JDK17.
 
 The next tools are only required on machines running the *Joex*
 component.