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/01/10 03:31:30 UTC
[incubator-servicecomb-saga] 06/07: SCB-168 removed default logging
from spring boot
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 1e7ff02c8a8691758fcb74decded944e7125cc18
Author: seanyinx <se...@huawei.com>
AuthorDate: Mon Jan 8 16:45:12 2018 +0800
SCB-168 removed default logging from spring boot
Signed-off-by: seanyinx <se...@huawei.com>
---
omega/omega-connector/omega-connector-grpc/pom.xml | 5 ++++-
.../servicecomb/saga/omega/format/KryoMessageFormatTest.java | 6 +++---
.../servicecomb/saga/omega/format/MessageFormatTestBase.java | 9 ++-------
omega/omega-spring-tx/pom.xml | 6 ++++++
4 files changed, 15 insertions(+), 11 deletions(-)
diff --git a/omega/omega-connector/omega-connector-grpc/pom.xml b/omega/omega-connector/omega-connector-grpc/pom.xml
index 258eb4b..8ed9aa8 100644
--- a/omega/omega-connector/omega-connector-grpc/pom.xml
+++ b/omega/omega-connector/omega-connector-grpc/pom.xml
@@ -53,19 +53,22 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
+
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j-impl</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-api</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
+ <scope>test</scope>
</dependency>
-
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
diff --git a/omega/omega-format/src/test/java/org/apache/servicecomb/saga/omega/format/KryoMessageFormatTest.java b/omega/omega-format/src/test/java/org/apache/servicecomb/saga/omega/format/KryoMessageFormatTest.java
index 1f63d74..327b6ec 100644
--- a/omega/omega-format/src/test/java/org/apache/servicecomb/saga/omega/format/KryoMessageFormatTest.java
+++ b/omega/omega-format/src/test/java/org/apache/servicecomb/saga/omega/format/KryoMessageFormatTest.java
@@ -17,7 +17,7 @@
package org.apache.servicecomb.saga.omega.format;
-import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.instanceOf;
import static org.junit.Assert.assertThat;
import org.junit.BeforeClass;
@@ -32,10 +32,10 @@ public class KryoMessageFormatTest extends MessageFormatTestBase {
@Test
public void serializeEmptyClassIntoBytes() {
- byte[] bytes = format.serialize(eventOf(new EmptyClass()));
+ byte[] bytes = format.serialize(new Object[]{new EmptyClass()});
Object[] message = format.deserialize(bytes);
- assertThat(message[0] instanceof EmptyClass, is(true));
+ assertThat(message[0], instanceOf(EmptyClass.class));
}
}
diff --git a/omega/omega-format/src/test/java/org/apache/servicecomb/saga/omega/format/MessageFormatTestBase.java b/omega/omega-format/src/test/java/org/apache/servicecomb/saga/omega/format/MessageFormatTestBase.java
index d3c591e..aab6ad7 100644
--- a/omega/omega-format/src/test/java/org/apache/servicecomb/saga/omega/format/MessageFormatTestBase.java
+++ b/omega/omega-format/src/test/java/org/apache/servicecomb/saga/omega/format/MessageFormatTestBase.java
@@ -26,7 +26,6 @@ import static org.hamcrest.Matchers.startsWith;
import static org.junit.Assert.assertThat;
import org.apache.servicecomb.saga.omega.transaction.OmegaException;
-import org.apache.servicecomb.saga.omega.transaction.TxEvent;
import org.junit.Ignore;
import org.junit.Test;
@@ -37,7 +36,7 @@ public class MessageFormatTestBase {
@Test
public void serializeObjectIntoBytes() throws Exception {
- byte[] bytes = format.serialize(new String[]{"hello", "world"});
+ byte[] bytes = format.serialize(new Object[]{"hello", "world"});
Object[] message = format.deserialize(bytes);
@@ -46,7 +45,7 @@ public class MessageFormatTestBase {
@Test
public void serializeNullIntoBytes() throws Exception {
- byte[] bytes = format.serialize(eventOf((Object[]) null));
+ byte[] bytes = format.serialize(null);
Object[] message = format.deserialize(bytes);
@@ -63,10 +62,6 @@ public class MessageFormatTestBase {
}
}
- TxEvent eventOf(Object... payloads) {
- return new TxEvent(null, null, null, null, payloads);
- }
-
static class EmptyClass {
}
}
diff --git a/omega/omega-spring-tx/pom.xml b/omega/omega-spring-tx/pom.xml
index 991ad93..539335b 100644
--- a/omega/omega-spring-tx/pom.xml
+++ b/omega/omega-spring-tx/pom.xml
@@ -32,6 +32,12 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.servicecomb.saga</groupId>
--
To stop receiving notification emails like this one, please contact
"commits@servicecomb.apache.org" <co...@servicecomb.apache.org>.