(hop) branch main updated: [fix] ensure janino uses the right classloader since TCCL is unexpectedly apploader (jvm one) in the UI (#7254)

[hansva]

This is an automated email from the ASF dual-hosted git repository.

hansva pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/hop.git


The following commit(s) were added to refs/heads/main by this push:
     new 062d6fbb94 [fix] ensure janino uses the right classloader since TCCL 
is unexpectedly apploader (jvm one) in the UI (#7254)
062d6fbb94 is described below

commit 062d6fbb94ac79bed35ea3c525f88c814d8d026f
Author: Romain Manni-Bucau <rmannibu...@gmail.com>
AuthorDate: Thu Jun 11 10:45:34 2026 +0200

    [fix] ensure janino uses the right classloader since TCCL is unexpectedly 
apploader (jvm one) in the UI (#7254)
---
 plugins/transforms/janino/src/assembly/assembly.xml               | 2 ++
 .../pipeline/transforms/janino/scanner/JarExclusionsLoader.java   | 8 ++------
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/plugins/transforms/janino/src/assembly/assembly.xml 
b/plugins/transforms/janino/src/assembly/assembly.xml
index f93928e547..433e12ecca 100644
--- a/plugins/transforms/janino/src/assembly/assembly.xml
+++ b/plugins/transforms/janino/src/assembly/assembly.xml
@@ -58,6 +58,8 @@
         </dependencySet>
         <dependencySet>
             <includes>
+                <include>org.apache.xbean:xbean-asm9-shaded:jar</include>
+                <include>org.apache.xbean:xbean-finder-shaded:jar</include>
                 <include>org.codehaus.janino:janino:jar</include>
                 <include>org.codehaus.janino:commons-compiler:jar</include>
             </includes>
diff --git 
a/plugins/transforms/janino/src/main/java/org/apache/hop/pipeline/transforms/janino/scanner/JarExclusionsLoader.java
 
b/plugins/transforms/janino/src/main/java/org/apache/hop/pipeline/transforms/janino/scanner/JarExclusionsLoader.java
index 092449e7ff..ae6553aa9b 100644
--- 
a/plugins/transforms/janino/src/main/java/org/apache/hop/pipeline/transforms/janino/scanner/JarExclusionsLoader.java
+++ 
b/plugins/transforms/janino/src/main/java/org/apache/hop/pipeline/transforms/janino/scanner/JarExclusionsLoader.java
@@ -16,8 +16,6 @@
  */
 package org.apache.hop.pipeline.transforms.janino.scanner;
 
-import static java.util.Optional.ofNullable;
-
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStream;
@@ -30,10 +28,8 @@ import org.apache.xbean.finder.filter.Filters;
 
 public class JarExclusionsLoader {
   public Predicate<String> load(String resourcePath) {
-    try (var is =
-        ofNullable(Thread.currentThread().getContextClassLoader())
-            .orElseGet(ClassLoader::getSystemClassLoader)
-            .getResourceAsStream(resourcePath)) {
+    try (final var is =
+        
JarExclusionsLoader.class.getClassLoader().getResourceAsStream(resourcePath)) {
       if (is == null) {
         throw new IllegalArgumentException("Resource not found: " + 
resourcePath);
       }