This is an automated email from the ASF dual-hosted git repository.
JiriOndrusek pushed a commit to branch camel-main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
The following commit(s) were added to refs/heads/camel-main by this push:
new 8f4c57196a better fix of shiro
8f4c57196a is described below
commit 8f4c57196acbddec9bff9ab510f59d2a1c212fcf
Author: Jiri Ondrusek <[email protected]>
AuthorDate: Fri Jun 26 13:51:11 2026 +0200
better fix of shiro
---
.../camel/quarkus/component/shiro/deployment/ShiroProcessor.java | 1 +
extensions/shiro/runtime/pom.xml | 4 ++++
poms/bom/pom.xml | 9 +++++++--
poms/bom/src/main/generated/flattened-full-pom.xml | 9 +++++++--
poms/bom/src/main/generated/flattened-reduced-pom.xml | 9 +++++++--
poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml | 9 +++++++--
6 files changed, 33 insertions(+), 8 deletions(-)
diff --git
a/extensions/shiro/deployment/src/main/java/org/apache/camel/quarkus/component/shiro/deployment/ShiroProcessor.java
b/extensions/shiro/deployment/src/main/java/org/apache/camel/quarkus/component/shiro/deployment/ShiroProcessor.java
index 31322e8279..a1644c9386 100644
---
a/extensions/shiro/deployment/src/main/java/org/apache/camel/quarkus/component/shiro/deployment/ShiroProcessor.java
+++
b/extensions/shiro/deployment/src/main/java/org/apache/camel/quarkus/component/shiro/deployment/ShiroProcessor.java
@@ -100,4 +100,5 @@ class ShiroProcessor {
IndexDependencyBuildItem registerDependencyForIndex() {
return new IndexDependencyBuildItem("org.apache.shiro", "shiro-core");
}
+
}
diff --git a/extensions/shiro/runtime/pom.xml b/extensions/shiro/runtime/pom.xml
index 62cd4ee680..cd85bb8027 100644
--- a/extensions/shiro/runtime/pom.xml
+++ b/extensions/shiro/runtime/pom.xml
@@ -44,6 +44,10 @@
<groupId>org.apache.camel</groupId>
<artifactId>camel-shiro</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.shiro</groupId>
+ <artifactId>shiro-core</artifactId>
+ </dependency>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-support-commons-logging</artifactId>
diff --git a/poms/bom/pom.xml b/poms/bom/pom.xml
index a9a0a6182e..8037f36c41 100644
--- a/poms/bom/pom.xml
+++ b/poms/bom/pom.xml
@@ -2861,11 +2861,16 @@
<version>${camel.version}</version>
<exclusions>
<exclusion>
- <groupId>org.omnifaces</groupId>
- <artifactId>omnifaces</artifactId>
+ <groupId>org.apache.shiro</groupId>
+ <artifactId>shiro-jakarta-ee</artifactId>
</exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>org.apache.shiro</groupId>
+ <artifactId>shiro-core</artifactId>
+ <version>${shiro-version}</version>
+ </dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-sjms</artifactId>
diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml
b/poms/bom/src/main/generated/flattened-full-pom.xml
index 3674de086c..a3ac7d89a1 100644
--- a/poms/bom/src/main/generated/flattened-full-pom.xml
+++ b/poms/bom/src/main/generated/flattened-full-pom.xml
@@ -2758,11 +2758,16 @@
<version>4.21.0-SNAPSHOT</version><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<exclusions>
<exclusion>
- <groupId>org.omnifaces</groupId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- <artifactId>omnifaces</artifactId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <groupId>org.apache.shiro</groupId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <artifactId>shiro-jakarta-ee</artifactId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
</exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>org.apache.shiro</groupId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <artifactId>shiro-core</artifactId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <version>3.0.0</version><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ </dependency>
<dependency>
<groupId>org.apache.camel</groupId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<artifactId>camel-sjms</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 dbf08a462f..9d337a8a06 100644
--- a/poms/bom/src/main/generated/flattened-reduced-pom.xml
+++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml
@@ -2743,11 +2743,16 @@
<version>4.21.0-SNAPSHOT</version>
<exclusions>
<exclusion>
- <groupId>org.omnifaces</groupId>
- <artifactId>omnifaces</artifactId>
+ <groupId>org.apache.shiro</groupId>
+ <artifactId>shiro-jakarta-ee</artifactId>
</exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>org.apache.shiro</groupId>
+ <artifactId>shiro-core</artifactId>
+ <version>3.0.0</version>
+ </dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-sjms</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 5121e77cd6..df9e8167d2 100644
--- a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml
+++ b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml
@@ -2743,11 +2743,16 @@
<version>4.21.0-SNAPSHOT</version><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<exclusions>
<exclusion>
- <groupId>org.omnifaces</groupId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- <artifactId>omnifaces</artifactId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <groupId>org.apache.shiro</groupId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <artifactId>shiro-jakarta-ee</artifactId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
</exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>org.apache.shiro</groupId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <artifactId>shiro-core</artifactId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <version>3.0.0</version><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ </dependency>
<dependency>
<groupId>org.apache.camel</groupId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<artifactId>camel-sjms</artifactId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
