study/Spring-Cloud-Alibaba
1
0
Fork 0
mirror of https://gitee.com/mirrors/Spring-Cloud-Alibaba.git synced 2021-06-26 13:25:11 +08:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'upstream/master'

Browse Source 
# Conflicts:
#	pom.xml
#	spring-cloud-alibaba-dependencies/pom.xml
#	spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/pom.xml
This commit is contained in:
mercyblitz
2019-01-22 15:16:21 +08:00
parent 59a969049d
commit 744e33229a
8 changed files with 42 additions and 253 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
pom.xml
View File

@@ -119,6 +119,14 @@
<scope>import</scope>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-alibaba-dependencies</artifactId>
<version>${project.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-commons-dependencies</artifactId>
@@ -157,7 +165,6 @@
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>net.sourceforge.cobertura</groupId>
<artifactId>cobertura-runtime</artifactId>
@@ -165,15 +172,6 @@
<scope>provided</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-alibaba-dependencies</artifactId>
<version>${project.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>
@@ -211,7 +209,14 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>cobertura-maven-plugin</artifactId>
<version>2.7</version>
<version>${cobertura-maven-plugin.version}</version>
<dependencies>
<dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm</artifactId>
<version>5.0.3</version>
</dependency>
</dependencies>
<configuration>
<quiet>true</quiet>
<formats>
@@ -220,26 +225,6 @@
</formats>
<check/>
<check />
<instrumentation>
<excludes>
<exclude>org/springframework/cloud/alibaba/cloud/dependencies/**.*.class</exclude>
<exclude>org/springframework/cloud/alibaba/cloud/docs/**.*.class</exclude>
<exclude>org/springframework/cloud/alibaba/cloud/examples/**.*.class</exclude>
<exclude>org/springframework/cloud/alibaba/cloud/test/**.*.class</exclude>
<exclude>org/springframework/cloud/start/alibaba/**.*.class</exclude>
<exclude>org/springframework/cloud/start/alicloud/**.*.class</exclude>
<exclude>org/springframework/cloud/alibaba/nacos/src/test/**.*.class</exclude>
<exclude>org/springframework/cloud/alibaba/nacos/config/server/src/test/**.*.class</exclude>
<exclude>org/springframework/cloud/alibaba/sentinel/src/test/**.*.class</exclude>
<exclude>org/springframework/cloud/alibaba/sentinel/datasource/src/test/**.*.class</exclude>
<exclude>org/springframework/cloud/alicloud/acm/src/test/**.*.class</exclude>
<exclude>org/springframework/cloud/alicloud/ans/src/test/**.*.class</exclude>
<exclude>org/springframework/cloud/alicloud/context/src/test/**.*.class</exclude>
<exclude>org/springframework/cloud/alicloud/oss/src/test/**.*.class</exclude>
<exclude>org/springframework/cloud/alicloud/scx/src/test/**.*.class</exclude>
<exclude>org/springframework/cloud/stream/binder/rocketmq/src/test/**.*.class</exclude>
</excludes>
</instrumentation>
</configuration>
<executions>
<execution>