From 09f069276b52b3023987f6e101c384243ba073b2 Mon Sep 17 00:00:00 2001
From: KomachiSion <263976490@qq.com>
Date: Fri, 15 Jan 2021 11:53:27 +0800
Subject: [PATCH 1/3] Use revision set version
---
address/pom.xml | 2 +-
api/pom.xml | 2 +-
auth/pom.xml | 2 +-
client/pom.xml | 2 +-
cmdb/pom.xml | 2 +-
common/pom.xml | 2 +-
config/pom.xml | 2 +-
consistency/pom.xml | 2 +-
console/pom.xml | 2 +-
core/pom.xml | 2 +-
distribution/pom.xml | 2 +-
example/pom.xml | 2 +-
istio/pom.xml | 2 +-
naming/pom.xml | 2 +-
pom.xml | 5 +++--
sys/pom.xml | 2 +-
test/pom.xml | 2 +-
17 files changed, 19 insertions(+), 18 deletions(-)
diff --git a/address/pom.xml b/address/pom.xml
index dd1bbf0216f..5247f1252ef 100644
--- a/address/pom.xml
+++ b/address/pom.xml
@@ -19,7 +19,7 @@
nacos-all
com.alibaba.nacos
- 1.4.1
+ ${revision}
4.0.0
diff --git a/api/pom.xml b/api/pom.xml
index f7210e73c32..d35ba3abd41 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -19,7 +19,7 @@
com.alibaba.nacos
nacos-all
- 1.4.1
+ ${revision}
4.0.0
diff --git a/auth/pom.xml b/auth/pom.xml
index 62c4c129ce8..368d2d0cc6e 100644
--- a/auth/pom.xml
+++ b/auth/pom.xml
@@ -21,7 +21,7 @@
com.alibaba.nacos
nacos-all
- 1.4.1
+ ${revision}
../pom.xml
4.0.0
diff --git a/client/pom.xml b/client/pom.xml
index b326d06e367..72fb7907a09 100644
--- a/client/pom.xml
+++ b/client/pom.xml
@@ -19,7 +19,7 @@
com.alibaba.nacos
nacos-all
- 1.4.1
+ ${revision}
../pom.xml
diff --git a/cmdb/pom.xml b/cmdb/pom.xml
index 508784c80e4..ea752307cf5 100644
--- a/cmdb/pom.xml
+++ b/cmdb/pom.xml
@@ -21,7 +21,7 @@
nacos-all
com.alibaba.nacos
- 1.4.1
+ ${revision}
../pom.xml
4.0.0
diff --git a/common/pom.xml b/common/pom.xml
index 764cfc5a690..aace1bef2b7 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -21,7 +21,7 @@
com.alibaba.nacos
nacos-all
- 1.4.1
+ ${revision}
../pom.xml
4.0.0
diff --git a/config/pom.xml b/config/pom.xml
index 349255bd555..77a0b685d02 100644
--- a/config/pom.xml
+++ b/config/pom.xml
@@ -20,7 +20,7 @@
com.alibaba.nacos
nacos-all
- 1.4.1
+ ${revision}
4.0.0
diff --git a/consistency/pom.xml b/consistency/pom.xml
index 7c0160a97b5..b25e1e3ab58 100644
--- a/consistency/pom.xml
+++ b/consistency/pom.xml
@@ -85,7 +85,7 @@
com.alibaba.nacos
nacos-all
../pom.xml
- 1.4.1
+ ${revision}
diff --git a/console/pom.xml b/console/pom.xml
index c0c610a5be1..61de71b3806 100644
--- a/console/pom.xml
+++ b/console/pom.xml
@@ -21,7 +21,7 @@
com.alibaba.nacos
nacos-all
- 1.4.1
+ ${revision}
nacos-console
jar
diff --git a/core/pom.xml b/core/pom.xml
index 15d99683c5b..717925baa47 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -21,7 +21,7 @@
com.alibaba.nacos
nacos-all
- 1.4.1
+ ${revision}
../pom.xml
diff --git a/distribution/pom.xml b/distribution/pom.xml
index 5b8c967df0f..4745d4768ec 100644
--- a/distribution/pom.xml
+++ b/distribution/pom.xml
@@ -21,7 +21,7 @@
com.alibaba.nacos
nacos-all
- 1.4.1
+ ${revision}
../pom.xml
diff --git a/example/pom.xml b/example/pom.xml
index 760c6047de7..fd8e425e03a 100644
--- a/example/pom.xml
+++ b/example/pom.xml
@@ -21,7 +21,7 @@
com.alibaba.nacos
nacos-all
- 1.4.1
+ ${revision}
../pom.xml
diff --git a/istio/pom.xml b/istio/pom.xml
index 01ab9ac87f7..49f29d1bfde 100644
--- a/istio/pom.xml
+++ b/istio/pom.xml
@@ -19,7 +19,7 @@
nacos-all
com.alibaba.nacos
- 1.4.1
+ ${revision}
4.0.0
diff --git a/naming/pom.xml b/naming/pom.xml
index 156c0ade2cf..7a2ab091b79 100644
--- a/naming/pom.xml
+++ b/naming/pom.xml
@@ -21,7 +21,7 @@
com.alibaba.nacos
nacos-all
- 1.4.1
+ ${revision}
../pom.xml
diff --git a/pom.xml b/pom.xml
index 088c783a62d..c9794552cf7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,7 @@
2018
com.alibaba.nacos
nacos-all
- 1.4.1
+ ${revision}
pom
Alibaba NACOS ${project.version}
@@ -36,7 +36,7 @@
git@github.com:alibaba/nacos.git
scm:git@github.com:alibaba/nacos.git
scm:git@github.com:alibaba/nacos.git
- nacos-all-1.4.1
+ nacos-all-${revision}
@@ -88,6 +88,7 @@
+ 1.4.1-SNAPSHOT
UTF-8
UTF-8
diff --git a/sys/pom.xml b/sys/pom.xml
index 4ba903d9300..703dcaf2df3 100644
--- a/sys/pom.xml
+++ b/sys/pom.xml
@@ -21,7 +21,7 @@
com.alibaba.nacos
nacos-all
- 1.4.1
+ ${revision}
../pom.xml
4.0.0
diff --git a/test/pom.xml b/test/pom.xml
index a27c5bfcf60..45aa8295b33 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -20,7 +20,7 @@
com.alibaba.nacos
nacos-all
- 1.4.1
+ ${revision}
../pom.xml
4.0.0
From 120038a68d53ea0ba75c2429572ca4fa661f2b5f Mon Sep 17 00:00:00 2001
From: KomachiSion <263976490@qq.com>
Date: Fri, 15 Jan 2021 13:35:24 +0800
Subject: [PATCH 2/3] Use revision set version
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index c9794552cf7..34fad089878 100644
--- a/pom.xml
+++ b/pom.xml
@@ -88,7 +88,7 @@
- 1.4.1-SNAPSHOT
+ 1.4.2-SNAPSHOT
UTF-8
UTF-8
From b4a6e573e61e806d9c92e75ffcebf087d11fe4d6 Mon Sep 17 00:00:00 2001
From: KomachiSion <263976490@qq.com>
Date: Fri, 15 Jan 2021 13:50:33 +0800
Subject: [PATCH 3/3] Add flatten plugin
---
pom.xml | 29 +++++++++++++++++++++++++++++
1 file changed, 29 insertions(+)
diff --git a/pom.xml b/pom.xml
index 34fad089878..a686c6a91d7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -122,6 +122,7 @@
2.19.1
3.0.0
3.1.1
+ 1.1.0
1.0-beta-4
1.3.0
@@ -426,6 +427,34 @@
maven-assembly-plugin
${maven-assembly-plugin.version}
+
+ org.codehaus.mojo
+ flatten-maven-plugin
+ ${maven-flatten-version}
+
+ true
+ resolveCiFriendliesOnly
+
+ expand
+
+
+
+
+ flatten
+ process-resources
+
+ flatten
+
+
+
+ flatten.clean
+ clean
+
+ clean
+
+
+
+