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/11/19 07:45:50 UTC
[servicecomb-saga] 02/02: SCB-963 Fixed the Alpha Server start error
This is an automated email from the ASF dual-hosted git repository.
ningjiang pushed a commit to branch 0.2.x
in repository https://gitbox.apache.org/repos/asf/servicecomb-saga.git
commit 0b9a868ed7ff4b90c35539b472df3fd0632a22a8
Author: Willem Jiang <ji...@huawei.com>
AuthorDate: Mon Nov 19 15:37:51 2018 +0800
SCB-963 Fixed the Alpha Server start error
---
alpha/alpha-server/pom.xml | 6 ++++--
.../apache/servicecomb/saga/alpha/server/AlphaEventController.java | 2 --
pom.xml | 6 ++++++
3 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/alpha/alpha-server/pom.xml b/alpha/alpha-server/pom.xml
index af0eb31..95f33f3 100644
--- a/alpha/alpha-server/pom.xml
+++ b/alpha/alpha-server/pom.xml
@@ -144,6 +144,10 @@
<groupId>io.netty</groupId>
<artifactId>netty-tcnative-boringssl-static</artifactId>
</dependency>
+ <dependency>
+ <groupId>com.lmax</groupId>
+ <artifactId>disruptor</artifactId>
+ </dependency>
</dependencies>
<build>
@@ -191,12 +195,10 @@
<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>
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 {
diff --git a/pom.xml b/pom.xml
index d36d493..924579b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -46,6 +46,7 @@
<java.version>1.8</java.version>
<kamon.version>0.6.7</kamon.version>
<log4j.version>2.6.2</log4j.version>
+ <disruptor.version>3.3.7</disruptor.version>
<dubbo.version>2.6.1</dubbo.version>
<spring.boot.version>1.5.13.RELEASE</spring.boot.version>
<spring.boot2.version>2.0.2.RELEASE</spring.boot2.version>
@@ -218,6 +219,11 @@
<version>${log4j.version}</version>
</dependency>
<dependency>
+ <groupId>com.lmax</groupId>
+ <artifactId>disruptor</artifactId>
+ <version>${disruptor.version}</version>
+ </dependency>
+ <dependency>
<groupId>io.kamon</groupId>
<artifactId>kamon-core_2.12</artifactId>
<version>${kamon.version}</version>