Merge branch 'master' into csv_file_eurostag_naming_strategy

.travis.yml

@@ -1,5 +1,14 @@
 language: java
+
 jdk:
-  - oraclejdk8
-after_success:
-    - mvn clean test jacoco:report coveralls:report
+- oraclejdk8
+
+install:
+# Build iPST core
+- git clone https://github.com/itesla/ipst-core itesla/ipst-core
+- cd itesla/ipst-core && mvn install
+
+script:
+- cd ${TRAVIS_BUILD_DIR}
+- mvn clean test jacoco:report coveralls:report
+

CMakeLists.txt

@@ -31,17 +31,13 @@ if (DEFINED thirdparty_prefix AND IS_DIRECTORY "${thirdparty_prefix}")
 else()
     message(FATAL_ERROR "Thirdparty libraries not found. The variable thirdparty_prefix is NOT set or is NOT a valid directory.")
 endif()
-set(PROTOBUF_HOME ${thirdparty_prefix}/protobuf)
-set(LIBARCHIVE_HOME ${thirdparty_prefix}/libarchive)
 set(BOOST_ROOT ${thirdparty_prefix}/boost)
 set(LOG4CPP_HOME ${thirdparty_prefix}/log4cpp)
 set(SZIP_HOME ${thirdparty_prefix}/szip)
 set(ZLIB_HOME ${thirdparty_prefix}/zlib)
 set(HDF5_HOME ${thirdparty_prefix}/hdf5)
 set(MATIO_HOME ${thirdparty_prefix}/matio)
 
-add_subdirectory(mpi-communication)
-
 if(BUILD_EUROSTAG)
     message(STATUS "Eurostag based components (eurostag-indexes and wp43adapter) will be compiled.")
     add_subdirectory(eurostag-indexes)

README.md

@@ -13,25 +13,14 @@ In order to build iPST you need:
   * Maven 
   * CMake *(2.6 or greater)*
   * Recent C++ compiler (GNU g++ or Clang)
-  * OpenMPI *(1.8.3 or greater)*
+  * [ipst-core](https://github.com/itesla/ipst-core)
 
 Optional C++ modules requires:
   * Intel Fortran Compiler 
   * Matlab
   * Dymola
   * Eurostag
 
-### OpenMPI (required)
-In order to support the MPI modules, you need to compile and install the [OpenMPI](https://www.open-mpi.org/) library.
-```
-$> wget http://www.open-mpi.org/software/ompi/v1.8/downloads/openmpi-1.8.3.tar.bz2
-$> tar xjf openmpi-1.8.3.tar.bz2
-$> cd openmpi-1.8.3
-$> ./configure --prefix=<INSTALL_DIR> --enable-mpi-thread-multiple
-$> make install
-$> export PATH=$PATH:<INSTALL_DIR>/bin
-```
-
 ### Intel Fortran Compiler
 To compile Eurostag dependant modules, you have to set your INTEL_HOME environment variable to the root of the
 Intel Fortran Compiler installation.
@@ -115,3 +104,4 @@ thirdparty_packs=$HOME/itesla_packs
 
 ## License
 https://www.mozilla.org/en-US/MPL/2.0/
+

ampl-export/pom.xml

@@ -28,7 +28,6 @@
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>iidm-converter-api</artifactId>
-            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
@@ -48,13 +47,11 @@
         <dependency>
             <groupId>eu.itesla_project</groupId>
             <artifactId>iidm-network-test</artifactId>
-            <version>${project.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>eu.itesla_project</groupId>
             <artifactId>iidm-network-impl</artifactId>
-            <version>${project.version}</version>
             <scope>test</scope>
         </dependency>
     </dependencies>

cim1-import/pom.xml

@@ -23,6 +23,10 @@
     <name>CIM ENTSO-E V1 import</name>
 
     <dependencies>
+        <dependency>
+            <groupId>com.google.auto.service</groupId>
+            <artifactId>auto-service</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
@@ -35,19 +39,18 @@
             <groupId>org.jgrapht</groupId>
             <artifactId>jgrapht-core</artifactId>
         </dependency>
-        <dependency>
-            <groupId>eu.itesla_project</groupId>
-            <artifactId>cim1-model</artifactId>
-            <version>${project.version}</version>
-        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>iidm-converter-api</artifactId>
-            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>iidm-network-api</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>eu.itesla_project</groupId>
+            <artifactId>cim1-model</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>