From 5e3b9099616870801ef4a3c1df493b37d15d1c63 Mon Sep 17 00:00:00 2001
From: Damien Jeandemange <damien.jeandemange@artelys.com>
Date: Thu, 5 Dec 2024 10:17:37 +0100
Subject: [PATCH 1/2] powsybl-core 6.6.0-RC1

Signed-off-by: Damien Jeandemange <damien.jeandemange@artelys.com>
---
 pom.xml | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index e7cd105..497fb04 100644
--- a/pom.xml
+++ b/pom.xml
@@ -43,9 +43,10 @@
 
     <properties>
         <java.version>17</java.version>
-        <asciitable.version>0.3.2</asciitable.version>
-        <powsybl-core.version>6.5.1</powsybl-core.version>
+        <powsybl-core.version>6.6.0-RC1</powsybl-core.version>
         <powsybl-open-loadflow.version>1.14.0-SNAPSHOT</powsybl-open-loadflow.version>
+        <knitro-interfaces.version>14.1.0</knitro-interfaces.version>
+        <bridj.version>0.7.0</bridj.version>
     </properties>
 
     <build>
@@ -96,12 +97,12 @@
         <dependency>
             <groupId>com.artelys</groupId>
             <artifactId>knitro-interfaces</artifactId>
-            <version>14.1.0</version>
+            <version>${knitro-interfaces.version}</version>
         </dependency>
         <dependency>
             <groupId>com.artelys</groupId>
             <artifactId>bridj</artifactId>
-            <version>0.7.0</version>
+            <version>${bridj.version}</version>
         </dependency>
 
         <!-- Test dependencies -->

From 67073a06912b23704dcae063e878ab78f247e36a Mon Sep 17 00:00:00 2001
From: Damien Jeandemange <damien.jeandemange@artelys.com>
Date: Thu, 5 Dec 2024 10:28:36 +0100
Subject: [PATCH 2/2] olf main branch

Signed-off-by: Damien Jeandemange <damien.jeandemange@artelys.com>
---
 .github/workflows/maven.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index 179001c..87beb3e 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -62,7 +62,7 @@ jobs:
         uses: actions/checkout@v4
         with:
           repository: powsybl/powsybl-open-loadflow
-          ref: external-ac-solver
+          ref: main
           path: powsybl-open-loadflow
       - name: Build powsybl-open-loadflow
         run: mvn -batch-mode --no-transfer-progress clean install -DskipTests