You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by zh...@apache.org on 2023/05/13 01:11:51 UTC
[hbase] branch branch-2.4 updated (357866b020d -> 9198494aa4c)
This is an automated email from the ASF dual-hosted git repository.
zhangduo pushed a change to branch branch-2.4
in repository https://gitbox.apache.org/repos/asf/hbase.git
from 357866b020d HBASE-27844 changed type names to avoid conflicts with built-in types (#5223)
new 4df157dbd71 HBASE-27857 Fix timeout exception handling in HBaseClassTestRule. (#5231)
new 9198494aa4c HBASE-27860 Fix build error against Hadoop 3.3.5 (#5233)
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../java/org/apache/hadoop/hbase/HBaseClassTestRule.java | 2 +-
hbase-shaded/pom.xml | 12 ++++++++++++
2 files changed, 13 insertions(+), 1 deletion(-)
[hbase] 02/02: HBASE-27860 Fix build error against Hadoop 3.3.5 (#5233)
Posted by zh...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
zhangduo pushed a commit to branch branch-2.4
in repository https://gitbox.apache.org/repos/asf/hbase.git
commit 9198494aa4c5aed47ae56df3eb30b6c371c418a0
Author: Shuhei Yamasaki <ya...@oss.nttdata.com>
AuthorDate: Sat May 13 09:56:37 2023 +0900
HBASE-27860 Fix build error against Hadoop 3.3.5 (#5233)
Add packages for hadoop-3.3.5
Signed-off-by: Duo Zhang <zh...@apache.org>
(cherry picked from commit bee09bbd61e077fd398cd534ed28e2305a66c85c)
---
hbase-shaded/pom.xml | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/hbase-shaded/pom.xml b/hbase-shaded/pom.xml
index 89447f3a599..85943124f13 100644
--- a/hbase-shaded/pom.xml
+++ b/hbase-shaded/pom.xml
@@ -124,6 +124,18 @@
</artifactSet>
<relocations>
<!-- top level com not including sun-->
+ <relocation>
+ <pattern>com.sun.istack</pattern>
+ <shadedPattern>${shaded.prefix}.com.sun.istack</shadedPattern>
+ </relocation>
+ <relocation>
+ <pattern>com.sun.jersey</pattern>
+ <shadedPattern>${shaded.prefix}.com.sun.jersey</shadedPattern>
+ </relocation>
+ <relocation>
+ <pattern>com.sun.xml</pattern>
+ <shadedPattern>${shaded.prefix}.com.sun.xml</shadedPattern>
+ </relocation>
<relocation>
<pattern>com.cedarsoftware</pattern>
<shadedPattern>${shaded.prefix}.com.cedarsoftware</shadedPattern>
[hbase] 01/02: HBASE-27857 Fix timeout exception handling in HBaseClassTestRule. (#5231)
Posted by zh...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
zhangduo pushed a commit to branch branch-2.4
in repository https://gitbox.apache.org/repos/asf/hbase.git
commit 4df157dbd717e084c38ea299ae1d9fcd8d3f157d
Author: Jonathan Albrecht <jo...@ibm.com>
AuthorDate: Fri May 12 20:54:50 2023 -0400
HBASE-27857 Fix timeout exception handling in HBaseClassTestRule. (#5231)
HBaseClassTestRule applies a timeout and a system exit rule to tests.
The timeout rule throws an exception if it hits the timeout threshold.
Since the timeout rule is applied after the system exit rule, the
system exit rule does not see the exception and does not re-enable
the system exit behavior which can cause maven to hang on some
tests.
This change applies the timeout rule before the system exit rule so
that normal system exit can be restored before the surefire forked
node is shutdown.
Signed-off-by: Duo Zhang <zh...@apache.org>
(cherry picked from commit 220eacf7c56f00a9c8746295fbc46db8a7a66da2)
---
.../src/test/java/org/apache/hadoop/hbase/HBaseClassTestRule.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/hbase-common/src/test/java/org/apache/hadoop/hbase/HBaseClassTestRule.java b/hbase-common/src/test/java/org/apache/hadoop/hbase/HBaseClassTestRule.java
index 59011cfc9cd..73f5442b6a7 100644
--- a/hbase-common/src/test/java/org/apache/hadoop/hbase/HBaseClassTestRule.java
+++ b/hbase-common/src/test/java/org/apache/hadoop/hbase/HBaseClassTestRule.java
@@ -162,7 +162,7 @@ public final class HBaseClassTestRule implements TestRule {
@Override
public Statement apply(Statement base, Description description) {
- return timeout.apply(systemExitRule.apply(base, description), description);
+ return systemExitRule.apply(timeout.apply(base, description), description);
}
}