Merge branch 'main' into wip_logs_on_demand

gridsuite · Oct 26, 2023 · 738293d · 738293d
2 parents 460fbeb + 6f96291
commit 738293d
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 8 deletions.
diff --git a/pom.xml b/pom.xml
@@ -47,7 +47,6 @@
         <log4j2-mock-version>0.0.2</log4j2-mock-version>
         <testcontainers.version>1.18.3</testcontainers.version>
         <liquibase-hibernate-package>org.gridsuite.study.server</liquibase-hibernate-package>
-        <powsybl-open-reac.version>0.2.0</powsybl-open-reac.version>
     </properties>
 
     <build>
@@ -139,11 +138,6 @@
             <groupId>com.powsybl</groupId>
             <artifactId>powsybl-network-store-client</artifactId>
         </dependency>
-        <dependency>
-            <groupId>com.powsybl</groupId>
-            <artifactId>powsybl-open-reac</artifactId>
-            <version>${powsybl-open-reac.version}</version>
-        </dependency>
         <dependency>
             <groupId>com.powsybl</groupId>
             <artifactId>powsybl-shortcircuit-api</artifactId>

diff --git a/src/main/java/org/gridsuite/study/server/RestTemplateConfig.java b/src/main/java/org/gridsuite/study/server/RestTemplateConfig.java
@@ -12,7 +12,6 @@
 import com.powsybl.contingency.json.ContingencyJsonModule;
 import com.powsybl.loadflow.json.LoadFlowParametersJsonModule;
 import com.powsybl.loadflow.json.LoadFlowResultJsonModule;
-import com.powsybl.openreac.parameters.input.json.OpenReactJsonModule;
 import com.powsybl.security.json.SecurityAnalysisJsonModule;
 import com.powsybl.sensitivity.json.SensitivityJsonModule;
 import com.powsybl.shortcircuit.json.ShortCircuitAnalysisJsonModule;
@@ -54,7 +53,6 @@ private ObjectMapper createObjectMapper() {
         objectMapper.registerModule(new ContingencyJsonModule());
         objectMapper.registerModule(new LoadFlowResultJsonModule());
         objectMapper.registerModule(new LoadFlowParametersJsonModule());
-        objectMapper.registerModule(new OpenReactJsonModule());
         objectMapper.registerModule(new SecurityAnalysisJsonModule());
         objectMapper.registerModule(new ShortCircuitAnalysisJsonModule());
         objectMapper.registerModule(new SensitivityJsonModule());