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/08/05 12:48:55 UTC
[phoenix-connectors] branch master updated: PHOENIX-6760 update log4j2 to 2.18.0
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-connectors.git
The following commit(s) were added to refs/heads/master by this push:
new 996fec8 PHOENIX-6760 update log4j2 to 2.18.0
996fec8 is described below
commit 996fec8c6befe103ef9328533c4eed56c8d73933
Author: Istvan Toth <st...@apache.org>
AuthorDate: Tue Aug 2 19:21:56 2022 +0200
PHOENIX-6760 update log4j2 to 2.18.0
---
phoenix-hive-base/phoenix4-hive-shaded/pom.xml | 1 -
phoenix-hive-base/phoenix4-hive/pom.xml | 1 -
phoenix-hive-base/phoenix5-hive-shaded/pom.xml | 6 ------
phoenix-hive-base/phoenix5-hive/pom.xml | 6 ------
phoenix-hive-base/pom.xml | 13 +++++++++++++
pom.xml | 2 +-
6 files changed, 14 insertions(+), 15 deletions(-)
diff --git a/phoenix-hive-base/phoenix4-hive-shaded/pom.xml b/phoenix-hive-base/phoenix4-hive-shaded/pom.xml
index 08e95f7..b477449 100644
--- a/phoenix-hive-base/phoenix4-hive-shaded/pom.xml
+++ b/phoenix-hive-base/phoenix4-hive-shaded/pom.xml
@@ -35,7 +35,6 @@
<properties>
<hive.version>${hive2.version}</hive.version>
<hive-storage.version>${hive2-storage.version}</hive-storage.version>
- <log4j2.version>2.6.2</log4j2.version>
</properties>
<dependencies>
diff --git a/phoenix-hive-base/phoenix4-hive/pom.xml b/phoenix-hive-base/phoenix4-hive/pom.xml
index d08cf42..d2fd374 100644
--- a/phoenix-hive-base/phoenix4-hive/pom.xml
+++ b/phoenix-hive-base/phoenix4-hive/pom.xml
@@ -35,7 +35,6 @@
<properties>
<hive.version>${hive2.version}</hive.version>
<hive-storage.version>${hive2-storage.version}</hive-storage.version>
- <log4j2.version>2.6.2</log4j2.version>
</properties>
<dependencies>
diff --git a/phoenix-hive-base/phoenix5-hive-shaded/pom.xml b/phoenix-hive-base/phoenix5-hive-shaded/pom.xml
index 3f995b5..25996f7 100644
--- a/phoenix-hive-base/phoenix5-hive-shaded/pom.xml
+++ b/phoenix-hive-base/phoenix5-hive-shaded/pom.xml
@@ -161,12 +161,6 @@
<artifactId>hadoop-hdfs-client</artifactId>
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-core</artifactId>
- <version>${log4j2.version}</version>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-minicluster</artifactId>
diff --git a/phoenix-hive-base/phoenix5-hive/pom.xml b/phoenix-hive-base/phoenix5-hive/pom.xml
index d8f7809..7e91939 100644
--- a/phoenix-hive-base/phoenix5-hive/pom.xml
+++ b/phoenix-hive-base/phoenix5-hive/pom.xml
@@ -139,12 +139,6 @@
<artifactId>hadoop-hdfs-client</artifactId>
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-core</artifactId>
- <version>${log4j2.version}</version>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-minicluster</artifactId>
diff --git a/phoenix-hive-base/pom.xml b/phoenix-hive-base/pom.xml
index 2f627cb..5521583 100644
--- a/phoenix-hive-base/pom.xml
+++ b/phoenix-hive-base/pom.xml
@@ -18,6 +18,7 @@
specific language governing permissions and limitations
under the License.
+
-->
<project xmlns="http://maven.apache.org/POM/4.0.0"
@@ -193,6 +194,18 @@
<scope>provided</scope>
<version>${log4j2.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-core</artifactId>
+ <scope>provided</scope>
+ <version>${log4j2.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-slf4j-impl</artifactId>
+ <scope>provided</scope>
+ <version>${log4j2.version}</version>
+ </dependency>
<!-- Mark every HBase and Hadoop jar as provided -->
diff --git a/pom.xml b/pom.xml
index 2d1e693..ab4e005 100644
--- a/pom.xml
+++ b/pom.xml
@@ -102,7 +102,7 @@
<scala.binary.version>2.11</scala.binary.version>
<log4j.version>1.2.17</log4j.version>
- <log4j2.version>2.17.2</log4j2.version>
+ <log4j2.version>2.18.0</log4j2.version>
<disruptor.version>3.3.6</disruptor.version>
<slf4j.version>1.7.30</slf4j.version>
<commons-collections.version>3.2.2</commons-collections.version>