Skip to content

Commit b6e0aa3

Browse files
jonenstsBouzols
andauthored
use common conf (#21)
Signed-off-by: HARPER Jon <[email protected]> Co-authored-by: sBouzols <[email protected]>
1 parent 93671e5 commit b6e0aa3

File tree

4 files changed

+28
-107
lines changed

4 files changed

+28
-107
lines changed

pom.xml

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,17 +14,17 @@
1414
<parent>
1515
<groupId>com.powsybl</groupId>
1616
<artifactId>powsybl-parent-ws</artifactId>
17-
<version>6</version>
17+
<version>7</version>
1818
<relativePath/>
1919
</parent>
2020

2121
<groupId>org.gridsuite</groupId>
22-
<artifactId>gridsuite-mapping-server</artifactId>
22+
<artifactId>gridsuite-dynamic-mapping-server</artifactId>
2323
<version>1.0.0-SNAPSHOT</version>
2424

2525
<packaging>jar</packaging>
26-
<name>Mapping server</name>
27-
<description>Mapping service</description>
26+
<name>Dynamic Mapping server</name>
27+
<description>Dynamic Mapping server</description>
2828
<url>http://www.gridsuite.org/</url>
2929

3030
<scm>
@@ -35,10 +35,9 @@
3535

3636
<properties>
3737
<java.version>11</java.version>
38-
<gridsuite-dependencies.version>11</gridsuite-dependencies.version>
38+
<gridsuite-dependencies.version>12</gridsuite-dependencies.version>
3939
<string-template.version>4.3.1</string-template.version>
4040
<commons-lang3.version>3.9</commons-lang3.version>
41-
<jib.container.environment>SPRING_PROFILES_ACTIVE=default</jib.container.environment>
4241
<liquibase-hibernate-package>org.gridsuite.mapping.server</liquibase-hibernate-package>
4342
</properties>
4443

@@ -107,6 +106,10 @@
107106
<groupId>com.powsybl</groupId>
108107
<artifactId>powsybl-network-store-client</artifactId>
109108
</dependency>
109+
<dependency>
110+
<groupId>com.powsybl</groupId>
111+
<artifactId>powsybl-ws-commons</artifactId>
112+
</dependency>
110113
<dependency>
111114
<groupId>javax.persistence</groupId>
112115
<artifactId>javax.persistence-api</artifactId>

src/main/resources/application.yaml

Lines changed: 0 additions & 64 deletions
This file was deleted.
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
spring:
2+
application:
3+
name: dynamic-mapping-server
4+
5+
jpa:
6+
properties:
7+
hibernate:
8+
event:
9+
merge:
10+
entity_copy_observer: allow
11+
12+
logging:
13+
level:
14+
ROOT: INFO
15+
16+
network-store-server:
17+
preloading-strategy: COLLECTION
18+
19+
dbName: dynamicmappings

src/main/resources/database.properties

Lines changed: 0 additions & 37 deletions
This file was deleted.

0 commit comments

Comments
 (0)