This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
The following commit(s) were added to refs/heads/main by this push:
new c87001a9ab Disable expression support for native mode in
net.engio:mbassador
c87001a9ab is described below
commit c87001a9aba6867e51a5a069c32fb8b3a96056c2
Author: James Netherton <[email protected]>
AuthorDate: Tue Jan 20 15:46:20 2026 +0000
Disable expression support for native mode in net.engio:mbassador
Fixes #8158
---
extensions/smb/runtime/pom.xml | 9 +++
.../component/smb/graal/ElFilterSubstitutions.java | 65 ++++++++++++++++++++++
pom.xml | 1 +
poms/bom/pom.xml | 5 ++
poms/bom/src/main/generated/flattened-full-pom.xml | 5 ++
.../src/main/generated/flattened-reduced-pom.xml | 5 ++
.../generated/flattened-reduced-verbose-pom.xml | 5 ++
7 files changed, 95 insertions(+)
diff --git a/extensions/smb/runtime/pom.xml b/extensions/smb/runtime/pom.xml
index 0a7f2551c0..89d10f40b4 100644
--- a/extensions/smb/runtime/pom.xml
+++ b/extensions/smb/runtime/pom.xml
@@ -48,6 +48,15 @@
<groupId>jakarta.el</groupId>
<artifactId>jakarta.el-api</artifactId>
</dependency>
+ <dependency>
+ <groupId>net.engio</groupId>
+ <artifactId>mbassador</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.graalvm.sdk</groupId>
+ <artifactId>graal-sdk</artifactId>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
<build>
diff --git
a/extensions/smb/runtime/src/main/java/org/apache/camel/component/smb/graal/ElFilterSubstitutions.java
b/extensions/smb/runtime/src/main/java/org/apache/camel/component/smb/graal/ElFilterSubstitutions.java
new file mode 100644
index 0000000000..87c15963df
--- /dev/null
+++
b/extensions/smb/runtime/src/main/java/org/apache/camel/component/smb/graal/ElFilterSubstitutions.java
@@ -0,0 +1,65 @@
+/*
+ * 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.
+ */
+package org.apache.camel.component.smb.graal;
+
+import com.oracle.svm.core.annotate.Alias;
+import com.oracle.svm.core.annotate.RecomputeFieldValue;
+import com.oracle.svm.core.annotate.Substitute;
+import com.oracle.svm.core.annotate.TargetClass;
+import jakarta.el.ExpressionFactory;
+import net.engio.mbassy.dispatch.el.StandardELResolutionContext;
+import net.engio.mbassy.subscription.SubscriptionContext;
+
+/**
+ * Disables unwanted for smbj jakarta.el support in net.engio:mbassador
+ *
+ * TODO: Remove this class when mbassador > 1.3.0 is available -
https://github.com/apache/camel-quarkus/issues/5646
+ */
+public class ElFilterSubstitutions {
+ @TargetClass(className = "net.engio.mbassy.dispatch.el.ElFilter")
+ static final class SubstituteElFilter {
+ @Substitute
+ public static boolean isELAvailable() {
+ return false;
+ }
+
+ @Substitute
+ public static ExpressionFactory ELFactory() {
+ return null;
+ }
+
+ @Substitute
+ public boolean accepts(Object message, final SubscriptionContext
context) {
+ return false;
+ }
+
+ @Substitute
+ private boolean evalExpression(final String expression,
+ final StandardELResolutionContext resolutionContext,
+ final SubscriptionContext context,
+ final Object message) {
+ return false;
+ }
+ }
+
+ @TargetClass(className =
"net.engio.mbassy.dispatch.el.ElFilter$ExpressionFactoryHolder")
+ static final class SubstituteExpressionFactoryHolder {
+ @Alias
+ @RecomputeFieldValue(kind = RecomputeFieldValue.Kind.FromAlias)
+ public static ExpressionFactory ELFactory = null;
+ }
+}
diff --git a/pom.xml b/pom.xml
index 2480bac6ff..56afa1d5bf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -143,6 +143,7 @@
<langchain4j.version>1.5.0</langchain4j.version><!-- @sync
io.quarkiverse.langchain4j:quarkus-langchain4j-parent:${quarkiverse-langchain4j.version}
prop:langchain4j.version -->
<langchain4j-beta.version>1.5.0-beta11</langchain4j-beta.version><!--
@sync
io.quarkiverse.langchain4j:quarkus-langchain4j-parent:${quarkiverse-langchain4j.version}
prop:langchain4j-beta.version -->
<mapstruct.version>${mapstruct-version}</mapstruct.version>
+ <mbassador.version>1.3.0</mbassador.version><!-- @sync
com.hierynomus:smbj:${smbj-version} dep:net.engio:mbassador -->
<minio.version>8.6.0</minio.version><!-- @sync
io.quarkiverse.minio:quarkus-minio-parent:${quarkiverse-minio.version}
prop:minio.version -->
<msal4j.version>1.23.1</msal4j.version><!-- @sync
com.azure:azure-identity:${azure-identity.version}
dep:com.microsoft.azure:msal4j -->
<murmur.version>1.0.0</murmur.version>
diff --git a/poms/bom/pom.xml b/poms/bom/pom.xml
index 808688cac4..bae60f331e 100644
--- a/poms/bom/pom.xml
+++ b/poms/bom/pom.xml
@@ -7809,6 +7809,11 @@
<artifactId>joda-time</artifactId>
<version>${jodatime.version}</version>
</dependency>
+ <dependency>
+ <groupId>net.engio</groupId>
+ <artifactId>mbassador</artifactId>
+ <version>${mbassador.version}</version>
+ </dependency>
<dependency>
<groupId>net.i2p.crypto</groupId>
<artifactId>eddsa</artifactId>
diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml
b/poms/bom/src/main/generated/flattened-full-pom.xml
index 8a7ec034d2..5737c44539 100644
--- a/poms/bom/src/main/generated/flattened-full-pom.xml
+++ b/poms/bom/src/main/generated/flattened-full-pom.xml
@@ -7695,6 +7695,11 @@
<artifactId>joda-time</artifactId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<version>2.14.0</version><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
</dependency>
+ <dependency>
+ <groupId>net.engio</groupId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <artifactId>mbassador</artifactId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <version>1.3.0</version><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ </dependency>
<dependency>
<groupId>net.i2p.crypto</groupId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<artifactId>eddsa</artifactId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
diff --git a/poms/bom/src/main/generated/flattened-reduced-pom.xml
b/poms/bom/src/main/generated/flattened-reduced-pom.xml
index b60a8a5476..b5a33342a7 100644
--- a/poms/bom/src/main/generated/flattened-reduced-pom.xml
+++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml
@@ -7639,6 +7639,11 @@
<artifactId>joda-time</artifactId>
<version>2.14.0</version>
</dependency>
+ <dependency>
+ <groupId>net.engio</groupId>
+ <artifactId>mbassador</artifactId>
+ <version>1.3.0</version>
+ </dependency>
<dependency>
<groupId>net.i2p.crypto</groupId>
<artifactId>eddsa</artifactId>
diff --git a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml
b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml
index d6f845a4c8..165b22c17e 100644
--- a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml
+++ b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml
@@ -7639,6 +7639,11 @@
<artifactId>joda-time</artifactId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<version>2.14.0</version><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
</dependency>
+ <dependency>
+ <groupId>net.engio</groupId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <artifactId>mbassador</artifactId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <version>1.3.0</version><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ </dependency>
<dependency>
<groupId>net.i2p.crypto</groupId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<artifactId>eddsa</artifactId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
