diff --git a/README.md b/README.md index 0084316..1ad7a33 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ -[![Build Status](https://travis-ci.org/itesla/ipst.svg?branch=master)](https://travis-ci.org/itesla/ipst) -[![Coverage Status](https://coveralls.io/repos/github/itesla/ipst/badge.svg?branch=master)](https://coveralls.io/github/itesla/ipst?branch=master) +[![Build Status](https://travis-ci.org/itesla/ipst-entsoe.svg?branch=master)](https://travis-ci.org/itesla/ipst-entsoe) +[![Coverage Status](https://coveralls.io/repos/github/itesla/ipst-entsoe/badge.svg?branch=master)](https://coveralls.io/github/itesla/ipst-entsoe?branch=master) [![MPL-2.0 License](https://img.shields.io/badge/license-MPL_2.0-blue.svg)](https://www.mozilla.org/en-US/MPL/2.0/) # iTESLA @@ -11,29 +11,16 @@ http://www.itesla-pst.org In order to build iPST you need: * JDK *(1.8 or greater)* * Maven - * CMake *(2.6 or greater)* - * Recent C++ compiler (GNU g++ or Clang) * [ipst-core](https://github.com/itesla/ipst-core) - -Optional C++ modules requires: - * Intel Fortran Compiler - * Matlab - * Dymola - * Eurostag - -### 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. ## Install To easily compile iPST, you can use the toolchain: ``` -$> git clone https://github.com/itesla/ipst.git +$> git clone https://github.com/itesla/ipst-entsoe.git $> ./install.sh ``` By default, the toolchain will: - * download and compile all external packages from the Internet - * compile C++ and Java modules + * compile Java modules * install iPST ### Targets @@ -41,11 +28,10 @@ By default, the toolchain will: | Target | Description | | ------ | ----------- | | clean | Clean iPST modules | -| clean-thirdparty | Clean the thirdparty libraries | | compile | Compile iPST modules | | package | Compile iPST modules and create a distributable package | | __install__ | __Compile iPST modules and install it__ | -| docs | Generate the documentation (Doxygen/Javadoc) | +| docs | Generate the documentation (Javadoc) | | help | Display this help | ### Options @@ -61,45 +47,10 @@ each time you use the toolchain. | --prefix | Set the installation directory | $HOME/itesla | | --package-type | Set the package format. The supported formats are zip, tar, tar.gz and tar.bz2 | zip | -#### C++ modules - -| Option | Description | Default value | -| ------ | ----------- | ------------- | -| --with-dymola | Enable the compilation of Dymola dependant modules | $DYMOLA_HOME | -| --without-dymola | Disable the compilation of Dymola dependant modules | | -| --with-eurostag | Enable the compilation of Eurostag dependant modules | $EUROSTAG_SDK_HOME | -| --without-eurostag | Disable the compilation of Eurostag dependant modules | | -| --with-matlab | Enable the compilation of Matlab dependant modules | $MATLAB_HOME | -| --without-matlab | Disable the compilation of Matlab dependant modules | | - -#### Third-parties - -| Option | Description | Default value | -| ------ | ----------- | ------------- | -| --with-thirdparty | Enable the compilation of thirdparty libraries | | -| --without-thirdparty | Disable the compilation of thirdparty libraries | | -| --thirdparty-prefix | Set the thirdparty installation directory | $HOME/itesla_thirdparty | -| --thirdparty-download | Sets false to compile thirdparty libraries from a local repository | true | -| --thirdparty-packs | Sets the thirdparty libraries local repository | $HOME/itesla_packs | - ### Default configuration file ``` ipst_prefix=$HOME/itesla ipst_package_type=zip - -# -- iPST C++ modules options -- -eurostag_build=false -eurostag_home=$EUROSTAG_SDK_HOME -dymola_build=false -dymola_home=$DYMOLA_HOME -matlab_build=false -matlab_home=$MATLAB_HOME - -# -- iPST thirdparty libraries -- -thirdparty_build=true -thirdparty_prefix=$HOME/itesla_thirdparty -thirdparty_download=true -thirdparty_packs=$HOME/itesla_packs ``` ## License diff --git a/cim1-import/pom.xml b/cim1-import/pom.xml index 337840e..49acdf6 100644 --- a/cim1-import/pom.xml +++ b/cim1-import/pom.xml @@ -14,7 +14,7 @@ eu.itesla_project - itesla-parent + ipst-entsoe 0.1-SNAPSHOT @@ -28,10 +28,6 @@ com.google.auto.service auto-service - - com.google.jimfs - jimfs - org.apache.servicemix.bundles org.apache.servicemix.bundles.gdata @@ -46,13 +42,12 @@ eu.itesla_project - iidm-converter-api + commons eu.itesla_project - iidm-network-api + iidm-converter-api - ${project.groupId} cim1-model @@ -65,6 +60,11 @@ + + com.google.jimfs + jimfs + test + commons-io commons-io @@ -75,5 +75,11 @@ junit test + + org.slf4j + slf4j-simple + test + + diff --git a/cim1-model/pom.xml b/cim1-model/pom.xml index 80724e0..6da35a9 100644 --- a/cim1-model/pom.xml +++ b/cim1-model/pom.xml @@ -14,7 +14,7 @@ eu.itesla_project - itesla-parent + ipst-entsoe 0.1-SNAPSHOT @@ -24,6 +24,7 @@ CIM ENTSO-E V1 model generated by CIM Gateway tool + org.apache.servicemix.bundles org.apache.servicemix.bundles.gdata @@ -39,5 +40,6 @@ junit test + diff --git a/distribution/pom.xml b/distribution/pom.xml index 38deb6a..b39c47b 100644 --- a/distribution/pom.xml +++ b/distribution/pom.xml @@ -14,7 +14,7 @@ eu.itesla_project - itesla-parent + ipst-entsoe 0.1-SNAPSHOT @@ -27,17 +27,9 @@ ${project.groupId} - offline-mpi + cim1-model ${project.version} - - - eu.itesla_project - online-mpi - ${project.version} - - - ${project.groupId} cim1-import @@ -45,112 +37,27 @@ ${project.groupId} - ucte-import - ${project.version} - - - - - eu.itesla_project entsoe-case-repository ${project.version} - - - - eu.itesla_project.iidm-ddb - iidm-ddb-eurostag-import-export - 0.0.1-SNAPSHOT - - - - - ${project.groupId} - histodb-client - ${project.version} - - - ${project.groupId} - sampling-integration + entsoe-util ${project.version} - - - + ${project.groupId} - eurostag-integration + network-merge ${project.version} - + ${project.groupId} - eurostag-step-up-transformer - ${project.version} - - - - - eu.itesla_project - pclfsim-integration - ${project.version} - - - - - eu.itesla_project - mmap-offline-db - ${project.version} - - - - - eu.itesla_project - file-system-rules-db - ${project.version} - - - - - eu.itesla_project - wca-integration - ${project.version} - - - - - eu.itesla_project - iidm-actions-contingencies-xml-client - ${project.version} - - - - org.slf4j - log4j-over-slf4j - 1.7.19 - - - - - eu.itesla_project.iidm-ddb - iidm-ddb-eurostag-modelica-converter - 0.0.1-SNAPSHOT - - - ${project.groupId} - modelica-export - ${project.version} - - - ${project.groupId} - modelica-events-adder + ucte-import ${project.version} - - - + ${project.groupId} - fpf-integration + ucte-network ${project.version} diff --git a/distribution/src/main/resources/assemblies/full.xml b/distribution/src/main/resources/assemblies/full.xml index 1d091a2..91afcaf 100644 --- a/distribution/src/main/resources/assemblies/full.xml +++ b/distribution/src/main/resources/assemblies/full.xml @@ -21,51 +21,8 @@ share/java - - - - ${project.basedir}/../scripts - bin - - * - - 0755 - - - ${project.basedir}/../config - etc - - logback*.xml - - 0644 - - - ${project.basedir}/../build/bin - bin - - * - - 0755 - - - ${project.basedir}/../build/lib - lib - - *.so - - - - - - - ${project.basedir}/../iidm-actions-contingencies-xml-client/src/main/resources - etc - - xsd/actions.xsd - - 0644 - + ${project.basedir}/../target/site/apidocs @@ -73,13 +30,6 @@ 0644 - - - ${project.basedir}/../build/html - doc/cpp/ipst - 0644 - - diff --git a/entsoe-case-repository/pom.xml b/entsoe-case-repository/pom.xml index c05bc1e..6d5aece 100644 --- a/entsoe-case-repository/pom.xml +++ b/entsoe-case-repository/pom.xml @@ -10,27 +10,56 @@ + 4.0.0 + - itesla-parent eu.itesla_project + ipst-entsoe 0.1-SNAPSHOT - 4.0.0 entsoe-case-repository ENTSO-E case repository + - ${project.groupId} + com.google.guava + guava + + + org.slf4j + slf4j-api + + + joda-time + joda-time + + + eu.itesla_project case-repository - ${project.version} + + + eu.itesla_project + commons + + + eu.itesla_project + iidm-converter-api ${project.groupId} entsoe-util ${project.version} + + + + junit + junit + test + + org.jboss.shrinkwrap shrinkwrap-api @@ -56,16 +85,12 @@ mockito-all test - - junit - junit - test - org.slf4j slf4j-simple test + - \ No newline at end of file + diff --git a/entsoe-util/pom.xml b/entsoe-util/pom.xml index 406cdbc..0024f5b 100644 --- a/entsoe-util/pom.xml +++ b/entsoe-util/pom.xml @@ -14,7 +14,7 @@ eu.itesla_project - itesla-parent + ipst-entsoe 0.1-SNAPSHOT @@ -24,6 +24,7 @@ Utilities for working with ENTSO-E data + com.google.guava guava @@ -37,18 +38,21 @@ poi-ooxml - ${project.groupId} + eu.itesla_project commons - ${project.groupId} + eu.itesla_project iidm-network-api + + junit junit test + diff --git a/install.sh b/install.sh index 1a14c70..69ccd6b 100755 --- a/install.sh +++ b/install.sh @@ -15,25 +15,12 @@ ipst_package_version=` mvn -f "$sourceDir/pom.xml" org.apache.maven.plugins:mave ipst_package_name=ipst-$ipst_package_version ipst_package_type=zip -dymola_build=false -dymola_home= -eurostag_build=false -eurostag_home= -matlab_build=false -matlab_home= - -thirdparty_build=true -thirdparty_prefix=$HOME/itesla_thirdparty -thirdparty_download=true -thirdparty_packs=$HOME/itesla_packs - # Targets ipst_clean=false ipst_compile=false ipst_docs=false ipst_package=false ipst_install=false -thirdparty_clean=false ## read settings from configuration file @@ -52,33 +39,17 @@ usage() { echo "" echo "Available targets:" echo " clean Clean iPST modules" - echo " clean-thirdparty Clean the thirdparty libraries" echo " compile Compile iPST modules" echo " package Compile iPST modules and create a distributable package" echo " install Compile iPST modules and install it (default target)" echo " help Display this help" - echo " docs Generate the documentation (Doxygen/Javadoc)" + echo " docs Generate the documentation (Javadoc)" echo "" echo "iPST options:" echo " --help Display this help" echo " --prefix Set the installation directory (default is $HOME/itesla)" echo " --package-type Set the package format. The supported formats are zip, tar, tar.gz and tar.bz2 (default is zip)" echo "" - echo "iPST C++ options:" - echo " --with-dymola Enable the compilation of Dymola dependant modules (DYMOLA_HOME)" - echo " --without-dymola Disable the compilation of Dymola dependant modules (default)" - echo " --with-eurostag Enable the compilation of Eurostag dependant modules (EUROSTAG_SDK_HOME)" - echo " --without-eurostag Disable the compilation of Eurostag dependant modules (default)" - echo " --with-matlab Enable the compilation of Matlab dependant modules (MATLAB_HOME)" - echo " --without-matlab Disable the compilation of Matlab dependant modules (default)" - echo "" - echo "Thirdparty options:" - echo " --with-thirdparty Enable the compilation of thirdparty libraries (default)" - echo " --without-thirdparty Disable the compilation of thirdparty libraries" - echo " --thirdparty-prefix Set the thirdparty installation directory (default is $HOME/itesla_thirdparty)" - echo " --thirdparty-download Sets false to compile thirdparty libraries from a local repository (default is true)" - echo " --thirdparty-packs Sets the thirdparty libraries local repository (default is $HOME/itesla_packs)" - echo "" } @@ -137,64 +108,6 @@ writeSettings() { } -## Build required C++ thirdparty libraries -############################################################################### -buildthirdparty() -{ - if [[ $thirdparty_clean = true || $ipst_compile = true ]]; then - echo "** C++ thirdparty libraries" - - if [ $thirdparty_clean = true ]; then - echo "**** Removing thirdparty install directory (if already exists)." - rm -rf "$thirdparty_prefix" - fi - - if [ $ipst_compile = true ]; then - if [ $thirdparty_build = true ]; then - echo "**** Building the C++ thirdparty libraries" - thirdparty_builddir="${thirdparty_prefix}/build/ipst" - cmake -Dprefix="$thirdparty_prefix" -Ddownload="$thirdparty_download" -Dpacks="$thirdparty_packs" -G "Unix Makefiles" -H"$sourceDir/thirdparty" -B"$thirdparty_builddir" || exit $? - make -C "$thirdparty_builddir" || exit $? - - thirdparty_build=false - else - echo "**** Skipping the build of the required thirdparty libraries, assuming a previous build in $thirdparty_prefix" - fi - fi - fi -} - -## Build C++ modules -############################################################################### -ipst_cpp() -{ - if [[ $ipst_clean = true || $ipst_compile = true || $ipst_docs = true ]]; then - echo "** iPST C++ modules" - - ipst_builddir=$sourceDir/build - - if [ $ipst_clean = true ]; then - echo "**** Removing build directory (if already exists)." - rm -rf "$ipst_builddir" - fi - - if [[ $ipst_compile = true || $ipst_docs = true ]]; then - # TODO: rename variable - cmake -DCMAKE_INSTALL_PREFIX="$ipst_prefix" -Dthirdparty_prefix="$thirdparty_prefix" -DBUILD_EUROSTAG=$eurostag_build -DEUROSTAG_SDK_HOME="${eurostag_home}" -DBUILD_MATLAB=$matlab_build -DMATLAB_HOME="${matlab_home}" -DBUILD_DYMOLA=$dymola_build -DDYMOLA_HOME="${dymola_home}" -G "Unix Makefiles" -H"$sourceDir" -B"$ipst_builddir" || exit $? - - if [ $ipst_compile = true ]; then - echo "**** Compiling C++ modules" - make -C "$ipst_builddir" || exit $? - fi - - if [ $ipst_docs = true ]; then - echo "**** Generating Doxygen documentation" - make -C "$ipst_builddir" doc || exit $? - fi - fi - fi -} - ## Build Java Modules ############################################################################### ipst_java() @@ -266,27 +179,14 @@ ipst_install() echo "**** Copying files" mkdir -p "$ipst_prefix" || exit $? cp -Rp "$sourceDir/distribution/target/distribution-${ipst_package_version}-full/itesla"/* "$ipst_prefix" || exit $? - - if [ ! -f "$ipst_prefix/etc/itesla.conf" ]; then - echo "**** Copying configuration files" - mkdir -p "$ipst_prefix/etc" || exit $? - - echo "#itesla_cache_dir=" >> "$ipst_prefix/etc/itesla.conf" - echo "#itesla_config_dir=" >> "$ipst_prefix/etc/itesla.conf" - echo "itesla_config_name=config" >> "$ipst_prefix/etc/itesla.conf" - echo "mpi_tasks=3" >> "$ipst_prefix/etc/itesla.conf" - echo "mpi_hosts=localhost" >> "$ipst_prefix/etc/itesla.conf" - fi fi } ## Parse command line ############################################################################### ipst_options="prefix:,package-type:" -ipst_cpp_options="with-eurostag::,without-eurostag,with-dymola::,without-dymola,with-matlab::,without-matlab" -thirdparty_options="with-thirdparty,without-thirdparty,thirdparty-prefix:,thirdparty-download,thirdparty-packs:" -opts=`getopt -o '' --long "help,$ipst_options,$ipst_cpp_options,$thirdparty_options" -n 'install.sh' -- "$@"` +opts=`getopt -o '' --long "help,$ipst_options" -n 'install.sh' -- "$@"` eval set -- "$opts" while true; do case "$1" in @@ -294,33 +194,6 @@ while true; do --prefix) ipst_prefix=$2 ; shift 2 ;; --package-type) ipst_package_type=$2 ; shift 2 ;; - # iPST C++ options - --with-dymola) - case "$2" in - "") dymola_build=true ; dymola_home=${DYMOLA_HOME} ; shift 2 ;; - *) dymola_build=true ; dymola_home=$2 ; shift 2 ;; - esac ;; - --without-dymola) dymola_build=false ; shift ;; - --with-eurostag) - case "$2" in - "") eurostag_build=true ; eurostag_home=${EUROSTAG_SDK_HOME} ; shift 2 ;; - *) eurostag_build=true ; eurostag_home=$2 ; shift 2 ;; - esac ;; - --without-eurostag) eurostag_build=false ; shift ;; - --with-matlab) - case "$2" in - "") matlab_build=true ; matlab_home=${MATLAB_HOME} ; shift 2 ;; - *) matlab_build=true ; matlab_home=$2 ; shift 2 ;; - esac ;; - --without-matlab) matlab_build=false ; shift ;; - - # Third-party options - --with-thirdparty) thirdparty_build=true ; shift ;; - --without-thirdparty) thirdparty_build=false ; shift ;; - --thirdparty-prefix) thirdparty_prefix=$2 ; shift 2 ;; - --thirdparty-download) thirdparty_download=true ; shift ;; - --thirdparty-packs) thirdparty_packs=$2 ; thirdparty_download=false ; shift 2 ;; - # Help --help) usage ; exit 0 ;; @@ -333,7 +206,6 @@ if [ $# -ne 0 ]; then for command in $*; do case "$command" in clean) ipst_clean=true ;; - clean-thirdparty) thirdparty_clean=true ; thirdparty_build=true ;; compile) ipst_compile=true ;; docs) ipst_docs=true ;; package) ipst_package=true ; ipst_compile=true ;; @@ -350,12 +222,6 @@ fi ## Build iPST platform ############################################################################### -# Build required C++ thirdparty libraries -buildthirdparty - -# Build C++ modules -ipst_cpp - # Build Java modules ipst_java @@ -367,3 +233,4 @@ ipst_install # Save settings writeSettings > "${settings}" + diff --git a/network-merge/pom.xml b/network-merge/pom.xml index f97f5ac..d73793c 100644 --- a/network-merge/pom.xml +++ b/network-merge/pom.xml @@ -10,17 +10,19 @@ + 4.0.0 + - itesla-parent eu.itesla_project + ipst-entsoe 0.1-SNAPSHOT - 4.0.0 network-merge Network merge + com.google.auto.service auto-service @@ -29,6 +31,14 @@ commons-cli commons-cli + + joda-time + joda-time + + + org.slf4j + slf4j-api + eu.itesla_project case-repository @@ -39,18 +49,24 @@ eu.itesla_project - computation-local + computation + + + eu.itesla_project + iidm-converter-api eu.itesla_project loadflow-api + junit junit test + diff --git a/pom.xml b/pom.xml index 0c0e9d6..35b1e09 100644 --- a/pom.xml +++ b/pom.xml @@ -12,7 +12,7 @@ 4.0.0 eu.itesla_project - itesla-parent + ipst-entsoe 0.1-SNAPSHOT pom @@ -20,41 +20,14 @@ http://www.itesla-project.eu/ - ampl-export cim1-model cim1-import distribution - dymola-integration entsoe-case-repository entsoe-util - EU2Mod_MB - eurostag-ech-export - eurostag-integration - eurostag-network - eurostag-step-up-transformer - file-system-rules-db - fpf-integration - - histodb-client - iidm-actions-contingencies-xml-client - iidm-ddb - mcla-integration - mmap-offline-db - modelica-events-adder - modelica-export - modules network-merge - offline-mpi - offline-server - offline-workflow - online-mpi - online-server - online-workflow - pclfsim-integration - sampling-integration ucte-import ucte-network - wca-integration @@ -62,55 +35,31 @@ 1.8 - 2.5.1 + 3.0.0 + + 4.3.0 + 3.6.0 3.0.4 - 2.10.4 0.7.7.201606060606 - 1.4 - 2.19.1 - 1.0.0 3.0.2 - 3.0.0 - 3.0 - 4.3.0 - - 1.1-ITESLA - 1.0-ITESLA + 2.10.4 + 2.19.1 + 1.0-rc2 - 1.12 1.3.1 - 1.10 - 1.10 2.4 - 2.6 - 3.4 - 3.6.1 1.41.1_1 - 1.1 - 2.6.2 20.0 - 1.4.191 - 4.5.2 0.1-SNAPSHOT - 2.7.3 - 2.0 - 0.9.1 + 1.0.1 1.1 - 1.0 2.9.6 - 20160212 - 2.4 4.12 - 1.1.7 1.10.19 - 3.14 + 3.15 1.2.6 - 1.0 1.7.21 - 2.4.0 - 3.0.3 - 2.3.0 @@ -122,9 +71,9 @@ - scm:git:https://github.com/itesla/ipst.git - scm:git:https://github.com/itesla/ipst.git - https://github.com/itesla/ipst + scm:git:https://github.com/itesla/ipst-entsoe.git + scm:git:https://github.com/itesla/ipst-entsoe.git + https://github.com/itesla/ipst-entsoe @@ -179,32 +128,10 @@ - - com.mycila - license-maven-plugin - ${maven.license.version} - -
header.txt
- - All partners of the iTesla project (http://www.itesla-project.eu/consortium) - 2016 - - - **/*.txt - **/*.md - src/test/resources/** - src/main/resources/** - **/js/libs/** - **/org/openmodelica/** - **/Messages.java - **/actions_contingencies/xml/mapping/** - - true - - + org.apache.maven.plugins maven-jar-plugin @@ -257,102 +185,26 @@ - - com.fasterxml.jackson.core - jackson-core - ${jackson.version} - com.google.auto.service auto-service ${autoservice.version} - - com.google.code.gson - gson - ${gson.version} - com.google.guava guava ${guava.version} - - com.google.jimfs - jimfs - ${jimfs.version} - commons-cli commons-cli ${commonscli.version} - - commons-codec - commons-codec - ${commonscodec.version} - - - commons-configuration - commons-configuration - ${commonsconfiguration.version} - - - commons-io - commons-io - ${commonsio.version} - - - com.h2database - h2 - ${h2database.version} - - - com.h2database - h2-mvstore - ${h2database.version} - joda-time joda-time ${jodatime.version} - - net.sf.json-lib - json-lib - jdk15 - ${jsonlib.version} - - - net.sf.supercsv - super-csv - ${supercsv.version} - - - net.sf.trove4j - trove4j - ${trove4j.version} - - - net.sourceforge.javacsv - javacsv - ${javacsv.version} - - - net.sourceforge.jmatio - jmatio - ${jmatio.version} - - - org.apache.commons - commons-math3 - ${commonsmath3.version} - - - org.apache.httpcomponents - httpclient - ${httpclient.version} - org.apache.poi poi-ooxml @@ -363,54 +215,18 @@ org.apache.servicemix.bundles.gdata ${gdata.version} - - org.jboss.shrinkwrap - shrinkwrap-api - ${shrinkwrap.version} - - - org.jboss.shrinkwrap - shrinkwrap-api-nio2 - ${shrinkwrap.version} - - - org.jboss.shrinkwrap - shrinkwrap-impl-base - ${shrinkwrap.version} - - - org.jboss.shrinkwrap - shrinkwrap-impl-nio2 - ${shrinkwrap.version} - org.jgrapht jgrapht-core ${jgrapht.version} - - org.json - json - ${json.version} - - - org.ow2.sirocco - sirocco-text-table-formatter - ${sirocco.version} - - - log4j - log4j - - - org.slf4j slf4j-api ${slf4j.version} - + eu.itesla_project case-repository @@ -426,21 +242,6 @@ computation ${ipstcore.version} - - eu.itesla_project - computation-local - ${ipstcore.version} - - - eu.itesla_project - contingency-api - ${ipstcore.version} - - - eu.itesla_project - graph - ${ipstcore.version} - eu.itesla_project iidm-converter-api @@ -451,103 +252,56 @@ iidm-network-api ${ipstcore.version} - - ${project.groupId} - iidm-network-impl - ${ipstcore.version} - - - eu.itesla_project - iidm-xml-converter - ${ipstcore.version} - eu.itesla_project loadflow-api ${ipstcore.version} + + + + - eu.itesla_project - security-analysis - ${ipstcore.version} - - - eu.itesla_project - simulation-api - ${ipstcore.version} - - - - - org.xmlunit - xmlunit-core - ${xmlunit.version} + org.jboss.shrinkwrap + shrinkwrap-api + ${shrinkwrap.version} test - --> - - - ch.qos.logback - logback-classic - ${logback.version} - runtime + org.jboss.shrinkwrap + shrinkwrap-api-nio2 + ${shrinkwrap.version} + test - org.slf4j - log4j-over-slf4j - ${slf4j.version} - runtime + org.jboss.shrinkwrap + shrinkwrap-impl-base + ${shrinkwrap.version} + test - - - junit - junit - ${junit.version} + org.jboss.shrinkwrap + shrinkwrap-impl-nio2 + ${shrinkwrap.version} test @@ -562,13 +316,9 @@ ${slf4j.version} test - - ${project.groupId} - iidm-network-test - ${ipstcore.version} - test - + + diff --git a/ucte-import/pom.xml b/ucte-import/pom.xml index fe49f45..d462853 100644 --- a/ucte-import/pom.xml +++ b/ucte-import/pom.xml @@ -12,12 +12,12 @@ eu.itesla_project - itesla-parent + ipst-entsoe 0.1-SNAPSHOT ucte-import - + UCTE import @@ -30,22 +30,17 @@ slf4j-api - ${project.groupId} - iidm-network-api - - - ${project.groupId} + eu.itesla_project iidm-converter-api - ${project.groupId} - ucte-network + entsoe-util ${project.version} ${project.groupId} - entsoe-util + ucte-network ${project.version} @@ -55,6 +50,7 @@ junit test + diff --git a/ucte-network/pom.xml b/ucte-network/pom.xml index cb17cee..368830c 100644 --- a/ucte-network/pom.xml +++ b/ucte-network/pom.xml @@ -12,7 +12,7 @@ eu.itesla_project - itesla-parent + ipst-entsoe 0.1-SNAPSHOT @@ -21,17 +21,18 @@ UCTE network + - org.slf4j - slf4j-api + com.google.guava + guava org.jgrapht jgrapht-core - com.google.guava - guava + org.slf4j + slf4j-api @@ -40,5 +41,6 @@ junit test +