PHOENIX-4745 Update Tephra version to 0.14.0-incubating
Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/f0430611 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/f0430611 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/f0430611 Branch: refs/heads/4.x-HBase-1.4 Commit: f04306112aaee4e7da2d492df70826bb9f806464 Parents: ea94951 Author: James Taylor <jtay...@salesforce.com> Authored: Thu May 24 16:10:52 2018 -0700 Committer: James Taylor <jtay...@salesforce.com> Committed: Thu May 24 16:10:52 2018 -0700 ---------------------------------------------------------------------- phoenix-core/pom.xml | 2 +- .../java/org/apache/phoenix/query/QueryServicesOptions.java | 5 ++++- pom.xml | 4 ++-- 3 files changed, 7 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/phoenix/blob/f0430611/phoenix-core/pom.xml ---------------------------------------------------------------------- diff --git a/phoenix-core/pom.xml b/phoenix-core/pom.xml index a29fb01..2bb7293 100644 --- a/phoenix-core/pom.xml +++ b/phoenix-core/pom.xml @@ -221,7 +221,7 @@ </dependency> <dependency> <groupId>org.apache.tephra</groupId> - <artifactId>tephra-hbase-compat-1.3</artifactId> + <artifactId>tephra-hbase-compat-1.4</artifactId> </dependency> <!-- Make sure we have all the antlr dependencies --> http://git-wip-us.apache.org/repos/asf/phoenix/blob/f0430611/phoenix-core/src/main/java/org/apache/phoenix/query/QueryServicesOptions.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/main/java/org/apache/phoenix/query/QueryServicesOptions.java b/phoenix-core/src/main/java/org/apache/phoenix/query/QueryServicesOptions.java index d708785..307c5dd 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/query/QueryServicesOptions.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/query/QueryServicesOptions.java @@ -117,6 +117,7 @@ import org.apache.phoenix.trace.util.Tracing; import org.apache.phoenix.transaction.TransactionFactory; import org.apache.phoenix.util.DateUtil; import org.apache.phoenix.util.ReadOnlyProps; +import org.apache.tephra.TxConstants; @@ -440,7 +441,9 @@ public class QueryServicesOptions { .setIfUnset(UPLOAD_BINARY_DATA_TYPE_ENCODING, DEFAULT_UPLOAD_BINARY_DATA_TYPE_ENCODING) .setIfUnset(PHOENIX_ACLS_ENABLED, DEFAULT_PHOENIX_ACLS_ENABLED) .setIfUnset(LOG_LEVEL, DEFAULT_LOGGING_LEVEL) - .setIfUnset(LOG_SAMPLE_RATE, DEFAULT_LOG_SAMPLE_RATE); + .setIfUnset(LOG_SAMPLE_RATE, DEFAULT_LOG_SAMPLE_RATE) + .setIfUnset(TxConstants.TX_PRE_014_CHANGESET_KEY, Boolean.FALSE.toString()) + ; // HBase sets this to 1, so we reset it to something more appropriate. // Hopefully HBase will change this, because we can't know if a user set // it to 1, so we'll change it. http://git-wip-us.apache.org/repos/asf/phoenix/blob/f0430611/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 38c1c41..8ba338c 100644 --- a/pom.xml +++ b/pom.xml @@ -100,7 +100,7 @@ <joni.version>2.1.2</joni.version> <avatica.version>1.10.0</avatica.version> <jettyVersion>8.1.7.v20120910</jettyVersion> - <tephra.version>0.13.0-incubating</tephra.version> + <tephra.version>0.14.0-incubating</tephra.version> <spark.version>2.0.2</spark.version> <scala.version>2.11.8</scala.version> <scala.binary.version>2.11</scala.binary.version> @@ -787,7 +787,7 @@ </dependency> <dependency> <groupId>org.apache.tephra</groupId> - <artifactId>tephra-hbase-compat-1.3</artifactId> + <artifactId>tephra-hbase-compat-1.4</artifactId> <version>${tephra.version}</version> </dependency>
