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 56c68111aadb278a67e6ad96192e51833f71c276 Author: Sam Tunnicliffe <[email protected]> AuthorDate: Mon Mar 6 10:09:36 2023 +0000 [CEP-21] Test / build config changes Co-authored-by: Marcus Eriksson <[email protected]> Co-authored-by: Alex Petrov <[email protected]> Co-authored-by: Sam Tunnicliffe <[email protected]> --- .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 cbf2f8c59d..03faa02235 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>org.quicktheories</groupId> <artifactId>quicktheories</artifactId> diff --git a/.build/parent-pom-template.xml b/.build/parent-pom-template.xml index 35ed4047fb..2605dfef8f 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: [email protected] For additional commands, e-mail: [email protected]
