diff --git a/AGENTS.md b/AGENTS.md
index 090dc4433e1..dcbeaf68568 100644
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -55,30 +55,24 @@ Apache Zeppelin is a web-based notebook for interactive data analytics. It provi
 
 ## Build Gotchas
 
-### Shaded JAR Rebuild Chain
+### Interpreter Runtime JAR
 
-The most common build mistake: modifying `zeppelin-interpreter` without rebuilding `zeppelin-interpreter-shaded`. The shaded JAR is an uber JAR that all interpreter processes use. If it's stale, you get `ClassNotFoundException` or `NoSuchMethodError` at runtime.
+Packaging `zeppelin-interpreter` produces both the normal Maven artifact and the relocated runtime JAR that every interpreter process uses:
 
 ```bash
-# After changing zeppelin-interpreter, ALWAYS rebuild in order:
-./mvnw clean package -pl zeppelin-interpreter -DskipTests
-./mvnw clean package -pl zeppelin-interpreter-shaded -DskipTests
-# Then rebuild affected interpreter modules
-
-# Shorthand:
-./mvnw clean package -pl zeppelin-interpreter,zeppelin-interpreter-shaded -DskipTests
+./mvnw clean package -pl zeppelin-interpreter --am -DskipTests
 ```
 
-The shaded JAR is also copied to `interpreter/` directory by maven-antrun-plugin after packaging. If this directory has a stale JAR, interpreter processes will load old code.
+The normal `zeppelin-interpreter-${version}.jar` remains under `zeppelin-interpreter/target` and is installed or deployed as the module artifact. The build stages the runtime-only `zeppelin-interpreter-shaded-${version}.jar` under `target/`, publishes the complete file to `interpreter/`, and then deletes older versions so interpreter launchers never see multiple matching JARs.
 
 ### Module Build Order
 
 Maven modules are ordered in the root `pom.xml`. Key sequence:
 ```
-zeppelin-interpreter → zeppelin-interpreter-shaded → zeppelin-server
+zeppelin-interpreter → interpreter modules / zeppelin-server
 ```
 
-All interpreter modules build after `zeppelin-interpreter-shaded`. A second shading chain exists for Jupyter:
+A separate shading chain exists for Jupyter:
 ```
 zeppelin-jupyter-interpreter → zeppelin-jupyter-interpreter-shaded → python
 ```
@@ -88,17 +82,17 @@ zeppelin-jupyter-interpreter → zeppelin-jupyter-interpreter-shaded → python
 ### Dependency Flow
 
 ```
-zeppelin-interpreter          Base API: Interpreter, InterpreterContext, Thrift services
-        ↓
-zeppelin-interpreter-shaded   Uber JAR (maven-shade-plugin, relocated packages)
+zeppelin-interpreter          Base API + normal Maven JAR + relocated runtime JAR
         ↓
+interpreter modules           Spark, Flink, Python, JDBC, etc.
+
 zeppelin-server               Core engine + Jetty 11, REST/WebSocket APIs, HK2 DI, entry point
 ```
 
 ### Core Modules
 
 #### `zeppelin-interpreter/`
-The base framework that all interpreters depend on. Defines the interpreter API and the Thrift communication protocol. This module is shaded into an uber JAR (`zeppelin-interpreter-shaded`) and placed on each interpreter process's classpath.
+The base framework that all interpreters depend on. Defines the interpreter API and the Thrift communication protocol. Its package phase also builds a relocated runtime JAR under `interpreter/`; that internal file is placed on each interpreter process's classpath but is not installed or deployed as a Maven artifact.
 
 Key classes:
 - `Interpreter` (abstract) / `AbstractInterpreter` — base class every interpreter extends
@@ -137,9 +131,6 @@ Engine / runtime (`org.apache.zeppelin.notebook`, `interpreter`, `scheduler`, `s
 - `RecoveryStorage` — persists interpreter process info for server-restart recovery
 - `ConfigStorage` — persists interpreter settings to JSON
 
-#### `zeppelin-interpreter-shaded/`
-Uses maven-shade-plugin to package `zeppelin-interpreter` + dependencies into an uber JAR with relocated packages (e.g., `org.apache.thrift` → `org.apache.zeppelin.shaded.org.apache.thrift`). This JAR is placed on each interpreter process's classpath.
-
 #### `zeppelin-client/`
 REST/WebSocket client library for programmatic access to Zeppelin.
 
diff --git a/bin/interpreter.sh b/bin/interpreter.sh
index 00ff0307313..c2c74baf3e9 100755
--- a/bin/interpreter.sh
+++ b/bin/interpreter.sh
@@ -117,8 +117,6 @@ if [[ -d "${ZEPPELIN_HOME}/zeppelin-server/target/test-classes" ]]; then
   addJarInDirForIntp "${ZEPPELIN_HOME}/zeppelin-server/target/test-classes"
 fi
 
-addJarInDirForIntp "${ZEPPELIN_HOME}/zeppelin-interpreter-shaded/target"
-
 HOSTNAME=$(hostname)
 ZEPPELIN_SERVER=org.apache.zeppelin.interpreter.remote.RemoteInterpreterServer
 
diff --git a/docs/setup/operation/upgrading.md b/docs/setup/operation/upgrading.md
index 673fcac59c7..0007210a43f 100644
--- a/docs/setup/operation/upgrading.md
+++ b/docs/setup/operation/upgrading.md
@@ -35,6 +35,10 @@ So, copying `notebook` and `conf` directory should be enough.
 
 ## Migration Guide
 
+### Upgrading from Zeppelin 0.12 to 0.13
+
+ - The `org.apache.zeppelin:zeppelin-interpreter-shaded` Maven artifact is no longer published. Custom interpreters should depend on `org.apache.zeppelin:zeppelin-interpreter` with `provided` scope instead. The Zeppelin distribution continues to provide the internal shaded runtime JAR to interpreter processes; custom interpreters should not depend on classes packaged only in that internal runtime JAR. Custom interpreters that use Commons Configuration, Commons BeanUtils, JSR 305, the Maven Plugin API, or Sisu Plexus must now declare those libraries directly instead of relying on transitive dependencies from `zeppelin-interpreter`.
+
 ### Upgrading from Zeppelin 0.9, 0.10 to 0.11
  - From 0.11, The type of `Pegdown` for parsing markdown was deprecated ([ZEPPELIN-5529](https://issues.apache.org/jira/browse/ZEPPELIN-2619)). It will use `Flexmark` instead.
 
diff --git a/jdbc/Dockerfile b/jdbc/Dockerfile
index a8865e87389..235715b4c93 100644
--- a/jdbc/Dockerfile
+++ b/jdbc/Dockerfile
@@ -23,7 +23,7 @@ WORKDIR /zeppelin
 
 RUN chmod +x ./mvnw
 
-RUN ./mvnw clean package -am -pl zeppelin-interpreter-shaded,zeppelin-interpreter,jdbc -DskipTests
+RUN ./mvnw clean package -am -pl zeppelin-interpreter,jdbc -DskipTests
 
 
 FROM openjdk:11
@@ -32,7 +32,7 @@ COPY --from=builder /zeppelin/bin /zeppelin/bin/
 COPY --from=builder /zeppelin/conf /zeppelin/conf
 
 COPY --from=builder /zeppelin/interpreter/jdbc /zeppelin/interpreter/jdbc
-COPY --from=builder /zeppelin/zeppelin-interpreter-shaded/target /zeppelin/zeppelin-interpreter-shaded/target
+COPY --from=builder /zeppelin/interpreter/zeppelin-interpreter-shaded-*.jar /zeppelin/interpreter/
 
 WORKDIR /zeppelin
 
diff --git a/pom.xml b/pom.xml
index 8ddaa73ec78..53b22a93dc8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -55,7 +55,6 @@
     <module>build-tools</module>
     <module>zeppelin-interpreter-parent</module>
     <module>zeppelin-interpreter</module>
-    <module>zeppelin-interpreter-shaded</module>
     <module>zeppelin-jupyter-interpreter</module>
     <module>zeppelin-jupyter-interpreter-shaded</module>
     <module>groovy</module>
@@ -137,6 +136,7 @@
     <dropwizard.version>4.2.29</dropwizard.version>
     <micrometer.version>1.14.2</micrometer.version>
     <findbugs.jsr305.version>3.0.2</findbugs.jsr305.version>
+    <jsr250.api.version>1.0</jsr250.api.version>
 
     <hadoop.version>3.3.6</hadoop.version>
     <hadoop.deps.scope>provided</hadoop.deps.scope>
@@ -362,6 +362,12 @@
         <version>${findbugs.jsr305.version}</version>
       </dependency>
 
+      <dependency>
+        <groupId>javax.annotation</groupId>
+        <artifactId>jsr250-api</artifactId>
+        <version>${jsr250.api.version}</version>
+      </dependency>
+
       <!-- Apache Shiro -->
       <dependency>
         <groupId>org.apache.shiro</groupId>
diff --git a/python/pom.xml b/python/pom.xml
index 3ac4b5f5141..275fa381586 100644
--- a/python/pom.xml
+++ b/python/pom.xml
@@ -136,10 +136,8 @@
       </plugin>
 
       <!--
-      shade for python interpreter is different from other interpreter, it depends on zeppelin-interpreter instead of
-      zeppelin-interpreter-shaded. Because spark interpreter depends on python interpreter and spark's py4j conflict with python interpreter's py4j.
-      python interpreter would generate 2 versions of jars, one is shaded jar which is used for running python interpreter, another is normal jar
-      which is used by spark interpreter as dependency.
+      Python produces two JARs because Spark depends on the normal Python interpreter JAR while the
+      standalone Python interpreter needs a shaded JAR to isolate its Py4J dependency.
       -->
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
@@ -156,11 +154,6 @@
               <resource>reference.conf</resource>
             </transformer>
           </transformers>
-          <artifactSet>
-            <excludes>
-              <exclude>org.apache.zeppelin:zeppelin-interpreter-shaded</exclude>
-            </excludes>
-          </artifactSet>
           <outputFile>${project.build.directory}/../../interpreter/python/${interpreter.jar.name}-${project.version}.jar</outputFile>
         </configuration>
         <executions>
diff --git a/shell/Dockerfile b/shell/Dockerfile
index 1da36a26338..753e6a4fb2f 100644
--- a/shell/Dockerfile
+++ b/shell/Dockerfile
@@ -23,7 +23,7 @@ WORKDIR /zeppelin
 
 RUN chmod +x ./mvnw
 
-RUN ./mvnw package -am -pl zeppelin-interpreter-shaded,zeppelin-interpreter,shell -DskipTests
+RUN ./mvnw package -am -pl zeppelin-interpreter,shell -DskipTests
 
 
 FROM openjdk:11
@@ -32,7 +32,7 @@ COPY --from=builder /zeppelin/bin /zeppelin/bin/
 COPY --from=builder /zeppelin/conf /zeppelin/conf
 
 COPY --from=builder /zeppelin/interpreter/sh /zeppelin/interpreter/sh
-COPY --from=builder /zeppelin/zeppelin-interpreter-shaded/target /zeppelin/zeppelin-interpreter-shaded/target
+COPY --from=builder /zeppelin/interpreter/zeppelin-interpreter-shaded-*.jar /zeppelin/interpreter/
 
 WORKDIR /zeppelin
 
diff --git a/spark/interpreter/pom.xml b/spark/interpreter/pom.xml
index 0e276a49ba5..8128ff0fe18 100644
--- a/spark/interpreter/pom.xml
+++ b/spark/interpreter/pom.xml
@@ -335,7 +335,6 @@
               <exclude>org.scala-lang:scala-reflect</exclude>
               <exclude>commons-lang:commons-lang</exclude>
               <exclude>org.apache.commons:commons-compress</exclude>
-              <exclude>org.apache.zeppelin:zeppelin-interpreter-shaded</exclude>
             </excludes>
           </artifactSet>
 
diff --git a/zeppelin-integration/pom.xml b/zeppelin-integration/pom.xml
index fe665f2d01e..434c7da9a22 100644
--- a/zeppelin-integration/pom.xml
+++ b/zeppelin-integration/pom.xml
@@ -198,8 +198,9 @@
                   </excludes>
                   <searchTransitive>true</searchTransitive>
                   <message>
-                    zeppelin-interpreter-shaded must NOT appear on the zeppelin-integration test classpath.
-                    MiniZeppelinServer instantiates ZeppelinServer in-process; mixing shaded and unshaded
+                    The legacy zeppelin-interpreter-shaded Maven artifact must NOT appear on the
+                    zeppelin-integration test classpath. MiniZeppelinServer instantiates ZeppelinServer
+                    in-process; mixing shaded and unshaded
                     org.eclipse.aether.* in the same JVM causes ClassCastException in
                     InterpreterSettingManager. See ZEPPELIN-6416.
                   </message>
diff --git a/zeppelin-interpreter-parent/pom.xml b/zeppelin-interpreter-parent/pom.xml
index e80d12dd3a1..9153924cb05 100644
--- a/zeppelin-interpreter-parent/pom.xml
+++ b/zeppelin-interpreter-parent/pom.xml
@@ -32,13 +32,6 @@
   <name>Zeppelin: Interpreter Parent</name>
 
   <dependencies>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>zeppelin-interpreter-shaded</artifactId>
-      <version>${project.version}</version>
-      <scope>provided</scope>
-    </dependency>
-
     <dependency>
       <groupId>org.apache.zeppelin</groupId>
       <artifactId>zeppelin-interpreter</artifactId>
@@ -117,7 +110,6 @@
                   <exclude>META-INF/*.SF</exclude>
                   <exclude>META-INF/*.DSA</exclude>
                   <exclude>META-INF/*.RSA</exclude>
-                  <exclude>org.apache.zeppelin:zeppelin-interpreter-shaded</exclude>
                 </excludes>
               </filter>
             </filters>
@@ -127,11 +119,6 @@
                 <resource>reference.conf</resource>
               </transformer>
             </transformers>
-            <artifactSet>
-              <excludes>
-                <exclude>org.apache.zeppelin:zeppelin-interpreter-shaded</exclude>
-              </excludes>
-            </artifactSet>
             <outputFile>${project.basedir}/../interpreter/${interpreter.name}/${project.artifactId}-${project.version}.jar</outputFile>
           </configuration>
           <executions>
diff --git a/zeppelin-interpreter-shaded/pom.xml b/zeppelin-interpreter-shaded/pom.xml
deleted file mode 100644
index 226f1c06820..00000000000
--- a/zeppelin-interpreter-shaded/pom.xml
+++ /dev/null
@@ -1,179 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ Licensed to the Apache Software Foundation (ASF) under one or more
-  ~ contributor license agreements.  See the NOTICE file distributed with
-  ~ this work for additional information regarding copyright ownership.
-  ~ The ASF licenses this file to You under the Apache License, Version 2.0
-  ~ (the "License"); you may not use this file except in compliance with
-  ~ the License.  You may obtain a copy of the License at
-  ~
-  ~    http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
-
-  <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <artifactId>zeppelin</artifactId>
-    <groupId>org.apache.zeppelin</groupId>
-    <version>0.13.0-SNAPSHOT</version>
-  </parent>
-
-  <artifactId>zeppelin-interpreter-shaded</artifactId>
-  <packaging>jar</packaging>
-  <name>Zeppelin: Interpreter Shaded</name>
-  <description>Zeppelin Interpreter Shaded</description>
-
-  <properties>
-    <shaded.dependency.prefix>shaded.org.apache.zeppelin</shaded.dependency.prefix>
-  </properties>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.zeppelin</groupId>
-      <artifactId>zeppelin-interpreter</artifactId>
-      <version>0.13.0-SNAPSHOT</version>
-      <optional>true</optional>
-    </dependency>
-  </dependencies>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-shade-plugin</artifactId>
-        <configuration>
-          <artifactSet>
-            <excludes>
-              <!-- Leave slf4j unshaded so downstream users can configure logging. -->
-              <exclude>org.slf4j:*</exclude>
-              <!-- Leave log4j unshaded so downstream users can configure logging. -->
-              <exclude>log4j:log4j</exclude>
-              <exclude>ch.qos.reload4j:reload4j</exclude>
-            </excludes>
-          </artifactSet>
-          <filters>
-            <filter>
-              <artifact>*:*</artifact>
-              <excludes>
-                <exclude>META-INF/*.SF</exclude>
-                <exclude>META-INF/*.DSA</exclude>
-                <exclude>META-INF/*.RSA</exclude>
-              </excludes>
-            </filter>
-          </filters>
-          <transformers>
-            <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" />
-            <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
-              <resource>reference.conf</resource>
-            </transformer>
-            <transformer implementation="org.apache.maven.plugins.shade.resource.ApacheLicenseResourceTransformer"/>
-            <transformer implementation="org.apache.maven.plugins.shade.resource.DontIncludeResourceTransformer">
-              <resource>NOTICE.txt</resource>
-            </transformer>
-            <transformer implementation="org.apache.maven.plugins.shade.resource.IncludeResourceTransformer">
-              <resource>META-INF/LICENSE.txt</resource>
-              <file>${basedir}/../../LICENSE.txt</file>
-            </transformer>
-            <transformer implementation="org.apache.maven.plugins.shade.resource.IncludeResourceTransformer">
-              <resource>META-INF/NOTICE.txt</resource>
-              <file>${basedir}/../../NOTICE.txt</file>
-            </transformer>
-          </transformers>
-          <relocations>
-            <relocation>
-              <pattern>org</pattern>
-              <shadedPattern>${shaded.dependency.prefix}.org</shadedPattern>
-              <excludes>
-                <exclude>org/apache/zeppelin/*</exclude>
-                <exclude>org/apache/zeppelin/**/*</exclude>
-                <exclude>org/apache/hadoop/*</exclude>
-                <exclude>org/apache/hadoop/**</exclude>
-                <exclude>org/slf4j/*</exclude>
-                <exclude>org/slf4j/**/*</exclude>
-                <exclude>org/apache/commons/logging/*</exclude>
-                <exclude>org/apache/commons/logging/**/*</exclude>
-                <exclude>org/apache/commons/exec/*</exclude>
-                <exclude>org/apache/commons/exec/**/*</exclude>
-                <exclude>org/apache/log4j/*</exclude>
-                <exclude>org/apache/log4j/**/*</exclude>
-                <exclude>org/sonatype/*</exclude>
-                <exclude>org/sonatype/**/*</exclude>
-                <exclude>**/pom.xml</exclude>
-
-                <!-- Not the org/ packages that are a part of the jdk -->
-                <exclude>org/ietf/jgss/*</exclude>
-                <exclude>org/omg/**/*</exclude>
-                <exclude>org/w3c/dom/*</exclude>
-                <exclude>org/w3c/dom/**/*</exclude>
-                <exclude>org/xml/sax/*</exclude>
-                <exclude>org/xml/sax/**/*</exclude>
-
-                <!-- ZEPPELIN-5875 To avoid changing class name improperly between configuration and code
-                  `org/apache/zeppelin/shaded/org.apache.zeppelin.shaded.org.eclipse.sisu.space.SisuIndexAPT6`
-                  -->
-                <exclude>org/eclipse/sisu/**</exclude>
-              </excludes>
-            </relocation>
-            <relocation>
-              <pattern>com.google</pattern>
-              <shadedPattern>${shaded.dependency.prefix}.com.google</shadedPattern>
-            </relocation>
-            <relocation>
-              <pattern>io</pattern>
-              <shadedPattern>${shaded.dependency.prefix}.io</shadedPattern>
-            </relocation>
-            <relocation>
-              <pattern>com.esotericsoftware</pattern>
-              <shadedPattern>${shaded.dependency.prefix}.com.esotericsoftware</shadedPattern>
-            </relocation>
-          </relocations>
-        </configuration>
-        <executions>
-          <execution>
-            <phase>package</phase>
-            <goals>
-              <goal>shade</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-antrun-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>copy-to-interpreter</id>
-            <phase>package</phase>
-            <goals>
-              <goal>run</goal>
-            </goals>
-            <configuration>
-              <target>
-                <echo>ANT TASK - clean files....</echo>
-                <delete failonerror="false">
-                  <fileset dir="${project.basedir}/../interpreter" includes="zeppelin-interpreter-shaded-*.jar" />
-                </delete>
-                <echo>ANT TASK - copying files....</echo>
-                <copy todir="${project.basedir}/../interpreter" overwrite="true" flatten="true">
-                  <fileset dir="${project.build.directory}" includes="zeppelin-interpreter-shaded-*.jar" >
-                  </fileset>
-                </copy>
-              </target>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-
-    </plugins>
-  </build>
-
-</project>
diff --git a/zeppelin-interpreter/pom.xml b/zeppelin-interpreter/pom.xml
index c86b0890a18..b2e394d41b7 100644
--- a/zeppelin-interpreter/pom.xml
+++ b/zeppelin-interpreter/pom.xml
@@ -37,8 +37,7 @@
     <!--library versions-->
     <commons.pool2.version>2.3</commons.pool2.version>
     <maven.resolver.version>1.4.1</maven.resolver.version>
-    <!-- must match with maven version -->
-    <sisu.plexus.version>0.3.4</sisu.plexus.version>
+    <shaded.dependency.prefix>shaded.org.apache.zeppelin</shaded.dependency.prefix>
     <jline.version>2.14.3</jline.version>
   </properties>
 
@@ -54,6 +53,11 @@
       <artifactId>commons-lang3</artifactId>
     </dependency>
 
+    <dependency>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-text</artifactId>
+    </dependency>
+
     <dependency>
       <groupId>org.apache.thrift</groupId>
       <artifactId>libthrift</artifactId>
@@ -71,35 +75,13 @@
       <artifactId>gson</artifactId>
     </dependency>
 
+    <!-- Required to compile Java sources generated by Thrift 0.13.0 on JDK 11+. -->
     <dependency>
-      <groupId>com.google.code.findbugs</groupId>
-      <artifactId>jsr305</artifactId>
+      <groupId>javax.annotation</groupId>
+      <artifactId>jsr250-api</artifactId>
+      <scope>provided</scope>
     </dependency>
 
-    <dependency>
-      <groupId>org.apache.commons</groupId>
-      <artifactId>commons-configuration2</artifactId>
-      <exclusions>
-      <!-- using jcl-over-slf4j instead -->
-        <exclusion>
-          <groupId>commons-logging</groupId>
-          <artifactId>commons-logging</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <!-- Used in conjunction with commons-configuration2 for the Fluent Builder -->
-    <dependency>
-      <groupId>commons-beanutils</groupId>
-      <artifactId>commons-beanutils</artifactId>
-      <version>1.11.0</version>
-        <exclusions>
-        <!-- using jcl-over-slf4j instead -->
-        <exclusion>
-          <groupId>commons-logging</groupId>
-          <artifactId>commons-logging</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
     <dependency>
       <groupId>org.apache.commons</groupId>
       <artifactId>commons-exec</artifactId>
@@ -132,30 +114,6 @@
     </dependency>
 
     <!-- maven dependency resolution -->
-    <dependency>
-      <groupId>org.apache.maven</groupId>
-      <artifactId>maven-plugin-api</artifactId>
-      <version>${maven.version}</version>
-    </dependency>
-
-    <dependency>
-      <groupId>org.eclipse.sisu</groupId>
-      <artifactId>org.eclipse.sisu.plexus</artifactId>
-      <version>${sisu.plexus.version}</version>
-      <exclusions>
-        <!-- part of maven-plugin-api -->
-        <exclusion>
-          <groupId>org.codehaus.plexus</groupId>
-          <artifactId>plexus-classworlds</artifactId>
-        </exclusion>
-        <!-- part of maven-plugin-api -->
-        <exclusion>
-          <groupId>org.codehaus.plexus</groupId>
-          <artifactId>plexus-utils</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-resolver-provider</artifactId>
@@ -226,6 +184,149 @@
           <dateFormat>yyyy-MM-dd HH:mm:ss</dateFormat>
         </configuration>
       </plugin>
+
+      <!--
+        Build the relocated interpreter runtime as an internal distribution artifact. The normal
+        zeppelin-interpreter artifact remains unchanged and is the only artifact installed or
+        deployed by this module.
+      -->
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-shade-plugin</artifactId>
+        <configuration>
+          <createDependencyReducedPom>false</createDependencyReducedPom>
+          <outputFile>${project.build.directory}/zeppelin-interpreter-shaded-${project.version}.jar</outputFile>
+          <artifactSet>
+            <excludes>
+              <!-- Leave slf4j unshaded so downstream users can configure logging. -->
+              <exclude>org.slf4j:*</exclude>
+              <!-- Leave log4j unshaded so downstream users can configure logging. -->
+              <exclude>log4j:log4j</exclude>
+              <exclude>ch.qos.reload4j:reload4j</exclude>
+            </excludes>
+          </artifactSet>
+          <filters>
+            <filter>
+              <artifact>*:*</artifact>
+              <excludes>
+                <exclude>META-INF/*.SF</exclude>
+                <exclude>META-INF/*.DSA</exclude>
+                <exclude>META-INF/*.RSA</exclude>
+              </excludes>
+            </filter>
+          </filters>
+          <transformers>
+            <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" />
+            <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
+              <resource>reference.conf</resource>
+            </transformer>
+            <transformer implementation="org.apache.maven.plugins.shade.resource.ApacheLicenseResourceTransformer" />
+            <transformer implementation="org.apache.maven.plugins.shade.resource.DontIncludeResourceTransformer">
+              <resource>NOTICE.txt</resource>
+            </transformer>
+            <transformer implementation="org.apache.maven.plugins.shade.resource.IncludeResourceTransformer">
+              <resource>META-INF/LICENSE</resource>
+              <file>${project.build.outputDirectory}/META-INF/LICENSE</file>
+            </transformer>
+          </transformers>
+          <relocations>
+            <relocation>
+              <pattern>org</pattern>
+              <shadedPattern>${shaded.dependency.prefix}.org</shadedPattern>
+              <excludes>
+                <exclude>org/apache/zeppelin/*</exclude>
+                <exclude>org/apache/zeppelin/**/*</exclude>
+                <exclude>org/apache/hadoop/*</exclude>
+                <exclude>org/apache/hadoop/**</exclude>
+                <exclude>org/slf4j/*</exclude>
+                <exclude>org/slf4j/**/*</exclude>
+                <exclude>org/apache/commons/logging/*</exclude>
+                <exclude>org/apache/commons/logging/**/*</exclude>
+                <exclude>org/apache/commons/exec/*</exclude>
+                <exclude>org/apache/commons/exec/**/*</exclude>
+                <exclude>org/apache/log4j/*</exclude>
+                <exclude>org/apache/log4j/**/*</exclude>
+                <exclude>org/sonatype/*</exclude>
+                <exclude>org/sonatype/**/*</exclude>
+                <exclude>**/pom.xml</exclude>
+
+                <!-- Not the org/ packages that are a part of the jdk -->
+                <exclude>org/ietf/jgss/*</exclude>
+                <exclude>org/omg/**/*</exclude>
+                <exclude>org/w3c/dom/*</exclude>
+                <exclude>org/w3c/dom/**/*</exclude>
+                <exclude>org/xml/sax/*</exclude>
+                <exclude>org/xml/sax/**/*</exclude>
+
+                <!-- ZEPPELIN-5875: Keep the configured Sisu implementation class name intact. -->
+                <exclude>org/eclipse/sisu/**</exclude>
+              </excludes>
+            </relocation>
+            <relocation>
+              <pattern>com.google</pattern>
+              <shadedPattern>${shaded.dependency.prefix}.com.google</shadedPattern>
+            </relocation>
+            <relocation>
+              <pattern>io</pattern>
+              <shadedPattern>${shaded.dependency.prefix}.io</shadedPattern>
+            </relocation>
+            <relocation>
+              <pattern>com.esotericsoftware</pattern>
+              <shadedPattern>${shaded.dependency.prefix}.com.esotericsoftware</shadedPattern>
+            </relocation>
+          </relocations>
+        </configuration>
+        <executions>
+          <execution>
+            <phase>package</phase>
+            <goals>
+              <goal>shade</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+
+      <!-- Publish a fully built runtime JAR before removing older versions from interpreter/. -->
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-antrun-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>publish-interpreter-runtime</id>
+            <phase>package</phase>
+            <goals>
+              <goal>run</goal>
+            </goals>
+            <configuration>
+              <target>
+                <copy file="${project.build.directory}/zeppelin-interpreter-shaded-${project.version}.jar"
+                      todir="${project.basedir}/../interpreter" overwrite="true" />
+                <delete failonerror="false">
+                  <fileset dir="${project.basedir}/../interpreter"
+                           includes="zeppelin-interpreter-shaded-*.jar"
+                           excludes="zeppelin-interpreter-shaded-${project.version}.jar" />
+                </delete>
+              </target>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-clean-plugin</artifactId>
+        <configuration>
+          <filesets>
+            <fileset>
+              <directory>${project.basedir}/../interpreter</directory>
+              <includes>
+                <include>zeppelin-interpreter-shaded-*.jar</include>
+              </includes>
+              <followSymlinks>false</followSymlinks>
+            </fileset>
+          </filesets>
+        </configuration>
+      </plugin>
     </plugins>
 
     <resources>
diff --git a/zeppelin-jupyter-interpreter-shaded/pom.xml b/zeppelin-jupyter-interpreter-shaded/pom.xml
index e43c6471b60..518a47f4ca4 100644
--- a/zeppelin-jupyter-interpreter-shaded/pom.xml
+++ b/zeppelin-jupyter-interpreter-shaded/pom.xml
@@ -104,7 +104,6 @@
           </transformers>
           <artifactSet>
             <excludes>
-              <exclude>org.apache.zeppelin:zeppelin-interpreter-shaded</exclude>
               <exclude>log4j:log4j</exclude>
             </excludes>
           </artifactSet>
diff --git a/zeppelin-jupyter-interpreter/pom.xml b/zeppelin-jupyter-interpreter/pom.xml
index 4651e0f4730..34b3aea4680 100644
--- a/zeppelin-jupyter-interpreter/pom.xml
+++ b/zeppelin-jupyter-interpreter/pom.xml
@@ -84,13 +84,12 @@
       <artifactId>commons-codec</artifactId>
     </dependency>
 
-    <!--
-      zeppelin-interpreter-shaded is inherited from zeppelin-interpreter-parent with <scope>provided</scope>.
-      Do NOT re-declare it here without that scope (ZEPPELIN-6416): doing so silently downgrades it to
-      the default compile scope and leaks the shaded jar into transitive consumers (e.g. spark-interpreter,
-      and onward into zeppelin-integration's test classpath), which causes ClassCastException between
-      shaded and unshaded org.eclipse.aether.repository.RemoteRepository inside InterpreterSettingManager.
-    -->
+    <!-- Required to compile Java sources generated by gRPC on JDK 11+. -->
+    <dependency>
+      <groupId>javax.annotation</groupId>
+      <artifactId>jsr250-api</artifactId>
+      <scope>provided</scope>
+    </dependency>
 
     <dependency>
       <groupId>${project.groupId}</groupId>
diff --git a/zeppelin-server/pom.xml b/zeppelin-server/pom.xml
index 8dbdb575673..a007b3beb2b 100644
--- a/zeppelin-server/pom.xml
+++ b/zeppelin-server/pom.xml
@@ -361,6 +361,28 @@
       <artifactId>commons-collections</artifactId>
     </dependency>
 
+    <dependency>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-configuration2</artifactId>
+      <exclusions>
+        <!-- using jcl-over-slf4j instead -->
+        <exclusion>
+          <groupId>commons-logging</groupId>
+          <artifactId>commons-logging</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+
+    <dependency>
+      <groupId>com.google.code.findbugs</groupId>
+      <artifactId>jsr305</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>javax.annotation</groupId>
+      <artifactId>jsr250-api</artifactId>
+    </dependency>
+
     <dependency>
       <groupId>org.apache.shiro</groupId>
       <artifactId>shiro-core</artifactId>
@@ -633,8 +655,9 @@
                   </excludes>
                   <searchTransitive>true</searchTransitive>
                   <message>
-                    zeppelin-interpreter-shaded must NOT appear on the zeppelin-server classpath.
-                    The shaded jar is meant for interpreter JVMs only (loaded from
+                    The legacy zeppelin-interpreter-shaded Maven artifact must NOT appear on the
+                    zeppelin-server classpath. The runtime shaded jar is meant for interpreter JVMs
+                    only (loaded from
                     ${ZEPPELIN_HOME}/interpreter/zeppelin-interpreter-shaded-*.jar). Mixing the shaded
                     and unshaded org.eclipse.aether.* on the server classpath causes ClassCastException
                     in InterpreterSettingManager. See ZEPPELIN-6416.