This is an automated email from the ASF dual-hosted git repository.
mercyblitz pushed a commit to branch 0.2.0
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.0 by this push:
new d1c7b73 Fix CI issue
d1c7b73 is described below
commit d1c7b734a10af0c9ca1865f800f3376117f896d5
Author: mercyblitz <mercybl...@gmail.com>
AuthorDate: Wed Jun 20 17:05:38 2018 +0800
Fix CI issue
---
dubbo-spring-boot-actuator/README.md | 4 +-
dubbo-spring-boot-actuator/pom.xml | 2 +-
dubbo-spring-boot-autoconfigure/pom.xml | 2 +-
dubbo-spring-boot-parent/pom.xml | 62 ++++++++++++++++++----
.../dubbo-spring-boot-sample-api/pom.xml | 2 +-
.../dubbo-spring-boot-sample-consumer/pom.xml | 2 +-
.../dubbo-spring-boot-sample-provider/pom.xml | 2 +-
dubbo-spring-boot-samples/pom.xml | 2 +-
dubbo-spring-boot-starter/pom.xml | 2 +-
pom.xml | 2 +-
10 files changed, 61 insertions(+), 21 deletions(-)
diff --git a/dubbo-spring-boot-actuator/README.md
b/dubbo-spring-boot-actuator/README.md
index 81d7b1a..103aa7d 100644
--- a/dubbo-spring-boot-actuator/README.md
+++ b/dubbo-spring-boot-actuator/README.md
@@ -33,7 +33,7 @@ You can introduce the latest `dubbo-spring-boot-actuator` to
your project by ad
<dependency>
<groupId>com.alibaba.boot</groupId>
<artifactId>dubbo-spring-boot-actuator</artifactId>
- <version>0.2.0-SNAPSHOT</version>
+ <version>0.2.0</version>
</dependency>
```
If your project failed to resolve the dependency, try to add the following
repository:
@@ -184,7 +184,7 @@ Actuator endpoint `dubbo` supports Actuator Endpoints :
{
"timestamp": 1516623290166,
"versions": {
- "dubbo-spring-boot": "0.2.0-SNAPSHOT"
+ "dubbo-spring-boot": "0.2.0"
"dubbo": "2.6.2"
},
"urls": {
diff --git a/dubbo-spring-boot-actuator/pom.xml
b/dubbo-spring-boot-actuator/pom.xml
index 9dc507b..1d2c648 100644
--- a/dubbo-spring-boot-actuator/pom.xml
+++ b/dubbo-spring-boot-actuator/pom.xml
@@ -20,7 +20,7 @@
<parent>
<artifactId>dubbo-spring-boot-parent</artifactId>
<groupId>com.alibaba.boot</groupId>
- <version>0.2.0-SNAPSHOT</version>
+ <version>0.2.0</version>
<relativePath>../dubbo-spring-boot-parent/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/dubbo-spring-boot-autoconfigure/pom.xml
b/dubbo-spring-boot-autoconfigure/pom.xml
index 30a2f8d..602ee77 100644
--- a/dubbo-spring-boot-autoconfigure/pom.xml
+++ b/dubbo-spring-boot-autoconfigure/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>com.alibaba.boot</groupId>
<artifactId>dubbo-spring-boot-parent</artifactId>
- <version>0.2.0-SNAPSHOT</version>
+ <version>0.2.0</version>
<relativePath>../dubbo-spring-boot-parent</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/dubbo-spring-boot-parent/pom.xml b/dubbo-spring-boot-parent/pom.xml
index e70db99..b9a9c03 100644
--- a/dubbo-spring-boot-parent/pom.xml
+++ b/dubbo-spring-boot-parent/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>com.alibaba.boot</groupId>
<artifactId>dubbo-spring-boot-project</artifactId>
- <version>0.2.0-SNAPSHOT</version>
+ <version>0.2.0</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -33,13 +33,25 @@
<properties>
<java.version>1.8</java.version>
+ <java.source.version>1.8</java.source.version>
+ <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.0.2.RELEASE</spring-boot.version>
+ <spring-boot.version>2.0.3.RELEASE</spring-boot.version>
<dubbo.version>2.6.2</dubbo.version>
<zkclient.version>0.2</zkclient.version>
<zookeeper.version>3.4.9</zookeeper.version>
<curator-framework.version>2.12.0</curator-framework.version>
+ <!-- Build args -->
+ <argline>-server -Xms256m -Xmx512m -XX:PermSize=64m
-XX:MaxPermSize=128m -Dfile.encoding=UTF-8
+ -Djava.net.preferIPv4Stack=true
+ </argline>
+
+ <!-- Maven plugins -->
+ <maven-jar-plugin.version>3.0.2</maven-jar-plugin.version>
+ <maven-compiler-plugin.version>3.6.0</maven-compiler-plugin.version>
+ <maven-source-plugin.version>3.0.1</maven-source-plugin.version>
+ <maven-jacoco-plugin.version>0.8.1</maven-jacoco-plugin.version>
<maven-gpg-plugin.version>1.5</maven-gpg-plugin.version>
<apache-rat-plugin.version>0.12</apache-rat-plugin.version>
</properties>
@@ -190,6 +202,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
+ <version>${maven-jar-plugin.version}</version>
<configuration>
<archive>
<addMavenDescriptor>true</addMavenDescriptor>
@@ -198,25 +211,51 @@
<addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
</manifest>
+ <manifestEntries>
+
<Specification-Version>${project.version}</Specification-Version>
+
<Implementation-Version>${project.version}</Implementation-Version>
+ </manifestEntries>
</archive>
</configuration>
</plugin>
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
+ <version>${maven-compiler-plugin.version}</version>
<configuration>
- <source>${java.version}</source>
- <target>${java.version}</target>
- <parameters>true</parameters>
+ <compilerArgument>-proc:none</compilerArgument>
+ <fork>true</fork>
+ <source>${java.source.version}</source>
+ <target>${java.target.version}</target>
+ <encoding>${file.encoding}</encoding>
</configuration>
</plugin>
+
<plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>2.20.1</version>
- <configuration>
- <argLine>--add-modules java.xml.bind</argLine>
- </configuration>
+ <groupId>org.jacoco</groupId>
+ <artifactId>jacoco-maven-plugin</artifactId>
+ <version>${maven-jacoco-plugin.version}</version>
+ <executions>
+ <execution>
+ <id>jacoco-initialize</id>
+ <goals>
+ <goal>prepare-agent</goal>
+ </goals>
+ <configuration>
+ <propertyName>jacocoArgLine</propertyName>
+ </configuration>
+ </execution>
+ <execution>
+ <id>jacoco-site</id>
+ <phase>package</phase>
+ <goals>
+ <goal>report</goal>
+ </goals>
+ </execution>
+ </executions>
</plugin>
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
@@ -229,7 +268,7 @@
<configuration>
<rules>
<requireJavaVersion>
- <version>[1.7,)</version>
+ <version>[1.8,)</version>
</requireJavaVersion>
<requireProperty>
<property>project.name</property>
@@ -246,6 +285,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
+ <version>${maven-source-plugin.version}</version>
<executions>
<execution>
<id>attach-sources</id>
diff --git a/dubbo-spring-boot-samples/dubbo-spring-boot-sample-api/pom.xml
b/dubbo-spring-boot-samples/dubbo-spring-boot-sample-api/pom.xml
index e404c4d..e9f443a 100644
--- a/dubbo-spring-boot-samples/dubbo-spring-boot-sample-api/pom.xml
+++ b/dubbo-spring-boot-samples/dubbo-spring-boot-sample-api/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>com.alibaba.boot</groupId>
<artifactId>dubbo-spring-boot-samples</artifactId>
- <version>0.2.0-SNAPSHOT</version>
+ <version>0.2.0</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git
a/dubbo-spring-boot-samples/dubbo-spring-boot-sample-consumer/pom.xml
b/dubbo-spring-boot-samples/dubbo-spring-boot-sample-consumer/pom.xml
index 8c3df20..de5e37d 100644
--- a/dubbo-spring-boot-samples/dubbo-spring-boot-sample-consumer/pom.xml
+++ b/dubbo-spring-boot-samples/dubbo-spring-boot-sample-consumer/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>com.alibaba.boot</groupId>
<artifactId>dubbo-spring-boot-samples</artifactId>
- <version>0.2.0-SNAPSHOT</version>
+ <version>0.2.0</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git
a/dubbo-spring-boot-samples/dubbo-spring-boot-sample-provider/pom.xml
b/dubbo-spring-boot-samples/dubbo-spring-boot-sample-provider/pom.xml
index 3c10d44..281eb9a 100644
--- a/dubbo-spring-boot-samples/dubbo-spring-boot-sample-provider/pom.xml
+++ b/dubbo-spring-boot-samples/dubbo-spring-boot-sample-provider/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>com.alibaba.boot</groupId>
<artifactId>dubbo-spring-boot-samples</artifactId>
- <version>0.2.0-SNAPSHOT</version>
+ <version>0.2.0</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/dubbo-spring-boot-samples/pom.xml
b/dubbo-spring-boot-samples/pom.xml
index 20c63a0..ad75b29 100644
--- a/dubbo-spring-boot-samples/pom.xml
+++ b/dubbo-spring-boot-samples/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>com.alibaba.boot</groupId>
<artifactId>dubbo-spring-boot-parent</artifactId>
- <version>0.2.0-SNAPSHOT</version>
+ <version>0.2.0</version>
<relativePath>../dubbo-spring-boot-parent/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/dubbo-spring-boot-starter/pom.xml
b/dubbo-spring-boot-starter/pom.xml
index 02115e4..073085c 100644
--- a/dubbo-spring-boot-starter/pom.xml
+++ b/dubbo-spring-boot-starter/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>com.alibaba.boot</groupId>
<artifactId>dubbo-spring-boot-parent</artifactId>
- <version>0.2.0-SNAPSHOT</version>
+ <version>0.2.0</version>
<relativePath>../dubbo-spring-boot-parent</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/pom.xml b/pom.xml
index 17fd80c..9226f07 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,7 +26,7 @@
<groupId>com.alibaba.boot</groupId>
<artifactId>dubbo-spring-boot-project</artifactId>
- <version>0.2.0-SNAPSHOT</version>
+ <version>0.2.0</version>
<packaging>pom</packaging>
