Skip to content

Commit 33318ab

Browse files
committed
Merge remote-tracking branch 'origin/main' into dbraquart/refacto-use-a-single-entity-for-tabulars
# Conflicts: # pom.xml
2 parents 2492fcc + ef4f983 commit 33318ab

File tree

1 file changed

+21
-1
lines changed

1 file changed

+21
-1
lines changed

pom.xml

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,9 @@
5252
<sonar.organization>gridsuite</sonar.organization>
5353
<sonar.projectKey>org.gridsuite:network-modification-server</sonar.projectKey>
5454
<!-- TODO network-modification.version remove when upgrading gridsuite dependencies -->
55-
<network-modification.version>0.42.0-SNAPSHOT</network-modification.version>
55+
<network-modification.version>0.43.0-SNAPSHOT</network-modification.version>
56+
<!-- FIXME: powsybl-network-store modules'version is overloaded in the dependencies section.The overloads and this property below have to be removed at next powsybl-ws-dependencies.version upgrade -->
57+
<powsybl-network-store.version>1.31.0</powsybl-network-store.version>
5658
<powsybl-balances-adjustment.version>2.14.1</powsybl-balances-adjustment.version>
5759
</properties>
5860

@@ -96,6 +98,24 @@
9698
<type>pom</type>
9799
<scope>import</scope>
98100
</dependency>
101+
<!-- FIXME: to be removed at next powsybl-ws-dependencies upgrade -->
102+
<dependency>
103+
<groupId>com.powsybl</groupId>
104+
<artifactId>powsybl-network-store-model</artifactId>
105+
<version>${powsybl-network-store.version}</version>
106+
</dependency>
107+
<!-- FIXME: to be removed at next powsybl-ws-dependencies upgrade -->
108+
<dependency>
109+
<groupId>com.powsybl</groupId>
110+
<artifactId>powsybl-network-store-iidm-impl</artifactId>
111+
<version>${powsybl-network-store.version}</version>
112+
</dependency>
113+
<!-- FIXME: to be removed at next powsybl-ws-dependencies upgrade -->
114+
<dependency>
115+
<groupId>com.powsybl</groupId>
116+
<artifactId>powsybl-network-store-client</artifactId>
117+
<version>${powsybl-network-store.version}</version>
118+
</dependency>
99119

100120
<dependency>
101121
<groupId>com.powsybl</groupId>

0 commit comments

Comments
 (0)