This is an automated email from the ASF dual-hosted git repository.

stoty pushed a commit to branch 4.x
in repository https://gitbox.apache.org/repos/asf/phoenix.git


The following commit(s) were added to refs/heads/4.x by this push:
     new eacc69e  PHOENIX-6578 sqlline.py cannot be started from source tree
eacc69e is described below

commit eacc69ecc12e17b2bd8dffe933645f0c39e4dbac
Author: Istvan Toth <st...@apache.org>
AuthorDate: Thu Oct 21 08:55:38 2021 +0200

    PHOENIX-6578 sqlline.py cannot be started from source tree
---
 phoenix-client-parent/phoenix-client/pom.xml |  1 -
 phoenix-core/pom.xml                         | 21 +++++++++++++++++++++
 pom.xml                                      |  5 +++++
 3 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/phoenix-client-parent/phoenix-client/pom.xml 
b/phoenix-client-parent/phoenix-client/pom.xml
index afe5090..8278e06 100644
--- a/phoenix-client-parent/phoenix-client/pom.xml
+++ b/phoenix-client-parent/phoenix-client/pom.xml
@@ -83,7 +83,6 @@
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-log4j12</artifactId>
-      <version>1.7.7</version>
     </dependency>
   </dependencies>
 
diff --git a/phoenix-core/pom.xml b/phoenix-core/pom.xml
index e79bd3f..4020d29 100644
--- a/phoenix-core/pom.xml
+++ b/phoenix-core/pom.xml
@@ -169,6 +169,27 @@
               
<outputFile>${project.build.directory}/cached_classpath.txt</outputFile>
             </configuration>
           </execution>
+          <!-- copies libraries for use by sqlline when it is started from 
source dir -->
+          <execution>
+            <id>copy-for-sqlline</id>
+            <goals>
+              <goal>copy</goal>
+            </goals>
+            <configuration>
+              <artifactItems>
+                <artifactItem>
+                  <groupId>org.slf4j</groupId>
+                  <artifactId>slf4j-log4j12</artifactId>
+                </artifactItem>
+                <artifactItem>
+                  <groupId>sqlline</groupId>
+                  <artifactId>sqlline</artifactId>
+                  <classifier>jar-with-dependencies</classifier>
+                </artifactItem>
+              </artifactItems>
+              <outputDirectory>${project.basedir}/../lib</outputDirectory>
+            </configuration>
+          </execution>
         </executions>
       </plugin>
       <plugin>
diff --git a/pom.xml b/pom.xml
index ffd7f42..2616ca2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1084,6 +1084,11 @@
         <version>${slf4j.version}</version>
       </dependency>
       <dependency>
+        <groupId>org.slf4j</groupId>
+        <artifactId>slf4j-log4j12</artifactId>
+        <version>${slf4j.version}</version>
+      </dependency>
+      <dependency>
         <groupId>org.apache.phoenix.thirdparty</groupId>
         <artifactId>phoenix-shaded-commons-cli</artifactId>
         <version>${phoenix.thirdparty.version}</version>

Reply via email to