【冲突解决】

pom.xml

@@ -15,7 +15,7 @@
     <groupId>i3plus.pojo</groupId>
     <artifactId>i3plus-pojo</artifactId>
     <packaging>pom</packaging>
-    <version>1.0-TEST-SNAPSHOT</version>
+    <version>1.0-${profileActive}-SNAPSHOT</version>
     <modules>
         <module>modules/i3plus-pojo-base</module>
         <module>modules/i3plus-pojo-platform</module>
@@ -254,36 +254,4 @@
         <finalName>${project.artifactId}-${project.version}</finalName>
     </build>
 
-    <profiles>
-        <profile>
-            <id>dev</id>
-            <properties>
-                <profileActive>DEV</profileActive>
-            </properties>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-        </profile>
-        <profile>
-            <id>test</id>
-            <properties>
-                <profileActive>TEST</profileActive>
-            </properties>
-        </profile>
-        <profile>
-            <id>docker</id>
-            <properties>
-                <profileActive>DOCKER</profileActive>
-            </properties>
-        </profile>
-        <profile>
-            <id>prod</id>
-            <properties>
-                <profileActive>PROD</profileActive>
-            </properties>
-        </profile>
-    </profiles>
-    <build>
-        <finalName>${project.artifactId}-${project.version}</finalName>
-    </build>
 </project>