This is an automated email from the ASF dual-hosted git repository. stoty pushed a commit to branch 4.16 in repository https://gitbox.apache.org/repos/asf/phoenix.git
The following commit(s) were added to refs/heads/4.16 by this push: new 02b3eee010 PHOENIX-6697 log4j-reload4j is missing from phoenix-assembly 02b3eee010 is described below commit 02b3eee010f28c15f4f5f4196b870bbd3e2e2e2f 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 | 9 ++++++--- .../src/build/components/all-common-dependencies.xml | 2 ++ phoenix-assembly/src/build/package-to-tar-all.xml | 11 ----------- 3 files changed, 8 insertions(+), 14 deletions(-) diff --git a/phoenix-assembly/pom.xml b/phoenix-assembly/pom.xml index 97ecfb619e..ef86c70ad3 100644 --- a/phoenix-assembly/pom.xml +++ b/phoenix-assembly/pom.xml @@ -144,9 +144,12 @@ <artifactId>phoenix-tracing-webapp</artifactId> </dependency> <dependency> - <groupId>org.apache.omid</groupId> - <artifactId>omid-hbase-tools-hbase1.x</artifactId> - <version>${omid.version}</version> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-reload4j</artifactId> + </dependency> + <dependency> + <groupId>ch.qos.reload4j</groupId> + <artifactId>reload4j</artifactId> </dependency> <dependency> <groupId>sqlline</groupId> 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>