You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@phoenix.apache.org by st...@apache.org on 2022/07/22 04:24:45 UTC
[phoenix] branch master updated: PHOENIX-6746 Test suite executions do not provide usable logs
This is an automated email from the ASF dual-hosted git repository.
stoty pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/phoenix.git
The following commit(s) were added to refs/heads/master by this push:
new b95df40fc5 PHOENIX-6746 Test suite executions do not provide usable logs
b95df40fc5 is described below
commit b95df40fc5f13359bddd5dc6f857ecdd04b0dcf1
Author: Istvan Toth <st...@apache.org>
AuthorDate: Tue Jul 19 08:36:29 2022 +0200
PHOENIX-6746 Test suite executions do not provide usable logs
rename log4j2 config files to the correct names
use log4j2 for tests for every HBase profile
---
bin/{log4j.xml => log4j2.xml} | 0
phoenix-assembly/pom.xml | 9 --
phoenix-core/pom.xml | 121 ++++-----------------
.../it/resources/{log4j.xml => log4j2-test.xml} | 0
.../test/resources/{log4j.xml => log4j2-test.xml} | 0
phoenix-pherf/config/{log4j.xml => log4j2.xml} | 0
phoenix-pherf/pom.xml | 31 ++++++
pom.xml | 12 +-
8 files changed, 60 insertions(+), 113 deletions(-)
diff --git a/bin/log4j.xml b/bin/log4j2.xml
similarity index 100%
rename from bin/log4j.xml
rename to bin/log4j2.xml
diff --git a/phoenix-assembly/pom.xml b/phoenix-assembly/pom.xml
index 8c69d861fd..53c0f86002 100644
--- a/phoenix-assembly/pom.xml
+++ b/phoenix-assembly/pom.xml
@@ -159,15 +159,6 @@
<groupId>org.apache.phoenix</groupId>
<artifactId>phoenix-tracing-webapp</artifactId>
</dependency>
-
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-reload4j</artifactId>
- </dependency>
- <dependency>
- <groupId>ch.qos.reload4j</groupId>
- <artifactId>reload4j</artifactId>
- </dependency>
<dependency>
<groupId>sqlline</groupId>
<artifactId>sqlline</artifactId>
diff --git a/phoenix-core/pom.xml b/phoenix-core/pom.xml
index ffb3477a23..5f3108660d 100644
--- a/phoenix-core/pom.xml
+++ b/phoenix-core/pom.xml
@@ -568,6 +568,26 @@
</dependency>
<!-- Other test dependencies -->
+ <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>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-slf4j-impl</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-1.2-api</artifactId>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
@@ -584,105 +604,4 @@
<scope>test</scope>
</dependency>
</dependencies>
-<profiles>
- <profile>
- <id>phoenix-hbase-compat-2.3.0</id>
- <!-- keep dependency plugin happy -->
- <activation>
- <property>
- <name>hbase.profile</name>
- <value>2.3</value>
- </property>
- </activation>
- <properties>
- <hbase.profile>2.3</hbase.profile>
- </properties>
- <dependencies>
- <dependency>
- <groupId>ch.qos.reload4j</groupId>
- <artifactId>reload4j</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-reload4j</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
- </profile>
- <profile>
- <id>phoenix-hbase-compat-2.4.0</id>
- <!-- keep dependency plugin happy -->
- <activation>
- <property>
- <name>hbase.profile</name>
- <value>2.4.0</value>
- </property>
- </activation>
- <properties>
- <hbase.profile>2.4.0</hbase.profile>
- </properties>
- <dependencies>
- <dependency>
- <groupId>ch.qos.reload4j</groupId>
- <artifactId>reload4j</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-reload4j</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
- </profile>
- <profile>
- <id>phoenix-hbase-compat-2.4.1</id>
- <!-- keep dependency plugin happy -->
- <activation>
- <property>
- <name>hbase.profile</name>
- <value>2.4</value>
- </property>
- </activation>
- <properties>
- <hbase.profile>2.4</hbase.profile>
- </properties>
- <dependencies>
- <dependency>
- <groupId>ch.qos.reload4j</groupId>
- <artifactId>reload4j</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-reload4j</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
- </profile>
- <profile>
- <id>phoenix-hbase-compat-2.4.1-default</id>
- <!-- keep dependency plugin happy -->
- <activation>
- <property>
- <name>!hbase.profile</name>
- </property>
- </activation>
- <properties>
- <hbase.profile>2.4</hbase.profile>
- </properties>
- <dependencies>
- <dependency>
- <groupId>ch.qos.reload4j</groupId>
- <artifactId>reload4j</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-reload4j</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
- </profile>
-</profiles>
</project>
diff --git a/phoenix-core/src/it/resources/log4j.xml b/phoenix-core/src/it/resources/log4j2-test.xml
similarity index 100%
rename from phoenix-core/src/it/resources/log4j.xml
rename to phoenix-core/src/it/resources/log4j2-test.xml
diff --git a/phoenix-core/src/test/resources/log4j.xml b/phoenix-core/src/test/resources/log4j2-test.xml
similarity index 100%
rename from phoenix-core/src/test/resources/log4j.xml
rename to phoenix-core/src/test/resources/log4j2-test.xml
diff --git a/phoenix-pherf/config/log4j.xml b/phoenix-pherf/config/log4j2.xml
similarity index 100%
rename from phoenix-pherf/config/log4j.xml
rename to phoenix-pherf/config/log4j2.xml
diff --git a/phoenix-pherf/pom.xml b/phoenix-pherf/pom.xml
index 4ba9260ff8..a7cb5c5c27 100644
--- a/phoenix-pherf/pom.xml
+++ b/phoenix-pherf/pom.xml
@@ -168,6 +168,25 @@
<!-- Test Dependencies -->
<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>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-slf4j-impl</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-1.2-api</artifactId>
+ <scope>test</scope>
+ </dependency> <dependency>
<groupId>org.apache.phoenix</groupId>
<artifactId>phoenix-core</artifactId>
<type>test-jar</type>
@@ -290,6 +309,18 @@
<ignoredUnusedDeclaredDependency>
org.apache.hbase:hbase-testing-util
</ignoredUnusedDeclaredDependency>
+ <ignoredUnusedDeclaredDependency>
+ org.apache.logging.log4j:log4j-api
+ </ignoredUnusedDeclaredDependency>
+ <ignoredUnusedDeclaredDependency>
+ org.apache.logging.log4j:log4j-core
+ </ignoredUnusedDeclaredDependency>
+ <ignoredUnusedDeclaredDependency>
+ org.apache.logging.log4j:log4j-slf4j-impl
+ </ignoredUnusedDeclaredDependency>
+ <ignoredUnusedDeclaredDependency>
+ org.apache.logging.log4j:log4j-1.2-api
+ </ignoredUnusedDeclaredDependency>
</ignoredUnusedDeclaredDependencies>
<ignoredUsedUndeclaredDependencies>
<ignoredUsedUndeclaredDependency>
diff --git a/pom.xml b/pom.xml
index dce00aaee1..e58c0482bc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -380,13 +380,19 @@
org.apache.omid:omid-timestamp-storage-hbase2.x
</ignoredUnusedDeclaredDependency>
<ignoredUnusedDeclaredDependency>
- org.slf4j:slf4j-reload4j
+ org.apache.hbase:hbase-testing-util
</ignoredUnusedDeclaredDependency>
<ignoredUnusedDeclaredDependency>
- ch.qos.reload4j:reload4j
+ org.apache.logging.log4j:log4j-api
</ignoredUnusedDeclaredDependency>
<ignoredUnusedDeclaredDependency>
- org.apache.hbase:hbase-testing-util
+ org.apache.logging.log4j:log4j-core
+ </ignoredUnusedDeclaredDependency>
+ <ignoredUnusedDeclaredDependency>
+ org.apache.logging.log4j:log4j-slf4j-impl
+ </ignoredUnusedDeclaredDependency>
+ <ignoredUnusedDeclaredDependency>
+ org.apache.logging.log4j:log4j-1.2-api
</ignoredUnusedDeclaredDependency>
</ignoredUnusedDeclaredDependencies>
<ignoredUsedUndeclaredDependencies>