You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by sa...@apache.org on 2023/03/14 16:45:39 UTC
[cassandra] 23/25: [CEP-21] Test / build config changes
This is an automated email from the ASF dual-hosted git repository.
samt pushed a commit to branch cep-21-tcm
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit e2036cd719b051c0cb9b58709f29028f0a51b0be
Author: Sam Tunnicliffe <sa...@apache.org>
AuthorDate: Mon Mar 6 10:09:36 2023 +0000
[CEP-21] Test / build config changes
Co-authored-by: Marcus Eriksson <ma...@apache.org>
Co-authored-by: Alex Petrov <ol...@gmail.com>
Co-authored-by: Sam Tunnicliffe <sa...@apache.org>
---
.build/cassandra-build-deps-template.xml | 4 ++++
.build/parent-pom-template.xml | 5 +++++
test/conf/logback-dtest.xml | 5 +++--
test/conf/logback-simulator.xml | 1 -
4 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/.build/cassandra-build-deps-template.xml b/.build/cassandra-build-deps-template.xml
index 93387996ef..a317f861a5 100644
--- a/.build/cassandra-build-deps-template.xml
+++ b/.build/cassandra-build-deps-template.xml
@@ -62,6 +62,10 @@
<groupId>com.google.jimfs</groupId>
<artifactId>jimfs</artifactId>
</dependency>
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava-testlib</artifactId>
+ </dependency>
<dependency>
<groupId>com.puppycrawl.tools</groupId>
<artifactId>checkstyle</artifactId>
diff --git a/.build/parent-pom-template.xml b/.build/parent-pom-template.xml
index 4edd92e65c..f016c98679 100644
--- a/.build/parent-pom-template.xml
+++ b/.build/parent-pom-template.xml
@@ -297,6 +297,11 @@
</exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava-testlib</artifactId>
+ <version>27.0-jre</version>
+ </dependency>
<dependency>
<groupId>com.google.jimfs</groupId>
<artifactId>jimfs</artifactId>
diff --git a/test/conf/logback-dtest.xml b/test/conf/logback-dtest.xml
index 52eaf335de..48d9859b67 100644
--- a/test/conf/logback-dtest.xml
+++ b/test/conf/logback-dtest.xml
@@ -27,7 +27,7 @@
<appender name="INSTANCEFILE" class="ch.qos.logback.core.FileAppender">
<file>./build/test/logs/${cassandra.testtag}/${suitename}/${cluster_id}/${instance_id}/system.log</file>
<encoder>
- <pattern>%-5level [%thread] ${instance_id} %date{ISO8601} %msg%n</pattern>
+ <pattern>%-5level [%thread] ${instance_id} %date{ISO8601} %F:%L - %msg%n</pattern>
</encoder>
<immediateFlush>true</immediateFlush>
</appender>
@@ -50,7 +50,8 @@
</filter>
</appender>
- <logger name="org.apache.hadoop" level="WARN"/>
+ <logger name="io.netty.*" level="WARN"/>
+ <logger name="org.apache.cassandra.db.Memtable" level="WARN"/>
<root level="DEBUG">
<appender-ref ref="INSTANCEFILE" /> <!-- use blocking to avoid race conditions with appending and searching -->
diff --git a/test/conf/logback-simulator.xml b/test/conf/logback-simulator.xml
index 25c9de8a6a..3a9fabc380 100644
--- a/test/conf/logback-simulator.xml
+++ b/test/conf/logback-simulator.xml
@@ -40,7 +40,6 @@
</filter>
</appender>
- <logger name="org.apache.cassandra.locator.TokenMetadata" level="ERROR"/>
<logger name="org.apache.cassandra.net.Message" level="ERROR"/>
<logger name="org.reflections.Reflections" level="ERROR"/>
<logger name="org.apache.hadoop" level="WARN"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org