phoenix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jamestay...@apache.org
Subject phoenix git commit: PHOENIX-1233 Detected both log4j-over-slf4j.jar AND slf4j-log4j12.jar on the class path, preempting StackOverflowError (Jesse Yates)
Date Sat, 20 Dec 2014 05:19:41 GMT
Repository: phoenix
Updated Branches:
  refs/heads/master 88ecb78cf -> 5bf808543


PHOENIX-1233 Detected both log4j-over-slf4j.jar AND slf4j-log4j12.jar on the class path, preempting
StackOverflowError (Jesse Yates)


Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/5bf80854
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/5bf80854
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/5bf80854

Branch: refs/heads/master
Commit: 5bf808543b76e482e3b1318fe5071f4a2bca77dc
Parents: 88ecb78
Author: James Taylor <jtaylor@salesforce.com>
Authored: Fri Dec 19 21:16:59 2014 -0800
Committer: James Taylor <jtaylor@salesforce.com>
Committed: Fri Dec 19 21:18:15 2014 -0800

----------------------------------------------------------------------
 .../src/build/components-major-client.xml             |  1 -
 .../src/build/components/all-common-dependencies.xml  |  1 -
 phoenix-assembly/src/build/package-to-tar-all.xml     | 14 ++++++++++++++
 3 files changed, 14 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/phoenix/blob/5bf80854/phoenix-assembly/src/build/components-major-client.xml
----------------------------------------------------------------------
diff --git a/phoenix-assembly/src/build/components-major-client.xml b/phoenix-assembly/src/build/components-major-client.xml
index f1f37c2..0a2ec14 100644
--- a/phoenix-assembly/src/build/components-major-client.xml
+++ b/phoenix-assembly/src/build/components-major-client.xml
@@ -36,7 +36,6 @@
         <!-- HBase also pulls in these dependencies on its own, should we include-them?
-->
         <include>com.google.protobuf:protobuf-java</include>
         <include>org.slf4j:slf4j-api</include>
-        <include>org.slf4j:slf4j-log4j12</include>
         <include>org.apache.zookeeper:zookeeper</include>
         <include>log4j:log4j</include>
         <include>org.apache.hadoop:hadoop*</include>

http://git-wip-us.apache.org/repos/asf/phoenix/blob/5bf80854/phoenix-assembly/src/build/components/all-common-dependencies.xml
----------------------------------------------------------------------
diff --git a/phoenix-assembly/src/build/components/all-common-dependencies.xml b/phoenix-assembly/src/build/components/all-common-dependencies.xml
index df4a32f..f6a2eda 100644
--- a/phoenix-assembly/src/build/components/all-common-dependencies.xml
+++ b/phoenix-assembly/src/build/components/all-common-dependencies.xml
@@ -37,7 +37,6 @@
         <include>org.apache.hadoop:hadoop*</include>
         <include>com.google.protobuf:protobuf-java</include>
         <include>org.slf4j:slf4j-api</include>
-        <include>org.slf4j:slf4j-log4j12</include>
         <include>org.apache.zookeeper:zookeeper</include>
         <include>log4j:log4j</include>
         <include>org.apache.hbase:hbase*</include>

http://git-wip-us.apache.org/repos/asf/phoenix/blob/5bf80854/phoenix-assembly/src/build/package-to-tar-all.xml
----------------------------------------------------------------------
diff --git a/phoenix-assembly/src/build/package-to-tar-all.xml b/phoenix-assembly/src/build/package-to-tar-all.xml
index 93c7b71..519599b 100644
--- a/phoenix-assembly/src/build/package-to-tar-all.xml
+++ b/phoenix-assembly/src/build/package-to-tar-all.xml
@@ -30,6 +30,20 @@
   </formats>
   <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 all the dependencies to class files, since java doesn't support
+        jar of jars for running -->
+      <unpack>false</unpack>
+      <!-- save these dependencies to the top-level -->
+      <outputDirectory>/lib</outputDirectory>
+      <includes>
+        <include>org.slf4j:slf4j-log4j12</include>
+      </includes>
+    </dependencySet>
+  </dependencySets>
+
   <componentDescriptors>
     <componentDescriptor>src/build/components/all-common-jars.xml</componentDescriptor>
     <componentDescriptor>src/build/components/all-common-files.xml</componentDescriptor>


Mime
View raw message