冲突解决合并代码

6 years ago · a99527f52e
parent ee46a7913b
commit a99527f52e
3 changed files with 3 additions and 3 deletions
--- a/modules/i3plus-core-api/pom.xml
+++ b/modules/i3plus-core-api/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <artifactId>i3plus-core</artifactId>
        <groupId>i3plus.core</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-core-apiservice/pom.xml
+++ b/modules/i3plus-core-apiservice/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <artifactId>i3plus-core</artifactId>
        <groupId>i3plus.core</groupId>
-        <version>1.0-DEV-SNAPSHOT</version>
+        <version>1.0-TEST-SNAPSHOT</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
--- a/pom.xml
+++ b/pom.xml
@ -7,7 +7,7 @@
    <groupId>i3plus.core</groupId>
    <artifactId>i3plus-core</artifactId>
    <packaging>pom</packaging>
-    <version>1.0-DEV-SNAPSHOT</version>
+    <version>1.0-TEST-SNAPSHOT</version>
    <modules>
        <module>modules/i3plus-core-api</module>
        <module>modules/i3plus-core-apiservice</module>