use common conf (#62)

Signed-off-by: HARPER Jon <[email protected]>

Author: jonenst

geo-data-server/pom.xml

@@ -20,10 +20,6 @@
     <name>Geo data server</name>
     <description>Geographical data server</description>
 
-    <properties>
-        <jib.container.environment>SPRING_PROFILES_ACTIVE=default</jib.container.environment>
-    </properties>
-
     <build>
         <pluginManagement>
             <plugins>
@@ -86,7 +82,7 @@
         </dependency>
         <dependency>
             <groupId>com.powsybl</groupId>
-            <artifactId>powsybl-iidm-test</artifactId>
+            <artifactId>powsybl-ws-commons</artifactId>
         </dependency>
         <dependency>
             <groupId>org.gridsuite</groupId>
@@ -145,5 +141,10 @@
             <artifactId>powsybl-iidm-impl</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>com.powsybl</groupId>
+            <artifactId>powsybl-iidm-test</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 </project>

geo-data-server/src/main/resources/cassandra.properties

@@ -1,9 +1,6 @@
-server:
-  forward-headers-strategy: framework
-
 spring:
-  profiles:
-    active: default,local
+  application:
+    name: geo-data-server
 
 network-store-server:
    preloading-strategy: COLLECTION

geo-data-server/src/main/resources/application.yml renamed to geo-data-server/src/main/resources/config/application.yaml

@@ -13,7 +13,7 @@
     <parent>
         <groupId>com.powsybl</groupId>
         <artifactId>powsybl-parent-ws</artifactId>
-        <version>5</version>
+        <version>7</version>
     </parent>
 
     <groupId>org.gridsuite</groupId>
@@ -56,7 +56,7 @@
     <properties>
         <java.version>11</java.version>
 
-        <gridsuite-dependencies.version>11</gridsuite-dependencies.version>
+        <gridsuite-dependencies.version>12</gridsuite-dependencies.version>
         <commons-lang3.version>3.9</commons-lang3.version>
 
         <sonar.coverage.jacoco.xmlReportPaths>