diff --git a/CHANGELOG.md b/CHANGELOG.md
index e2c0ce023..fde271c4e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -39,6 +39,7 @@ All notable changes to this project will be documented in this file.
 - opa: Remove `1.4.2` ([#1396]).
 - zookeeper: Remove `3.9.3` ([#1401]).
 - trino: Remove `451` and `476` ([#1403]).
+- hbase: Remove `2.6.2` ([#1408]).
 
 ### Fixed
 
@@ -69,6 +70,7 @@ All notable changes to this project will be documented in this file.
 [#1401]: https://github.com/stackabletech/docker-images/pull/1401
 [#1403]: https://github.com/stackabletech/docker-images/pull/1403
 [#1405]: https://github.com/stackabletech/docker-images/pull/1405
+[#1408]: https://github.com/stackabletech/docker-images/pull/1408
 
 ## [25.11.0] - 2025-11-07
 
diff --git a/hbase/boil-config.toml b/hbase/boil-config.toml
index 8b62185cc..77ccbca5e 100644
--- a/hbase/boil-config.toml
+++ b/hbase/boil-config.toml
@@ -1,16 +1,3 @@
-[versions."2.6.2".local-images]
-"hbase/hbase" = "2.6.2"
-"hbase/hbase-operator-tools" = "1.3.0-fd5a5fb-hbase2.6.2"
-"hbase/phoenix" = "5.2.1-hbase2.6.2"
-"hbase/hbase-opa-authorizer" = "0.1.0" # only for HBase 2.6.1
-"hadoop/hadoop" = "3.4.1"
-java-base = "11"
-java-devel = "11"
-
-[versions."2.6.2".build-arguments]
-hbase-profile = "2.6"
-delete-caches = "true"
-
 [versions."2.6.3".local-images]
 "hbase/hbase" = "2.6.3"
 "hbase/hbase-operator-tools" = "1.3.0-fd5a5fb-hbase2.6.3"
diff --git a/hbase/hbase-operator-tools/boil-config.toml b/hbase/hbase-operator-tools/boil-config.toml
index 30c0d5bf3..c897edb83 100644
--- a/hbase/hbase-operator-tools/boil-config.toml
+++ b/hbase/hbase-operator-tools/boil-config.toml
@@ -1,13 +1,3 @@
-[versions."1.3.0-fd5a5fb-hbase2.6.2".local-images]
-"hadoop/hadoop" = "3.4.1"
-"hbase/hbase" = "2.6.2"
-"java-devel" = "11"
-
-[versions."1.3.0-fd5a5fb-hbase2.6.2".build-arguments]
-hbase-operator-tools-version = "1.3.0-fd5a5fb"
-hbase-thirdparty-version = "4.1.9"
-delete-caches = "true"
-
 [versions."1.3.0-fd5a5fb-hbase2.6.3".local-images]
 "hadoop/hadoop" = "3.4.2"
 "hbase/hbase" = "2.6.3"
diff --git a/hbase/hbase-operator-tools/stackable/patches/1.2.0/0001-Add-CycloneDX-plugin.patch b/hbase/hbase-operator-tools/stackable/patches/1.2.0/0001-Add-CycloneDX-plugin.patch
deleted file mode 100644
index fe491124d..000000000
--- a/hbase/hbase-operator-tools/stackable/patches/1.2.0/0001-Add-CycloneDX-plugin.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 925a136ad24ae2d273990c36e591a87116f78ec0 Mon Sep 17 00:00:00 2001
-From: dervoeti <lukas.krug@stackable.tech>
-Date: Thu, 13 Mar 2025 22:04:20 +0100
-Subject: Add CycloneDX plugin
-
----
- pom.xml | 17 +++++++++++++++++
- 1 file changed, 17 insertions(+)
-
-diff --git a/pom.xml b/pom.xml
-index aba42b0..0288bde 100644
---- a/pom.xml
-+++ b/pom.xml
-@@ -396,6 +396,23 @@
-           <skipAssembly>true</skipAssembly>
-         </configuration>
-       </plugin>
-+      <plugin>
-+        <groupId>org.cyclonedx</groupId>
-+        <artifactId>cyclonedx-maven-plugin</artifactId>
-+        <version>2.8.0</version>
-+        <configuration>
-+          <projectType>application</projectType>
-+          <schemaVersion>1.5</schemaVersion>
-+        </configuration>
-+        <executions>
-+          <execution>
-+          <goals>
-+            <goal>makeBom</goal>
-+          </goals>
-+          <phase>package</phase>
-+          </execution>
-+        </executions>
-+      </plugin>
-     </plugins>
-   </build>
-   <profiles>
diff --git a/hbase/hbase-operator-tools/stackable/patches/1.2.0/patchable.toml b/hbase/hbase-operator-tools/stackable/patches/1.2.0/patchable.toml
deleted file mode 100644
index a6296d2f7..000000000
--- a/hbase/hbase-operator-tools/stackable/patches/1.2.0/patchable.toml
+++ /dev/null
@@ -1,2 +0,0 @@
-base = "478af00af79f82624264fd2bb447b97fecc8e790"
-mirror = "https://github.com/stackabletech/hbase-operator-tools.git"
diff --git a/hbase/hbase/boil-config.toml b/hbase/hbase/boil-config.toml
index aaf3adec1..6f02457e2 100644
--- a/hbase/hbase/boil-config.toml
+++ b/hbase/hbase/boil-config.toml
@@ -1,12 +1,3 @@
-[versions."2.6.2".local-images]
-"hadoop/hadoop" = "3.4.1"
-java-base = "11"
-java-devel = "11"
-
-[versions."2.6.2".build-arguments]
-async-profiler-version = "2.9"
-delete-caches = "true"
-
 [versions."2.6.3".local-images]
 "hadoop/hadoop" = "3.4.2"
 java-base = "11"
diff --git a/hbase/hbase/stackable/patches/2.6.1/0001-HBASE-28242-Updates-async-profiler-support.patch b/hbase/hbase/stackable/patches/2.6.1/0001-HBASE-28242-Updates-async-profiler-support.patch
deleted file mode 100644
index 2901aaf99..000000000
--- a/hbase/hbase/stackable/patches/2.6.1/0001-HBASE-28242-Updates-async-profiler-support.patch
+++ /dev/null
@@ -1,384 +0,0 @@
-From 12fa4ad4f12adef53c4e9d782b18152dfb3f7075 Mon Sep 17 00:00:00 2001
-From: Siegfried Weber <mail@siegfriedweber.net>
-Date: Tue, 6 Feb 2024 16:10:54 +0100
-Subject: HBASE-28242: Updates async-profiler support
-
----
- .../hadoop/hbase/http/ProfileServlet.java     | 205 +++++++++++-------
- 1 file changed, 121 insertions(+), 84 deletions(-)
-
-diff --git a/hbase-http/src/main/java/org/apache/hadoop/hbase/http/ProfileServlet.java b/hbase-http/src/main/java/org/apache/hadoop/hbase/http/ProfileServlet.java
-index 83087dbed3..6139114717 100644
---- a/hbase-http/src/main/java/org/apache/hadoop/hbase/http/ProfileServlet.java
-+++ b/hbase-http/src/main/java/org/apache/hadoop/hbase/http/ProfileServlet.java
-@@ -25,9 +25,11 @@ import java.util.concurrent.TimeUnit;
- import java.util.concurrent.atomic.AtomicInteger;
- import java.util.concurrent.locks.Lock;
- import java.util.concurrent.locks.ReentrantLock;
-+
- import javax.servlet.http.HttpServlet;
- import javax.servlet.http.HttpServletRequest;
- import javax.servlet.http.HttpServletResponse;
-+
- import org.apache.hadoop.hbase.util.ProcessUtils;
- import org.apache.yetus.audience.InterfaceAudience;
- import org.slf4j.Logger;
-@@ -37,23 +39,60 @@ import org.apache.hbase.thirdparty.com.google.common.base.Joiner;
- 
- /**
-  * Servlet that runs async-profiler as web-endpoint. Following options from async-profiler can be
-- * specified as query paramater. // -e event profiling event: cpu|alloc|lock|cache-misses etc. // -d
-- * duration run profiling for 'duration' seconds (integer) // -i interval sampling interval in
-- * nanoseconds (long) // -j jstackdepth maximum Java stack depth (integer) // -b bufsize frame
-- * buffer size (long) // -t profile different threads separately // -s simple class names instead of
-- * FQN // -o fmt[,fmt...] output format: summary|traces|flat|collapsed|svg|tree|jfr|html // --width
-- * px SVG width pixels (integer) // --height px SVG frame height pixels (integer) // --minwidth px
-- * skip frames smaller than px (double) // --reverse generate stack-reversed FlameGraph / Call tree
-- * Example: - To collect 30 second CPU profile of current process (returns FlameGraph svg) curl
-- * "http://localhost:10002/prof" - To collect 1 minute CPU profile of current process and output in
-- * tree format (html) curl "http://localhost:10002/prof?output=tree&amp;duration=60" - To collect 30
-- * second heap allocation profile of current process (returns FlameGraph svg) curl
-- * "http://localhost:10002/prof?event=alloc" - To collect lock contention profile of current process
-- * (returns FlameGraph svg) curl "http://localhost:10002/prof?event=lock" Following event types are
-- * supported (default is 'cpu') (NOTE: not all OS'es support all events) // Perf events: // cpu //
-- * page-faults // context-switches // cycles // instructions // cache-references // cache-misses //
-- * branches // branch-misses // bus-cycles // L1-dcache-load-misses // LLC-load-misses //
-- * dTLB-load-misses // mem:breakpoint // trace:tracepoint // Java events: // alloc // lock
-+ * specified as query parameter.
-+ * <ul>
-+ * <li>-e event profiling event: cpu|alloc|lock|cache-misses etc.</li>
-+ * <li>-d duration run profiling for 'duration' seconds (integer), default 10s</li>
-+ * <li>-i interval sampling interval in nanoseconds (long), default 10ms</li>
-+ * <li>-j jstackdepth maximum Java stack depth (integer), default 2048</li>
-+ * <li>-t profile different threads separately</li>
-+ * <li>-s simple class names instead of FQN</li>
-+ * <li>-g print method signatures</li>
-+ * <li>-a annotate Java methods</li>
-+ * <li>-l prepend library names</li>
-+ * <li>-o fmt output format: flat|traces|collapsed|flamegraph|tree|jfr</li>
-+ * <li>--minwidth pct skip frames smaller than pct% (double)</li>
-+ * <li>--reverse generate stack-reversed FlameGraph / Call tree</li>
-+ * </ul>
-+ * Example:
-+ * <ul>
-+ * <li>To collect 30 second CPU profile of current process (returns FlameGraph svg):
-+ * {@code curl http://localhost:10002/prof"}</li>
-+ * <li>To collect 1 minute CPU profile of current process and output in tree format (html)
-+ * {@code curl "http://localhost:10002/prof?output=tree&amp;duration=60"}</li>
-+ * <li>To collect 30 second heap allocation profile of current process (returns FlameGraph):
-+ * {@code curl "http://localhost:10002/prof?event=alloc"}</li>
-+ * <li>To collect lock contention profile of current process (returns FlameGraph):
-+ * {@code curl "http://localhost:10002/prof?event=lock"}</li>
-+ * </ul>
-+ * Following event types are supported (default is 'cpu') (NOTE: not all OS'es support all
-+ * events).<br/>
-+ * Basic events:
-+ * <ul>
-+ * <li>cpu</li>
-+ * <li>alloc</li>
-+ * <li>lock</li>
-+ * <li>wall</li>
-+ * <li>itimer</li>
-+ * </ul>
-+ * Perf events:
-+ * <ul>
-+ * <li>L1-dcache-load-misses</li>
-+ * <li>LLC-load-misses</li>
-+ * <li>branch-instructions</li>
-+ * <li>branch-misses</li>
-+ * <li>bus-cycles</li>
-+ * <li>cache-misses</li>
-+ * <li>cache-references</li>
-+ * <li>context-switches</li>
-+ * <li>cpu</li>
-+ * <li>cycles</li>
-+ * <li>dTLB-load-misses</li>
-+ * <li>instructions</li>
-+ * <li>mem:breakpoint</li>
-+ * <li>page-faults</li>
-+ * <li>trace:tracepoint</li>
-+ * </ul>
-  */
- @InterfaceAudience.Private
- public class ProfileServlet extends HttpServlet {
-@@ -77,19 +116,20 @@ public class ProfileServlet extends HttpServlet {
-     WALL("wall"),
-     ALLOC("alloc"),
-     LOCK("lock"),
--    PAGE_FAULTS("page-faults"),
-+    ITIMER("itimer"),
-+    BRANCH_INSTRUCTIONS("branch-instructions"),
-+    BRANCH_MISSES("branch-misses"),
-+    BUS_CYCLES("bus-cycles"),
-+    CACHE_MISSES("cache-misses"),
-+    CACHE_REFERENCES("cache-references"),
-     CONTEXT_SWITCHES("context-switches"),
-     CYCLES("cycles"),
-+    DTLB_LOAD_MISSES("dTLB-load-misses"),
-     INSTRUCTIONS("instructions"),
--    CACHE_REFERENCES("cache-references"),
--    CACHE_MISSES("cache-misses"),
--    BRANCHES("branches"),
--    BRANCH_MISSES("branch-misses"),
--    BUS_CYCLES("bus-cycles"),
-     L1_DCACHE_LOAD_MISSES("L1-dcache-load-misses"),
-     LLC_LOAD_MISSES("LLC-load-misses"),
--    DTLB_LOAD_MISSES("dTLB-load-misses"),
-     MEM_BREAKPOINT("mem:breakpoint"),
-+    PAGE_FAULTS("page-faults"),
-     TRACE_TRACEPOINT("trace:tracepoint"),;
- 
-     private final String internalName;
-@@ -98,11 +138,11 @@ public class ProfileServlet extends HttpServlet {
-       this.internalName = internalName;
-     }
- 
--    public String getInternalName() {
-+    String getInternalName() {
-       return internalName;
-     }
- 
--    public static Event fromInternalName(final String name) {
-+    static Event fromInternalName(final String name) {
-       for (Event event : values()) {
-         if (event.getInternalName().equalsIgnoreCase(name)) {
-           return event;
-@@ -113,30 +153,26 @@ public class ProfileServlet extends HttpServlet {
-     }
-   }
- 
--  enum Output {
--    SUMMARY,
--    TRACES,
--    FLAT,
-+  private enum Output {
-     COLLAPSED,
--    // No SVG in 2.x asyncprofiler.
--    SVG,
--    TREE,
-+    FLAMEGRAPH,
-+    FLAT,
-     JFR,
--    // In 2.x asyncprofiler, this is how you get flamegraphs.
--    HTML
-+    TRACES,
-+    TREE
-   }
- 
-   @edu.umd.cs.findbugs.annotations.SuppressWarnings(value = "SE_TRANSIENT_FIELD_NOT_RESTORED",
-       justification = "This class is never serialized nor restored.")
--  private transient Lock profilerLock = new ReentrantLock();
-+  private final transient Lock profilerLock = new ReentrantLock();
-   private transient volatile Process process;
--  private String asyncProfilerHome;
-+  private final String asyncProfilerHome;
-   private Integer pid;
- 
-   public ProfileServlet() {
-     this.asyncProfilerHome = getAsyncProfilerHome();
-     this.pid = ProcessUtils.getPid();
--    LOG.info("Servlet process PID: " + pid + " asyncProfilerHome: " + asyncProfilerHome);
-+    LOG.info("Servlet process PID: {} asyncProfilerHome: {}", pid, asyncProfilerHome);
-   }
- 
-   @Override
-@@ -155,9 +191,9 @@ public class ProfileServlet extends HttpServlet {
-       setResponseHeader(resp);
-       resp.getWriter()
-         .write("ASYNC_PROFILER_HOME env is not set.\n\n"
--          + "Please ensure the prerequsites for the Profiler Servlet have been installed and the\n"
-+          + "Please ensure the prerequisites for the Profiler Servlet have been installed and the\n"
-           + "environment is properly configured. For more information please see\n"
--          + "http://hbase.apache.org/book.html#profiler\n");
-+          + "https://hbase.apache.org/book.html#profiler\n");
-       return;
-     }
- 
-@@ -173,18 +209,18 @@ public class ProfileServlet extends HttpServlet {
-       return;
-     }
- 
--    final int duration = getInteger(req, "duration", DEFAULT_DURATION_SECONDS);
--    final Output output = getOutput(req);
--    final Event event = getEvent(req);
--    final Long interval = getLong(req, "interval");
--    final Integer jstackDepth = getInteger(req, "jstackdepth", null);
--    final Long bufsize = getLong(req, "bufsize");
--    final boolean thread = req.getParameterMap().containsKey("thread");
--    final boolean simple = req.getParameterMap().containsKey("simple");
--    final Integer width = getInteger(req, "width", null);
--    final Integer height = getInteger(req, "height", null);
--    final Double minwidth = getMinWidth(req);
--    final boolean reverse = req.getParameterMap().containsKey("reverse");
-+    Event event = getEvent(req);
-+    int duration = getInteger(req, "duration", DEFAULT_DURATION_SECONDS);
-+    Long interval = getLong(req, "interval");
-+    Integer jstackDepth = getInteger(req, "jstackdepth", null);
-+    boolean thread = req.getParameterMap().containsKey("thread");
-+    boolean simple = req.getParameterMap().containsKey("simple");
-+    boolean signature = req.getParameterMap().containsKey("signature");
-+    boolean annotate = req.getParameterMap().containsKey("annotate");
-+    boolean prependLib = req.getParameterMap().containsKey("prependlib");
-+    Output output = getOutput(req);
-+    Double minwidth = getMinWidth(req);
-+    boolean reverse = req.getParameterMap().containsKey("reverse");
- 
-     if (process == null || !process.isAlive()) {
-       try {
-@@ -199,11 +235,7 @@ public class ProfileServlet extends HttpServlet {
-             cmd.add("-e");
-             cmd.add(event.getInternalName());
-             cmd.add("-d");
--            cmd.add("" + duration);
--            cmd.add("-o");
--            cmd.add(output.name().toLowerCase());
--            cmd.add("-f");
--            cmd.add(outputFile.getAbsolutePath());
-+            cmd.add(String.valueOf(duration));
-             if (interval != null) {
-               cmd.add("-i");
-               cmd.add(interval.toString());
-@@ -212,24 +244,25 @@ public class ProfileServlet extends HttpServlet {
-               cmd.add("-j");
-               cmd.add(jstackDepth.toString());
-             }
--            if (bufsize != null) {
--              cmd.add("-b");
--              cmd.add(bufsize.toString());
--            }
-             if (thread) {
-               cmd.add("-t");
-             }
-             if (simple) {
-               cmd.add("-s");
-             }
--            if (width != null) {
--              cmd.add("--width");
--              cmd.add(width.toString());
-+            if (signature) {
-+              cmd.add("-g");
-             }
--            if (height != null) {
--              cmd.add("--height");
--              cmd.add(height.toString());
-+            if (annotate) {
-+              cmd.add("-a");
-             }
-+            if (prependLib) {
-+              cmd.add("-l");
-+            }
-+            cmd.add("-o");
-+            cmd.add(output.name().toLowerCase());
-+            cmd.add("-f");
-+            cmd.add(outputFile.getAbsolutePath());
-             if (minwidth != null) {
-               cmd.add("--minwidth");
-               cmd.add(minwidth.toString());
-@@ -237,6 +270,7 @@ public class ProfileServlet extends HttpServlet {
-             if (reverse) {
-               cmd.add("--reverse");
-             }
-+
-             cmd.add(pid.toString());
-             process = ProcessUtils.runCmdAsync(cmd);
- 
-@@ -247,7 +281,10 @@ public class ProfileServlet extends HttpServlet {
-             resp.getWriter()
-               .write("Started [" + event.getInternalName()
-                 + "] profiling. This page will automatically redirect to " + relativeUrl + " after "
--                + duration + " seconds.\n\nCommand:\n" + Joiner.on(" ").join(cmd));
-+                + duration + " seconds. "
-+                + "If empty diagram and Linux 4.6+, see 'Basic Usage' section on the Async "
-+                + "Profiler Home Page, https://github.com/jvm-profiling-tools/async-profiler."
-+                + "\n\nCommand:\n" + Joiner.on(" ").join(cmd));
- 
-             // to avoid auto-refresh by ProfileOutputServlet, refreshDelay can be specified
-             // via url param
-@@ -265,8 +302,9 @@ public class ProfileServlet extends HttpServlet {
-           resp.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
-           resp.getWriter()
-             .write("Unable to acquire lock. Another instance of profiler might be running.");
--          LOG.warn("Unable to acquire lock in " + lockTimeoutSecs
--            + " seconds. Another instance of profiler might be running.");
-+          LOG.warn(
-+            "Unable to acquire lock in {} seconds. Another instance of profiler might be running.",
-+            lockTimeoutSecs);
-         }
-       } catch (InterruptedException e) {
-         LOG.warn("Interrupted while acquiring profile lock.", e);
-@@ -279,9 +317,9 @@ public class ProfileServlet extends HttpServlet {
-     }
-   }
- 
--  private Integer getInteger(final HttpServletRequest req, final String param,
-+  private static Integer getInteger(final HttpServletRequest req, final String param,
-     final Integer defaultValue) {
--    final String value = req.getParameter(param);
-+    String value = req.getParameter(param);
-     if (value != null) {
-       try {
-         return Integer.valueOf(value);
-@@ -292,8 +330,8 @@ public class ProfileServlet extends HttpServlet {
-     return defaultValue;
-   }
- 
--  private Long getLong(final HttpServletRequest req, final String param) {
--    final String value = req.getParameter(param);
-+  private static Long getLong(final HttpServletRequest req, final String param) {
-+    String value = req.getParameter(param);
-     if (value != null) {
-       try {
-         return Long.valueOf(value);
-@@ -304,8 +342,8 @@ public class ProfileServlet extends HttpServlet {
-     return null;
-   }
- 
--  private Double getMinWidth(final HttpServletRequest req) {
--    final String value = req.getParameter("minwidth");
-+  private static Double getMinWidth(final HttpServletRequest req) {
-+    String value = req.getParameter("minwidth");
-     if (value != null) {
-       try {
-         return Double.valueOf(value);
-@@ -316,8 +354,8 @@ public class ProfileServlet extends HttpServlet {
-     return null;
-   }
- 
--  private Event getEvent(final HttpServletRequest req) {
--    final String eventArg = req.getParameter("event");
-+  private static Event getEvent(final HttpServletRequest req) {
-+    String eventArg = req.getParameter("event");
-     if (eventArg != null) {
-       Event event = Event.fromInternalName(eventArg);
-       return event == null ? Event.CPU : event;
-@@ -325,16 +363,16 @@ public class ProfileServlet extends HttpServlet {
-     return Event.CPU;
-   }
- 
--  private Output getOutput(final HttpServletRequest req) {
--    final String outputArg = req.getParameter("output");
-+  private static Output getOutput(final HttpServletRequest req) {
-+    String outputArg = req.getParameter("output");
-     if (req.getParameter("output") != null) {
-       try {
-         return Output.valueOf(outputArg.trim().toUpperCase());
-       } catch (IllegalArgumentException e) {
--        return Output.HTML;
-+        return Output.FLAMEGRAPH;
-       }
-     }
--    return Output.HTML;
-+    return Output.FLAMEGRAPH;
-   }
- 
-   static void setResponseHeader(final HttpServletResponse response) {
-@@ -366,8 +404,7 @@ public class ProfileServlet extends HttpServlet {
-         .write("The profiler servlet was disabled at startup.\n\n"
-           + "Please ensure the prerequisites for the Profiler Servlet have been installed and the\n"
-           + "environment is properly configured. For more information please see\n"
--          + "http://hbase.apache.org/book.html#profiler\n");
--      return;
-+          + "https://hbase.apache.org/book.html#profiler\n");
-     }
- 
-   }
diff --git a/hbase/hbase/stackable/patches/2.6.1/0002-Update-all-dependencies-which-have-a-new-patch-updat.patch b/hbase/hbase/stackable/patches/2.6.1/0002-Update-all-dependencies-which-have-a-new-patch-updat.patch
deleted file mode 100644
index 5d140b62a..000000000
--- a/hbase/hbase/stackable/patches/2.6.1/0002-Update-all-dependencies-which-have-a-new-patch-updat.patch
+++ /dev/null
@@ -1,122 +0,0 @@
-From b2cccc639680890cf595ddd217dff2dcbf10c04b Mon Sep 17 00:00:00 2001
-From: Lars Francke <lars.francke@stackable.tech>
-Date: Thu, 11 Jul 2024 10:12:51 +0200
-Subject: Update all dependencies which have a new patch update available.
-
----
- pom.xml | 48 ++++++++++++++++++++++++------------------------
- 1 file changed, 24 insertions(+), 24 deletions(-)
-
-diff --git a/pom.xml b/pom.xml
-index 01123cb35b..e78b9eb5d5 100644
---- a/pom.xml
-+++ b/pom.xml
-@@ -567,7 +567,7 @@
-       modules and cause trouble if we only rely on transitive dependencies.
-     -->
-     <netty3.version>3.10.6.Final</netty3.version>
--    <netty4.version>4.1.112.Final</netty4.version>
-+    <netty4.version>4.1.122.Final</netty4.version>
-     <!-- end HBASE-15925 default hadoop compatibility values -->
-     <audience-annotations.version>0.13.0</audience-annotations.version>
-     <!--
-@@ -576,28 +576,28 @@
-     -->
-     <javadoc.audience-annotations.version>0.13.0</javadoc.audience-annotations.version>
-     <avro.version>1.11.4</avro.version>
--    <caffeine.version>2.8.1</caffeine.version>
-+    <caffeine.version>2.8.8</caffeine.version>
-     <commons-codec.version>1.15</commons-codec.version>
-     <commons-io.version>2.11.0</commons-io.version>
-     <commons-lang3.version>3.9</commons-lang3.version>
-     <commons-math.version>3.6.1</commons-math.version>
-     <commons-cli.version>1.5.0</commons-cli.version>
-     <disruptor.version>3.4.4</disruptor.version>
--    <httpclient.version>4.5.13</httpclient.version>
--    <httpcore.version>4.4.13</httpcore.version>
-+    <httpclient.version>4.5.14</httpclient.version>
-+    <httpcore.version>4.4.16</httpcore.version>
-     <metrics-core.version>3.2.6</metrics-core.version>
-     <!--
-       Note that the version of jackson-[annotations,core,databind] must be kept in sync with the
-       version of jackson-jaxrs-json-provider shipped in hbase-thirdparty.
-     -->
--    <jackson.version>2.17.2</jackson.version>
--    <jackson.databind.version>2.17.2</jackson.databind.version>
-+    <jackson.version>2.17.3</jackson.version>
-+    <jackson.databind.version>2.17.3</jackson.databind.version>
-     <jaxb-api.version>2.3.1</jaxb-api.version>
-     <servlet.api.version>3.1.0</servlet.api.version>
-     <wx.rs.api.version>2.1.1</wx.rs.api.version>
--    <glassfish.jsp.version>2.3.2</glassfish.jsp.version>
--    <glassfish.el.version>3.0.1-b08</glassfish.el.version>
--    <jruby.version>9.3.13.0</jruby.version>
-+    <glassfish.jsp.version>2.3.4</glassfish.jsp.version>
-+    <glassfish.el.version>3.0.1-b12</glassfish.el.version>
-+    <jruby.version>9.3.15.0</jruby.version>
-     <junit.version>4.13.2</junit.version>
-     <hamcrest.version>1.3</hamcrest.version>
-     <opentelemetry.version>1.15.0</opentelemetry.version>
-@@ -615,19 +615,19 @@
-     <internal.protobuf.version>4.28.2</internal.protobuf.version>
-     <protobuf.plugin.version>0.6.1</protobuf.plugin.version>
-     <thrift.path>thrift</thrift.path>
--    <thrift.version>0.14.1</thrift.version>
-+    <thrift.version>0.14.2</thrift.version>
-     <zookeeper.version>3.8.4</zookeeper.version>
-     <jline.version>2.11</jline.version>
--    <slf4j.version>1.7.33</slf4j.version>
-+    <slf4j.version>1.7.36</slf4j.version>
-     <clover.version>4.0.3</clover.version>
-     <jamon-runtime.version>2.4.1</jamon-runtime.version>
-     <jettison.version>1.5.4</jettison.version>
-     <!--Make sure these joni/jcodings are compatible with the versions used by jruby-->
--    <joni.version>2.2.1</joni.version>
--    <jcodings.version>1.0.58</jcodings.version>
--    <spy.version>2.12.2</spy.version>
--    <bouncycastle.version>1.78</bouncycastle.version>
--    <skyscreamer.version>1.5.1</skyscreamer.version>
-+    <joni.version>2.2.6</joni.version>
-+    <jcodings.version>1.0.63</jcodings.version>
-+    <spy.version>2.12.3</spy.version>
-+    <bouncycastle.version>1.78.1</bouncycastle.version>
-+    <skyscreamer.version>1.5.3</skyscreamer.version>
-     <kerby.version>1.0.1</kerby.version>
-     <commons-crypto.version>1.1.0</commons-crypto.version>
-     <curator.version>4.2.0</curator.version>
-@@ -644,27 +644,27 @@
-     <lifecycle.mapping.version>1.0.0</lifecycle.mapping.version>
-     <maven.antrun.version>1.8</maven.antrun.version>
-     <maven.bundle.version>3.3.0</maven.bundle.version>
--    <maven.checkstyle.version>3.1.0</maven.checkstyle.version>
-+    <maven.checkstyle.version>3.1.2</maven.checkstyle.version>
-     <maven.eclipse.version>2.10</maven.eclipse.version>
-     <maven.gpg.version>3.0.1</maven.gpg.version>
--    <maven.javadoc.version>3.4.0</maven.javadoc.version>
--    <maven.warbucks.version>1.1.0</maven.warbucks.version>
-+    <maven.javadoc.version>3.4.1</maven.javadoc.version>
-+    <maven.warbucks.version>1.1.2</maven.warbucks.version>
-     <maven.project.info.report.version>3.1.2</maven.project.info.report.version>
-     <os.maven.version>1.5.0.Final</os.maven.version>
-     <findbugs-annotations.version>1.3.9-1</findbugs-annotations.version>
-     <spotbugs.version>4.7.3</spotbugs.version>
--    <spotbugs.maven.version>4.7.2.1</spotbugs.maven.version>
--    <surefire.version>3.1.0</surefire.version>
-+    <spotbugs.maven.version>4.7.3.6</spotbugs.maven.version>
-+    <surefire.version>3.1.2</surefire.version>
-     <wagon.ssh.version>2.12</wagon.ssh.version>
-     <xml.maven.version>1.0.1</xml.maven.version>
-     <spotless.version>2.27.2</spotless.version>
--    <maven-site.version>3.12.0</maven-site.version>
-+    <maven-site.version>3.12.1</maven-site.version>
-     <!-- compression -->
-     <aircompressor.version>0.27</aircompressor.version>
-     <brotli4j.version>1.11.0</brotli4j.version>
-     <lz4.version>1.8.0</lz4.version>
--    <snappy.version>1.1.10.4</snappy.version>
--    <zstd-jni.version>1.5.5-2</zstd-jni.version>
-+    <snappy.version>1.1.10.7</snappy.version>
-+    <zstd-jni.version>1.5.7-3</zstd-jni.version>
-     <!--
-         Note that the version of protobuf shipped in hbase-thirdparty must match the version used
-         in hbase-protocol-shaded and hbase-examples. The version of jackson-[annotations,core,
diff --git a/hbase/hbase/stackable/patches/2.6.1/0003-Include-jackson-dataformat-xml.patch b/hbase/hbase/stackable/patches/2.6.1/0003-Include-jackson-dataformat-xml.patch
deleted file mode 100644
index 9ed4d2d21..000000000
--- a/hbase/hbase/stackable/patches/2.6.1/0003-Include-jackson-dataformat-xml.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From 21b16c876a30be29ad8450f1092b676137e2a0d1 Mon Sep 17 00:00:00 2001
-From: Razvan-Daniel Mihai <84674+razvan@users.noreply.github.com>
-Date: Fri, 12 Jul 2024 17:30:12 -0400
-Subject: Include jackson-dataformat-xml.
-
-This is needed for XmlLayout to work so our structured logging works.
-It is an optional dependency of log4j2 so we need to make sure to include
-it.
----
- hbase-assembly/pom.xml |  5 +++++
- pom.xml                | 12 ++++++++++++
- 2 files changed, 17 insertions(+)
-
-diff --git a/hbase-assembly/pom.xml b/hbase-assembly/pom.xml
-index 1564851b85..0786288a84 100644
---- a/hbase-assembly/pom.xml
-+++ b/hbase-assembly/pom.xml
-@@ -222,6 +222,11 @@
-       <groupId>org.apache.logging.log4j</groupId>
-       <artifactId>log4j-core</artifactId>
-     </dependency>
-+    <dependency>
-+      <!-- This is an optional dependency of log4j which is needed to use XmlLayout -->
-+      <groupId>com.fasterxml.jackson.dataformat</groupId>
-+      <artifactId>jackson-dataformat-xml</artifactId>
-+    </dependency>
-     <dependency>
-       <groupId>org.apache.logging.log4j</groupId>
-       <artifactId>log4j-slf4j-impl</artifactId>
-diff --git a/pom.xml b/pom.xml
-index e78b9eb5d5..69bdb12b71 100644
---- a/pom.xml
-+++ b/pom.xml
-@@ -1159,6 +1159,11 @@
-         <artifactId>log4j-core</artifactId>
-         <version>${log4j2.version}</version>
-       </dependency>
-+      <dependency>
-+        <groupId>org.apache.logging.log4j</groupId>
-+        <artifactId>log4j-core</artifactId>
-+        <version>${log4j2.version}</version>
-+      </dependency>
-       <dependency>
-         <groupId>org.apache.logging.log4j</groupId>
-         <artifactId>log4j-slf4j-impl</artifactId>
-@@ -1169,6 +1174,13 @@
-         <artifactId>log4j-1.2-api</artifactId>
-         <version>${log4j2.version}</version>
-       </dependency>
-+      <dependency>
-+        <!-- This is an optional dependency of log4j which is needed to use XmlLayout -->
-+        <groupId>com.fasterxml.jackson.dataformat</groupId>
-+        <artifactId>jackson-dataformat-xml</artifactId>
-+        <version>${jackson.databind.version}</version>
-+      </dependency>
-+
-       <!-- Avro dependencies we mostly get transitively, manual version coallescing -->
-       <dependency>
-         <groupId>org.apache.avro</groupId>
diff --git a/hbase/hbase/stackable/patches/2.6.1/0004-Bump-cyclonedx-maven-plugin-to-version-2.9.1-and-twe.patch b/hbase/hbase/stackable/patches/2.6.1/0004-Bump-cyclonedx-maven-plugin-to-version-2.9.1-and-twe.patch
deleted file mode 100644
index 6e7415869..000000000
--- a/hbase/hbase/stackable/patches/2.6.1/0004-Bump-cyclonedx-maven-plugin-to-version-2.9.1-and-twe.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From cd7a88298fab77b973ed46f80db5df16eb5b010c Mon Sep 17 00:00:00 2001
-From: Lukas Voetmand <lukas.voetmand@stackable.tech>
-Date: Fri, 6 Sep 2024 17:53:52 +0200
-Subject: Bump cyclonedx-maven-plugin to version 2.9.1 and tweak its
- configuration
-
----
- pom.xml | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/pom.xml b/pom.xml
-index 69bdb12b71..fe1bc7ab8e 100644
---- a/pom.xml
-+++ b/pom.xml
-@@ -3290,7 +3290,11 @@
-           <plugin>
-             <groupId>org.cyclonedx</groupId>
-             <artifactId>cyclonedx-maven-plugin</artifactId>
--            <version>2.7.10</version>
-+            <version>2.9.1</version>
-+            <configuration>
-+                <projectType>application</projectType>
-+                <schemaVersion>1.5</schemaVersion>
-+            </configuration>
-             <executions>
-               <execution>
-                 <goals>
diff --git a/hbase/hbase/stackable/patches/2.6.1/0005-Allow-overriding-ipc-bind-port-and-use-alternative-p.patch b/hbase/hbase/stackable/patches/2.6.1/0005-Allow-overriding-ipc-bind-port-and-use-alternative-p.patch
deleted file mode 100644
index 76ef0961b..000000000
--- a/hbase/hbase/stackable/patches/2.6.1/0005-Allow-overriding-ipc-bind-port-and-use-alternative-p.patch
+++ /dev/null
@@ -1,310 +0,0 @@
-From e84ed39191101b7dac7a6970afafc00dcec0f135 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Natalie=20Klestrup=20R=C3=B6ijezon?= <nat@nullable.se>
-Date: Fri, 30 May 2025 14:26:26 +0200
-Subject: Allow overriding ipc bind port and use alternative port from listener
-
----
- .../org/apache/hadoop/hbase/HConstants.java   | 29 +++++++++++--
- .../apache/hadoop/hbase/master/HMaster.java   | 20 +++++++--
- .../hbase/regionserver/HRegionServer.java     | 41 +++++++++++++++----
- .../hbase/regionserver/RSRpcServices.java     |  8 +++-
- 4 files changed, 80 insertions(+), 18 deletions(-)
-
-diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/HConstants.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/HConstants.java
-index 3b2a58827f..ea96ff8fce 100644
---- a/hbase-common/src/main/java/org/apache/hadoop/hbase/HConstants.java
-+++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/HConstants.java
-@@ -194,18 +194,27 @@ public final class HConstants {
-   /** default host address */
-   public static final String DEFAULT_HOST = "0.0.0.0";
- 
--  /** Parameter name for port master listens on. */
-+  /** Parameter name for port master advertises as listening on. */
-   public static final String MASTER_PORT = "hbase.master.port";
- 
-+  /** Parameter name for IPC address that master listens on. (Defaults to hostname.) */
-+  public static final String MASTER_IPC_ADDRESS = "hbase.master.ipc.address";
-+
-+  /** Parameter name for IPC port that master listens on. (Defaults to MASTER_PORT.) */
-+  public static final String MASTER_IPC_PORT = "hbase.master.ipc.port";
-+
-   /** default port that the master listens on */
-   public static final int DEFAULT_MASTER_PORT = 16000;
- 
-   /** default port for master web api */
-   public static final int DEFAULT_MASTER_INFOPORT = 16010;
- 
--  /** Configuration key for master web API port */
-+  /** Configuration key for advertised master web API port */
-   public static final String MASTER_INFO_PORT = "hbase.master.info.port";
- 
-+  /** Configuration key for bound master web API port. (Defaults to MASTER_INFO_PORT.) */
-+  public static final String MASTER_BOUND_INFO_PORT = "hbase.master.bound.info.port";
-+
-   /** Configuration key for the list of master host:ports **/
-   public static final String MASTER_ADDRS_KEY = "hbase.masters";
- 
-@@ -313,18 +322,27 @@ public final class HConstants {
-   /** Default value for ZooKeeper session timeout */
-   public static final int DEFAULT_ZK_SESSION_TIMEOUT = 90 * 1000;
- 
--  /** Parameter name for port region server listens on. */
-+  /** Parameter name for port region server advertises as listening on. */
-   public static final String REGIONSERVER_PORT = "hbase.regionserver.port";
- 
-+  /** Parameter name for IPC address that region server listens on. (Defaults to hostname.) */
-+  public static final String REGIONSERVER_IPC_ADDRESS = "hbase.regionserver.ipc.address";
-+
-+  /** Parameter name for IPC port that region server listens on. (Defaults to REGIONSERVER_PORT.) */
-+  public static final String REGIONSERVER_IPC_PORT = "hbase.regionserver.ipc.port";
-+
-   /** Default port region server listens on. */
-   public static final int DEFAULT_REGIONSERVER_PORT = 16020;
- 
-   /** default port for region server web api */
-   public static final int DEFAULT_REGIONSERVER_INFOPORT = 16030;
- 
--  /** A configuration key for regionserver info port */
-+  /** Configuration key for advertised region server web API port */
-   public static final String REGIONSERVER_INFO_PORT = "hbase.regionserver.info.port";
- 
-+  /** Configuration key for bound region server web API port. (Defaults to REGIONSERVER_INFO_PORT.) */
-+  public static final String REGIONSERVER_BOUND_INFO_PORT = "hbase.regionserver.bound.info.port";
-+
-   /** A flag that enables automatic selection of regionserver info port */
-   public static final String REGIONSERVER_INFO_PORT_AUTO = REGIONSERVER_INFO_PORT + ".auto";
- 
-@@ -1392,6 +1410,9 @@ public final class HConstants {
-   /** Configuration key for setting RPC codec class name */
-   public static final String RPC_CODEC_CONF_KEY = "hbase.client.rpc.codec";
- 
-+  /** Configuration key for setting that the RPC client should bind the client address. This forces outgoing RPC traffic to happen from the same network interface that the RPC server is bound on. */
-+  public static final String RPC_CLIENT_BIND_ADDRESS = "hbase.client.rpc.bind.address";
-+
-   /** Configuration key for setting replication codec class name */
-   public static final String REPLICATION_CODEC_CONF_KEY = "hbase.replication.rpc.codec";
- 
-diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
-index 3fe5abac27..2f323518da 100644
---- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
-+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
-@@ -20,6 +20,8 @@ package org.apache.hadoop.hbase.master;
- import static org.apache.hadoop.hbase.HConstants.DEFAULT_HBASE_SPLIT_COORDINATED_BY_ZK;
- import static org.apache.hadoop.hbase.HConstants.HBASE_MASTER_LOGCLEANER_PLUGINS;
- import static org.apache.hadoop.hbase.HConstants.HBASE_SPLIT_WAL_COORDINATED_BY_ZK;
-+import static org.apache.hadoop.hbase.HConstants.MASTER_BOUND_INFO_PORT;
-+import static org.apache.hadoop.hbase.HConstants.MASTER_PORT;
- import static org.apache.hadoop.hbase.master.cleaner.HFileCleaner.CUSTOM_POOL_SIZE;
- import static org.apache.hadoop.hbase.util.DNS.MASTER_HOSTNAME_KEY;
- 
-@@ -559,6 +561,18 @@ public class HMaster extends HRegionServer implements MasterServices {
-     return conf.get(MASTER_HOSTNAME_KEY);
-   }
- 
-+  @Override
-+  protected int getUseThisPortInstead(Configuration conf) {
-+    int port = conf.getInt(MASTER_PORT, 0);
-+    return port != 0 ? port : this.rpcServices.getSocketAddress().getPort();
-+  }
-+
-+  @Override
-+  protected int getUseThisInfoPortInstead(Configuration conf) {
-+    int port = conf.getInt(MASTER_BOUND_INFO_PORT, 0);
-+    return port != 0 ? port : this.infoServer != null ? this.infoServer.getPort() : -1;
-+  }
-+
-   private void registerConfigurationObservers() {
-     configurationManager.registerObserver(this.rpcServices);
-     configurationManager.registerObserver(this);
-@@ -586,8 +600,8 @@ public class HMaster extends HRegionServer implements MasterServices {
-       registerConfigurationObservers();
-       Threads.setDaemonThreadRunning(new Thread(() -> TraceUtil.trace(() -> {
-         try {
--          int infoPort = putUpJettyServer();
--          startActiveMasterManager(infoPort);
-+          putUpJettyServer();
-+          startActiveMasterManager(useThisInfoPortInstead);
-         } catch (Throwable t) {
-           // Make sure we log the exception.
-           String error = "Failed to become Active Master";
-@@ -2991,7 +3005,7 @@ public class HMaster extends HRegionServer implements MasterServices {
-         }
-         case MASTER_INFO_PORT: {
-           if (infoServer != null) {
--            builder.setMasterInfoPort(infoServer.getPort());
-+            builder.setMasterInfoPort(useThisInfoPortInstead);
-           }
-           break;
-         }
-diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
-index 27bcef2f06..11bd1e58b5 100644
---- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
-+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
-@@ -24,6 +24,9 @@ import static org.apache.hadoop.hbase.HConstants.DEFAULT_HBASE_SPLIT_WAL_MAX_SPL
- import static org.apache.hadoop.hbase.HConstants.DEFAULT_SLOW_LOG_SYS_TABLE_CHORE_DURATION;
- import static org.apache.hadoop.hbase.HConstants.HBASE_SPLIT_WAL_COORDINATED_BY_ZK;
- import static org.apache.hadoop.hbase.HConstants.HBASE_SPLIT_WAL_MAX_SPLITTER;
-+import static org.apache.hadoop.hbase.HConstants.REGIONSERVER_BOUND_INFO_PORT;
-+import static org.apache.hadoop.hbase.HConstants.REGIONSERVER_PORT;
-+import static org.apache.hadoop.hbase.HConstants.RPC_CLIENT_BIND_ADDRESS;
- import static org.apache.hadoop.hbase.master.waleventtracker.WALEventTrackerTableCreator.WAL_EVENT_TRACKER_ENABLED_DEFAULT;
- import static org.apache.hadoop.hbase.master.waleventtracker.WALEventTrackerTableCreator.WAL_EVENT_TRACKER_ENABLED_KEY;
- import static org.apache.hadoop.hbase.namequeues.NamedQueueServiceChore.NAMED_QUEUE_CHORE_DURATION_DEFAULT;
-@@ -505,6 +508,10 @@ public class HRegionServer extends Thread
-    */
-   protected String useThisHostnameInstead;
- 
-+  protected int useThisPortInstead;
-+
-+  protected int useThisInfoPortInstead;
-+
-   /**
-    * @deprecated since 2.4.0 and will be removed in 4.0.0. Use
-    *             {@link HRegionServer#UNSAFE_RS_HOSTNAME_DISABLE_MASTER_REVERSEDNS_KEY} instead.
-@@ -669,6 +676,8 @@ public class HRegionServer extends Thread
-       this.namedQueueRecorder = NamedQueueRecorder.getInstance(this.conf);
-       rpcServices = createRpcServices();
-       useThisHostnameInstead = getUseThisHostnameInstead(conf);
-+      useThisPortInstead = getUseThisPortInstead(conf);
-+      useThisInfoPortInstead = getUseThisInfoPortInstead(conf);
- 
-       // if use-ip is enabled, we will use ip to expose Master/RS service for client,
-       // see HBASE-27304 for details.
-@@ -678,7 +687,7 @@ public class HRegionServer extends Thread
-         useIp ? rpcServices.isa.getAddress().getHostAddress() : rpcServices.isa.getHostName();
-       String hostName =
-         StringUtils.isBlank(useThisHostnameInstead) ? isaHostName : useThisHostnameInstead;
--      serverName = ServerName.valueOf(hostName, this.rpcServices.isa.getPort(), this.startcode);
-+      serverName = ServerName.valueOf(hostName, useThisPortInstead, this.startcode);
- 
-       rpcControllerFactory = RpcControllerFactory.instantiate(this.conf);
-       rpcRetryingCallerFactory = RpcRetryingCallerFactory.instantiate(this.conf,
-@@ -715,7 +724,7 @@ public class HRegionServer extends Thread
- 
-       // Some unit tests don't need a cluster, so no zookeeper at all
-       // Open connection to zookeeper and set primary watcher
--      zooKeeper = new ZKWatcher(conf, getProcessName() + ":" + rpcServices.isa.getPort(), this,
-+      zooKeeper = new ZKWatcher(conf, getProcessName() + ":" + useThisPortInstead, this,
-         canCreateBaseZNode());
-       // If no master in cluster, skip trying to track one or look for a cluster status.
-       if (!this.masterless) {
-@@ -776,6 +785,16 @@ public class HRegionServer extends Thread
-     }
-   }
- 
-+  protected int getUseThisPortInstead(Configuration conf) {
-+    int port = conf.getInt(REGIONSERVER_PORT, 0);
-+    return port != 0 ? port : this.rpcServices.isa.getPort();
-+  }
-+
-+  protected int getUseThisInfoPortInstead(Configuration conf) {
-+    int port = conf.getInt(REGIONSERVER_BOUND_INFO_PORT, 0);
-+    return port != 0 ? port : this.infoServer != null ? this.infoServer.getPort() : -1;
-+  }
-+
-   private void setupSignalHandlers() {
-     if (!SystemUtils.IS_OS_WINDOWS) {
-       HBasePlatformDependent.handle("HUP", (number, name) -> {
-@@ -957,8 +976,7 @@ public class HRegionServer extends Thread
-         bootstrapNodeManager = new BootstrapNodeManager(clusterConnection, masterAddressTracker);
-       }
-       // Setup RPC client for master communication
--      this.rpcClient = RpcClientFactory.createClient(conf, clusterId,
--        new InetSocketAddress(this.rpcServices.isa.getAddress(), 0),
-+      this.rpcClient = RpcClientFactory.createClient(conf, clusterId, getInetSocketAddress(this.conf),
-         clusterConnection.getConnectionMetrics(), Collections.emptyMap());
-       span.setStatus(StatusCode.OK);
-     } catch (Throwable t) {
-@@ -972,6 +990,11 @@ public class HRegionServer extends Thread
-     }
-   }
- 
-+  private InetSocketAddress getInetSocketAddress(Configuration conf) {
-+    return conf.getBoolean(RPC_CLIENT_BIND_ADDRESS, true) ?
-+      new InetSocketAddress(this.rpcServices.isa.getAddress(), 0) : new InetSocketAddress(0);
-+  }
-+
-   /**
-    * Bring up connection to zk ensemble and then wait until a master for this cluster and then after
-    * that, wait until cluster 'up' flag has been set. This is the order in which master does things.
-@@ -1533,6 +1556,7 @@ public class HRegionServer extends Thread
-     } else {
-       serverLoad.setInfoServerPort(-1);
-     }
-+    serverLoad.setInfoServerPort(useThisInfoPortInstead);
-     MetricsUserAggregateSource userSource =
-       metricsRegionServer.getMetricsUserAggregate().getSource();
-     if (userSource != null) {
-@@ -1688,7 +1712,7 @@ public class HRegionServer extends Thread
-         if (key.equals(HConstants.KEY_FOR_HOSTNAME_SEEN_BY_MASTER)) {
-           String hostnameFromMasterPOV = e.getValue();
-           this.serverName = ServerName.valueOf(hostnameFromMasterPOV,
--            rpcServices.getSocketAddress().getPort(), this.startcode);
-+            useThisPortInstead, this.startcode);
-           String expectedHostName = rpcServices.getSocketAddress().getHostName();
-           // if Master use-ip is enabled, RegionServer use-ip will be enabled by default even if it
-           // is set to disable. so we will use the ip of the RegionServer to compare with the
-@@ -1814,7 +1838,7 @@ public class HRegionServer extends Thread
- 
-   private void createMyEphemeralNode() throws KeeperException {
-     RegionServerInfo.Builder rsInfo = RegionServerInfo.newBuilder();
--    rsInfo.setInfoPort(infoServer != null ? infoServer.getPort() : -1);
-+    rsInfo.setInfoPort(infoServer != null ? useThisInfoPortInstead : -1);
-     rsInfo.setVersionInfo(ProtobufUtil.getVersionInfo());
-     byte[] data = ProtobufUtil.prependPBMagic(rsInfo.build().toByteArray());
-     ZKUtil.createEphemeralNodeAndWatch(this.zooKeeper, getMyEphemeralNodePath(), data);
-@@ -2479,7 +2503,7 @@ public class HRegionServer extends Thread
-         LOG.info("Retry starting http info server with port: " + port);
-       }
-     }
--    port = this.infoServer.getPort();
-+    port = useThisInfoPortInstead;
-     conf.setInt(HConstants.REGIONSERVER_INFO_PORT, port);
-     int masterInfoPort =
-       conf.getInt(HConstants.MASTER_INFO_PORT, HConstants.DEFAULT_MASTER_INFOPORT);
-@@ -3073,12 +3097,11 @@ public class HRegionServer extends Thread
-       LOG.info("reportForDuty to master=" + masterServerName + " with isa=" + rpcServices.isa
-         + ", startcode=" + this.startcode);
-       long now = EnvironmentEdgeManager.currentTime();
--      int port = rpcServices.isa.getPort();
-       RegionServerStartupRequest.Builder request = RegionServerStartupRequest.newBuilder();
-       if (!StringUtils.isBlank(useThisHostnameInstead)) {
-         request.setUseThisHostnameInstead(useThisHostnameInstead);
-       }
--      request.setPort(port);
-+      request.setPort(useThisPortInstead);
-       request.setServerStartCode(this.startcode);
-       request.setServerCurrentTime(now);
-       result = rss.regionServerStartup(null, request.build());
-diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RSRpcServices.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RSRpcServices.java
-index b77fcf338a..a86cd273ff 100644
---- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RSRpcServices.java
-+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RSRpcServices.java
-@@ -280,6 +280,10 @@ import org.apache.hadoop.hbase.shaded.protobuf.generated.WALProtos.BulkLoadDescr
- import org.apache.hadoop.hbase.shaded.protobuf.generated.WALProtos.CompactionDescriptor;
- import org.apache.hadoop.hbase.shaded.protobuf.generated.WALProtos.FlushDescriptor;
- import org.apache.hadoop.hbase.shaded.protobuf.generated.WALProtos.RegionEventDescriptor;
-+import static org.apache.hadoop.hbase.HConstants.MASTER_IPC_ADDRESS;
-+import static org.apache.hadoop.hbase.HConstants.MASTER_IPC_PORT;
-+import static org.apache.hadoop.hbase.HConstants.REGIONSERVER_IPC_ADDRESS;
-+import static org.apache.hadoop.hbase.HConstants.REGIONSERVER_IPC_PORT;
- 
- /**
-  * Implements the regionserver RPC services.
-@@ -1270,14 +1274,14 @@ public class RSRpcServices implements HBaseRPCErrorHandler, AdminService.Blockin
-       int port = conf.getInt(HConstants.MASTER_PORT, HConstants.DEFAULT_MASTER_PORT);
-       // Creation of a HSA will force a resolve.
-       initialIsa = new InetSocketAddress(hostname, port);
--      bindAddress = new InetSocketAddress(conf.get("hbase.master.ipc.address", hostname), port);
-+      bindAddress = new InetSocketAddress(conf.get(MASTER_IPC_ADDRESS, hostname), conf.getInt(MASTER_IPC_PORT, port));
-     } else {
-       String hostname = DNS.getHostname(conf, DNS.ServerType.REGIONSERVER);
-       int port = conf.getInt(HConstants.REGIONSERVER_PORT, HConstants.DEFAULT_REGIONSERVER_PORT);
-       // Creation of a HSA will force a resolve.
-       initialIsa = new InetSocketAddress(hostname, port);
-       bindAddress =
--        new InetSocketAddress(conf.get("hbase.regionserver.ipc.address", hostname), port);
-+        new InetSocketAddress(conf.get(REGIONSERVER_IPC_ADDRESS, hostname), conf.getInt(REGIONSERVER_IPC_PORT, port));
-     }
-     if (initialIsa.getAddress() == null) {
-       throw new IllegalArgumentException("Failed resolve of " + initialIsa);
diff --git a/hbase/hbase/stackable/patches/2.6.1/0006-Update-property-usage-for-bound-ports.patch b/hbase/hbase/stackable/patches/2.6.1/0006-Update-property-usage-for-bound-ports.patch
deleted file mode 100644
index 2b6c3d582..000000000
--- a/hbase/hbase/stackable/patches/2.6.1/0006-Update-property-usage-for-bound-ports.patch
+++ /dev/null
@@ -1,155 +0,0 @@
-From 5cc38b12c2bfc5fa3850e13e3eb87086d5f1737a Mon Sep 17 00:00:00 2001
-From: Andrew Kenworthy <andrew.kenworthy@stackable.tech>
-Date: Thu, 26 Jun 2025 14:59:01 +0200
-Subject: Update property usage for bound ports
-
----
- .../org/apache/hadoop/hbase/HConstants.java   |  4 ++--
- .../hadoop/hbase/LocalHBaseCluster.java       | 12 +++++------
- .../apache/hadoop/hbase/master/HMaster.java   |  6 +++---
- .../hbase/regionserver/HRegionServer.java     | 21 +++++++++++++------
- 4 files changed, 26 insertions(+), 17 deletions(-)
-
-diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/HConstants.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/HConstants.java
-index ea96ff8fce..054beb10d3 100644
---- a/hbase-common/src/main/java/org/apache/hadoop/hbase/HConstants.java
-+++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/HConstants.java
-@@ -212,7 +212,7 @@ public final class HConstants {
-   /** Configuration key for advertised master web API port */
-   public static final String MASTER_INFO_PORT = "hbase.master.info.port";
- 
--  /** Configuration key for bound master web API port. (Defaults to MASTER_INFO_PORT.) */
-+  /** Configuration key for bound master web API port */
-   public static final String MASTER_BOUND_INFO_PORT = "hbase.master.bound.info.port";
- 
-   /** Configuration key for the list of master host:ports **/
-@@ -340,7 +340,7 @@ public final class HConstants {
-   /** Configuration key for advertised region server web API port */
-   public static final String REGIONSERVER_INFO_PORT = "hbase.regionserver.info.port";
- 
--  /** Configuration key for bound region server web API port. (Defaults to REGIONSERVER_INFO_PORT.) */
-+  /** Configuration key for bound region server web API port */
-   public static final String REGIONSERVER_BOUND_INFO_PORT = "hbase.regionserver.bound.info.port";
- 
-   /** A flag that enables automatic selection of regionserver info port */
-diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/LocalHBaseCluster.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/LocalHBaseCluster.java
-index 816ef997cb..2114725986 100644
---- a/hbase-server/src/main/java/org/apache/hadoop/hbase/LocalHBaseCluster.java
-+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/LocalHBaseCluster.java
-@@ -144,20 +144,20 @@ public class LocalHBaseCluster {
-       // treat info ports special; expressly don't change '-1' (keep off)
-       // in case we make that the default behavior.
-       if (
--        conf.getInt(HConstants.REGIONSERVER_INFO_PORT, 0) != -1
--          && conf.getInt(HConstants.REGIONSERVER_INFO_PORT,
-+        conf.getInt(HConstants.REGIONSERVER_BOUND_INFO_PORT, 0) != -1
-+          && conf.getInt(HConstants.REGIONSERVER_BOUND_INFO_PORT,
-             HConstants.DEFAULT_REGIONSERVER_INFOPORT) == HConstants.DEFAULT_REGIONSERVER_INFOPORT
-       ) {
-         LOG.debug("Setting RS InfoServer Port to random.");
--        conf.set(HConstants.REGIONSERVER_INFO_PORT, "0");
-+        conf.set(HConstants.REGIONSERVER_BOUND_INFO_PORT, "0");
-       }
-       if (
--        conf.getInt(HConstants.MASTER_INFO_PORT, 0) != -1
--          && conf.getInt(HConstants.MASTER_INFO_PORT, HConstants.DEFAULT_MASTER_INFOPORT)
-+        conf.getInt(HConstants.MASTER_BOUND_INFO_PORT, 0) != -1
-+          && conf.getInt(HConstants.MASTER_BOUND_INFO_PORT, HConstants.DEFAULT_MASTER_INFOPORT)
-               == HConstants.DEFAULT_MASTER_INFOPORT
-       ) {
-         LOG.debug("Setting Master InfoServer Port to random.");
--        conf.set(HConstants.MASTER_INFO_PORT, "0");
-+        conf.set(HConstants.MASTER_BOUND_INFO_PORT, "0");
-       }
-     }
- 
-diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
-index 2f323518da..37cd7b3afd 100644
---- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
-+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
-@@ -20,7 +20,7 @@ package org.apache.hadoop.hbase.master;
- import static org.apache.hadoop.hbase.HConstants.DEFAULT_HBASE_SPLIT_COORDINATED_BY_ZK;
- import static org.apache.hadoop.hbase.HConstants.HBASE_MASTER_LOGCLEANER_PLUGINS;
- import static org.apache.hadoop.hbase.HConstants.HBASE_SPLIT_WAL_COORDINATED_BY_ZK;
--import static org.apache.hadoop.hbase.HConstants.MASTER_BOUND_INFO_PORT;
-+import static org.apache.hadoop.hbase.HConstants.MASTER_INFO_PORT;
- import static org.apache.hadoop.hbase.HConstants.MASTER_PORT;
- import static org.apache.hadoop.hbase.master.cleaner.HFileCleaner.CUSTOM_POOL_SIZE;
- import static org.apache.hadoop.hbase.util.DNS.MASTER_HOSTNAME_KEY;
-@@ -569,7 +569,7 @@ public class HMaster extends HRegionServer implements MasterServices {
- 
-   @Override
-   protected int getUseThisInfoPortInstead(Configuration conf) {
--    int port = conf.getInt(MASTER_BOUND_INFO_PORT, 0);
-+    int port = conf.getInt(MASTER_INFO_PORT, 0);
-     return port != 0 ? port : this.infoServer != null ? this.infoServer.getPort() : -1;
-   }
- 
-@@ -3143,7 +3143,7 @@ public class HMaster extends HRegionServer implements MasterServices {
-   public int getRegionServerInfoPort(final ServerName sn) {
-     int port = this.serverManager.getInfoPort(sn);
-     return port == 0
--      ? conf.getInt(HConstants.REGIONSERVER_INFO_PORT, HConstants.DEFAULT_REGIONSERVER_INFOPORT)
-+      ? conf.getInt(HConstants.REGIONSERVER_BOUND_INFO_PORT, HConstants.DEFAULT_REGIONSERVER_INFOPORT)
-       : port;
-   }
- 
-diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
-index 11bd1e58b5..358ce486f1 100644
---- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
-+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
-@@ -25,6 +25,7 @@ import static org.apache.hadoop.hbase.HConstants.DEFAULT_SLOW_LOG_SYS_TABLE_CHOR
- import static org.apache.hadoop.hbase.HConstants.HBASE_SPLIT_WAL_COORDINATED_BY_ZK;
- import static org.apache.hadoop.hbase.HConstants.HBASE_SPLIT_WAL_MAX_SPLITTER;
- import static org.apache.hadoop.hbase.HConstants.REGIONSERVER_BOUND_INFO_PORT;
-+import static org.apache.hadoop.hbase.HConstants.REGIONSERVER_INFO_PORT;
- import static org.apache.hadoop.hbase.HConstants.REGIONSERVER_PORT;
- import static org.apache.hadoop.hbase.HConstants.RPC_CLIENT_BIND_ADDRESS;
- import static org.apache.hadoop.hbase.master.waleventtracker.WALEventTrackerTableCreator.WAL_EVENT_TRACKER_ENABLED_DEFAULT;
-@@ -791,7 +792,7 @@ public class HRegionServer extends Thread
-   }
- 
-   protected int getUseThisInfoPortInstead(Configuration conf) {
--    int port = conf.getInt(REGIONSERVER_BOUND_INFO_PORT, 0);
-+    int port = conf.getInt(REGIONSERVER_INFO_PORT, 0);
-     return port != 0 ? port : this.infoServer != null ? this.infoServer.getPort() : -1;
-   }
- 
-@@ -2463,11 +2464,13 @@ public class HRegionServer extends Thread
-    */
-   private void putUpWebUI() throws IOException {
-     int port =
--      this.conf.getInt(HConstants.REGIONSERVER_INFO_PORT, HConstants.DEFAULT_REGIONSERVER_INFOPORT);
-+      this.conf.getInt(REGIONSERVER_BOUND_INFO_PORT,
-+        this.conf.getInt(REGIONSERVER_INFO_PORT, HConstants.DEFAULT_REGIONSERVER_INFOPORT));
-     String addr = this.conf.get("hbase.regionserver.info.bindAddress", "0.0.0.0");
- 
-     if (this instanceof HMaster) {
--      port = conf.getInt(HConstants.MASTER_INFO_PORT, HConstants.DEFAULT_MASTER_INFOPORT);
-+      port = conf.getInt(HConstants.MASTER_BOUND_INFO_PORT,
-+        this.conf.getInt(HConstants.MASTER_INFO_PORT, HConstants.DEFAULT_MASTER_INFOPORT));
-       addr = this.conf.get("hbase.master.info.bindAddress", "0.0.0.0");
-     }
-     // -1 is for disabling info server
-@@ -2503,12 +2506,18 @@ public class HRegionServer extends Thread
-         LOG.info("Retry starting http info server with port: " + port);
-       }
-     }
--    port = useThisInfoPortInstead;
--    conf.setInt(HConstants.REGIONSERVER_INFO_PORT, port);
-+
-+    // update bound ports
-+    port = this.infoServer.getPort();
-+    conf.setInt(REGIONSERVER_BOUND_INFO_PORT, port);
-+    conf.setInt(HConstants.MASTER_BOUND_INFO_PORT, port);
-+
-+    // set advertised ports
-+    conf.setInt(REGIONSERVER_INFO_PORT, useThisInfoPortInstead);
-     int masterInfoPort =
-       conf.getInt(HConstants.MASTER_INFO_PORT, HConstants.DEFAULT_MASTER_INFOPORT);
-     conf.setInt("hbase.master.info.port.orig", masterInfoPort);
--    conf.setInt(HConstants.MASTER_INFO_PORT, port);
-+    conf.setInt(HConstants.MASTER_INFO_PORT, useThisInfoPortInstead);
-   }
- 
-   /*
diff --git a/hbase/hbase/stackable/patches/2.6.1/patchable.toml b/hbase/hbase/stackable/patches/2.6.1/patchable.toml
deleted file mode 100644
index c1c9eacbf..000000000
--- a/hbase/hbase/stackable/patches/2.6.1/patchable.toml
+++ /dev/null
@@ -1,2 +0,0 @@
-base = "7ed50b4dd742269a78875fb32112215f831284ff"
-mirror = "https://github.com/stackabletech/hbase.git"
diff --git a/hbase/hbase/stackable/patches/2.6.2/0001-HBASE-28242-Updates-async-profiler-support.patch b/hbase/hbase/stackable/patches/2.6.2/0001-HBASE-28242-Updates-async-profiler-support.patch
deleted file mode 100644
index df2efe1e1..000000000
--- a/hbase/hbase/stackable/patches/2.6.2/0001-HBASE-28242-Updates-async-profiler-support.patch
+++ /dev/null
@@ -1,384 +0,0 @@
-From 3f32872b0c49ed7125803fd599e7f1318ce8c00a Mon Sep 17 00:00:00 2001
-From: Siegfried Weber <mail@siegfriedweber.net>
-Date: Tue, 6 Feb 2024 16:10:54 +0100
-Subject: HBASE-28242: Updates async-profiler support
-
----
- .../hadoop/hbase/http/ProfileServlet.java     | 205 +++++++++++-------
- 1 file changed, 121 insertions(+), 84 deletions(-)
-
-diff --git a/hbase-http/src/main/java/org/apache/hadoop/hbase/http/ProfileServlet.java b/hbase-http/src/main/java/org/apache/hadoop/hbase/http/ProfileServlet.java
-index e92b4f9ae0..521ad7c380 100644
---- a/hbase-http/src/main/java/org/apache/hadoop/hbase/http/ProfileServlet.java
-+++ b/hbase-http/src/main/java/org/apache/hadoop/hbase/http/ProfileServlet.java
-@@ -28,9 +28,11 @@ import java.util.concurrent.TimeUnit;
- import java.util.concurrent.atomic.AtomicInteger;
- import java.util.concurrent.locks.Lock;
- import java.util.concurrent.locks.ReentrantLock;
-+
- import javax.servlet.http.HttpServlet;
- import javax.servlet.http.HttpServletRequest;
- import javax.servlet.http.HttpServletResponse;
-+
- import org.apache.hadoop.hbase.util.ProcessUtils;
- import org.apache.yetus.audience.InterfaceAudience;
- import org.slf4j.Logger;
-@@ -40,23 +42,60 @@ import org.apache.hbase.thirdparty.com.google.common.base.Joiner;
- 
- /**
-  * Servlet that runs async-profiler as web-endpoint. Following options from async-profiler can be
-- * specified as query paramater. // -e event profiling event: cpu|alloc|lock|cache-misses etc. // -d
-- * duration run profiling for 'duration' seconds (integer) // -i interval sampling interval in
-- * nanoseconds (long) // -j jstackdepth maximum Java stack depth (integer) // -b bufsize frame
-- * buffer size (long) // -t profile different threads separately // -s simple class names instead of
-- * FQN // -o fmt[,fmt...] output format: summary|traces|flat|collapsed|svg|tree|jfr|html // --width
-- * px SVG width pixels (integer) // --height px SVG frame height pixels (integer) // --minwidth px
-- * skip frames smaller than px (double) // --reverse generate stack-reversed FlameGraph / Call tree
-- * Example: - To collect 30 second CPU profile of current process (returns FlameGraph svg) curl
-- * "http://localhost:10002/prof" - To collect 1 minute CPU profile of current process and output in
-- * tree format (html) curl "http://localhost:10002/prof?output=tree&amp;duration=60" - To collect 30
-- * second heap allocation profile of current process (returns FlameGraph svg) curl
-- * "http://localhost:10002/prof?event=alloc" - To collect lock contention profile of current process
-- * (returns FlameGraph svg) curl "http://localhost:10002/prof?event=lock" Following event types are
-- * supported (default is 'cpu') (NOTE: not all OS'es support all events) // Perf events: // cpu //
-- * page-faults // context-switches // cycles // instructions // cache-references // cache-misses //
-- * branches // branch-misses // bus-cycles // L1-dcache-load-misses // LLC-load-misses //
-- * dTLB-load-misses // mem:breakpoint // trace:tracepoint // Java events: // alloc // lock
-+ * specified as query parameter.
-+ * <ul>
-+ * <li>-e event profiling event: cpu|alloc|lock|cache-misses etc.</li>
-+ * <li>-d duration run profiling for 'duration' seconds (integer), default 10s</li>
-+ * <li>-i interval sampling interval in nanoseconds (long), default 10ms</li>
-+ * <li>-j jstackdepth maximum Java stack depth (integer), default 2048</li>
-+ * <li>-t profile different threads separately</li>
-+ * <li>-s simple class names instead of FQN</li>
-+ * <li>-g print method signatures</li>
-+ * <li>-a annotate Java methods</li>
-+ * <li>-l prepend library names</li>
-+ * <li>-o fmt output format: flat|traces|collapsed|flamegraph|tree|jfr</li>
-+ * <li>--minwidth pct skip frames smaller than pct% (double)</li>
-+ * <li>--reverse generate stack-reversed FlameGraph / Call tree</li>
-+ * </ul>
-+ * Example:
-+ * <ul>
-+ * <li>To collect 30 second CPU profile of current process (returns FlameGraph svg):
-+ * {@code curl http://localhost:10002/prof"}</li>
-+ * <li>To collect 1 minute CPU profile of current process and output in tree format (html)
-+ * {@code curl "http://localhost:10002/prof?output=tree&amp;duration=60"}</li>
-+ * <li>To collect 30 second heap allocation profile of current process (returns FlameGraph):
-+ * {@code curl "http://localhost:10002/prof?event=alloc"}</li>
-+ * <li>To collect lock contention profile of current process (returns FlameGraph):
-+ * {@code curl "http://localhost:10002/prof?event=lock"}</li>
-+ * </ul>
-+ * Following event types are supported (default is 'cpu') (NOTE: not all OS'es support all
-+ * events).<br/>
-+ * Basic events:
-+ * <ul>
-+ * <li>cpu</li>
-+ * <li>alloc</li>
-+ * <li>lock</li>
-+ * <li>wall</li>
-+ * <li>itimer</li>
-+ * </ul>
-+ * Perf events:
-+ * <ul>
-+ * <li>L1-dcache-load-misses</li>
-+ * <li>LLC-load-misses</li>
-+ * <li>branch-instructions</li>
-+ * <li>branch-misses</li>
-+ * <li>bus-cycles</li>
-+ * <li>cache-misses</li>
-+ * <li>cache-references</li>
-+ * <li>context-switches</li>
-+ * <li>cpu</li>
-+ * <li>cycles</li>
-+ * <li>dTLB-load-misses</li>
-+ * <li>instructions</li>
-+ * <li>mem:breakpoint</li>
-+ * <li>page-faults</li>
-+ * <li>trace:tracepoint</li>
-+ * </ul>
-  */
- @InterfaceAudience.Private
- public class ProfileServlet extends HttpServlet {
-@@ -81,19 +120,20 @@ public class ProfileServlet extends HttpServlet {
-     WALL("wall"),
-     ALLOC("alloc"),
-     LOCK("lock"),
--    PAGE_FAULTS("page-faults"),
-+    ITIMER("itimer"),
-+    BRANCH_INSTRUCTIONS("branch-instructions"),
-+    BRANCH_MISSES("branch-misses"),
-+    BUS_CYCLES("bus-cycles"),
-+    CACHE_MISSES("cache-misses"),
-+    CACHE_REFERENCES("cache-references"),
-     CONTEXT_SWITCHES("context-switches"),
-     CYCLES("cycles"),
-+    DTLB_LOAD_MISSES("dTLB-load-misses"),
-     INSTRUCTIONS("instructions"),
--    CACHE_REFERENCES("cache-references"),
--    CACHE_MISSES("cache-misses"),
--    BRANCHES("branches"),
--    BRANCH_MISSES("branch-misses"),
--    BUS_CYCLES("bus-cycles"),
-     L1_DCACHE_LOAD_MISSES("L1-dcache-load-misses"),
-     LLC_LOAD_MISSES("LLC-load-misses"),
--    DTLB_LOAD_MISSES("dTLB-load-misses"),
-     MEM_BREAKPOINT("mem:breakpoint"),
-+    PAGE_FAULTS("page-faults"),
-     TRACE_TRACEPOINT("trace:tracepoint"),;
- 
-     private final String internalName;
-@@ -102,11 +142,11 @@ public class ProfileServlet extends HttpServlet {
-       this.internalName = internalName;
-     }
- 
--    public String getInternalName() {
-+    String getInternalName() {
-       return internalName;
-     }
- 
--    public static Event fromInternalName(final String name) {
-+    static Event fromInternalName(final String name) {
-       for (Event event : values()) {
-         if (event.getInternalName().equalsIgnoreCase(name)) {
-           return event;
-@@ -117,30 +157,26 @@ public class ProfileServlet extends HttpServlet {
-     }
-   }
- 
--  enum Output {
--    SUMMARY,
--    TRACES,
--    FLAT,
-+  private enum Output {
-     COLLAPSED,
--    // No SVG in 2.x asyncprofiler.
--    SVG,
--    TREE,
-+    FLAMEGRAPH,
-+    FLAT,
-     JFR,
--    // In 2.x asyncprofiler, this is how you get flamegraphs.
--    HTML
-+    TRACES,
-+    TREE
-   }
- 
-   @edu.umd.cs.findbugs.annotations.SuppressWarnings(value = "SE_TRANSIENT_FIELD_NOT_RESTORED",
-       justification = "This class is never serialized nor restored.")
--  private transient Lock profilerLock = new ReentrantLock();
-+  private final transient Lock profilerLock = new ReentrantLock();
-   private transient volatile Process process;
--  private String asyncProfilerHome;
-+  private final String asyncProfilerHome;
-   private Integer pid;
- 
-   public ProfileServlet() {
-     this.asyncProfilerHome = getAsyncProfilerHome();
-     this.pid = ProcessUtils.getPid();
--    LOG.info("Servlet process PID: " + pid + " asyncProfilerHome: " + asyncProfilerHome);
-+    LOG.info("Servlet process PID: {} asyncProfilerHome: {}", pid, asyncProfilerHome);
-   }
- 
-   @Override
-@@ -159,9 +195,9 @@ public class ProfileServlet extends HttpServlet {
-       setResponseHeader(resp);
-       resp.getWriter()
-         .write("ASYNC_PROFILER_HOME env is not set.\n\n"
--          + "Please ensure the prerequsites for the Profiler Servlet have been installed and the\n"
-+          + "Please ensure the prerequisites for the Profiler Servlet have been installed and the\n"
-           + "environment is properly configured. For more information please see\n"
--          + "http://hbase.apache.org/book.html#profiler\n");
-+          + "https://hbase.apache.org/book.html#profiler\n");
-       return;
-     }
- 
-@@ -177,18 +213,18 @@ public class ProfileServlet extends HttpServlet {
-       return;
-     }
- 
--    final int duration = getInteger(req, "duration", DEFAULT_DURATION_SECONDS);
--    final Output output = getOutput(req);
--    final Event event = getEvent(req);
--    final Long interval = getLong(req, "interval");
--    final Integer jstackDepth = getInteger(req, "jstackdepth", null);
--    final Long bufsize = getLong(req, "bufsize");
--    final boolean thread = req.getParameterMap().containsKey("thread");
--    final boolean simple = req.getParameterMap().containsKey("simple");
--    final Integer width = getInteger(req, "width", null);
--    final Integer height = getInteger(req, "height", null);
--    final Double minwidth = getMinWidth(req);
--    final boolean reverse = req.getParameterMap().containsKey("reverse");
-+    Event event = getEvent(req);
-+    int duration = getInteger(req, "duration", DEFAULT_DURATION_SECONDS);
-+    Long interval = getLong(req, "interval");
-+    Integer jstackDepth = getInteger(req, "jstackdepth", null);
-+    boolean thread = req.getParameterMap().containsKey("thread");
-+    boolean simple = req.getParameterMap().containsKey("simple");
-+    boolean signature = req.getParameterMap().containsKey("signature");
-+    boolean annotate = req.getParameterMap().containsKey("annotate");
-+    boolean prependLib = req.getParameterMap().containsKey("prependlib");
-+    Output output = getOutput(req);
-+    Double minwidth = getMinWidth(req);
-+    boolean reverse = req.getParameterMap().containsKey("reverse");
- 
-     if (process == null || !process.isAlive()) {
-       try {
-@@ -208,11 +244,7 @@ public class ProfileServlet extends HttpServlet {
-             cmd.add("-e");
-             cmd.add(event.getInternalName());
-             cmd.add("-d");
--            cmd.add("" + duration);
--            cmd.add("-o");
--            cmd.add(output.name().toLowerCase());
--            cmd.add("-f");
--            cmd.add(outputFile.getAbsolutePath());
-+            cmd.add(String.valueOf(duration));
-             if (interval != null) {
-               cmd.add("-i");
-               cmd.add(interval.toString());
-@@ -221,24 +253,25 @@ public class ProfileServlet extends HttpServlet {
-               cmd.add("-j");
-               cmd.add(jstackDepth.toString());
-             }
--            if (bufsize != null) {
--              cmd.add("-b");
--              cmd.add(bufsize.toString());
--            }
-             if (thread) {
-               cmd.add("-t");
-             }
-             if (simple) {
-               cmd.add("-s");
-             }
--            if (width != null) {
--              cmd.add("--width");
--              cmd.add(width.toString());
-+            if (signature) {
-+              cmd.add("-g");
-             }
--            if (height != null) {
--              cmd.add("--height");
--              cmd.add(height.toString());
-+            if (annotate) {
-+              cmd.add("-a");
-             }
-+            if (prependLib) {
-+              cmd.add("-l");
-+            }
-+            cmd.add("-o");
-+            cmd.add(output.name().toLowerCase());
-+            cmd.add("-f");
-+            cmd.add(outputFile.getAbsolutePath());
-             if (minwidth != null) {
-               cmd.add("--minwidth");
-               cmd.add(minwidth.toString());
-@@ -246,6 +279,7 @@ public class ProfileServlet extends HttpServlet {
-             if (reverse) {
-               cmd.add("--reverse");
-             }
-+
-             cmd.add(pid.toString());
-             process = ProcessUtils.runCmdAsync(cmd);
- 
-@@ -256,7 +290,10 @@ public class ProfileServlet extends HttpServlet {
-             resp.getWriter()
-               .write("Started [" + event.getInternalName()
-                 + "] profiling. This page will automatically redirect to " + relativeUrl + " after "
--                + duration + " seconds.\n\nCommand:\n" + Joiner.on(" ").join(cmd));
-+                + duration + " seconds. "
-+                + "If empty diagram and Linux 4.6+, see 'Basic Usage' section on the Async "
-+                + "Profiler Home Page, https://github.com/jvm-profiling-tools/async-profiler."
-+                + "\n\nCommand:\n" + Joiner.on(" ").join(cmd));
- 
-             // to avoid auto-refresh by ProfileOutputServlet, refreshDelay can be specified
-             // via url param
-@@ -274,8 +311,9 @@ public class ProfileServlet extends HttpServlet {
-           resp.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
-           resp.getWriter()
-             .write("Unable to acquire lock. Another instance of profiler might be running.");
--          LOG.warn("Unable to acquire lock in " + lockTimeoutSecs
--            + " seconds. Another instance of profiler might be running.");
-+          LOG.warn(
-+            "Unable to acquire lock in {} seconds. Another instance of profiler might be running.",
-+            lockTimeoutSecs);
-         }
-       } catch (InterruptedException e) {
-         LOG.warn("Interrupted while acquiring profile lock.", e);
-@@ -288,9 +326,9 @@ public class ProfileServlet extends HttpServlet {
-     }
-   }
- 
--  private Integer getInteger(final HttpServletRequest req, final String param,
-+  private static Integer getInteger(final HttpServletRequest req, final String param,
-     final Integer defaultValue) {
--    final String value = req.getParameter(param);
-+    String value = req.getParameter(param);
-     if (value != null) {
-       try {
-         return Integer.valueOf(value);
-@@ -301,8 +339,8 @@ public class ProfileServlet extends HttpServlet {
-     return defaultValue;
-   }
- 
--  private Long getLong(final HttpServletRequest req, final String param) {
--    final String value = req.getParameter(param);
-+  private static Long getLong(final HttpServletRequest req, final String param) {
-+    String value = req.getParameter(param);
-     if (value != null) {
-       try {
-         return Long.valueOf(value);
-@@ -313,8 +351,8 @@ public class ProfileServlet extends HttpServlet {
-     return null;
-   }
- 
--  private Double getMinWidth(final HttpServletRequest req) {
--    final String value = req.getParameter("minwidth");
-+  private static Double getMinWidth(final HttpServletRequest req) {
-+    String value = req.getParameter("minwidth");
-     if (value != null) {
-       try {
-         return Double.valueOf(value);
-@@ -325,8 +363,8 @@ public class ProfileServlet extends HttpServlet {
-     return null;
-   }
- 
--  private Event getEvent(final HttpServletRequest req) {
--    final String eventArg = req.getParameter("event");
-+  private static Event getEvent(final HttpServletRequest req) {
-+    String eventArg = req.getParameter("event");
-     if (eventArg != null) {
-       Event event = Event.fromInternalName(eventArg);
-       return event == null ? Event.CPU : event;
-@@ -334,16 +372,16 @@ public class ProfileServlet extends HttpServlet {
-     return Event.CPU;
-   }
- 
--  private Output getOutput(final HttpServletRequest req) {
--    final String outputArg = req.getParameter("output");
-+  private static Output getOutput(final HttpServletRequest req) {
-+    String outputArg = req.getParameter("output");
-     if (req.getParameter("output") != null) {
-       try {
-         return Output.valueOf(outputArg.trim().toUpperCase());
-       } catch (IllegalArgumentException e) {
--        return Output.HTML;
-+        return Output.FLAMEGRAPH;
-       }
-     }
--    return Output.HTML;
-+    return Output.FLAMEGRAPH;
-   }
- 
-   static void setResponseHeader(final HttpServletResponse response) {
-@@ -375,8 +413,7 @@ public class ProfileServlet extends HttpServlet {
-         .write("The profiler servlet was disabled at startup.\n\n"
-           + "Please ensure the prerequisites for the Profiler Servlet have been installed and the\n"
-           + "environment is properly configured. For more information please see\n"
--          + "http://hbase.apache.org/book.html#profiler\n");
--      return;
-+          + "https://hbase.apache.org/book.html#profiler\n");
-     }
- 
-   }
diff --git a/hbase/hbase/stackable/patches/2.6.2/0002-Update-all-dependencies-which-have-a-new-patch-updat.patch b/hbase/hbase/stackable/patches/2.6.2/0002-Update-all-dependencies-which-have-a-new-patch-updat.patch
deleted file mode 100644
index c88e444a4..000000000
--- a/hbase/hbase/stackable/patches/2.6.2/0002-Update-all-dependencies-which-have-a-new-patch-updat.patch
+++ /dev/null
@@ -1,119 +0,0 @@
-From d50dc29c05f49b9eb44fc149a5533faa6595d922 Mon Sep 17 00:00:00 2001
-From: Razvan-Daniel Mihai <84674+razvan@users.noreply.github.com>
-Date: Tue, 6 May 2025 13:11:25 +0200
-Subject: Update all dependencies which have a new patch update available
-
----
- pom.xml | 44 ++++++++++++++++++++++----------------------
- 1 file changed, 22 insertions(+), 22 deletions(-)
-
-diff --git a/pom.xml b/pom.xml
-index e4be54a0ad..7d40196351 100644
---- a/pom.xml
-+++ b/pom.xml
-@@ -566,7 +566,7 @@
-       in the dependencyManagement section as it could still lead to different versions of netty
-       modules and cause trouble if we only rely on transitive dependencies.
-     -->
--    <netty4.version>4.1.116.Final</netty4.version>
-+    <netty4.version>4.1.122.Final</netty4.version>
-     <!-- end HBASE-15925 default hadoop compatibility values -->
-     <audience-annotations.version>0.13.0</audience-annotations.version>
-     <!--
-@@ -575,27 +575,27 @@
-     -->
-     <javadoc.audience-annotations.version>0.13.0</javadoc.audience-annotations.version>
-     <avro.version>1.11.4</avro.version>
--    <caffeine.version>2.8.1</caffeine.version>
-+    <caffeine.version>2.8.8</caffeine.version>
-     <commons-codec.version>1.15</commons-codec.version>
-     <commons-io.version>2.18.0</commons-io.version>
-     <commons-lang3.version>3.9</commons-lang3.version>
-     <commons-math.version>3.6.1</commons-math.version>
-     <commons-cli.version>1.5.0</commons-cli.version>
-     <disruptor.version>3.4.4</disruptor.version>
--    <httpclient.version>4.5.13</httpclient.version>
--    <httpcore.version>4.4.13</httpcore.version>
-+    <httpclient.version>4.5.14</httpclient.version>
-+    <httpcore.version>4.4.16</httpcore.version>
-     <metrics-core.version>3.2.6</metrics-core.version>
-     <!--
-       Note that the version of jackson-[annotations,core,databind] must be kept in sync with the
-       version of jackson-jaxrs-json-provider shipped in hbase-thirdparty.
-     -->
--    <jackson.version>2.17.2</jackson.version>
--    <jackson.databind.version>2.17.2</jackson.databind.version>
-+    <jackson.version>2.17.3</jackson.version>
-+    <jackson.databind.version>2.17.3</jackson.databind.version>
-     <jaxb-api.version>2.3.1</jaxb-api.version>
-     <servlet.api.version>3.1.0</servlet.api.version>
-     <wx.rs.api.version>2.1.1</wx.rs.api.version>
--    <tomcat.jasper.version>9.0.93</tomcat.jasper.version>
--    <jruby.version>9.3.13.0</jruby.version>
-+    <tomcat.jasper.version>9.0.106</tomcat.jasper.version>
-+    <jruby.version>9.3.15.0</jruby.version>
-     <junit.version>4.13.2</junit.version>
-     <hamcrest.version>1.3</hamcrest.version>
-     <opentelemetry.version>1.15.0</opentelemetry.version>
-@@ -613,19 +613,19 @@
-     <internal.protobuf.version>4.28.2</internal.protobuf.version>
-     <protobuf.plugin.version>0.6.1</protobuf.plugin.version>
-     <thrift.path>thrift</thrift.path>
--    <thrift.version>0.14.1</thrift.version>
-+    <thrift.version>0.14.2</thrift.version>
-     <zookeeper.version>3.8.4</zookeeper.version>
-     <jline.version>2.11</jline.version>
--    <slf4j.version>1.7.33</slf4j.version>
-+    <slf4j.version>1.7.36</slf4j.version>
-     <clover.version>4.0.3</clover.version>
-     <jamon-runtime.version>2.4.1</jamon-runtime.version>
-     <jettison.version>1.5.4</jettison.version>
-     <!--Make sure these joni/jcodings are compatible with the versions used by jruby-->
--    <joni.version>2.2.1</joni.version>
--    <jcodings.version>1.0.58</jcodings.version>
-+    <joni.version>2.2.6</joni.version>
-+    <jcodings.version>1.0.63</jcodings.version>
-     <spy.version>2.12.3</spy.version>
--    <bouncycastle.version>1.78</bouncycastle.version>
--    <skyscreamer.version>1.5.1</skyscreamer.version>
-+    <bouncycastle.version>1.78.1</bouncycastle.version>
-+    <skyscreamer.version>1.5.3</skyscreamer.version>
-     <kerby.version>1.0.1</kerby.version>
-     <commons-crypto.version>1.1.0</commons-crypto.version>
-     <curator.version>4.2.0</curator.version>
-@@ -642,27 +642,27 @@
-     <lifecycle.mapping.version>1.0.0</lifecycle.mapping.version>
-     <maven.antrun.version>1.8</maven.antrun.version>
-     <maven.bundle.version>3.3.0</maven.bundle.version>
--    <maven.checkstyle.version>3.1.0</maven.checkstyle.version>
-+    <maven.checkstyle.version>3.1.2</maven.checkstyle.version>
-     <maven.eclipse.version>2.10</maven.eclipse.version>
-     <maven.gpg.version>3.0.1</maven.gpg.version>
--    <maven.javadoc.version>3.4.0</maven.javadoc.version>
--    <maven.warbucks.version>1.1.0</maven.warbucks.version>
-+    <maven.javadoc.version>3.4.1</maven.javadoc.version>
-+    <maven.warbucks.version>1.1.2</maven.warbucks.version>
-     <maven.project.info.report.version>3.1.2</maven.project.info.report.version>
-     <os.maven.version>1.5.0.Final</os.maven.version>
-     <findbugs-annotations.version>1.3.9-1</findbugs-annotations.version>
-     <spotbugs.version>4.7.3</spotbugs.version>
--    <spotbugs.maven.version>4.7.2.1</spotbugs.maven.version>
--    <surefire.version>3.1.0</surefire.version>
-+    <spotbugs.maven.version>4.7.3.6</spotbugs.maven.version>
-+    <surefire.version>3.1.2</surefire.version>
-     <wagon.ssh.version>2.12</wagon.ssh.version>
-     <xml.maven.version>1.0.1</xml.maven.version>
-     <spotless.version>2.27.2</spotless.version>
--    <maven-site.version>3.12.0</maven-site.version>
-+    <maven-site.version>3.12.1</maven-site.version>
-     <!-- compression -->
-     <aircompressor.version>0.27</aircompressor.version>
-     <brotli4j.version>1.11.0</brotli4j.version>
-     <lz4.version>1.8.0</lz4.version>
--    <snappy.version>1.1.10.4</snappy.version>
--    <zstd-jni.version>1.5.5-2</zstd-jni.version>
-+    <snappy.version>1.1.10.7</snappy.version>
-+    <zstd-jni.version>1.5.7-3</zstd-jni.version>
-     <!--
-         Note that the version of protobuf shipped in hbase-thirdparty must match the version used
-         in hbase-protocol-shaded and hbase-examples. The version of jackson-[annotations,core,
diff --git a/hbase/hbase/stackable/patches/2.6.2/0003-Include-jackson-dataformat-xml.patch b/hbase/hbase/stackable/patches/2.6.2/0003-Include-jackson-dataformat-xml.patch
deleted file mode 100644
index ee0565f1e..000000000
--- a/hbase/hbase/stackable/patches/2.6.2/0003-Include-jackson-dataformat-xml.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From d374ae35545500652411db02a9661dc884d6e8e1 Mon Sep 17 00:00:00 2001
-From: Razvan-Daniel Mihai <84674+razvan@users.noreply.github.com>
-Date: Fri, 12 Jul 2024 17:30:12 -0400
-Subject: Include jackson-dataformat-xml.
-
-This is needed for XmlLayout to work so our structured logging works.
-It is an optional dependency of log4j2 so we need to make sure to include
-it.
----
- hbase-assembly/pom.xml |  5 +++++
- pom.xml                | 12 ++++++++++++
- 2 files changed, 17 insertions(+)
-
-diff --git a/hbase-assembly/pom.xml b/hbase-assembly/pom.xml
-index 459d3d2cb9..a5ae653d02 100644
---- a/hbase-assembly/pom.xml
-+++ b/hbase-assembly/pom.xml
-@@ -221,6 +221,11 @@
-       <groupId>org.apache.logging.log4j</groupId>
-       <artifactId>log4j-core</artifactId>
-     </dependency>
-+    <dependency>
-+      <!-- This is an optional dependency of log4j which is needed to use XmlLayout -->
-+      <groupId>com.fasterxml.jackson.dataformat</groupId>
-+      <artifactId>jackson-dataformat-xml</artifactId>
-+    </dependency>
-     <dependency>
-       <groupId>org.apache.logging.log4j</groupId>
-       <artifactId>log4j-slf4j-impl</artifactId>
-diff --git a/pom.xml b/pom.xml
-index 7d40196351..c907686136 100644
---- a/pom.xml
-+++ b/pom.xml
-@@ -1157,6 +1157,11 @@
-         <artifactId>log4j-core</artifactId>
-         <version>${log4j2.version}</version>
-       </dependency>
-+      <dependency>
-+        <groupId>org.apache.logging.log4j</groupId>
-+        <artifactId>log4j-core</artifactId>
-+        <version>${log4j2.version}</version>
-+      </dependency>
-       <dependency>
-         <groupId>org.apache.logging.log4j</groupId>
-         <artifactId>log4j-slf4j-impl</artifactId>
-@@ -1167,6 +1172,13 @@
-         <artifactId>log4j-1.2-api</artifactId>
-         <version>${log4j2.version}</version>
-       </dependency>
-+      <dependency>
-+        <!-- This is an optional dependency of log4j which is needed to use XmlLayout -->
-+        <groupId>com.fasterxml.jackson.dataformat</groupId>
-+        <artifactId>jackson-dataformat-xml</artifactId>
-+        <version>${jackson.databind.version}</version>
-+      </dependency>
-+
-       <!-- Avro dependencies we mostly get transitively, manual version coallescing -->
-       <dependency>
-         <groupId>org.apache.avro</groupId>
diff --git a/hbase/hbase/stackable/patches/2.6.2/0004-Bump-cyclonedx-maven-plugin-to-version-2.9.1-and-twe.patch b/hbase/hbase/stackable/patches/2.6.2/0004-Bump-cyclonedx-maven-plugin-to-version-2.9.1-and-twe.patch
deleted file mode 100644
index ac2178bbb..000000000
--- a/hbase/hbase/stackable/patches/2.6.2/0004-Bump-cyclonedx-maven-plugin-to-version-2.9.1-and-twe.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 50f6936c35406b4e652ccc08ae7e386d8ca3fc48 Mon Sep 17 00:00:00 2001
-From: Lukas Voetmand <lukas.voetmand@stackable.tech>
-Date: Fri, 6 Sep 2024 17:53:52 +0200
-Subject: Bump cyclonedx-maven-plugin to version 2.9.1 and tweak its
- configuration
-
----
- pom.xml | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/pom.xml b/pom.xml
-index c907686136..c1fba4ab9a 100644
---- a/pom.xml
-+++ b/pom.xml
-@@ -3275,7 +3275,11 @@
-           <plugin>
-             <groupId>org.cyclonedx</groupId>
-             <artifactId>cyclonedx-maven-plugin</artifactId>
--            <version>2.7.10</version>
-+            <version>2.9.1</version>
-+            <configuration>
-+                <projectType>application</projectType>
-+                <schemaVersion>1.5</schemaVersion>
-+            </configuration>
-             <executions>
-               <execution>
-                 <goals>
diff --git a/hbase/hbase/stackable/patches/2.6.2/0005-Allow-overriding-ipc-bind-port-and-use-alternative-p.patch b/hbase/hbase/stackable/patches/2.6.2/0005-Allow-overriding-ipc-bind-port-and-use-alternative-p.patch
deleted file mode 100644
index 7f9dc023e..000000000
--- a/hbase/hbase/stackable/patches/2.6.2/0005-Allow-overriding-ipc-bind-port-and-use-alternative-p.patch
+++ /dev/null
@@ -1,314 +0,0 @@
-From d8b2c245ad1ee6f79060875cc76049e97f7b459b Mon Sep 17 00:00:00 2001
-From: Andrew Kenworthy <andrew.kenworthy@stackable.tech>
-Date: Mon, 16 Jun 2025 14:44:32 +0200
-Subject: Allow overriding ipc bind port and use alternative port from listener
-
----
- .../org/apache/hadoop/hbase/HConstants.java   | 29 ++++++++++--
- .../apache/hadoop/hbase/master/HMaster.java   | 20 +++++++--
- .../hbase/regionserver/HRegionServer.java     | 45 +++++++++++++------
- .../hbase/regionserver/RSRpcServices.java     |  8 +++-
- 4 files changed, 80 insertions(+), 22 deletions(-)
-
-diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/HConstants.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/HConstants.java
-index 12f8bc6df0..4d892755d2 100644
---- a/hbase-common/src/main/java/org/apache/hadoop/hbase/HConstants.java
-+++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/HConstants.java
-@@ -194,18 +194,27 @@ public final class HConstants {
-   /** default host address */
-   public static final String DEFAULT_HOST = "0.0.0.0";
- 
--  /** Parameter name for port master listens on. */
-+  /** Parameter name for port master advertises as listening on. */
-   public static final String MASTER_PORT = "hbase.master.port";
- 
-+  /** Parameter name for IPC address that master listens on. (Defaults to hostname.) */
-+  public static final String MASTER_IPC_ADDRESS = "hbase.master.ipc.address";
-+
-+  /** Parameter name for IPC port that master listens on. (Defaults to MASTER_PORT.) */
-+  public static final String MASTER_IPC_PORT = "hbase.master.ipc.port";
-+
-   /** default port that the master listens on */
-   public static final int DEFAULT_MASTER_PORT = 16000;
- 
-   /** default port for master web api */
-   public static final int DEFAULT_MASTER_INFOPORT = 16010;
- 
--  /** Configuration key for master web API port */
-+  /** Configuration key for advertised master web API port */
-   public static final String MASTER_INFO_PORT = "hbase.master.info.port";
- 
-+  /** Configuration key for bound master web API port. (Defaults to MASTER_INFO_PORT.) */
-+  public static final String MASTER_BOUND_INFO_PORT = "hbase.master.bound.info.port";
-+
-   /** Configuration key for the list of master host:ports **/
-   public static final String MASTER_ADDRS_KEY = "hbase.masters";
- 
-@@ -313,18 +322,27 @@ public final class HConstants {
-   /** Default value for ZooKeeper session timeout */
-   public static final int DEFAULT_ZK_SESSION_TIMEOUT = 90 * 1000;
- 
--  /** Parameter name for port region server listens on. */
-+  /** Parameter name for port region server advertises as listening on. */
-   public static final String REGIONSERVER_PORT = "hbase.regionserver.port";
- 
-+  /** Parameter name for IPC address that region server listens on. (Defaults to hostname.) */
-+  public static final String REGIONSERVER_IPC_ADDRESS = "hbase.regionserver.ipc.address";
-+
-+  /** Parameter name for IPC port that region server listens on. (Defaults to REGIONSERVER_PORT.) */
-+  public static final String REGIONSERVER_IPC_PORT = "hbase.regionserver.ipc.port";
-+
-   /** Default port region server listens on. */
-   public static final int DEFAULT_REGIONSERVER_PORT = 16020;
- 
-   /** default port for region server web api */
-   public static final int DEFAULT_REGIONSERVER_INFOPORT = 16030;
- 
--  /** A configuration key for regionserver info port */
-+  /** Configuration key for advertised region server web API port */
-   public static final String REGIONSERVER_INFO_PORT = "hbase.regionserver.info.port";
- 
-+  /** Configuration key for bound region server web API port. (Defaults to REGIONSERVER_INFO_PORT.) */
-+  public static final String REGIONSERVER_BOUND_INFO_PORT = "hbase.regionserver.bound.info.port";
-+
-   /** A flag that enables automatic selection of regionserver info port */
-   public static final String REGIONSERVER_INFO_PORT_AUTO = REGIONSERVER_INFO_PORT + ".auto";
- 
-@@ -1397,6 +1415,9 @@ public final class HConstants {
-   /** Configuration key for setting RPC codec class name */
-   public static final String RPC_CODEC_CONF_KEY = "hbase.client.rpc.codec";
- 
-+  /** Configuration key for setting that the RPC client should bind the client address. This forces outgoing RPC traffic to happen from the same network interface that the RPC server is bound on. */
-+  public static final String RPC_CLIENT_BIND_ADDRESS = "hbase.client.rpc.bind.address";
-+
-   /** Configuration key for setting replication codec class name */
-   public static final String REPLICATION_CODEC_CONF_KEY = "hbase.replication.rpc.codec";
- 
-diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
-index 9cafbb7cbf..313124d1d0 100644
---- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
-+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
-@@ -17,6 +17,8 @@
-  */
- package org.apache.hadoop.hbase.master;
- 
-+import static org.apache.hadoop.hbase.HConstants.MASTER_BOUND_INFO_PORT;
-+import static org.apache.hadoop.hbase.HConstants.MASTER_PORT;
- import static org.apache.hadoop.hbase.HConstants.DEFAULT_HBASE_SPLIT_COORDINATED_BY_ZK;
- import static org.apache.hadoop.hbase.HConstants.HBASE_MASTER_LOGCLEANER_PLUGINS;
- import static org.apache.hadoop.hbase.HConstants.HBASE_SPLIT_WAL_COORDINATED_BY_ZK;
-@@ -570,6 +572,18 @@ public class HMaster extends HRegionServer implements MasterServices {
-     return conf.get(MASTER_HOSTNAME_KEY);
-   }
- 
-+  @Override
-+  protected int getUseThisPortInstead(Configuration conf) {
-+    int port = conf.getInt(MASTER_PORT, 0);
-+    return port != 0 ? port : this.rpcServices.getSocketAddress().getPort();
-+  }
-+
-+  @Override
-+  protected int getUseThisInfoPortInstead(Configuration conf) {
-+        int port = conf.getInt(MASTER_BOUND_INFO_PORT, 0);
-+        return port != 0 ? port : this.infoServer != null ? this.infoServer.getPort() : -1;
-+  }
-+
-   private void registerConfigurationObservers() {
-     configurationManager.registerObserver(this.rpcServices);
-     configurationManager.registerObserver(this);
-@@ -597,8 +611,8 @@ public class HMaster extends HRegionServer implements MasterServices {
-       registerConfigurationObservers();
-       Threads.setDaemonThreadRunning(new Thread(() -> TraceUtil.trace(() -> {
-         try {
--          int infoPort = putUpJettyServer();
--          startActiveMasterManager(infoPort);
-+          putUpJettyServer();
-+          startActiveMasterManager(useThisInfoPortInstead);
-         } catch (Throwable t) {
-           // Make sure we log the exception.
-           String error = "Failed to become Active Master";
-@@ -3006,7 +3020,7 @@ public class HMaster extends HRegionServer implements MasterServices {
-         }
-         case MASTER_INFO_PORT: {
-           if (infoServer != null) {
--            builder.setMasterInfoPort(infoServer.getPort());
-+            builder.setMasterInfoPort(useThisInfoPortInstead);
-           }
-           break;
-         }
-diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
-index 351b4fef19..68f56ab796 100644
---- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
-+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
-@@ -24,6 +24,9 @@ import static org.apache.hadoop.hbase.HConstants.DEFAULT_HBASE_SPLIT_WAL_MAX_SPL
- import static org.apache.hadoop.hbase.HConstants.DEFAULT_SLOW_LOG_SYS_TABLE_CHORE_DURATION;
- import static org.apache.hadoop.hbase.HConstants.HBASE_SPLIT_WAL_COORDINATED_BY_ZK;
- import static org.apache.hadoop.hbase.HConstants.HBASE_SPLIT_WAL_MAX_SPLITTER;
-+import static org.apache.hadoop.hbase.HConstants.REGIONSERVER_BOUND_INFO_PORT;
-+import static org.apache.hadoop.hbase.HConstants.REGIONSERVER_PORT;
-+import static org.apache.hadoop.hbase.HConstants.RPC_CLIENT_BIND_ADDRESS;
- import static org.apache.hadoop.hbase.master.waleventtracker.WALEventTrackerTableCreator.WAL_EVENT_TRACKER_ENABLED_DEFAULT;
- import static org.apache.hadoop.hbase.master.waleventtracker.WALEventTrackerTableCreator.WAL_EVENT_TRACKER_ENABLED_KEY;
- import static org.apache.hadoop.hbase.namequeues.NamedQueueServiceChore.NAMED_QUEUE_CHORE_DURATION_DEFAULT;
-@@ -505,6 +508,10 @@ public class HRegionServer extends Thread
-    */
-   protected String useThisHostnameInstead;
- 
-+  protected int useThisPortInstead;
-+
-+  protected int useThisInfoPortInstead;
-+
-   /**
-    * @deprecated since 2.4.0 and will be removed in 4.0.0. Use
-    *             {@link HRegionServer#UNSAFE_RS_HOSTNAME_DISABLE_MASTER_REVERSEDNS_KEY} instead.
-@@ -669,6 +676,8 @@ public class HRegionServer extends Thread
-       this.namedQueueRecorder = NamedQueueRecorder.getInstance(this.conf);
-       rpcServices = createRpcServices();
-       useThisHostnameInstead = getUseThisHostnameInstead(conf);
-+      useThisPortInstead = getUseThisPortInstead(conf);
-+      useThisInfoPortInstead = getUseThisInfoPortInstead(conf);
- 
-       // if use-ip is enabled, we will use ip to expose Master/RS service for client,
-       // see HBASE-27304 for details.
-@@ -678,7 +687,7 @@ public class HRegionServer extends Thread
-         useIp ? rpcServices.isa.getAddress().getHostAddress() : rpcServices.isa.getHostName();
-       String hostName =
-         StringUtils.isBlank(useThisHostnameInstead) ? isaHostName : useThisHostnameInstead;
--      serverName = ServerName.valueOf(hostName, this.rpcServices.isa.getPort(), this.startcode);
-+      serverName = ServerName.valueOf(hostName, useThisPortInstead, this.startcode);
- 
-       rpcControllerFactory = RpcControllerFactory.instantiate(this.conf);
-       rpcRetryingCallerFactory = RpcRetryingCallerFactory.instantiate(this.conf,
-@@ -715,7 +724,7 @@ public class HRegionServer extends Thread
- 
-       // Some unit tests don't need a cluster, so no zookeeper at all
-       // Open connection to zookeeper and set primary watcher
--      zooKeeper = new ZKWatcher(conf, getProcessName() + ":" + rpcServices.isa.getPort(), this,
-+      zooKeeper = new ZKWatcher(conf, getProcessName() + ":" + useThisPortInstead, this,
-         canCreateBaseZNode());
-       // If no master in cluster, skip trying to track one or look for a cluster status.
-       if (!this.masterless) {
-@@ -776,6 +785,16 @@ public class HRegionServer extends Thread
-     }
-   }
- 
-+  protected int getUseThisPortInstead(Configuration conf) {
-+    int port = conf.getInt(REGIONSERVER_PORT, 0);
-+    return port != 0 ? port : this.rpcServices.isa.getPort();
-+  }
-+
-+  protected int getUseThisInfoPortInstead(Configuration conf) {
-+    int port = conf.getInt(REGIONSERVER_BOUND_INFO_PORT, 0);
-+    return port != 0 ? port : this.infoServer != null ? this.infoServer.getPort() : -1;
-+  }
-+
-   private void setupSignalHandlers() {
-     if (!SystemUtils.IS_OS_WINDOWS) {
-       HBasePlatformDependent.handle("HUP", (number, name) -> {
-@@ -958,7 +977,7 @@ public class HRegionServer extends Thread
-       }
-       // Setup RPC client for master communication
-       this.rpcClient = RpcClientFactory.createClient(conf, clusterId,
--        new InetSocketAddress(this.rpcServices.isa.getAddress(), 0),
-+        getInetSocketAddress(this.conf),
-         clusterConnection.getConnectionMetrics(), Collections.emptyMap());
-       span.setStatus(StatusCode.OK);
-     } catch (Throwable t) {
-@@ -972,6 +991,11 @@ public class HRegionServer extends Thread
-     }
-   }
- 
-+  private InetSocketAddress getInetSocketAddress(Configuration conf) {
-+    return conf.getBoolean(RPC_CLIENT_BIND_ADDRESS, true) ?
-+      new InetSocketAddress(this.rpcServices.isa.getAddress(), 0) : new InetSocketAddress(0);
-+  }
-+
-   /**
-    * Bring up connection to zk ensemble and then wait until a master for this cluster and then after
-    * that, wait until cluster 'up' flag has been set. This is the order in which master does things.
-@@ -1528,11 +1552,7 @@ public class HRegionServer extends Thread
- 
-     serverLoad.setReportStartTime(reportStartTime);
-     serverLoad.setReportEndTime(reportEndTime);
--    if (this.infoServer != null) {
--      serverLoad.setInfoServerPort(this.infoServer.getPort());
--    } else {
--      serverLoad.setInfoServerPort(-1);
--    }
-+    serverLoad.setInfoServerPort(useThisInfoPortInstead);
-     MetricsUserAggregateSource userSource =
-       metricsRegionServer.getMetricsUserAggregate().getSource();
-     if (userSource != null) {
-@@ -1688,7 +1708,7 @@ public class HRegionServer extends Thread
-         if (key.equals(HConstants.KEY_FOR_HOSTNAME_SEEN_BY_MASTER)) {
-           String hostnameFromMasterPOV = e.getValue();
-           this.serverName = ServerName.valueOf(hostnameFromMasterPOV,
--            rpcServices.getSocketAddress().getPort(), this.startcode);
-+            useThisPortInstead, this.startcode);
-           String expectedHostName = rpcServices.getSocketAddress().getHostName();
-           // if Master use-ip is enabled, RegionServer use-ip will be enabled by default even if it
-           // is set to disable. so we will use the ip of the RegionServer to compare with the
-@@ -1814,7 +1834,7 @@ public class HRegionServer extends Thread
- 
-   private void createMyEphemeralNode() throws KeeperException {
-     RegionServerInfo.Builder rsInfo = RegionServerInfo.newBuilder();
--    rsInfo.setInfoPort(infoServer != null ? infoServer.getPort() : -1);
-+    rsInfo.setInfoPort(infoServer != null ? useThisInfoPortInstead : -1);
-     rsInfo.setVersionInfo(ProtobufUtil.getVersionInfo());
-     byte[] data = ProtobufUtil.prependPBMagic(rsInfo.build().toByteArray());
-     ZKUtil.createEphemeralNodeAndWatch(this.zooKeeper, getMyEphemeralNodePath(), data);
-@@ -2481,7 +2501,7 @@ public class HRegionServer extends Thread
-         LOG.info("Retry starting http info server with port: " + port);
-       }
-     }
--    port = this.infoServer.getPort();
-+    port = useThisInfoPortInstead;
-     conf.setInt(HConstants.REGIONSERVER_INFO_PORT, port);
-     int masterInfoPort =
-       conf.getInt(HConstants.MASTER_INFO_PORT, HConstants.DEFAULT_MASTER_INFOPORT);
-@@ -3075,12 +3095,11 @@ public class HRegionServer extends Thread
-       LOG.info("reportForDuty to master=" + masterServerName + " with isa=" + rpcServices.isa
-         + ", startcode=" + this.startcode);
-       long now = EnvironmentEdgeManager.currentTime();
--      int port = rpcServices.isa.getPort();
-       RegionServerStartupRequest.Builder request = RegionServerStartupRequest.newBuilder();
-       if (!StringUtils.isBlank(useThisHostnameInstead)) {
-         request.setUseThisHostnameInstead(useThisHostnameInstead);
-       }
--      request.setPort(port);
-+      request.setPort(useThisPortInstead);
-       request.setServerStartCode(this.startcode);
-       request.setServerCurrentTime(now);
-       result = rss.regionServerStartup(null, request.build());
-diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RSRpcServices.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RSRpcServices.java
-index b77fcf338a..a86cd273ff 100644
---- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RSRpcServices.java
-+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RSRpcServices.java
-@@ -280,6 +280,10 @@ import org.apache.hadoop.hbase.shaded.protobuf.generated.WALProtos.BulkLoadDescr
- import org.apache.hadoop.hbase.shaded.protobuf.generated.WALProtos.CompactionDescriptor;
- import org.apache.hadoop.hbase.shaded.protobuf.generated.WALProtos.FlushDescriptor;
- import org.apache.hadoop.hbase.shaded.protobuf.generated.WALProtos.RegionEventDescriptor;
-+import static org.apache.hadoop.hbase.HConstants.MASTER_IPC_ADDRESS;
-+import static org.apache.hadoop.hbase.HConstants.MASTER_IPC_PORT;
-+import static org.apache.hadoop.hbase.HConstants.REGIONSERVER_IPC_ADDRESS;
-+import static org.apache.hadoop.hbase.HConstants.REGIONSERVER_IPC_PORT;
- 
- /**
-  * Implements the regionserver RPC services.
-@@ -1270,14 +1274,14 @@ public class RSRpcServices implements HBaseRPCErrorHandler, AdminService.Blockin
-       int port = conf.getInt(HConstants.MASTER_PORT, HConstants.DEFAULT_MASTER_PORT);
-       // Creation of a HSA will force a resolve.
-       initialIsa = new InetSocketAddress(hostname, port);
--      bindAddress = new InetSocketAddress(conf.get("hbase.master.ipc.address", hostname), port);
-+      bindAddress = new InetSocketAddress(conf.get(MASTER_IPC_ADDRESS, hostname), conf.getInt(MASTER_IPC_PORT, port));
-     } else {
-       String hostname = DNS.getHostname(conf, DNS.ServerType.REGIONSERVER);
-       int port = conf.getInt(HConstants.REGIONSERVER_PORT, HConstants.DEFAULT_REGIONSERVER_PORT);
-       // Creation of a HSA will force a resolve.
-       initialIsa = new InetSocketAddress(hostname, port);
-       bindAddress =
--        new InetSocketAddress(conf.get("hbase.regionserver.ipc.address", hostname), port);
-+        new InetSocketAddress(conf.get(REGIONSERVER_IPC_ADDRESS, hostname), conf.getInt(REGIONSERVER_IPC_PORT, port));
-     }
-     if (initialIsa.getAddress() == null) {
-       throw new IllegalArgumentException("Failed resolve of " + initialIsa);
diff --git a/hbase/hbase/stackable/patches/2.6.2/0006-Update-property-usage-for-bound-ports.patch b/hbase/hbase/stackable/patches/2.6.2/0006-Update-property-usage-for-bound-ports.patch
deleted file mode 100644
index 9a5cfae42..000000000
--- a/hbase/hbase/stackable/patches/2.6.2/0006-Update-property-usage-for-bound-ports.patch
+++ /dev/null
@@ -1,156 +0,0 @@
-From a36c936d8132bad255bb2be40e4b1dde2a44f478 Mon Sep 17 00:00:00 2001
-From: Andrew Kenworthy <andrew.kenworthy@stackable.tech>
-Date: Thu, 26 Jun 2025 16:58:47 +0200
-Subject: Update property usage for bound ports
-
----
- .../org/apache/hadoop/hbase/HConstants.java   |  4 ++--
- .../hadoop/hbase/LocalHBaseCluster.java       | 12 +++++------
- .../apache/hadoop/hbase/master/HMaster.java   |  6 +++---
- .../hbase/regionserver/HRegionServer.java     | 21 +++++++++++++------
- 4 files changed, 26 insertions(+), 17 deletions(-)
-
-diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/HConstants.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/HConstants.java
-index 4d892755d2..3f852e7acc 100644
---- a/hbase-common/src/main/java/org/apache/hadoop/hbase/HConstants.java
-+++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/HConstants.java
-@@ -212,7 +212,7 @@ public final class HConstants {
-   /** Configuration key for advertised master web API port */
-   public static final String MASTER_INFO_PORT = "hbase.master.info.port";
- 
--  /** Configuration key for bound master web API port. (Defaults to MASTER_INFO_PORT.) */
-+  /** Configuration key for bound master web API port */
-   public static final String MASTER_BOUND_INFO_PORT = "hbase.master.bound.info.port";
- 
-   /** Configuration key for the list of master host:ports **/
-@@ -340,7 +340,7 @@ public final class HConstants {
-   /** Configuration key for advertised region server web API port */
-   public static final String REGIONSERVER_INFO_PORT = "hbase.regionserver.info.port";
- 
--  /** Configuration key for bound region server web API port. (Defaults to REGIONSERVER_INFO_PORT.) */
-+  /** Configuration key for bound region server web API port */
-   public static final String REGIONSERVER_BOUND_INFO_PORT = "hbase.regionserver.bound.info.port";
- 
-   /** A flag that enables automatic selection of regionserver info port */
-diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/LocalHBaseCluster.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/LocalHBaseCluster.java
-index 816ef997cb..2114725986 100644
---- a/hbase-server/src/main/java/org/apache/hadoop/hbase/LocalHBaseCluster.java
-+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/LocalHBaseCluster.java
-@@ -144,20 +144,20 @@ public class LocalHBaseCluster {
-       // treat info ports special; expressly don't change '-1' (keep off)
-       // in case we make that the default behavior.
-       if (
--        conf.getInt(HConstants.REGIONSERVER_INFO_PORT, 0) != -1
--          && conf.getInt(HConstants.REGIONSERVER_INFO_PORT,
-+        conf.getInt(HConstants.REGIONSERVER_BOUND_INFO_PORT, 0) != -1
-+          && conf.getInt(HConstants.REGIONSERVER_BOUND_INFO_PORT,
-             HConstants.DEFAULT_REGIONSERVER_INFOPORT) == HConstants.DEFAULT_REGIONSERVER_INFOPORT
-       ) {
-         LOG.debug("Setting RS InfoServer Port to random.");
--        conf.set(HConstants.REGIONSERVER_INFO_PORT, "0");
-+        conf.set(HConstants.REGIONSERVER_BOUND_INFO_PORT, "0");
-       }
-       if (
--        conf.getInt(HConstants.MASTER_INFO_PORT, 0) != -1
--          && conf.getInt(HConstants.MASTER_INFO_PORT, HConstants.DEFAULT_MASTER_INFOPORT)
-+        conf.getInt(HConstants.MASTER_BOUND_INFO_PORT, 0) != -1
-+          && conf.getInt(HConstants.MASTER_BOUND_INFO_PORT, HConstants.DEFAULT_MASTER_INFOPORT)
-               == HConstants.DEFAULT_MASTER_INFOPORT
-       ) {
-         LOG.debug("Setting Master InfoServer Port to random.");
--        conf.set(HConstants.MASTER_INFO_PORT, "0");
-+        conf.set(HConstants.MASTER_BOUND_INFO_PORT, "0");
-       }
-     }
- 
-diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
-index 313124d1d0..00e01c116e 100644
---- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
-+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
-@@ -17,7 +17,7 @@
-  */
- package org.apache.hadoop.hbase.master;
- 
--import static org.apache.hadoop.hbase.HConstants.MASTER_BOUND_INFO_PORT;
-+import static org.apache.hadoop.hbase.HConstants.MASTER_INFO_PORT;
- import static org.apache.hadoop.hbase.HConstants.MASTER_PORT;
- import static org.apache.hadoop.hbase.HConstants.DEFAULT_HBASE_SPLIT_COORDINATED_BY_ZK;
- import static org.apache.hadoop.hbase.HConstants.HBASE_MASTER_LOGCLEANER_PLUGINS;
-@@ -580,7 +580,7 @@ public class HMaster extends HRegionServer implements MasterServices {
- 
-   @Override
-   protected int getUseThisInfoPortInstead(Configuration conf) {
--        int port = conf.getInt(MASTER_BOUND_INFO_PORT, 0);
-+        int port = conf.getInt(MASTER_INFO_PORT, 0);
-         return port != 0 ? port : this.infoServer != null ? this.infoServer.getPort() : -1;
-   }
- 
-@@ -3158,7 +3158,7 @@ public class HMaster extends HRegionServer implements MasterServices {
-   public int getRegionServerInfoPort(final ServerName sn) {
-     int port = this.serverManager.getInfoPort(sn);
-     return port == 0
--      ? conf.getInt(HConstants.REGIONSERVER_INFO_PORT, HConstants.DEFAULT_REGIONSERVER_INFOPORT)
-+      ? conf.getInt(HConstants.REGIONSERVER_BOUND_INFO_PORT, HConstants.DEFAULT_REGIONSERVER_INFOPORT)
-       : port;
-   }
- 
-diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
-index 68f56ab796..b610d11651 100644
---- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
-+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
-@@ -25,6 +25,7 @@ import static org.apache.hadoop.hbase.HConstants.DEFAULT_SLOW_LOG_SYS_TABLE_CHOR
- import static org.apache.hadoop.hbase.HConstants.HBASE_SPLIT_WAL_COORDINATED_BY_ZK;
- import static org.apache.hadoop.hbase.HConstants.HBASE_SPLIT_WAL_MAX_SPLITTER;
- import static org.apache.hadoop.hbase.HConstants.REGIONSERVER_BOUND_INFO_PORT;
-+import static org.apache.hadoop.hbase.HConstants.REGIONSERVER_INFO_PORT;
- import static org.apache.hadoop.hbase.HConstants.REGIONSERVER_PORT;
- import static org.apache.hadoop.hbase.HConstants.RPC_CLIENT_BIND_ADDRESS;
- import static org.apache.hadoop.hbase.master.waleventtracker.WALEventTrackerTableCreator.WAL_EVENT_TRACKER_ENABLED_DEFAULT;
-@@ -791,7 +792,7 @@ public class HRegionServer extends Thread
-   }
- 
-   protected int getUseThisInfoPortInstead(Configuration conf) {
--    int port = conf.getInt(REGIONSERVER_BOUND_INFO_PORT, 0);
-+    int port = conf.getInt(REGIONSERVER_INFO_PORT, 0);
-     return port != 0 ? port : this.infoServer != null ? this.infoServer.getPort() : -1;
-   }
- 
-@@ -2459,12 +2460,14 @@ public class HRegionServer extends Thread
-    */
-   private void putUpWebUI() throws IOException {
-     int port =
--      this.conf.getInt(HConstants.REGIONSERVER_INFO_PORT, HConstants.DEFAULT_REGIONSERVER_INFOPORT);
-+      this.conf.getInt(REGIONSERVER_BOUND_INFO_PORT,
-+        this.conf.getInt(REGIONSERVER_INFO_PORT, HConstants.DEFAULT_REGIONSERVER_INFOPORT));
-     String addr = this.conf.get("hbase.regionserver.info.bindAddress", "0.0.0.0");
- 
-     boolean isMaster = false;
-     if (this instanceof HMaster) {
--      port = conf.getInt(HConstants.MASTER_INFO_PORT, HConstants.DEFAULT_MASTER_INFOPORT);
-+      port = conf.getInt(HConstants.MASTER_BOUND_INFO_PORT,
-+        this.conf.getInt(HConstants.MASTER_INFO_PORT, HConstants.DEFAULT_MASTER_INFOPORT));
-       addr = this.conf.get("hbase.master.info.bindAddress", "0.0.0.0");
-       isMaster = true;
-     }
-@@ -2501,12 +2504,18 @@ public class HRegionServer extends Thread
-         LOG.info("Retry starting http info server with port: " + port);
-       }
-     }
--    port = useThisInfoPortInstead;
--    conf.setInt(HConstants.REGIONSERVER_INFO_PORT, port);
-+
-+    // update bound ports
-+    port = this.infoServer.getPort();
-+    conf.setInt(REGIONSERVER_BOUND_INFO_PORT, port);
-+    conf.setInt(HConstants.MASTER_BOUND_INFO_PORT, port);
-+
-+    // set advertised ports
-+    conf.setInt(REGIONSERVER_INFO_PORT, useThisInfoPortInstead);
-     int masterInfoPort =
-       conf.getInt(HConstants.MASTER_INFO_PORT, HConstants.DEFAULT_MASTER_INFOPORT);
-     conf.setInt("hbase.master.info.port.orig", masterInfoPort);
--    conf.setInt(HConstants.MASTER_INFO_PORT, port);
-+    conf.setInt(HConstants.MASTER_INFO_PORT, useThisInfoPortInstead);
-   }
- 
-   /*
diff --git a/hbase/hbase/stackable/patches/2.6.2/patchable.toml b/hbase/hbase/stackable/patches/2.6.2/patchable.toml
deleted file mode 100644
index a46f266be..000000000
--- a/hbase/hbase/stackable/patches/2.6.2/patchable.toml
+++ /dev/null
@@ -1,2 +0,0 @@
-base = "6b3b36b429cf9a9d74110de79eb3b327b29ebf17"
-mirror = "https://github.com/stackabletech/hbase.git"