This is an automated email from the ASF dual-hosted git repository.
mercyblitz pushed a commit to branch 0.2.x
in repository
https://gitbox.apache.org/repos/asf/incubator-dubbo-spring-boot-project.git
The following commit(s) were added to refs/heads/0.2.x by this push:
new d89ef99 Replace ${project.version} to ${revision} in the "pom.xml"
files
d89ef99 is described below
commit d89ef990a54f67ca77880c3379c57e7a34f84c59
Author: mercyblitz <[email protected]>
AuthorDate: Tue Jan 29 16:01:21 2019 +0800
Replace ${project.version} to ${revision} in the "pom.xml" files
---
.gitignore | 5 +++-
dubbo-spring-boot-actuator/pom.xml | 2 +-
dubbo-spring-boot-distribution/pom.xml | 6 ++---
.../auto-configure-samples/consumer-sample/pom.xml | 4 ++--
.../auto-configure-samples/provider-sample/pom.xml | 4 ++--
.../consumer-sample/pom.xml | 4 ++--
.../provider-sample/pom.xml | 4 ++--
.../consumer-sample/pom.xml | 4 ++--
.../provider-sample/pom.xml | 4 ++--
.../consumer-sample/pom.xml | 4 ++--
.../provider-sample/pom.xml | 4 ++--
dubbo-spring-boot-starter/pom.xml | 2 +-
pom.xml | 28 ++++++++++++++++++++++
13 files changed, 53 insertions(+), 22 deletions(-)
diff --git a/.gitignore b/.gitignore
index 35e3ede..8f36fda 100644
--- a/.gitignore
+++ b/.gitignore
@@ -41,4 +41,7 @@ target
# system ignore
.DS_Store
-Thumbs.db
\ No newline at end of file
+Thumbs.db
+
+# Maven ignore
+.flattened-pom.xml
\ No newline at end of file
diff --git a/dubbo-spring-boot-actuator/pom.xml
b/dubbo-spring-boot-actuator/pom.xml
index 644e5d2..f78b95a 100644
--- a/dubbo-spring-boot-actuator/pom.xml
+++ b/dubbo-spring-boot-actuator/pom.xml
@@ -61,7 +61,7 @@
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>dubbo-spring-boot-autoconfigure</artifactId>
- <version>${project.version}</version>
+ <version>${revision}</version>
</dependency>
<!-- Dubbo -->
diff --git a/dubbo-spring-boot-distribution/pom.xml
b/dubbo-spring-boot-distribution/pom.xml
index 377375b..6ffa3ee 100644
--- a/dubbo-spring-boot-distribution/pom.xml
+++ b/dubbo-spring-boot-distribution/pom.xml
@@ -36,19 +36,19 @@
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>dubbo-spring-boot-actuator</artifactId>
- <version>${project.version}</version>
+ <version>${revision}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>dubbo-spring-boot-autoconfigure</artifactId>
- <version>${project.version}</version>
+ <version>${revision}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>dubbo-spring-boot-starter</artifactId>
- <version>${project.version}</version>
+ <version>${revision}</version>
</dependency>
</dependencies>
diff --git
a/dubbo-spring-boot-samples/auto-configure-samples/consumer-sample/pom.xml
b/dubbo-spring-boot-samples/auto-configure-samples/consumer-sample/pom.xml
index 1c1920f..4ce4021 100644
--- a/dubbo-spring-boot-samples/auto-configure-samples/consumer-sample/pom.xml
+++ b/dubbo-spring-boot-samples/auto-configure-samples/consumer-sample/pom.xml
@@ -38,7 +38,7 @@
<dependency>
<groupId>com.alibaba.boot</groupId>
<artifactId>dubbo-spring-boot-starter</artifactId>
- <version>${project.version}</version>
+ <version>${revision}</version>
</dependency>
<dependency>
@@ -49,7 +49,7 @@
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>dubbo-spring-boot-sample-api</artifactId>
- <version>${project.version}</version>
+ <version>${revision}</version>
</dependency>
</dependencies>
diff --git
a/dubbo-spring-boot-samples/auto-configure-samples/provider-sample/pom.xml
b/dubbo-spring-boot-samples/auto-configure-samples/provider-sample/pom.xml
index 8d8e322..ad97367 100644
--- a/dubbo-spring-boot-samples/auto-configure-samples/provider-sample/pom.xml
+++ b/dubbo-spring-boot-samples/auto-configure-samples/provider-sample/pom.xml
@@ -39,7 +39,7 @@
<dependency>
<groupId>com.alibaba.boot</groupId>
<artifactId>dubbo-spring-boot-starter</artifactId>
- <version>${project.version}</version>
+ <version>${revision}</version>
</dependency>
<dependency>
@@ -50,7 +50,7 @@
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>dubbo-spring-boot-sample-api</artifactId>
- <version>${project.version}</version>
+ <version>${revision}</version>
</dependency>
</dependencies>
diff --git
a/dubbo-spring-boot-samples/dubbo-registry-nacos-samples/consumer-sample/pom.xml
b/dubbo-spring-boot-samples/dubbo-registry-nacos-samples/consumer-sample/pom.xml
index 2f11091..d0578fb 100644
---
a/dubbo-spring-boot-samples/dubbo-registry-nacos-samples/consumer-sample/pom.xml
+++
b/dubbo-spring-boot-samples/dubbo-registry-nacos-samples/consumer-sample/pom.xml
@@ -38,7 +38,7 @@
<dependency>
<groupId>com.alibaba.boot</groupId>
<artifactId>dubbo-spring-boot-starter</artifactId>
- <version>${project.version}</version>
+ <version>${revision}</version>
</dependency>
<!-- Dubbo -->
@@ -50,7 +50,7 @@
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>dubbo-spring-boot-sample-api</artifactId>
- <version>${project.version}</version>
+ <version>${revision}</version>
</dependency>
<!-- Netty -->
diff --git
a/dubbo-spring-boot-samples/dubbo-registry-nacos-samples/provider-sample/pom.xml
b/dubbo-spring-boot-samples/dubbo-registry-nacos-samples/provider-sample/pom.xml
index 93740db..13d1a1f 100644
---
a/dubbo-spring-boot-samples/dubbo-registry-nacos-samples/provider-sample/pom.xml
+++
b/dubbo-spring-boot-samples/dubbo-registry-nacos-samples/provider-sample/pom.xml
@@ -39,7 +39,7 @@
<dependency>
<groupId>com.alibaba.boot</groupId>
<artifactId>dubbo-spring-boot-starter</artifactId>
- <version>${project.version}</version>
+ <version>${revision}</version>
</dependency>
<!-- Dubbo -->
@@ -51,7 +51,7 @@
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>dubbo-spring-boot-sample-api</artifactId>
- <version>${project.version}</version>
+ <version>${revision}</version>
</dependency>
<!-- Netty -->
diff --git
a/dubbo-spring-boot-samples/dubbo-registry-zookeeper-samples/consumer-sample/pom.xml
b/dubbo-spring-boot-samples/dubbo-registry-zookeeper-samples/consumer-sample/pom.xml
index 375c279..73adeed 100644
---
a/dubbo-spring-boot-samples/dubbo-registry-zookeeper-samples/consumer-sample/pom.xml
+++
b/dubbo-spring-boot-samples/dubbo-registry-zookeeper-samples/consumer-sample/pom.xml
@@ -38,7 +38,7 @@
<dependency>
<groupId>com.alibaba.boot</groupId>
<artifactId>dubbo-spring-boot-starter</artifactId>
- <version>${project.version}</version>
+ <version>${revision}</version>
</dependency>
<dependency>
@@ -49,7 +49,7 @@
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>dubbo-spring-boot-sample-api</artifactId>
- <version>${project.version}</version>
+ <version>${revision}</version>
</dependency>
<dependency>
diff --git
a/dubbo-spring-boot-samples/dubbo-registry-zookeeper-samples/provider-sample/pom.xml
b/dubbo-spring-boot-samples/dubbo-registry-zookeeper-samples/provider-sample/pom.xml
index fb46909..f6828a9 100644
---
a/dubbo-spring-boot-samples/dubbo-registry-zookeeper-samples/provider-sample/pom.xml
+++
b/dubbo-spring-boot-samples/dubbo-registry-zookeeper-samples/provider-sample/pom.xml
@@ -39,7 +39,7 @@
<dependency>
<groupId>com.alibaba.boot</groupId>
<artifactId>dubbo-spring-boot-starter</artifactId>
- <version>${project.version}</version>
+ <version>${revision}</version>
</dependency>
<!-- Dubbo -->
@@ -51,7 +51,7 @@
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>dubbo-spring-boot-sample-api</artifactId>
- <version>${project.version}</version>
+ <version>${revision}</version>
</dependency>
<!-- Zookeeper -->
diff --git
a/dubbo-spring-boot-samples/externalized-configuration-samples/consumer-sample/pom.xml
b/dubbo-spring-boot-samples/externalized-configuration-samples/consumer-sample/pom.xml
index 413eb9b..3e4cd26 100644
---
a/dubbo-spring-boot-samples/externalized-configuration-samples/consumer-sample/pom.xml
+++
b/dubbo-spring-boot-samples/externalized-configuration-samples/consumer-sample/pom.xml
@@ -38,7 +38,7 @@
<dependency>
<groupId>com.alibaba.boot</groupId>
<artifactId>dubbo-spring-boot-starter</artifactId>
- <version>${project.version}</version>
+ <version>${revision}</version>
</dependency>
<dependency>
@@ -49,7 +49,7 @@
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>dubbo-spring-boot-sample-api</artifactId>
- <version>${project.version}</version>
+ <version>${revision}</version>
</dependency>
</dependencies>
diff --git
a/dubbo-spring-boot-samples/externalized-configuration-samples/provider-sample/pom.xml
b/dubbo-spring-boot-samples/externalized-configuration-samples/provider-sample/pom.xml
index 4f90d8c..37cb3b5 100644
---
a/dubbo-spring-boot-samples/externalized-configuration-samples/provider-sample/pom.xml
+++
b/dubbo-spring-boot-samples/externalized-configuration-samples/provider-sample/pom.xml
@@ -39,7 +39,7 @@
<dependency>
<groupId>com.alibaba.boot</groupId>
<artifactId>dubbo-spring-boot-starter</artifactId>
- <version>${project.version}</version>
+ <version>${revision}</version>
</dependency>
<dependency>
@@ -50,7 +50,7 @@
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>dubbo-spring-boot-sample-api</artifactId>
- <version>${project.version}</version>
+ <version>${revision}</version>
</dependency>
</dependencies>
diff --git a/dubbo-spring-boot-starter/pom.xml
b/dubbo-spring-boot-starter/pom.xml
index 2bd319a..92f5c7e 100644
--- a/dubbo-spring-boot-starter/pom.xml
+++ b/dubbo-spring-boot-starter/pom.xml
@@ -55,7 +55,7 @@
<dependency>
<groupId>com.alibaba.boot</groupId>
<artifactId>dubbo-spring-boot-autoconfigure</artifactId>
- <version>${project.version}</version>
+ <version>${revision}</version>
</dependency>
</dependencies>
diff --git a/pom.xml b/pom.xml
index 0f1dd4f..a223d60 100644
--- a/pom.xml
+++ b/pom.xml
@@ -112,6 +112,7 @@
</execution>
</executions>
</plugin>
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
@@ -124,6 +125,33 @@
</execution>
</executions>
</plugin>
+
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>flatten-maven-plugin</artifactId>
+ <version>1.1.0</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>
+
</plugins>
</build>
</profile>