Merge pull request #168 from doubleSlashde/feature/update_dependencies

upgrade Spring Boot to 3.1.3

Author: Death111

pom.xml

@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.springframework.boot</groupId>
     <artifactId>spring-boot-starter-parent</artifactId>
-    <version>3.0.6</version>
+    <version>3.1.10</version>
     <relativePath />
     <!-- lookup parent from repository -->
   </parent>

src/main/java/de/doubleslash/keeptime/view/SettingsController.java

@@ -365,12 +365,12 @@ private void initImportButton() {
             confirmationAlert.setHeaderText("Do you want to Override current Data ?");
             confirmationAlert.getDialogPane()
                              .setContent(new Label(
-                                   """
-                                   Import previously exported .sql file. This will overwrite the currently used database contents - all current data will be lost!
-                                   
-                                   If you do not have a .sql file yet you need to open the previous version of KeepTime and in the settings dialog press "Export".
-                                   
-                                   You will need to restart the application after this action. If you proceed you need to select the previous exported .sql file.\
+                                   """
+                                   Import previously exported .sql file. This will overwrite the currently used database contents - all current data will be lost!
+                                   
+                                   If you do not have a .sql file yet you need to open the previous version of KeepTime and in the settings dialog press "Export".
+                                   
+                                   You will need to restart the application after this action. If you proceed you need to select the previous exported .sql file.\
                                    """));
             confirmationAlert.showAndWait();
 
@@ -391,10 +391,14 @@ private void initImportButton() {
             final String url = applicationProperties.getSpringDataSourceUrl();
             final String username = applicationProperties.getSpringDataSourceUserName();
             final String password = applicationProperties.getSpringDataSourcePassword();
-            // TODO: add an option at the next release to make the "FROM_1X flag" configurable. E.g. if we upgrade (in
-            // the release after) from H2 version 2.x to 2.x we must not set the "FROM_1X flag".
-            new RunScript().runTool("-url", url, "-user", username, "-password", password, "-script", file.toString(),
-                  "-options", "FROM_1X");
+
+            if (file.getName().contains("H2-version-1")) {
+               new RunScript().runTool("-url", url, "-user", username, "-password", password, "-script", file.toString(),
+                       "-options", "FROM_1X");
+               LOG.info("FROM_1X feature is used");
+            }else {
+               new RunScript().runTool("-url", url, "-user", username, "-password", password, "-script", file.toString());
+            }
 
             Alert informationDialog = new Alert(AlertType.INFORMATION);
 
@@ -404,9 +408,9 @@ private void initImportButton() {
             informationDialog.setTitle("Import done");
             informationDialog.setHeaderText("The data was imported.");
             informationDialog.getDialogPane()
-                             .setContent(new Label("""
-                                   KeepTime will now be CLOSED!
-                                   You have to RESTART it again to see the changes\
+                             .setContent(new Label("""
+                                   KeepTime will now be CLOSED!
+                                   You have to RESTART it again to see the changes\
                                    """));
             informationDialog.showAndWait();
             Platform.exit();
@@ -525,8 +529,8 @@ private void showLicense(final Licenses license) {
          final Alert alert = new Alert(AlertType.ERROR);
          alert.setTitle("Ooops");
          alert.setHeaderText("Could not find the license file");
-         alert.setContentText(
-               "We could not find the license file at \"%s\". Did you remove it?%nPlease redownload or visit \"%s\".".formatted(
+         alert.setContentText(
+               "We could not find the license file at \"%s\". Did you remove it?%nPlease redownload or visit \"%s\".".formatted(
                      license.getPath(), license.getUrl()));
 
          alert.getDialogPane().setMinHeight(Region.USE_PREF_SIZE);