Repository: phoenix Updated Branches: refs/heads/4.x-HBase-1.0 3e798008d -> 5779f263c
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/f1579067 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/f1579067 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/f1579067 Branch: refs/heads/4.x-HBase-1.0 Commit: f15790679f8f9cb95b28562266cc198f0e4309fc Parents: deffe07 Author: Gabriel Reid <[email protected]> Authored: Fri Dec 11 13:21:41 2015 +0100 Committer: Gabriel Reid <[email protected]> Committed: Sun Dec 13 06:24:48 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/f1579067/phoenix-core/pom.xml ---------------------------------------------------------------------- diff --git a/phoenix-core/pom.xml b/phoenix-core/pom.xml index f504a8f..73b4795 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-1.0</artifactId> - <version>${tephra.version}</version> </dependency> <!-- Make sure we have all the antlr dependencies --> http://git-wip-us.apache.org/repos/asf/phoenix/blob/f1579067/phoenix-flume/pom.xml ---------------------------------------------------------------------- diff --git a/phoenix-flume/pom.xml b/phoenix-flume/pom.xml index b2b131e..35db13b 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/f1579067/phoenix-pherf/pom.xml ---------------------------------------------------------------------- diff --git a/phoenix-pherf/pom.xml b/phoenix-pherf/pom.xml index de3a2e3..8dc3977 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/f1579067/phoenix-pig/pom.xml ---------------------------------------------------------------------- diff --git a/phoenix-pig/pom.xml b/phoenix-pig/pom.xml index 8d6cb7e..29ceb86 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/f1579067/phoenix-server/pom.xml ---------------------------------------------------------------------- diff --git a/phoenix-server/pom.xml b/phoenix-server/pom.xml index b128d6a..c9b7b17 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/f1579067/phoenix-spark/pom.xml ---------------------------------------------------------------------- diff --git a/phoenix-spark/pom.xml b/phoenix-spark/pom.xml index a0f6abd..af37b1e 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/f1579067/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 97f9f90..0b65a66 100644 --- a/pom.xml +++ b/pom.xml @@ -590,6 +590,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-1.0</artifactId> + <version>${tephra.version}</version> + </dependency> + <!-- Make sure we have all the antlr dependencies --> <dependency> <groupId>org.antlr</groupId>
