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:51 UTC
[incubator-servicecomb-saga] branch master updated (679399d ->
a782ed5)
This is an automated email from the ASF dual-hosted git repository.
ningjiang pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-servicecomb-saga.git.
from 679399d SCB-784 Fixed the acceptance test error
new 4838636 SCB-806 Polished the log setting of Alpha-Server
new a782ed5 Fixed the build warning of alpha-server
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
alpha/alpha-server/pom.xml | 23 ++++------------------
.../saga/alpha/server/AlphaEventController.java | 2 --
pom.xml | 11 ++++++-----
3 files changed, 10 insertions(+), 26 deletions(-)
[incubator-servicecomb-saga] 01/02: SCB-806 Polished the log
setting of Alpha-Server
Posted by ni...@apache.org.
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>
[incubator-servicecomb-saga] 02/02: Fixed the build warning of
alpha-server
Posted by ni...@apache.org.
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 a782ed5cde19c1f9f728e3b7b5050cbad0a237b0
Author: Willem Jiang <ji...@huawei.com>
AuthorDate: Mon Aug 6 10:39:53 2018 +0800
Fixed the build warning of alpha-server
---
.../org/apache/servicecomb/saga/alpha/server/AlphaEventController.java | 2 --
1 file changed, 2 deletions(-)
diff --git a/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/AlphaEventController.java b/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/AlphaEventController.java
index 8d401de..b85cfbc 100644
--- a/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/AlphaEventController.java
+++ b/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/AlphaEventController.java
@@ -34,8 +34,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
import com.fasterxml.jackson.annotation.JsonAutoDetect;
import com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility;
-import sun.rmi.runtime.Log;
-
@Controller
@RequestMapping("/")
class AlphaEventController {