Fix pom.xml and remove references to ipst-core and ipst-entsoe

itesla · Oct 9, 2017 · 2a2285b · 2a2285b
1 parent 8c68a40
commit 2a2285b
Show file tree

Hide file tree

Showing 41 changed files with 759 additions and 755 deletions.
diff --git a/README.md b/README.md
@@ -13,8 +13,7 @@ In order to build iPST you need:
   * Maven 
   * CMake *(2.6 or greater)*
   * Recent C++ compiler (GNU g++ or Clang)
-  * [ipst-core](https://github.com/itesla/ipst-core)
-  * [ipst-entsoe](https://github.com/itesla/ipst-entsoe)
+  * [powsybl-core](https://github.com/powsybl/powsybl-core)
 
 Optional C++ modules requires:
   * Intel Fortran Compiler 

diff --git a/ampl-export/pom.xml b/ampl-export/pom.xml
@@ -22,38 +22,39 @@
 
     <dependencies>
         <!-- Compilation dependencies -->
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-api</artifactId>
-        </dependency>
         <dependency>
             <groupId>com.powsybl</groupId>
             <artifactId>powsybl-iidm-converter-api</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+        </dependency>
         <dependency>
             <groupId>eu.itesla_project</groupId>
             <artifactId>network-merge</artifactId>
+            <version>${project.version}</version>
         </dependency>
 
         <!-- Test dependencies -->
         <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
+            <groupId>com.powsybl</groupId>
+            <artifactId>powsybl-iidm-test</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-simple</artifactId>
+            <groupId>com.powsybl</groupId>
+            <artifactId>powsybl-iidm-impl</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>com.powsybl</groupId>
-            <artifactId>powsybl-iidm-test</artifactId>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>com.powsybl</groupId>
-            <artifactId>powsybl-iidm-impl</artifactId>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-simple</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>

diff --git a/case-projector/pom.xml b/case-projector/pom.xml
@@ -28,10 +28,6 @@
             <groupId>com.google.auto.service</groupId>
             <artifactId>auto-service</artifactId>
         </dependency>
-        <dependency>
-            <groupId>commons-cli</groupId>
-            <artifactId>commons-cli</artifactId>
-        </dependency>
         <dependency>
             <groupId>com.powsybl</groupId>
             <artifactId>powsybl-commons</artifactId>
@@ -52,14 +48,18 @@
             <groupId>com.powsybl</groupId>
             <artifactId>powsybl-simulation-api</artifactId>
         </dependency>
+        <dependency>
+            <groupId>commons-cli</groupId>
+            <artifactId>commons-cli</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>ampl-export</artifactId>
-            <version>${ipst.version}</version>
+            <version>${project.version}</version>
         </dependency>
 
         <!-- Test dependencies -->

diff --git a/case-repository/pom.xml b/case-repository/pom.xml
@@ -21,24 +21,25 @@
     <name>Case repository</name>
 
     <dependencies>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>joda-time</groupId>
-            <artifactId>joda-time</artifactId>
-        </dependency>
+        <!-- Compilation dependencies -->
         <dependency>
             <groupId>com.powsybl</groupId>
             <artifactId>powsybl-iidm-converter-api</artifactId>
-            <version>${powsybl.version}</version>
         </dependency>
         <dependency>
             <groupId>com.powsybl</groupId>
             <artifactId>powsybl-computation</artifactId>
-            <version>${powsybl.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>joda-time</groupId>
+            <artifactId>joda-time</artifactId>
+        </dependency>
+
+        <!-- Test dependencies -->
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>

diff --git a/config/logback-offline.xml b/config/logback-offline.xml
@@ -21,13 +21,13 @@
     <logger name="eu.itesla_project.eurostag.EurostagImpactAnalysis" level="TRACE" />
     <logger name="com.rte_france.itesla.optim.OptimizerExecutor" level="DEBUG" />
     <logger name="eu.itesla_project.modules.topo.TopologyHistory" level="DEBUG" />
-    <logger name="eu.itesla_project.iidm.import_.JavaScriptPostProcessor" level="DEBUG" />
+    <logger name="com.powsybl.iidm.import_.JavaScriptPostProcessor" level="DEBUG" />
     <logger name="eu.itesla_project.iidm.ddb.eurostag.EurostagStepUpTransformerInserter" level="DEBUG" />
-    <logger name="eu.itesla_project.ucte.network" level="ERROR" />
+    <logger name="com.powsybl.ucte.network" level="ERROR" />
     <logger name="com.rte_france.itesla.hades2.Hades2Executor" level="DEBUG" />
     <logger name="eu.itesla_project.iidm.ddb.eurostag_imp_exp" level="ERROR" />
     <logger name="org.nocrala.tools.texttablefmt" level="ERROR" />
-    <logger name="eu.itesla_project.iidm.network.impl.CurrentLimitsAdderImpl" level="ERROR" />
+    <logger name="com.powsybl.iidm.network.impl.CurrentLimitsAdderImpl" level="ERROR" />
     <logger name="com.rte_france.itesla.iidm.export.adn.ADNConverter" level="ERROR" />   
     <root level="INFO">
         <appender-ref ref="STDOUT" />

diff --git a/config/logback-online.xml b/config/logback-online.xml
@@ -25,11 +25,11 @@
     <logger name="org.xnio" level="WARN" />
     <logger name="org.jboss" level="ERROR" />
     <logger name="org.jboss.naming.remote.protocol.v1.RemoteNamingStoreV1" level="FATAL" />
-    <logger name="eu.itesla_project.cim1.converter.ModelConverter" level="INFO" />
+    <logger name="com.powsybl.cim1.converter.ModelConverter" level="INFO" />
     <logger name="eu.itesla_project.iidm.ddb.eurostag_imp_exp" level="INFO" />
     <logger name="eu.itesla_project.iidm.eurostag.export" level="WARN" />
-    <logger name="eu.itesla_project.iidm.import_" level="DEBUG" />
-    <logger name="eu.itesla_project.iidm" level="DEBUG" />
+    <logger name="com.powsybl.iidm.import_" level="DEBUG" />
+    <logger name="com.powsybl.iidm" level="DEBUG" />
     <logger name="eu.itesla_project.iidm.ddb.eurostag" level="INFO" />
     <logger name="eu.itesla_project.mcla" level="INFO" />
     <logger name="eu.itesla_project.mcla.montecarlo.MontecarloSamplerImpl" level="DEBUG" />
@@ -38,7 +38,7 @@
     <logger name="com.gridquant.helm" level="ERROR" />
     <logger name="org.apache" level="ERROR" />
     <logger name="org.nocrala.tools.texttablefmt" level="ERROR" />
-    <logger name="eu.itesla_project.iidm.network.impl.CurrentLimitsAdderImpl" level="ERROR" />
+    <logger name="com.powsybl.iidm.network.impl.CurrentLimitsAdderImpl" level="ERROR" />
     <logger name="com.rte_france.itesla.iidm.export.adn.ADNConverter" level="ERROR" />
     <root level="DEBUG">
         <!--appender-ref ref="FILE" /-->

diff --git a/dymola-integration/pom.xml b/dymola-integration/pom.xml
@@ -28,84 +28,62 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-api</artifactId>
+            <groupId>com.powsybl</groupId>
+            <artifactId>powsybl-simulation-api</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.jboss.shrinkwrap</groupId>
-            <artifactId>shrinkwrap-api</artifactId>
+            <groupId>commons-configuration</groupId>
+            <artifactId>commons-configuration</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.jboss.shrinkwrap</groupId>
-            <artifactId>shrinkwrap-api-nio2</artifactId>
+            <groupId>net.sourceforge.jmatio</groupId>
+            <artifactId>jmatio</artifactId>
         </dependency>
         <dependency>
             <groupId>org.jboss.shrinkwrap</groupId>
-            <artifactId>shrinkwrap-impl-base</artifactId>
-            <scope>runtime</scope>
+            <artifactId>shrinkwrap-api</artifactId>
         </dependency>
         <dependency>
             <groupId>org.jboss.shrinkwrap</groupId>
-            <artifactId>shrinkwrap-impl-nio2</artifactId>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>commons-configuration</groupId>
-            <artifactId>commons-configuration</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>ch.qos.logback</groupId>
-            <artifactId>logback-classic</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>jcl-over-slf4j</artifactId>
-            <version>1.6.6</version>
-            <scope>test</scope>
+            <artifactId>shrinkwrap-api-nio2</artifactId>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
-            <artifactId>log4j-over-slf4j</artifactId>
-            <version>1.7.6</version>
-            <scope>test</scope>
+            <artifactId>slf4j-api</artifactId>
         </dependency>
         <dependency>
-            <groupId>net.sourceforge.jmatio</groupId>
-            <artifactId>jmatio</artifactId>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>modelica-events-adder</artifactId>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
-            <groupId>com.powsybl</groupId>
-            <artifactId>powsybl-iidm-converter-api</artifactId>
-            <version>${powsybl.version}</version>
-            <scope>test</scope>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>modelica-export</artifactId>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>eu.itesla_project.iidm-ddb</groupId>
             <artifactId>iidm-ddb-eurostag-import-export</artifactId>
             <version>0.0.1-SNAPSHOT</version>
         </dependency>
+
+        <!-- Runtime dependencies -->
         <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.powsybl</groupId>
-            <artifactId>powsybl-simulation-api</artifactId>
-            <version>${powsybl.version}</version>
+            <groupId>org.jboss.shrinkwrap</groupId>
+            <artifactId>shrinkwrap-impl-base</artifactId>
+            <scope>runtime</scope>
         </dependency>
-
         <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>modelica-export</artifactId>
-            <version>${ipst.version}</version>
+            <groupId>org.jboss.shrinkwrap</groupId>
+            <artifactId>shrinkwrap-impl-nio2</artifactId>
+            <scope>runtime</scope>
         </dependency>
 
+        <!-- Test dependencies -->
         <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>modelica-events-adder</artifactId>
-            <version>${ipst.version}</version>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>test</scope>
         </dependency>
 
     </dependencies>

diff --git a/dymola-integration/src/test/resources/logback-test.xml b/dymola-integration/src/test/resources/logback-test.xml
@@ -19,7 +19,7 @@
     <logger name="ch.qos.logback.classic" level="ERROR" />
 
     <!-- logger name="eu.itesla_project.iidm.ddb" level="WARN" /-->
-    <!-- logger name="eu.itesla_project.computation" level="TRACE" /-->
+    <!-- logger name="com.powsybl.computation" level="TRACE" /-->
 
     <root level="INFO">
         <appender-ref ref="STDOUT" />

diff --git a/dymola-integration/src/test/resources/logback.xml b/dymola-integration/src/test/resources/logback.xml
@@ -21,7 +21,7 @@
     <logger name="ch.qos.logback.classic" level="ERROR" />
 
     <!-- logger name="eu.itesla_project.iidm.ddb" level="WARN" /-->
-    <!-- logger name="eu.itesla_project.computation" level="TRACE" /-->
+    <!-- logger name="com.powsybl.computation" level="TRACE" /-->
 
     <root level="INFO">
         <appender-ref ref="STDOUT" />

diff --git a/entsoe-case-repository/pom.xml b/entsoe-case-repository/pom.xml
@@ -28,35 +28,37 @@
             <artifactId>guava</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-api</artifactId>
+            <groupId>com.powsybl</groupId>
+            <artifactId>powsybl-commons</artifactId>
         </dependency>
         <dependency>
-            <groupId>joda-time</groupId>
-            <artifactId>joda-time</artifactId>
+            <groupId>com.powsybl</groupId>
+            <artifactId>powsybl-entsoe-util</artifactId>
         </dependency>
         <dependency>
-            <groupId>eu.itesla_project</groupId>
-            <artifactId>case-repository</artifactId>
+            <groupId>com.powsybl</groupId>
+            <artifactId>powsybl-iidm-converter-api</artifactId>
         </dependency>
+
         <dependency>
-            <groupId>com.powsybl</groupId>
-            <artifactId>powsybl-commons</artifactId>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
         </dependency>
         <dependency>
-            <groupId>com.powsybl</groupId>
-            <artifactId>powsybl-iidm-converter-api</artifactId>
+            <groupId>joda-time</groupId>
+            <artifactId>joda-time</artifactId>
         </dependency>
         <dependency>
-            <groupId>com.powsybl</groupId>
-            <artifactId>powsybl-entsoe-util</artifactId>
-            <version>${powsybl.version}</version>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>case-repository</artifactId>
+            <version>${project.version}</version>
         </dependency>
 
         <!-- Test dependencies -->
         <dependency>
             <groupId>com.google.jimfs</groupId>
             <artifactId>jimfs</artifactId>
+            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>junit</groupId>