From 471804a0a38ac8115f64d4e97371d078d5184131 Mon Sep 17 00:00:00 2001
From: Tristan Chuine <tristan.chuine_externe@rte-france.com>
Date: Tue, 17 Oct 2023 11:20:16 +0200
Subject: [PATCH 1/2] Add missing lombok config

---
 .mvn/lombok-config-copy.marker | 0
 lombok.config                  | 1 +
 2 files changed, 1 insertion(+)
 create mode 100644 .mvn/lombok-config-copy.marker
 create mode 100644 lombok.config

diff --git a/.mvn/lombok-config-copy.marker b/.mvn/lombok-config-copy.marker
new file mode 100644
index 0000000..e69de29
diff --git a/lombok.config b/lombok.config
new file mode 100644
index 0000000..4fa8250
--- /dev/null
+++ b/lombok.config
@@ -0,0 +1 @@
+import target/configs/powsybl-build-tools.jar!powsybl-build-tools/lombok.config

From ed973f2e08b9d36e8fe6a0d3d3ecd0877cbc5dfc Mon Sep 17 00:00:00 2001
From: Tristan Chuine <tristan.chuine_externe@rte-france.com>
Date: Tue, 17 Oct 2023 11:22:30 +0200
Subject: [PATCH 2/2] Update pom parent & liquibase config for tests

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

diff --git a/.gitignore b/.gitignore
index 41e2fab..c2d91ac 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/pom.xml b/pom.xml
index bc713dc..75e20d6 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 a3aee8b..8affe98 100644
--- a/src/test/resources/application-default.yml
+++ b/src/test/resources/application-default.yml
@@ -19,5 +19,5 @@ 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: ":"