Merge remote-tracking branch 'origin/master'

This commit is contained in:
ascrutae 2016-06-13 22:17:40 +08:00
commit 85d123478e
2 changed files with 5 additions and 12 deletions

View File

@ -39,13 +39,6 @@
<version>2.4.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.12</version>
<scope>test</scope>
</dependency>
</dependencies>
<build>

View File

@ -29,11 +29,11 @@
<dependencies>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.12</version>
<scope>test</scope>
</dependency>
<groupId>com.ai.cloud</groupId>
<artifactId>skywalking-test-api</artifactId>
<version>1.0-Final</version>
<scope>test</scope>
</dependency>
</dependencies>
<build>