You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicecomb.apache.org by ni...@apache.org on 2018/08/06 02:49:52 UTC
[incubator-servicecomb-saga] 01/02: SCB-806 Polished the log
setting of Alpha-Server
This is an automated email from the ASF dual-hosted git repository.
ningjiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-servicecomb-saga.git
commit 4838636ef90c6e884548d97b98fb418f07b2e3e2
Author: Willem Jiang <ji...@huawei.com>
AuthorDate: Mon Aug 6 10:39:32 2018 +0800
SCB-806 Polished the log setting of Alpha-Server
---
alpha/alpha-server/pom.xml | 23 ++++-------------------
pom.xml | 11 ++++++-----
2 files changed, 10 insertions(+), 24 deletions(-)
diff --git a/alpha/alpha-server/pom.xml b/alpha/alpha-server/pom.xml
index 5958aad..26a75ac 100644
--- a/alpha/alpha-server/pom.xml
+++ b/alpha/alpha-server/pom.xml
@@ -105,6 +105,10 @@
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-actuator</artifactId>
</dependency>
+ <dependency>
+ <groupId>com.lmax</groupId>
+ <artifactId>disruptor</artifactId>
+ </dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
@@ -187,25 +191,6 @@
</build>
</profile>
<profile>
- <id>spring-boot-2</id>
- <properties>
- <spring.boot.version>${spring.boot2.version}</spring.boot.version>
- </properties>
- <!-- Need to add the dependency of log4j2 core -->
- <dependencies>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-core</artifactId>
- <version>2.6.2</version>
- </dependency>
- <dependency>
- <groupId>com.lmax</groupId>
- <artifactId>disruptor</artifactId>
- <version>3.3.7</version>
- </dependency>
- </dependencies>
- </profile>
- <profile>
<id>mysql</id>
<dependencies>
<dependency>
diff --git a/pom.xml b/pom.xml
index e99b71e..0612291 100644
--- a/pom.xml
+++ b/pom.xml
@@ -53,6 +53,7 @@
<kamon.version>0.6.7</kamon.version>
<!-- using log4j 2.7 with Spring Boot 1.x -->
<log4j.version>2.7</log4j.version>
+ <disruptor.version>3.3.7</disruptor.version>
<dubbo.version>2.6.1</dubbo.version>
<spring.boot.version>1.5.14.RELEASE</spring.boot.version>
<spring.boot2.version>2.0.3.RELEASE</spring.boot2.version>
@@ -356,6 +357,11 @@
<version>1.7.25</version>
</dependency>
<dependency>
+ <groupId>com.lmax</groupId>
+ <artifactId>disruptor</artifactId>
+ <version>${disruptor.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j-impl</artifactId>
<version>${log4j.version}</version>
@@ -451,11 +457,6 @@
<version>1.8.10</version>
</dependency>
<dependency>
- <groupId>com.lmax</groupId>
- <artifactId>disruptor</artifactId>
- <version>3.3.6</version>
- </dependency>
- <dependency>
<groupId>com.typesafe.akka</groupId>
<artifactId>akka-actor_2.12</artifactId>
<version>${akka.version}</version>