Use revision to set version and upgrade to 1.4.2-SNAPSHOT (#4711)

* Use revision set version * Use revision set version * Add flatten plugin
2021-01-15 14:37:47 +08:00 · 2021-01-15 14:37:47 +08:00 · 1bd67269cd
commit 1bd67269cd
parent b9596a7392
17 changed files with 48 additions and 18 deletions
--- a/address/pom.xml
+++ b/address/pom.xml
@ -19,7 +19,7 @@
    <parent>
        <artifactId>nacos-all</artifactId>
        <groupId>com.alibaba.nacos</groupId>
-        <version>1.4.1</version>
+        <version>${revision}</version>
    </parent>
    
    <modelVersion>4.0.0</modelVersion>
--- a/api/pom.xml
+++ b/api/pom.xml
@ -19,7 +19,7 @@
    <parent>
        <groupId>com.alibaba.nacos</groupId>
        <artifactId>nacos-all</artifactId>
-        <version>1.4.1</version>
+        <version>${revision}</version>
    </parent>
    
    <modelVersion>4.0.0</modelVersion>
--- a/auth/pom.xml
+++ b/auth/pom.xml
@ -21,7 +21,7 @@
    <parent>
        <groupId>com.alibaba.nacos</groupId>
        <artifactId>nacos-all</artifactId>
-        <version>1.4.1</version>
+        <version>${revision}</version>
        <relativePath>../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
--- a/client/pom.xml
+++ b/client/pom.xml
@ -19,7 +19,7 @@
    <parent>
        <groupId>com.alibaba.nacos</groupId>
        <artifactId>nacos-all</artifactId>
-        <version>1.4.1</version>
+        <version>${revision}</version>
        <relativePath>../pom.xml</relativePath>
    </parent>
    
--- a/cmdb/pom.xml
+++ b/cmdb/pom.xml
@ -21,7 +21,7 @@
    <parent>
        <artifactId>nacos-all</artifactId>
        <groupId>com.alibaba.nacos</groupId>
-        <version>1.4.1</version>
+        <version>${revision}</version>
        <relativePath>../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
--- a/common/pom.xml
+++ b/common/pom.xml
@ -21,7 +21,7 @@
    <parent>
        <groupId>com.alibaba.nacos</groupId>
        <artifactId>nacos-all</artifactId>
-        <version>1.4.1</version>
+        <version>${revision}</version>
        <relativePath>../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
--- a/config/pom.xml
+++ b/config/pom.xml
@ -20,7 +20,7 @@
    <parent>
        <groupId>com.alibaba.nacos</groupId>
        <artifactId>nacos-all</artifactId>
-        <version>1.4.1</version>
+        <version>${revision}</version>
    </parent>
    
    <modelVersion>4.0.0</modelVersion>
--- a/consistency/pom.xml
+++ b/consistency/pom.xml
@ -85,7 +85,7 @@
        <groupId>com.alibaba.nacos</groupId>
        <artifactId>nacos-all</artifactId>
        <relativePath>../pom.xml</relativePath>
-        <version>1.4.1</version>
+        <version>${revision}</version>
    </parent>
    
    <properties>
--- a/console/pom.xml
+++ b/console/pom.xml
@ -21,7 +21,7 @@
    <parent>
        <groupId>com.alibaba.nacos</groupId>
        <artifactId>nacos-all</artifactId>
-        <version>1.4.1</version>
+        <version>${revision}</version>
    </parent>
    <artifactId>nacos-console</artifactId>
    <packaging>jar</packaging>
--- a/core/pom.xml
+++ b/core/pom.xml
@ -21,7 +21,7 @@
    <parent>
        <groupId>com.alibaba.nacos</groupId>
        <artifactId>nacos-all</artifactId>
-        <version>1.4.1</version>
+        <version>${revision}</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

--- a/distribution/pom.xml
+++ b/distribution/pom.xml
@ -21,7 +21,7 @@
    <parent>
        <groupId>com.alibaba.nacos</groupId>
        <artifactId>nacos-all</artifactId>
-        <version>1.4.1</version>
+        <version>${revision}</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

--- a/example/pom.xml
+++ b/example/pom.xml
@ -21,7 +21,7 @@
    <parent>
        <groupId>com.alibaba.nacos</groupId>
        <artifactId>nacos-all</artifactId>
-        <version>1.4.1</version>
+        <version>${revision}</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

--- a/istio/pom.xml
+++ b/istio/pom.xml
@ -19,7 +19,7 @@
    <parent>
        <artifactId>nacos-all</artifactId>
        <groupId>com.alibaba.nacos</groupId>
-        <version>1.4.1</version>
+        <version>${revision}</version>
    </parent>
    
    <modelVersion>4.0.0</modelVersion>
--- a/naming/pom.xml
+++ b/naming/pom.xml
@ -21,7 +21,7 @@
    <parent>
        <groupId>com.alibaba.nacos</groupId>
        <artifactId>nacos-all</artifactId>
-        <version>1.4.1</version>
+        <version>${revision}</version>
        <relativePath>../pom.xml</relativePath>
    </parent>
    
--- a/pom.xml
+++ b/pom.xml
@ -22,7 +22,7 @@
    <inceptionYear>2018</inceptionYear>
    <groupId>com.alibaba.nacos</groupId>
    <artifactId>nacos-all</artifactId>
-    <version>1.4.1</version>
+    <version>${revision}</version>
    <packaging>pom</packaging>

    <name>Alibaba NACOS ${project.version}</name>
@ -36,7 +36,7 @@
        <url>git@github.com:alibaba/nacos.git</url>
        <connection>scm:git@github.com:alibaba/nacos.git</connection>
        <developerConnection>scm:git@github.com:alibaba/nacos.git</developerConnection>
-        <tag>nacos-all-1.4.1</tag>
+        <tag>nacos-all-${revision}</tag>
    </scm>

    <mailingLists>
@ -88,6 +88,7 @@
    </issueManagement>

    <properties>
+        <revision>1.4.2-SNAPSHOT</revision>
        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
        <!-- Compiler settings properties -->
@ -121,6 +122,7 @@
        <maven-failsafe-plugin.version>2.19.1</maven-failsafe-plugin.version>
        <maven-assembly-plugin.version>3.0.0</maven-assembly-plugin.version>
        <maven-checkstyle-plugin.version>3.1.1</maven-checkstyle-plugin.version>
+        <maven-flatten-version>1.1.0</maven-flatten-version>
        <!-- dependency version related to plugin -->
        <extra-enforcer-rules.version>1.0-beta-4</extra-enforcer-rules.version>
        <p3c-pmd.version>1.3.0</p3c-pmd.version>
@ -425,6 +427,34 @@
                <artifactId>maven-assembly-plugin</artifactId>
                <version>${maven-assembly-plugin.version}</version>
            </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>flatten-maven-plugin</artifactId>
+                <version>${maven-flatten-version}</version>
+                <configuration>
+                    <updatePomFile>true</updatePomFile>
+                    <flattenMode>resolveCiFriendliesOnly</flattenMode>
+                    <pomElements>
+                        <dependencies>expand</dependencies>
+                    </pomElements>
+                </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>
        </plugins>
    </build>

--- a/sys/pom.xml
+++ b/sys/pom.xml
@ -21,7 +21,7 @@
    <parent>
        <groupId>com.alibaba.nacos</groupId>
        <artifactId>nacos-all</artifactId>
-        <version>1.4.1</version>
+        <version>${revision}</version>
        <relativePath>../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
--- a/test/pom.xml
+++ b/test/pom.xml
@ -20,7 +20,7 @@
    <parent>
        <groupId>com.alibaba.nacos</groupId>
        <artifactId>nacos-all</artifactId>
-        <version>1.4.1</version>
+        <version>${revision}</version>
        <relativePath>../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>