(phoenix-omid) branch master updated: OMID-277 Omid 1.1.2 fails with Phoenix 5.2

2024-02-29 Thread stoty 
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-omid.git


The following commit(s) were added to refs/heads/master by this push:
 new 91260e35 OMID-277 Omid 1.1.2 fails with Phoenix 5.2
91260e35 is described below

commit 91260e355d0e6c004420eef6cead2cda3dbc8971
Author: Istvan Toth 
AuthorDate: Thu Feb 29 07:22:13 2024 +0100

OMID-277 Omid 1.1.2 fails with Phoenix 5.2

* remove overlooked unrelecated Guava references
* add maven enforcer plugin to catch future problems
---
 .../org/apache/omid/transaction/HBaseCellId.java   |  2 +-
 .../org/apache/omid/transaction/TestCellUtils.java | 28 -
 .../apache/omid/transaction/TestOmidLLRaces.java   |  2 +-
 .../apache/omid/transaction/TestShadowCells.java   |  2 +-
 .../committable/hbase/HBaseCommitTableConfig.java  |  2 +-
 pom.xml| 67 ++
 .../timestamp/storage/HBaseTimestampStorage.java   |  2 +-
 .../omid/tso/client/TestUnconnectedTSOClient.java  |  2 +-
 8 files changed, 87 insertions(+), 20 deletions(-)

diff --git 
a/hbase-client/src/main/java/org/apache/omid/transaction/HBaseCellId.java 
b/hbase-client/src/main/java/org/apache/omid/transaction/HBaseCellId.java
index 7c21bc8e..736ab3dc 100644
--- a/hbase-client/src/main/java/org/apache/omid/transaction/HBaseCellId.java
+++ b/hbase-client/src/main/java/org/apache/omid/transaction/HBaseCellId.java
@@ -17,7 +17,7 @@
  */
 package org.apache.omid.transaction;
 
-import static com.google.common.base.Charsets.UTF_8;
+import static 
org.apache.phoenix.thirdparty.com.google.common.base.Charsets.UTF_8;
 
 import org.apache.omid.tso.client.CellId;
 
diff --git 
a/hbase-client/src/test/java/org/apache/omid/transaction/TestCellUtils.java 
b/hbase-client/src/test/java/org/apache/omid/transaction/TestCellUtils.java
index 50a4a9ba..d5a162fd 100644
--- a/hbase-client/src/test/java/org/apache/omid/transaction/TestCellUtils.java
+++ b/hbase-client/src/test/java/org/apache/omid/transaction/TestCellUtils.java
@@ -57,13 +57,13 @@ public class TestCellUtils {
 public void testShadowCellQualifiers(byte[] shadowCellSuffixToTest) throws 
IOException {
 
 final byte[] validShadowCellQualifier =
-com.google.common.primitives.Bytes.concat(qualifier, 
shadowCellSuffixToTest);
+
org.apache.phoenix.thirdparty.com.google.common.primitives.Bytes.concat(qualifier,
 shadowCellSuffixToTest);
 final byte[] sandwichValidShadowCellQualifier =
-
com.google.common.primitives.Bytes.concat(shadowCellSuffixToTest, 
validShadowCellQualifier);
+
org.apache.phoenix.thirdparty.com.google.common.primitives.Bytes.concat(shadowCellSuffixToTest,
 validShadowCellQualifier);
 final byte[] doubleEndedValidShadowCellQualifier =
-
com.google.common.primitives.Bytes.concat(validShadowCellQualifier, 
shadowCellSuffixToTest);
+
org.apache.phoenix.thirdparty.com.google.common.primitives.Bytes.concat(validShadowCellQualifier,
 shadowCellSuffixToTest);
 final byte[] interleavedValidShadowCellQualifier =
-
com.google.common.primitives.Bytes.concat(validShadowCellQualifier, 
com.google.common.primitives.Bytes
+
org.apache.phoenix.thirdparty.com.google.common.primitives.Bytes.concat(validShadowCellQualifier,
 org.apache.phoenix.thirdparty.com.google.common.primitives.Bytes
 .concat(validShadowCellQualifier, 
validShadowCellQualifier));
 final byte[] value = Bytes.toBytes("test-value");
 
@@ -100,11 +100,11 @@ public class TestCellUtils {
 public void testCorrectMapingOfCellsToShadowCells() throws IOException {
 // Create the required data
 final byte[] validShadowCellQualifier =
-com.google.common.primitives.Bytes.concat(SHADOW_CELL_PREFIX, 
qualifier, SHADOW_CELL_SUFFIX);
+
org.apache.phoenix.thirdparty.com.google.common.primitives.Bytes.concat(SHADOW_CELL_PREFIX,
 qualifier, SHADOW_CELL_SUFFIX);
 
 final byte[] qualifier2 = Bytes.toBytes("test-qual2");
 final byte[] validShadowCellQualifier2 =
-com.google.common.primitives.Bytes.concat(SHADOW_CELL_PREFIX, 
qualifier2, SHADOW_CELL_SUFFIX);
+
org.apache.phoenix.thirdparty.com.google.common.primitives.Bytes.concat(SHADOW_CELL_PREFIX,
 qualifier2, SHADOW_CELL_SUFFIX);
 
 final byte[] qualifier3 = Bytes.toBytes("test-qual3");
 
@@ -176,7 +176,7 @@ public class TestCellUtils {
 byte[] suffixedQualifier = 
CellUtils.addShadowCellSuffixPrefix(cell.getQualifierArray(),
  
cell.getQualifierOffset(),
  
cell.getQualifierLength());
-byte[] expectedQualifier = 
com.google.common.primitive

Apache-Phoenix | master | HBase 2.4 | Build #656 FAILURE

2024-02-29 Thread Apache Jenkins Server 

master branch  HBase 2.4  build #656 status FAILURE
Build #656 https://ci-hadoop.apache.org/job/Phoenix/job/Phoenix-mulitbranch/job/master/656/

Apache-Phoenix | master | HBase 2.5 | Build #656 FAILURE

2024-02-29 Thread Apache Jenkins Server 

master branch  HBase 2.5  build #656 status FAILURE
Build #656 https://ci-hadoop.apache.org/job/Phoenix/job/Phoenix-mulitbranch/job/master/656/

(phoenix-omid) branch master updated (91260e35 -> 470fed9f)

2024-02-29 Thread stoty 
This is an automated email from the ASF dual-hosted git repository.

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


from 91260e35 OMID-277 Omid 1.1.2 fails with Phoenix 5.2
 add 470fed9f OMID-278 Change default waitStrategy to LOW_CPU

No new revisions were added by this update.

Summary of changes:
 tso-server/src/main/resources/default-omid-server-configuration.yml | 2 +-
 tso-server/src/test/resources/tlstest-omid-server-config.yml| 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(phoenix-omid) branch master updated: OMID-280 Use Hbase 2.5 for building OMID

2024-02-29 Thread stoty 
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-omid.git


The following commit(s) were added to refs/heads/master by this push:
 new 1fb914f5 OMID-280 Use Hbase 2.5 for building OMID
1fb914f5 is described below

commit 1fb914f522d6bd989f17a89c6ea340184d4f2766
Author: Istvan Toth 
AuthorDate: Thu Feb 29 11:18:24 2024 +0100

OMID-280 Use Hbase 2.5 for building OMID
---
 pom.xml | 11 +++
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index 0e577cd8..db149cf2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -152,8 +152,8 @@
 UTF-8
 
 
-2.4.17
-3.1.4
+2.5.7-hadoop3
+3.2.4
 2.1.0
 5.1.0
 6.10
@@ -174,8 +174,7 @@
 1.3
 32.1.3-jre
 
-4.2.0
-3.5.9
+5.6.0
 2.0
 1.9.4
 2.11.0
@@ -1153,6 +1152,10 @@
 org.apache.zookeeper
 zookeeper
   
+  
+org.junit.jupiter
+junit-jupiter-api
+  
 
 ${curator.version}