(phoenix) branch master updated: PHOENIX-7176 QueryTimeoutIT#testQueryTimeout fails with incorrect error message (addendum: accept exactly 1000ms in timeout check)
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.git
The following commit(s) were added to refs/heads/master by this push:
new d936032078 PHOENIX-7176 QueryTimeoutIT#testQueryTimeout fails with
incorrect error message (addendum: accept exactly 1000ms in timeout check)
d936032078 is described below
commit d936032078fdfa41b13905b251a9e92d5fb4e01b
Author: Aron Meszaros
AuthorDate: Tue Jan 16 11:13:19 2024 +0100
PHOENIX-7176 QueryTimeoutIT#testQueryTimeout fails with incorrect error
message (addendum: accept exactly 1000ms in timeout check)
---
.../src/it/java/org/apache/phoenix/end2end/QueryTimeoutIT.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryTimeoutIT.java
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryTimeoutIT.java
index 4103655e16..0ac5d50c10 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryTimeoutIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryTimeoutIT.java
@@ -130,7 +130,8 @@ public class QueryTimeoutIT extends BaseTest {
} catch (SQLTimeoutException e) {
long elapsedTimeMillis = System.currentTimeMillis() - startTime;
assertEquals(SQLExceptionCode.OPERATION_TIMED_OUT.getErrorCode(),
e.getErrorCode());
-assertTrue(elapsedTimeMillis > 1000);
+assertTrue("Total time of query was " + elapsedTimeMillis + " ms,
but expected to be greater or equal to 1000",
+elapsedTimeMillis >= 1000);
}
conn.close();
}
(phoenix) branch 5.1 updated: PHOENIX-7176 QueryTimeoutIT#testQueryTimeout fails with incorrect error message (addendum: accept exactly 1000ms in timeout check)
This is an automated email from the ASF dual-hosted git repository.
stoty pushed a commit to branch 5.1
in repository https://gitbox.apache.org/repos/asf/phoenix.git
The following commit(s) were added to refs/heads/5.1 by this push:
new 3bb97d476f PHOENIX-7176 QueryTimeoutIT#testQueryTimeout fails with
incorrect error message (addendum: accept exactly 1000ms in timeout check)
3bb97d476f is described below
commit 3bb97d476f423c69414ab4a65323a0f69e27bbb4
Author: Aron Meszaros
AuthorDate: Tue Jan 16 11:13:19 2024 +0100
PHOENIX-7176 QueryTimeoutIT#testQueryTimeout fails with incorrect error
message (addendum: accept exactly 1000ms in timeout check)
---
.../src/it/java/org/apache/phoenix/end2end/QueryTimeoutIT.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryTimeoutIT.java
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryTimeoutIT.java
index 4103655e16..0ac5d50c10 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryTimeoutIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryTimeoutIT.java
@@ -130,7 +130,8 @@ public class QueryTimeoutIT extends BaseTest {
} catch (SQLTimeoutException e) {
long elapsedTimeMillis = System.currentTimeMillis() - startTime;
assertEquals(SQLExceptionCode.OPERATION_TIMED_OUT.getErrorCode(),
e.getErrorCode());
-assertTrue(elapsedTimeMillis > 1000);
+assertTrue("Total time of query was " + elapsedTimeMillis + " ms,
but expected to be greater or equal to 1000",
+elapsedTimeMillis >= 1000);
}
conn.close();
}
Apache-Phoenix | 5.1 | HBase 2.5 | Build #306 SUCCESS
5.1 branch HBase 2.5 build #306 status SUCCESS Build #306 https://ci-hadoop.apache.org/job/Phoenix/job/Phoenix-mulitbranch/job/5.1/306/
Apache-Phoenix | 5.1 | HBase 2.4 | Build #306 SUCCESS
5.1 branch HBase 2.4 build #306 status SUCCESS Build #306 https://ci-hadoop.apache.org/job/Phoenix/job/Phoenix-mulitbranch/job/5.1/306/
Apache-Phoenix | 5.1 | HBase 2.3 | Build #306 FAILURE
5.1 branch HBase 2.3 build #306 status FAILURE Build #306 https://ci-hadoop.apache.org/job/Phoenix/job/Phoenix-mulitbranch/job/5.1/306/
Apache-Phoenix | master | HBase 2.5 | Build #626 FAILURE
master branch HBase 2.5 build #626 status FAILURE Build #626 https://ci-hadoop.apache.org/job/Phoenix/job/Phoenix-mulitbranch/job/master/626/
Apache-Phoenix | master | HBase 2.4 | Build #626 SUCCESS
master branch HBase 2.4 build #626 status SUCCESS Build #626 https://ci-hadoop.apache.org/job/Phoenix/job/Phoenix-mulitbranch/job/master/626/
Apache-Phoenix | 5.1 | HBase 2.1 | Build #306 SUCCESS
5.1 branch HBase 2.1 build #306 status SUCCESS Build #306 https://ci-hadoop.apache.org/job/Phoenix/job/Phoenix-mulitbranch/job/5.1/306/
Apache-Phoenix | 5.1 | HBase 2.2 | Build #306 FAILURE
5.1 branch HBase 2.2 build #306 status FAILURE Build #306 https://ci-hadoop.apache.org/job/Phoenix/job/Phoenix-mulitbranch/job/5.1/306/
(phoenix) branch master updated: PHOENIX-7181 Do not declare commons-configuration2 dependency
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.git
The following commit(s) were added to refs/heads/master by this push:
new 3492933940 PHOENIX-7181 Do not declare commons-configuration2
dependency
3492933940 is described below
commit 3492933940807737f08ef778469db9fa84b281d0
Author: Istvan Toth
AuthorDate: Mon Jan 15 15:39:03 2024 +0100
PHOENIX-7181 Do not declare commons-configuration2 dependency
also remove redundant commons-configuration2 from
phoenix-mapreduce-byo-shaded-hbase
---
phoenix-core-client/pom.xml| 4
phoenix-core/pom.xml | 5 -
phoenix-mapreduce-byo-shaded-hbase/pom.xml | 9 +
pom.xml| 13 +++--
4 files changed, 16 insertions(+), 15 deletions(-)
diff --git a/phoenix-core-client/pom.xml b/phoenix-core-client/pom.xml
index 1d886b3bae..ba02beaa33 100644
--- a/phoenix-core-client/pom.xml
+++ b/phoenix-core-client/pom.xml
@@ -394,10 +394,6 @@
org.apache.commons
commons-lang3
-
- org.apache.commons
- commons-configuration2
-
commons-io
commons-io
diff --git a/phoenix-core/pom.xml b/phoenix-core/pom.xml
index 85f95b5bf3..704bb5d55e 100644
--- a/phoenix-core/pom.xml
+++ b/phoenix-core/pom.xml
@@ -349,11 +349,6 @@
phoenix-shaded-commons-cli
test
-
-org.apache.commons
-commons-configuration2
-test
-
com.github.stephenc.findbugs
findbugs-annotations
diff --git a/phoenix-mapreduce-byo-shaded-hbase/pom.xml
b/phoenix-mapreduce-byo-shaded-hbase/pom.xml
index 7cf6a98ea8..d9ccfd30c9 100644
--- a/phoenix-mapreduce-byo-shaded-hbase/pom.xml
+++ b/phoenix-mapreduce-byo-shaded-hbase/pom.xml
@@ -574,6 +574,15 @@
4.0.0
provided
+
+
+ org.apache.commons
+ commons-configuration2
+
+ 2.1.1
+ provided
+
+
diff --git a/pom.xml b/pom.xml
index 807baa4002..7c598fb80c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -116,7 +116,6 @@
1.0
1.21
1.9.0
-2.1.1
1.0-1
2.0.1
0.3
@@ -445,6 +444,13 @@
org.apache.hbase.thirdparty:*
+
+
+ org.apache.commons:commons-configuration2
+
@@ -1518,11 +1524,6 @@
commons-lang3
${commons-lang.version}
-
-org.apache.commons
-commons-configuration2
-${commons-configuration2.version}
-
commons-io
commons-io
(phoenix) branch 5.1 updated: PHOENIX-7181 Do not declare commons-configuration2 dependency
This is an automated email from the ASF dual-hosted git repository.
stoty pushed a commit to branch 5.1
in repository https://gitbox.apache.org/repos/asf/phoenix.git
The following commit(s) were added to refs/heads/5.1 by this push:
new 569f931d8e PHOENIX-7181 Do not declare commons-configuration2
dependency
569f931d8e is described below
commit 569f931d8e1dae1990a26f40a445b6920e11be08
Author: Istvan Toth
AuthorDate: Mon Jan 15 15:39:03 2024 +0100
PHOENIX-7181 Do not declare commons-configuration2 dependency
---
phoenix-core/pom.xml | 4
pom.xml | 13 +++--
2 files changed, 7 insertions(+), 10 deletions(-)
diff --git a/phoenix-core/pom.xml b/phoenix-core/pom.xml
index 22c81d9d00..3f6193793a 100644
--- a/phoenix-core/pom.xml
+++ b/phoenix-core/pom.xml
@@ -500,10 +500,6 @@
org.apache.commons
commons-lang3
-
- org.apache.commons
- commons-configuration2
-
commons-io
commons-io
diff --git a/pom.xml b/pom.xml
index ddf4ac6495..c923b3e6f6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -121,7 +121,6 @@
1.0
1.21
1.9.0
-2.1.1
1.0-1
2.0.1
0.3
@@ -450,6 +449,13 @@
org.apache.hbase.thirdparty:*
+
+
+ org.apache.commons:commons-configuration2
+
@@ -1434,11 +1440,6 @@
commons-lang3
${commons-lang.version}
-
-org.apache.commons
-commons-configuration2
-${commons-configuration2.version}
-
commons-io
commons-io
(phoenix) branch master updated: PHOENIX-7171 Update Zookeeper to 3.8.3 when building with HBase 2.4+
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.git The following commit(s) were added to refs/heads/master by this push: new 25cdd7fbf4 PHOENIX-7171 Update Zookeeper to 3.8.3 when building with HBase 2.4+ 25cdd7fbf4 is described below commit 25cdd7fbf4fc2a8e7d07877595459a9d4803a0c7 Author: Istvan Toth AuthorDate: Wed Jan 10 17:19:00 2024 +0100 PHOENIX-7171 Update Zookeeper to 3.8.3 when building with HBase 2.4+ --- pom.xml | 10 +- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 7c598fb80c..052b5c4a55 100644 --- a/pom.xml +++ b/pom.xml @@ -128,7 +128,7 @@ 2.9.5 72.1 5.1.0 -3.5.7 +3.8.3 4.2.0 1.0.55 9.4.53.v20231009 @@ -1430,6 +1430,14 @@ org.slf4j slf4j-log4j12 + +ch.qos.logback +logback-core + + +ch.qos.logback +logback-classic +
