Commit d8dd26d8 by QIANGLU

Merge branch 'dev' into test

# Conflicts:
#	pom.xml
#	secoo-log-starter/pom.xml
#	secoo-log/pom.xml
parents daadb707 428e5f20
......@@ -7,7 +7,7 @@
<groupId>com.secoo.mall</groupId>
<artifactId>secoo-log-parent</artifactId>
<packaging>pom</packaging>
<version>1.0.6-SNAPSHOT</version>
<version>1.0.7-SNAPSHOT</version>
<modules>
<module>secoo-log-starter</module>
<module>secoo-log</module>
......@@ -52,7 +52,7 @@
<dependency>
<groupId>org.apache.skywalking</groupId>
<artifactId>apm-toolkit-logback-1.x</artifactId>
<version>6.2.1-beta.RELEASE</version>
<version>6.3.0.RELEASE</version>
</dependency>
</dependencies>
</dependencyManagement>
......
......@@ -5,7 +5,7 @@
<parent>
<artifactId>secoo-log-parent</artifactId>
<groupId>com.secoo.mall</groupId>
<version>1.0.6-SNAPSHOT</version>
<version>1.0.7-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
......@@ -5,7 +5,7 @@
<parent>
<artifactId>secoo-log-parent</artifactId>
<groupId>com.secoo.mall</groupId>
<version>1.0.6-SNAPSHOT</version>
<version>1.0.7-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment