SpringCloud/spring-cloud-sleuth
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into 2.0.x

Browse Source
This commit is contained in:
Dave Syer
2017-07-26 11:52:10 +01:00
parent e8eef5ad62 540c95895a
commit c43345f197
5 changed files with 227 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
benchmarks/pom.xml
View File

@@ -22,7 +22,7 @@
<properties>
<main.basedir>${project.basedir}/..</main.basedir>
<jmh.version>1.11.3</jmh.version>
<jmh.version>1.16</jmh.version>
<maven-shade-plugin.version>2.4.3</maven-shade-plugin.version>
<maven-install-plugin.version>2.5.2</maven-install-plugin.version>
<sonar.skip>true</sonar.skip>
@@ -51,13 +51,6 @@
</dependencyManagement>
<dependencies>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-sleuth-dependencies</artifactId>
<version>${project.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>spring-cloud-sleuth-core</artifactId>
@@ -248,7 +241,7 @@
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<version>1.5.1.RELEASE</version>
<version>1.5.4.RELEASE</version>
<executions>
<execution>
<goals>