1.0.0 (#421)
* Polish apache/incubator-dubbo-spring-boot-project#395
* Polish apache/incubator-dubbo-spring-boot-project#395 fixed issues
* Polish apache/incubator-dubbo-spring-boot-project#395 Update documents
* Update the root POM's parent
* Replace ${project.version} to ${revision} in the "pom.xml" files
* Update <projectId>
diff --git a/.gitignore b/.gitignore
index 35e3ede..8f36fda 100644
--- a/.gitignore
+++ b/.gitignore
@@ -41,4 +41,7 @@
# 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 e655820..592bcd6 100644
--- a/dubbo-spring-boot-actuator/pom.xml
+++ b/dubbo-spring-boot-actuator/pom.xml
@@ -59,9 +59,9 @@
<!-- Dubbo autoconfigure -->
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>org.apache.dubbo</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 8c21fba..38f4a19 100644
--- a/dubbo-spring-boot-distribution/pom.xml
+++ b/dubbo-spring-boot-distribution/pom.xml
@@ -34,21 +34,21 @@
<dependencies>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-spring-boot-actuator</artifactId>
- <version>${project.version}</version>
+ <version>${revision}</version>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-spring-boot-autoconfigure</artifactId>
- <version>${project.version}</version>
+ <version>${revision}</version>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-spring-boot-starter</artifactId>
- <version>${project.version}</version>
+ <version>${revision}</version>
</dependency>
</dependencies>
diff --git a/dubbo-spring-boot-parent/pom.xml b/dubbo-spring-boot-parent/pom.xml
index aff3cf0..e1db10f 100644
--- a/dubbo-spring-boot-parent/pom.xml
+++ b/dubbo-spring-boot-parent/pom.xml
@@ -37,10 +37,8 @@
<java.target.version>1.8</java.target.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
- <spring-boot.version>2.1.1.RELEASE</spring-boot.version>
- <dubbo.version>2.7.0-SNAPSHOT</dubbo.version>
- <dubbo-registry-nacos.version>0.0.2</dubbo-registry-nacos.version>
- <nacos-client.version>0.6.2</nacos-client.version>
+ <spring-boot.version>2.1.2.RELEASE</spring-boot.version>
+ <dubbo.version>2.7.0</dubbo.version>
<!-- Build args -->
<argline>-server -Xms256m -Xmx512m -XX:PermSize=64m -XX:MaxPermSize=128m -Dfile.encoding=UTF-8
-Djava.net.preferIPv4Stack=true
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 d367482..304dddb 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>org.apache.dubbo</groupId>
<artifactId>dubbo-spring-boot-starter</artifactId>
- <version>${project.version}</version>
+ <version>${revision}</version>
</dependency>
<dependency>
@@ -47,9 +47,9 @@
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>org.apache.dubbo.samples</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 c842d8e..048ccb0 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>org.apache.dubbo</groupId>
<artifactId>dubbo-spring-boot-starter</artifactId>
- <version>${project.version}</version>
+ <version>${revision}</version>
</dependency>
<dependency>
@@ -48,9 +48,9 @@
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>org.apache.dubbo.samples</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-zookeeper-samples/consumer-sample/pom.xml b/dubbo-spring-boot-samples/dubbo-registry-zookeeper-samples/consumer-sample/pom.xml
index fe0ca52..c80eaf8 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>org.apache.dubbo</groupId>
<artifactId>dubbo-spring-boot-starter</artifactId>
- <version>${project.version}</version>
+ <version>${revision}</version>
</dependency>
<dependency>
@@ -47,9 +47,9 @@
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>org.apache.dubbo.samples</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 ff1edf4..810def9 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>org.apache.dubbo</groupId>
<artifactId>dubbo-spring-boot-starter</artifactId>
- <version>${project.version}</version>
+ <version>${revision}</version>
</dependency>
<!-- Dubbo -->
@@ -49,9 +49,9 @@
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>org.apache.dubbo.samples</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 aa438e9..6804c6b 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>org.apache.dubbo</groupId>
<artifactId>dubbo-spring-boot-starter</artifactId>
- <version>${project.version}</version>
+ <version>${revision}</version>
</dependency>
<dependency>
@@ -47,9 +47,9 @@
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>org.apache.dubbo.samples</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 559045a..c9c9e01 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>org.apache.dubbo</groupId>
<artifactId>dubbo-spring-boot-starter</artifactId>
- <version>${project.version}</version>
+ <version>${revision}</version>
</dependency>
<dependency>
@@ -48,9 +48,9 @@
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>org.apache.dubbo.samples</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 e81df95..ac2576d 100644
--- a/dubbo-spring-boot-starter/pom.xml
+++ b/dubbo-spring-boot-starter/pom.xml
@@ -55,7 +55,7 @@
<dependency>
<groupId>org.apache.dubbo</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 6d2ecc8..9b52dd1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -37,7 +37,7 @@
<properties>
<maven_javadoc_version>3.0.1</maven_javadoc_version>
<maven_surefire_version>2.19.1</maven_surefire_version>
- <revision>1.0.0-SNAPSHOT</revision>
+ <revision>2.7.0</revision>
</properties>
<modules>
@@ -124,6 +124,31 @@
</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>
