phoenix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gr...@apache.org
Subject phoenix git commit: PHOENIX-2484 Exclude logback impl from Tephra
Date Sun, 13 Dec 2015 05:41:31 GMT
Repository: phoenix
Updated Branches:
  refs/heads/4.x-HBase-0.98 b24fdc053 -> aec4587fd


PHOENIX-2484 Exclude logback impl from Tephra

Exclude the logback dependency that is pulled in by Tephra,
allowing Tephra's SLF4J logging to be delegated into log4j,
and having everything configured via a single log4j.properties
config.


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

Branch: refs/heads/4.x-HBase-0.98
Commit: aec4587fdf73708d01011fba84c9d8d96ef805e0
Parents: b24fdc0
Author: Gabriel Reid <gabrielr@ngdata.com>
Authored: Fri Dec 11 13:21:41 2015 +0100
Committer: Gabriel Reid <greid@apache.org>
Committed: Sun Dec 13 06:23:41 2015 +0100

----------------------------------------------------------------------
 phoenix-core/pom.xml   |  4 ----
 phoenix-flume/pom.xml  |  1 -
 phoenix-pherf/pom.xml  |  9 ++++-----
 phoenix-pig/pom.xml    |  1 -
 phoenix-server/pom.xml |  1 -
 phoenix-spark/pom.xml  |  1 -
 pom.xml                | 44 ++++++++++++++++++++++++++++++++++++++++++++
 7 files changed, 48 insertions(+), 13 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/phoenix/blob/aec4587f/phoenix-core/pom.xml
----------------------------------------------------------------------
diff --git a/phoenix-core/pom.xml b/phoenix-core/pom.xml
index 143b3d5..2208b94 100644
--- a/phoenix-core/pom.xml
+++ b/phoenix-core/pom.xml
@@ -226,24 +226,20 @@
     <dependency>
       <groupId>co.cask.tephra</groupId>
       <artifactId>tephra-api</artifactId>
-      <version>${tephra.version}</version>
     </dependency>
     <dependency>
       <groupId>co.cask.tephra</groupId>
       <artifactId>tephra-core</artifactId>
-      <version>${tephra.version}</version>
     </dependency>
     <dependency>
       <groupId>co.cask.tephra</groupId>
       <artifactId>tephra-core</artifactId>
       <type>test-jar</type>
-      <version>${tephra.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>co.cask.tephra</groupId>
       <artifactId>tephra-hbase-compat-0.98</artifactId>
-      <version>${tephra.version}</version>
     </dependency>
   
     <!-- Make sure we have all the antlr dependencies -->

http://git-wip-us.apache.org/repos/asf/phoenix/blob/aec4587f/phoenix-flume/pom.xml
----------------------------------------------------------------------
diff --git a/phoenix-flume/pom.xml b/phoenix-flume/pom.xml
index b17ef5c..fc77645 100644
--- a/phoenix-flume/pom.xml
+++ b/phoenix-flume/pom.xml
@@ -177,7 +177,6 @@
       <groupId>co.cask.tephra</groupId>
       <artifactId>tephra-core</artifactId>
       <type>test-jar</type>
-      <version>${tephra.version}</version>
       <scope>test</scope>
     </dependency>
   </dependencies>

http://git-wip-us.apache.org/repos/asf/phoenix/blob/aec4587f/phoenix-pherf/pom.xml
----------------------------------------------------------------------
diff --git a/phoenix-pherf/pom.xml b/phoenix-pherf/pom.xml
index 50cc134..ec3b199 100644
--- a/phoenix-pherf/pom.xml
+++ b/phoenix-pherf/pom.xml
@@ -100,11 +100,10 @@
 			<scope>test</scope>
 		</dependency>
 		<dependency>
-		        <groupId>co.cask.tephra</groupId>
-		        <artifactId>tephra-core</artifactId>
-		        <type>test-jar</type>
-		        <version>${tephra.version}</version>
-		        <scope>test</scope>
+			<groupId>co.cask.tephra</groupId>
+			<artifactId>tephra-core</artifactId>
+			<type>test-jar</type>
+			<scope>test</scope>
 		</dependency>
 	</dependencies>
 

http://git-wip-us.apache.org/repos/asf/phoenix/blob/aec4587f/phoenix-pig/pom.xml
----------------------------------------------------------------------
diff --git a/phoenix-pig/pom.xml b/phoenix-pig/pom.xml
index e27ccc1..1b78c28 100644
--- a/phoenix-pig/pom.xml
+++ b/phoenix-pig/pom.xml
@@ -151,7 +151,6 @@
       <groupId>co.cask.tephra</groupId>
       <artifactId>tephra-core</artifactId>
       <type>test-jar</type>
-      <version>${tephra.version}</version>
       <scope>test</scope>
     </dependency>
   </dependencies>

http://git-wip-us.apache.org/repos/asf/phoenix/blob/aec4587f/phoenix-server/pom.xml
----------------------------------------------------------------------
diff --git a/phoenix-server/pom.xml b/phoenix-server/pom.xml
index 7ce13f0..3a19f87 100644
--- a/phoenix-server/pom.xml
+++ b/phoenix-server/pom.xml
@@ -110,7 +110,6 @@
       <groupId>co.cask.tephra</groupId>
       <artifactId>tephra-core</artifactId>
       <type>test-jar</type>
-      <version>${tephra.version}</version>
       <scope>test</scope>
     </dependency>
   </dependencies>

http://git-wip-us.apache.org/repos/asf/phoenix/blob/aec4587f/phoenix-spark/pom.xml
----------------------------------------------------------------------
diff --git a/phoenix-spark/pom.xml b/phoenix-spark/pom.xml
index bc77a26..b42fded 100644
--- a/phoenix-spark/pom.xml
+++ b/phoenix-spark/pom.xml
@@ -475,7 +475,6 @@
         <groupId>co.cask.tephra</groupId>
         <artifactId>tephra-core</artifactId>
         <type>test-jar</type>
-        <version>${tephra.version}</version>
         <scope>test</scope>
     </dependency>
   </dependencies>

http://git-wip-us.apache.org/repos/asf/phoenix/blob/aec4587f/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 7ca319f..d379bfa 100644
--- a/pom.xml
+++ b/pom.xml
@@ -591,6 +591,50 @@
         <version>${calcite.version}</version>
       </dependency>
 
+      <!-- Transaction dependencies -->
+      <dependency>
+        <groupId>co.cask.tephra</groupId>
+        <artifactId>tephra-api</artifactId>
+        <version>${tephra.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>co.cask.tephra</groupId>
+        <artifactId>tephra-core</artifactId>
+        <version>${tephra.version}</version>
+        <exclusions>
+          <exclusion>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-core</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-classic</artifactId>
+          </exclusion>
+        </exclusions>
+      </dependency>
+      <dependency>
+        <groupId>co.cask.tephra</groupId>
+        <artifactId>tephra-core</artifactId>
+        <type>test-jar</type>
+        <version>${tephra.version}</version>
+        <scope>test</scope>
+        <exclusions>
+          <exclusion>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-core</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-classic</artifactId>
+          </exclusion>
+        </exclusions>
+      </dependency>
+      <dependency>
+        <groupId>co.cask.tephra</groupId>
+        <artifactId>tephra-hbase-compat-0.98</artifactId>
+        <version>${tephra.version}</version>
+      </dependency>
+
       <!-- Make sure we have all the antlr dependencies -->
       <dependency>
         <groupId>org.antlr</groupId>


Mime
View raw message