Merge pull request #386 from lostsnow/fix/pom-project-version

unified project version in pom
HXSecurity · Sep 30, 2022 · 2315e5e · 2315e5e
2 parents 12b8557 + 69c79e2
commit 2315e5e
Show file tree

Hide file tree

Showing 11 changed files with 54 additions and 23 deletions.
diff --git a/.gitignore b/.gitignore
@@ -12,6 +12,7 @@ dongtai-agent/target/
 UnitText/target/
 target/
 **/dependency-reduced-pom.xml
+.flattened-pom.xml
 
 ## for eclipse and vscode
 .classpath

diff --git a/dongtai-agent/pom.xml b/dongtai-agent/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>io.dongtai.iast</groupId>
         <artifactId>iast</artifactId>
-        <version>1.7.7</version>
+        <version>${revision}</version>
     </parent>
     <artifactId>dongtai-agent</artifactId>
     <name>dongtai-agent</name>
@@ -48,12 +48,12 @@
         <dependency>
             <groupId>io.dongtai.iast</groupId>
             <artifactId>dongtai-log</artifactId>
-            <version>${dongtai.version}</version>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>io.dongtai.iast</groupId>
             <artifactId>dongtai-common</artifactId>
-            <version>${project.parent.version}</version>
+            <version>${project.version}</version>
         </dependency>
 
         <dependency>

diff --git a/dongtai-api/pom.xml b/dongtai-api/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>iast</artifactId>
         <groupId>io.dongtai.iast</groupId>
-        <version>1.7.7</version>
+        <version>${revision}</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -39,12 +39,12 @@
         <dependency>
             <groupId>cn.huoxian.iast</groupId>
             <artifactId>dongtai-spring-api</artifactId>
-            <version>${dongtai.version}</version>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>io.dongtai.iast</groupId>
             <artifactId>dongtai-log</artifactId>
-            <version>${dongtai.version}</version>
+            <version>${project.version}</version>
         </dependency>
     </dependencies>
 

diff --git a/dongtai-common/pom.xml b/dongtai-common/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>iast</artifactId>
         <groupId>io.dongtai.iast</groupId>
-        <version>1.7.7</version>
+        <version>${revision}</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/dongtai-core/pom.xml b/dongtai-core/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>io.dongtai.iast</groupId>
         <artifactId>iast</artifactId>
-        <version>1.7.7</version>
+        <version>${revision}</version>
     </parent>
     <artifactId>dongtai-core</artifactId>
     <name>dongtai-core</name>
@@ -162,7 +162,7 @@
         <dependency>
             <groupId>io.dongtai.iast</groupId>
             <artifactId>dongtai-spy</artifactId>
-            <version>${dongtai.version}</version>
+            <version>${project.version}</version>
             <scope>provided</scope>
         </dependency>
 
@@ -227,12 +227,12 @@
         <dependency>
             <groupId>io.dongtai.iast</groupId>
             <artifactId>dongtai-log</artifactId>
-            <version>${dongtai.version}</version>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>io.dongtai.iast</groupId>
             <artifactId>dongtai-common</artifactId>
-            <version>${project.parent.version}</version>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>

diff --git a/dongtai-log/pom.xml b/dongtai-log/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>iast</artifactId>
         <groupId>io.dongtai.iast</groupId>
-        <version>1.7.7</version>
+        <version>${revision}</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/dongtai-plugins/dongtai-grpc/pom.xml b/dongtai-plugins/dongtai-grpc/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dongtai-plugins</artifactId>
         <groupId>io.dongtai.iast</groupId>
-        <version>1.7.7</version>
+        <version>${revision}</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/dongtai-plugins/pom.xml b/dongtai-plugins/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>iast</artifactId>
         <groupId>io.dongtai.iast</groupId>
-        <version>1.7.7</version>
+        <version>${revision}</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -24,7 +24,7 @@
         <dependency>
             <groupId>io.dongtai.iast</groupId>
             <artifactId>dongtai-core</artifactId>
-            <version>${dongtai.version}</version>
+            <version>${project.version}</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>

diff --git a/dongtai-spring-api/pom.xml b/dongtai-spring-api/pom.xml
@@ -5,13 +5,12 @@
     <parent>
         <artifactId>iast</artifactId>
         <groupId>io.dongtai.iast</groupId>
-        <version>1.7.7</version>
+        <version>${revision}</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>cn.huoxian.iast</groupId>
     <artifactId>dongtai-spring-api</artifactId>
-    <version>1.7.7</version>
 
     <properties>
         <maven.compiler.source>8</maven.compiler.source>
@@ -28,7 +27,7 @@
         <dependency>
             <groupId>io.dongtai.iast</groupId>
             <artifactId>dongtai-log</artifactId>
-            <version>${dongtai.version}</version>
+            <version>${project.version}</version>
         </dependency>
     </dependencies>
 

diff --git a/dongtai-spy/pom.xml b/dongtai-spy/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>iast</artifactId>
         <groupId>io.dongtai.iast</groupId>
-        <version>1.7.7</version>
+        <version>${revision}</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/pom.xml b/pom.xml
@@ -4,20 +4,21 @@
     <modelVersion>4.0.0</modelVersion>
 
     <properties>
+        <revision>1.7.7</revision>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <shade-prefix>io.dongtai.iast.thirdparty</shade-prefix>
 
         <maven.compiler.source>1.6</maven.compiler.source>
         <maven.compiler.target>1.6</maven.compiler.target>
         <maven.deploy.plugin.version>3.2.0</maven.deploy.plugin.version>
         <maven.compiler.version>2.3.2</maven.compiler.version>
+        <maven.flatten.plugin.version>1.3.0</maven.flatten.plugin.version>
         <commons.cli.versin>1.4</commons.cli.versin>
         <sun.tools.version>1.6</sun.tools.version>
         <!--docker环境下配置-->
         <sun.tools.systempath>${java.home}/../lib/tools.jar</sun.tools.systempath>
         <nanoxml.version>2.2.3</nanoxml.version>
 
-        <dongtai.version>1.7.7</dongtai.version>
         <!-- java 1.6 最高可用版本-->
         <logback-classic.version>1.2.1</logback-classic.version>
         <commons-lang3.version>3.4</commons-lang3.version>
@@ -42,7 +43,7 @@
 
     <groupId>io.dongtai.iast</groupId>
     <artifactId>iast</artifactId>
-    <version>1.7.7</version>
+    <version>${revision}</version>
     <packaging>pom</packaging>
 
     <name>dongtai-agent-java</name>
@@ -70,6 +71,11 @@
     <build>
         <pluginManagement>
             <plugins>
+                <plugin>
+                    <groupId>org.codehaus.mojo</groupId>
+                    <artifactId>flatten-maven-plugin</artifactId>
+                    <version>${maven.flatten.plugin.version}</version>
+                </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-deploy-plugin</artifactId>
@@ -83,6 +89,31 @@
             </plugins>
         </pluginManagement>
         <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>flatten-maven-plugin</artifactId>
+                <version>${maven.flatten.plugin.version}</version>
+                <configuration>
+                    <updatePomFile>true</updatePomFile>
+                    <flattenMode>resolveCiFriendliesOnly</flattenMode>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>flatten</id>
+                        <phase>process-resources</phase>
+                        <goals>
+                            <goal>flatten</goal>
+                        </goals>
+                    </execution>
+                    <execution>
+                        <id>flatten.clean</id>
+                        <phase>clean</phase>
+                        <goals>
+                            <goal>clean</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
@@ -119,12 +150,12 @@
             <dependency>
                 <groupId>io.dongtai.iast</groupId>
                 <artifactId>dongtai-spy</artifactId>
-                <version>${dongtai.version}</version>
+                <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>io.dongtai.iast</groupId>
                 <artifactId>dongtai-core</artifactId>
-                <version>${dongtai.version}</version>
+                <version>${project.version}</version>
                 <scope>test</scope>
             </dependency>
         </dependencies>