From 8cb666fb12f35bc208b707a46faf3c6b825cf58f Mon Sep 17 00:00:00 2001
From: Tristan Chuine <tristan.chuine_externe@rte-france.com>
Date: Thu, 12 Oct 2023 15:16:59 +0200
Subject: [PATCH 1/2] unwanted file

---
 .gitignore                                 | 3 +++
 derby.log                                  | 0
 src/test/resources/application-default.yml | 2 +-
 3 files changed, 4 insertions(+), 1 deletion(-)
 delete mode 100644 derby.log

diff --git a/.gitignore b/.gitignore
index 41e2fabd..c2d91ac2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,6 @@ target/
 # IntelliJ
 /.idea
 *.iml
+
+# https://github.com/liquibase/liquibase/issues/2196
+/derby.log
diff --git a/derby.log b/derby.log
deleted file mode 100644
index e69de29b..00000000
diff --git a/src/test/resources/application-default.yml b/src/test/resources/application-default.yml
index 61069556..bf43d9cb 100644
--- a/src/test/resources/application-default.yml
+++ b/src/test/resources/application-default.yml
@@ -6,7 +6,7 @@ spring:
       hibernate.format_sql: true
       hibernate.generate_statistics: true
     hibernate:
-      #to turn off schema validation that fails (because of clob types) and blocks tests even if the the schema is compatible
+      #to turn off schema validation that fails (because of clob types) and blocks tests even if the schema is compatible
       ddl-auto: none
 
 logging:

From 7ec45a93d3a0ec3c90141be0462a5a8df77a0523 Mon Sep 17 00:00:00 2001
From: Tristan Chuine <tristan.chuine_externe@rte-france.com>
Date: Mon, 16 Oct 2023 18:36:04 +0200
Subject: [PATCH 2/2] Update pom parent and liquibase config for tests

---
 pom.xml                                    | 2 +-
 src/test/resources/application-default.yml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 3d57a8ec..7e215e9f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -13,7 +13,7 @@
     <parent>
         <groupId>com.powsybl</groupId>
         <artifactId>powsybl-parent-ws</artifactId>
-        <version>17</version>
+        <version>18</version>
         <relativePath/>
     </parent>
 
diff --git a/src/test/resources/application-default.yml b/src/test/resources/application-default.yml
index bf43d9cb..3d7fa2a1 100644
--- a/src/test/resources/application-default.yml
+++ b/src/test/resources/application-default.yml
@@ -19,7 +19,7 @@ logging:
 powsybl-ws:
   database:
     vendor: h2:mem
-    query: ;DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=FALSE;MODE=PostgreSQL
+    query: ;DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=FALSE;MODE=PostgreSQL;DEFAULT_NULL_ORDERING=HIGH
     hostPort: ":"