Resolve conflits in .gitignore and fix powsybl dependencies in histoDB

itesla · Oct 10, 2017 · e33e7f5 · e33e7f5
1 parent 2a2285b
commit e33e7f5
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 11 deletions.
diff --git a/.gitignore b/.gitignore
@@ -55,8 +55,7 @@
 
 # iPST compilation settings
 install.cfg
-/.project
-<<<<<<< HEAD
-=======
-/.settings/
->>>>>>> refs/heads/master
+.project
+.classpath
+.settings
+
diff --git a/dymola-integration/.gitignore b/dymola-integration/.gitignore
@@ -1,8 +1,5 @@
 /install
 dymola_integration_binaries.zip
-/.classpath
-<<<<<<< HEAD
-=======
-/.settings/
->>>>>>> refs/heads/master
-/.project
+.classpath
+.settings
+.project
diff --git a/histoDB/histodb-dataserver/pom.xml b/histoDB/histodb-dataserver/pom.xml
@@ -113,16 +113,19 @@
         <dependency>
             <groupId>com.powsybl</groupId>
             <artifactId>powsybl-iidm-converter-api</artifactId>
+            <version>${powsybl.version}</version>
         </dependency>
 
         <dependency>
             <groupId>com.powsybl</groupId>
             <artifactId>powsybl-iidm-api</artifactId>
+            <version>${powsybl.version}</version>
         </dependency>
 
         <dependency>
             <groupId>com.powsybl</groupId>
             <artifactId>powsybl-iidm-impl</artifactId>
+            <version>${powsybl.version}</version>
         </dependency>
 
         <dependency>
@@ -134,22 +137,26 @@
         <dependency>
             <groupId>com.powsybl</groupId>
             <artifactId>powsybl-cim1-converter</artifactId>
+            <version>${powsybl.version}</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>com.powsybl</groupId>
             <artifactId>powsybl-iidm-xml-converter</artifactId>
+            <version>${powsybl.version}</version>
         </dependency>
 
         <dependency>
             <groupId>com.powsybl</groupId>
             <artifactId>powsybl-computation-local</artifactId>
+            <version>${powsybl.version}</version>
         </dependency>
 
         <dependency>
             <groupId>com.powsybl</groupId>
             <artifactId>powsybl-ucte-converter</artifactId>
+            <version>${powsybl.version}</version>
             <scope>runtime</scope>
         </dependency>