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 348d6d803c PHOENIX-6697 log4j-reload4j is missing from phoenix-assembly
348d6d803c is described below
commit 348d6d803cbfa39ccdf0450db4cf98de091f9ad4
Author: Istvan Toth <st...@apache.org>
AuthorDate: Wed Apr 27 09:13:11 2022 +0200
PHOENIX-6697 log4j-reload4j is missing from phoenix-assembly
also remove obsolete dependencies from assembly pom.xml
---
phoenix-assembly/pom.xml | 43 ++--------------------
.../build/components/all-common-dependencies.xml | 2 +
phoenix-assembly/src/build/package-to-tar-all.xml | 11 ------
3 files changed, 6 insertions(+), 50 deletions(-)
diff --git a/phoenix-assembly/pom.xml b/phoenix-assembly/pom.xml
index 7af1c0cc7d..00d95ff7fe 100644
--- a/phoenix-assembly/pom.xml
+++ b/phoenix-assembly/pom.xml
@@ -186,48 +186,13 @@
</dependency>
<dependency>
- <groupId>com.fasterxml.woodstox</groupId>
- <artifactId>woodstox-core</artifactId>
- <version>5.2.0</version>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-reload4j</artifactId>
</dependency>
-
- <dependency>
- <groupId>org.codehaus.woodstox</groupId>
- <artifactId>stax2-api</artifactId>
- <version>3.0.1</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-configuration2</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.hbase.thirdparty</groupId>
- <artifactId>hbase-shaded-miscellaneous</artifactId>
- </dependency>
-
<dependency>
- <groupId>org.apache.hbase.thirdparty</groupId>
- <artifactId>hbase-shaded-protobuf</artifactId>
+ <groupId>ch.qos.reload4j</groupId>
+ <artifactId>reload4j</artifactId>
</dependency>
-
- <dependency>
- <groupId>org.apache.hbase.thirdparty</groupId>
- <artifactId>hbase-shaded-netty</artifactId>
- <version>${hbase.thirdparty.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-lang3</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.htrace</groupId>
- <artifactId>htrace-core</artifactId>
- </dependency>
-
<dependency>
<groupId>sqlline</groupId>
<artifactId>sqlline</artifactId>
diff --git a/phoenix-assembly/src/build/components/all-common-dependencies.xml
b/phoenix-assembly/src/build/components/all-common-dependencies.xml
index 5381c88529..84fcd0a58d 100644
--- a/phoenix-assembly/src/build/components/all-common-dependencies.xml
+++ b/phoenix-assembly/src/build/components/all-common-dependencies.xml
@@ -24,6 +24,8 @@
<outputDirectory>/lib</outputDirectory>
<includes>
<include>sqlline:sqlline:jar:jar-with-dependencies</include>
+ <include>org.slf4j:slf4j-reload4j</include>
+ <include>ch.qos.reload4j:reload4j</include>
</includes>
</dependencySet>
</dependencySets>
diff --git a/phoenix-assembly/src/build/package-to-tar-all.xml
b/phoenix-assembly/src/build/package-to-tar-all.xml
index e03d4e86d1..9683ea714b 100644
--- a/phoenix-assembly/src/build/package-to-tar-all.xml
+++ b/phoenix-assembly/src/build/package-to-tar-all.xml
@@ -31,17 +31,6 @@
<includeBaseDirectory>true</includeBaseDirectory>
<!-- Components that we don't want in jars that are used with other
libraries, but we want for a standalone client -->
- <dependencySets>
- <dependencySet>
- <unpack>false</unpack>
- <outputDirectory>/lib</outputDirectory>
- <includes>
- <include>org.slf4j:slf4j-reload4j</include>
- <include>ch.qos.reload4j:reload4j</include>
- </includes>
- </dependencySet>
- </dependencySets>
-
<componentDescriptors>
<componentDescriptor>src/build/components/all-common-jars.xml</componentDescriptor>
<componentDescriptor>src/build/components/all-common-files.xml</componentDescriptor>
