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

stoty pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/phoenix-connectors.git


The following commit(s) were added to refs/heads/master by this push:
     new 26c1aba  PHOENIX-7114 Use Phoenix 5.1.3 for building Connectiors
26c1aba is described below

commit 26c1aba65b02c893f595620601b1c263552b93d8
Author: Istvan Toth <st...@apache.org>
AuthorDate: Fri Nov 17 16:02:35 2023 +0100

    PHOENIX-7114 Use Phoenix 5.1.3 for building Connectiors
---
 phoenix5-hive/pom.xml      | 11 +++++++++++
 phoenix5-spark/pom.xml     | 12 ++++++++++++
 phoenix5-spark3-it/pom.xml | 12 ++++++++++++
 pom.xml                    | 16 +++++++++++++++-
 4 files changed, 50 insertions(+), 1 deletion(-)

diff --git a/phoenix5-hive/pom.xml b/phoenix5-hive/pom.xml
index dd31e80..25f90ae 100644
--- a/phoenix5-hive/pom.xml
+++ b/phoenix5-hive/pom.xml
@@ -216,6 +216,17 @@
       <classifier>tests</classifier>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.apache.omid</groupId>
+      <artifactId>omid-tso-server-hbase2.x</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.omid</groupId>
+      <artifactId>omid-tso-server-hbase2.x</artifactId>
+      <scope>test</scope>
+      <type>test-jar</type>
+    </dependency>
     <dependency>
       <groupId>org.apache.hbase</groupId>
       <artifactId>hbase-server</artifactId>
diff --git a/phoenix5-spark/pom.xml b/phoenix5-spark/pom.xml
index 35b1d83..7b26396 100644
--- a/phoenix5-spark/pom.xml
+++ b/phoenix5-spark/pom.xml
@@ -103,6 +103,18 @@
       <classifier>tests</classifier>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.apache.omid</groupId>
+      <artifactId>omid-tso-server-hbase2.x</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.omid</groupId>
+      <artifactId>omid-tso-server-hbase2.x</artifactId>
+      <scope>test</scope>
+      <type>test-jar</type>
+    </dependency>
+
 
     <dependency>
       <groupId>junit</groupId>
diff --git a/phoenix5-spark3-it/pom.xml b/phoenix5-spark3-it/pom.xml
index 3232eb5..37f9ca8 100644
--- a/phoenix5-spark3-it/pom.xml
+++ b/phoenix5-spark3-it/pom.xml
@@ -97,6 +97,17 @@
       <classifier>tests</classifier>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.apache.omid</groupId>
+      <artifactId>omid-tso-server-hbase2.x</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.omid</groupId>
+      <artifactId>omid-tso-server-hbase2.x</artifactId>
+      <scope>test</scope>
+      <type>test-jar</type>
+    </dependency>
 
     <!-- Test dependencies -->
     <dependency>
@@ -221,6 +232,7 @@
             
<ignoredDependency>org.apache.hadoop:hadoop-minicluster</ignoredDependency>
             
<ignoredDependency>org.apache.phoenix:phoenix-hbase-compat-${hbase.compat.version}</ignoredDependency>
             <ignoredDependency>org.apache.hbase:hbase-it</ignoredDependency>
+            <ignoredDependency>org.apache.omid:*</ignoredDependency>
           </ignoredDependencies>
         </configuration>
       </plugin>
diff --git a/pom.xml b/pom.xml
index 461c073..a415667 100644
--- a/pom.xml
+++ b/pom.xml
@@ -55,7 +55,8 @@
 
   <properties>
     <!-- Phoenix Version -->
-    <phoenix.version>5.1.2</phoenix.version>
+    <phoenix.version>5.1.3</phoenix.version>
+    <omid.version>1.0.2</omid.version>
     <phoenix.thirdparty.version>2.0.0</phoenix.thirdparty.version>
     <!-- Hadoop Versions -->
     <hbase.version>2.1.10</hbase.version>
@@ -499,6 +500,19 @@
         <classifier>tests</classifier>
         <scope>test</scope>
       </dependency>
+      <dependency>
+        <groupId>org.apache.omid</groupId>
+        <artifactId>omid-tso-server-hbase2.x</artifactId>
+        <scope>test</scope>
+        <version>${omid.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.omid</groupId>
+        <artifactId>omid-tso-server-hbase2.x</artifactId>
+        <scope>test</scope>
+       <version>${omid.version}</version>
+        <type>test-jar</type>
+      </dependency>
       <dependency>
         <groupId>org.apache.phoenix.thirdparty</groupId>
         <artifactId>phoenix-shaded-guava</artifactId>

Reply via email to