You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@phoenix.apache.org by ri...@apache.org on 2022/08/16 16:45:10 UTC
[phoenix-connectors] branch PHOENIX-6770 created (now 79eea1a)
This is an automated email from the ASF dual-hosted git repository.
richardantal pushed a change to branch PHOENIX-6770
in repository https://gitbox.apache.org/repos/asf/phoenix-connectors.git
at 79eea1a PHOENIX-6770 set Log4j dependencies to provided
This branch includes the following new commits:
new 79eea1a PHOENIX-6770 set Log4j dependencies to provided
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[phoenix-connectors] 01/01: PHOENIX-6770 set Log4j dependencies to provided
Posted by ri...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
richardantal pushed a commit to branch PHOENIX-6770
in repository https://gitbox.apache.org/repos/asf/phoenix-connectors.git
commit 79eea1a7b058bbb33e44a0ac4b47056cfff4fa5b
Author: Richard Antal <an...@gmail.com>
AuthorDate: Tue Aug 16 18:43:43 2022 +0200
PHOENIX-6770 set Log4j dependencies to provided
---
phoenix-hive-base/phoenix4-hive-shaded/pom.xml | 6 ++++++
phoenix-hive-base/phoenix5-hive-shaded/pom.xml | 6 ++++++
phoenix-pig-base/phoenix4-pig-shaded/pom.xml | 11 +++++++++++
phoenix-pig-base/phoenix5-pig-shaded/pom.xml | 11 +++++++++++
phoenix-spark-base/phoenix4-spark-shaded/pom.xml | 6 ++++++
phoenix-spark-base/phoenix5-spark-shaded/pom.xml | 6 ++++++
phoenix5-spark3-shaded/pom.xml | 5 +++++
pom.xml | 5 +++++
8 files changed, 56 insertions(+)
diff --git a/phoenix-hive-base/phoenix4-hive-shaded/pom.xml b/phoenix-hive-base/phoenix4-hive-shaded/pom.xml
index b477449..1e301a5 100644
--- a/phoenix-hive-base/phoenix4-hive-shaded/pom.xml
+++ b/phoenix-hive-base/phoenix4-hive-shaded/pom.xml
@@ -103,6 +103,12 @@ adding the provided dependencies -->
<version>${zookeeper.version}</version>
<scope>provided</scope>
</dependency>
+ <!-- We want to take the implementation from Hive -->
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
<build>
diff --git a/phoenix-hive-base/phoenix5-hive-shaded/pom.xml b/phoenix-hive-base/phoenix5-hive-shaded/pom.xml
index 25996f7..67211e9 100644
--- a/phoenix-hive-base/phoenix5-hive-shaded/pom.xml
+++ b/phoenix-hive-base/phoenix5-hive-shaded/pom.xml
@@ -172,6 +172,12 @@
<version>${zookeeper.version}</version>
<scope>provided</scope>
</dependency>
+ <!-- We want to take the implementation from Hive -->
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
<build>
diff --git a/phoenix-pig-base/phoenix4-pig-shaded/pom.xml b/phoenix-pig-base/phoenix4-pig-shaded/pom.xml
index 4ab1ddb..c825c9f 100644
--- a/phoenix-pig-base/phoenix4-pig-shaded/pom.xml
+++ b/phoenix-pig-base/phoenix4-pig-shaded/pom.xml
@@ -68,5 +68,16 @@
<artifactId>phoenix-hbase-compat-${hbase.compat.version}</artifactId>
<scope>runtime</scope>
</dependency>
+ <!-- We want to take the implementation from Pig -->
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
</project>
\ No newline at end of file
diff --git a/phoenix-pig-base/phoenix5-pig-shaded/pom.xml b/phoenix-pig-base/phoenix5-pig-shaded/pom.xml
index 675ea27..19e6845 100644
--- a/phoenix-pig-base/phoenix5-pig-shaded/pom.xml
+++ b/phoenix-pig-base/phoenix5-pig-shaded/pom.xml
@@ -79,6 +79,17 @@
<artifactId>phoenix-hbase-compat-${hbase.compat.version}</artifactId>
<scope>runtime</scope>
</dependency>
+ <!-- We want to take the implementation from Pig -->
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
</project>
\ No newline at end of file
diff --git a/phoenix-spark-base/phoenix4-spark-shaded/pom.xml b/phoenix-spark-base/phoenix4-spark-shaded/pom.xml
index 0d8561a..3bae294 100644
--- a/phoenix-spark-base/phoenix4-spark-shaded/pom.xml
+++ b/phoenix-spark-base/phoenix4-spark-shaded/pom.xml
@@ -42,6 +42,12 @@
<artifactId>phoenix-hbase-compat-${hbase.compat.version}</artifactId>
<scope>runtime</scope>
</dependency>
+ <!-- We want to take the implementation from Spark -->
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
<build>
diff --git a/phoenix-spark-base/phoenix5-spark-shaded/pom.xml b/phoenix-spark-base/phoenix5-spark-shaded/pom.xml
index 1b6c49c..5beddc0 100644
--- a/phoenix-spark-base/phoenix5-spark-shaded/pom.xml
+++ b/phoenix-spark-base/phoenix5-spark-shaded/pom.xml
@@ -52,6 +52,12 @@
<artifactId>phoenix-hbase-compat-${hbase.compat.version}</artifactId>
<scope>runtime</scope>
</dependency>
+ <!-- We want to take the implementation from Spark -->
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
<build>
diff --git a/phoenix5-spark3-shaded/pom.xml b/phoenix5-spark3-shaded/pom.xml
index 012b1ef..5e881d6 100644
--- a/phoenix5-spark3-shaded/pom.xml
+++ b/phoenix5-spark3-shaded/pom.xml
@@ -121,6 +121,11 @@
<artifactId>slf4j-log4j12</artifactId>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <scope>provided</scope>
+ </dependency>
<!-- Mark HBase as provided, too -->
<dependency>
diff --git a/pom.xml b/pom.xml
index ab4e005..5da7f74 100644
--- a/pom.xml
+++ b/pom.xml
@@ -883,6 +883,11 @@
<artifactId>slf4j-log4j12</artifactId>
<version>${slf4j.version}</version>
</dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>${log4j.version}</version>
+ </dependency>
<dependency>
<groupId>org.apache.pig</groupId>
<artifactId>pig</artifactId>