resolve conflicts

Author: ghazwarhili

pom.xml

@@ -42,12 +42,11 @@
     </developers>
 
     <properties>
-        <!-- FIXME to remove at next upgrade of powsybl-ws-dependencies -->
-        <powsybl-network-store.version>1.28.0</powsybl-network-store.version>
+
+        <jib.from.image>powsybl/java-dynawo:3.0.0</jib.from.image>
+        <gridsuite-dependencies.version>42.0.0</gridsuite-dependencies.version>
         <!-- FIXME to remove at next upgrade of gridsuite-dependencies -->
         <gridsuite-computation.version>1.0.0</gridsuite-computation.version>
-        <jib.from.image>powsybl/java-dynawo:3.0.0</jib.from.image>
-        <gridsuite-dependencies.version>41.0.0</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>
@@ -91,25 +90,7 @@
 
     <dependencyManagement>
         <dependencies>
-            <!-- overrides of imports -->
-            <!-- FIXME to remove at next upgrade of powsybl-ws-dependencies -->
-            <dependency>
-                <groupId>com.powsybl</groupId>
-                <artifactId>powsybl-network-store-model</artifactId>
-                <version>${powsybl-network-store.version}</version>
-            </dependency>
-            <!-- FIXME to remove at next upgrade of powsybl-ws-dependencies -->
-            <dependency>
-                <groupId>com.powsybl</groupId>
-                <artifactId>powsybl-network-store-iidm-impl</artifactId>
-                <version>${powsybl-network-store.version}</version>
-            </dependency>
-            <!-- FIXME to remove at next upgrade of powsybl-ws-dependencies -->
-            <dependency>
-                <groupId>com.powsybl</groupId>
-                <artifactId>powsybl-network-store-client</artifactId>
-                <version>${powsybl-network-store.version}</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>