Skip to content

S
secoo-log
Commit d8dd26d8 by QIANGLU
Options

Merge branch 'dev' into test 

# Conflicts:
#	pom.xml
#	secoo-log-starter/pom.xml
#	secoo-log/pom.xml
parents daadb707 428e5f20
Showing with 4 additions and 4 deletions
pom.xml
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
<groupId>com.secoo.mall</groupId> <groupId>com.secoo.mall</groupId>
<artifactId>secoo-log-parent</artifactId> <artifactId>secoo-log-parent</artifactId>
<packaging>pom</packaging> <packaging>pom</packaging>
<version>1.0.6-SNAPSHOT</version> <version>1.0.7-SNAPSHOT</version>
<modules> <modules>
<module>secoo-log-starter</module> <module>secoo-log-starter</module>
<module>secoo-log</module> <module>secoo-log</module>
...@@ -52,7 +52,7 @@ ...@@ -52,7 +52,7 @@
<dependency> <dependency>
<groupId>org.apache.skywalking</groupId> <groupId>org.apache.skywalking</groupId>
<artifactId>apm-toolkit-logback-1.x</artifactId> <artifactId>apm-toolkit-logback-1.x</artifactId>
<version>6.2.1-beta.RELEASE</version> <version>6.3.0.RELEASE</version>
</dependency> </dependency>
</dependencies> </dependencies>
</dependencyManagement> </dependencyManagement>
......
secoo-log-starter/pom.xml
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>secoo-log-parent</artifactId> <artifactId>secoo-log-parent</artifactId>
<groupId>com.secoo.mall</groupId> <groupId>com.secoo.mall</groupId>
<version>1.0.6-SNAPSHOT</version> <version>1.0.7-SNAPSHOT</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
......
secoo-log/pom.xml
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>secoo-log-parent</artifactId> <artifactId>secoo-log-parent</artifactId>
<groupId>com.secoo.mall</groupId> <groupId>com.secoo.mall</groupId>
<version>1.0.6-SNAPSHOT</version> <version>1.0.7-SNAPSHOT</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <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