From 522d0ef02a802f64fb5e9a5dfa992f9f77d20dc3 Mon Sep 17 00:00:00 2001
From: Franck LECUYER <franck.lecuyer@rte-france.com>
Date: Mon, 23 Dec 2024 15:12:21 +0100
Subject: [PATCH 1/2] upgrade to gridsuite dependencies 36

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 3f616b35..32bc91eb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -43,7 +43,7 @@
 
     <properties>
         <jib.from.image>powsybl/java-dynawo:2.1.0</jib.from.image>
-        <gridsuite-dependencies.version>35</gridsuite-dependencies.version>
+        <gridsuite-dependencies.version>36</gridsuite-dependencies.version>
         <liquibase-hibernate-package>org.gridsuite.securityanalysis.server</liquibase-hibernate-package>
         <db-util.version>1.0.5</db-util.version>
         <mockwebserver3.version>5.0.0-alpha.14</mockwebserver3.version>

From dcd0fefe7923a6739ed1f6aacb619bb0f6e5be2c Mon Sep 17 00:00:00 2001
From: Franck LECUYER <franck.lecuyer@rte-france.com>
Date: Wed, 8 Jan 2025 16:18:03 +0100
Subject: [PATCH 2/2] Remove powsybl-ws-commons version override

Signed-off-by: Franck LECUYER <franck.lecuyer@rte-france.com>
---
 pom.xml | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/pom.xml b/pom.xml
index ea86945b..7be13fbe 100644
--- a/pom.xml
+++ b/pom.xml
@@ -86,11 +86,6 @@
     <dependencyManagement>
         <dependencies>
             <!-- overrides of imports -->
-            <dependency><!-- To remove when integrate in next release of gridsuite-dependencies or powsybl-ws-dependencies -->
-                <groupId>com.powsybl</groupId>
-                <artifactId>powsybl-ws-commons</artifactId>
-                <version>1.19.0</version>
-            </dependency>
             <dependency><!-- To remove when integrate in next release of gridsuite-dependencies or powsybl-ws-dependencies -->
                 <groupId>com.squareup.okhttp3</groupId>
                 <artifactId>okhttp-bom</artifactId>