Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-ics into test

# Conflicts: # modules/i3plus-ics-console/src/main/resources/application.properties # modules/i3plus-ics-gateway/src/main/resources/application.properties # modules/i3plus-ics-regist/src/main/resources/application.properties
5 years ago · b199c5995f
parent 134757c92b
commit b199c5995f
2 changed files with 2 additions and 2 deletions
--- a/modules/i3plus-pojo-ptl-pcn/pom.xml
+++ b/modules/i3plus-pojo-ptl-pcn/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <artifactId>i3plus-pojo</artifactId>
        <groupId>i3plus.pojo</groupId>
-        <version>1.0-DEV-SNAPSHOT</version>
+        <version>1.0-TEST-SNAPSHOT</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
--- a/modules/i3plus-pojo-ptl/pom.xml
+++ b/modules/i3plus-pojo-ptl/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <artifactId>i3plus-pojo</artifactId>
        <groupId>i3plus.pojo</groupId>
-        <version>1.0-DEV-SNAPSHOT</version>
+        <version>1.0-TEST-SNAPSHOT</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>