From 5f7dc6fe3d31527d504a537bd71fb4835c250eb8 Mon Sep 17 00:00:00 2001
From: David Gerber <dg@zapek.com>
Date: Sat, 23 Nov 2024 20:39:21 +0100
Subject: [PATCH] Upgrade to Spring Boot 3.4.0

---
 SandBox.wsb                                         | 13 +++++++++++++
 .../java/io/xeres/app/service/file/FileService.java |  6 ++++--
 app/src/main/resources/application-dev.properties   |  5 +----
 build.gradle                                        |  4 ++--
 4 files changed, 20 insertions(+), 8 deletions(-)
 create mode 100644 SandBox.wsb

diff --git a/SandBox.wsb b/SandBox.wsb
new file mode 100644
index 00000000..e1334ac4
--- /dev/null
+++ b/SandBox.wsb
@@ -0,0 +1,13 @@
+<Configuration>
+<VGpu>Default</VGpu>
+<Networking>Default</Networking>
+<MappedFolders>
+    <MappedFolder>
+        <HostFolder>C:\Users\zapek\workspace\Xeres\app\build\distributions</HostFolder>
+        <ReadOnly>true</ReadOnly>
+    </MappedFolder>
+</MappedFolders>
+<LogonCommand>
+    <Command>msiexec /i C:\Users\WDAGutilityAccount\Desktop\distributions\Xeres-0.7.2.msi</Command>
+</LogonCommand>
+</Configuration>
\ No newline at end of file
diff --git a/app/src/main/java/io/xeres/app/service/file/FileService.java b/app/src/main/java/io/xeres/app/service/file/FileService.java
index c8e0e70f..61c0f9e3 100644
--- a/app/src/main/java/io/xeres/app/service/file/FileService.java
+++ b/app/src/main/java/io/xeres/app/service/file/FileService.java
@@ -386,8 +386,10 @@ private List<File> getFullPath(File file)
 		tree.add(file);
 		while (file.getParent() != null)
 		{
-			tree.add(file.getParent());
-			file = file.getParent();
+			var parent = file.getParent();
+			tree.add(parent);
+			parent.getChildren().add(file);
+			file = parent;
 		}
 		Collections.reverse(tree);
 
diff --git a/app/src/main/resources/application-dev.properties b/app/src/main/resources/application-dev.properties
index 2cead72a..58221723 100644
--- a/app/src/main/resources/application-dev.properties
+++ b/app/src/main/resources/application-dev.properties
@@ -80,16 +80,13 @@ logging.level.io.xeres.app.xrs.service.turtle=DEBUG
 
 ### Other settings
 
-## Flyway
-spring.flyway.clean-on-validation-error=false
-
 ## Swagger UI
 springdoc.swagger-ui.tags-sorter=alpha
 
 ## Actuator
 info.java.vm.vendor=${java.vm.vendor}
 info.java.version=${java.version}
-management.endpoint.shutdown.enabled=true
+management.endpoint.shutdown.access=unrestricted
 management.endpoints.web.exposure.include=*
 management.endpoints.web.base-path=/api/v1/actuator
 management.info.java.enabled=true
diff --git a/build.gradle b/build.gradle
index 35818024..6e911e0f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -32,8 +32,8 @@ buildscript {
 }
 
 plugins {
-    id 'org.springframework.boot' version '3.3.6' apply false
-    id 'org.flywaydb.flyway' version '10.10.0' apply false // Keep the version in sync with spring-boot from time to time
+    id 'org.springframework.boot' version '3.4.0' apply false
+    id 'org.flywaydb.flyway' version '10.20.0' apply false // Keep the version in sync with spring-boot from time to time
     id 'org.panteleyev.jpackageplugin' version '1.6.0' apply false
     id 'org.sonarqube' version '6.0.0.5145'
 }