This is an automated email from the ASF dual-hosted git repository.
jbonofre pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/activemq.git
The following commit(s) were added to refs/heads/main by this push:
new 897e25c09e [AMQ-9444] Upgrade to Shiro 2.0.5 (#1168)
897e25c09e is described below
commit 897e25c09edaa340b1b88b76bc4ecbb884a551c5
Author: JB Onofré <[email protected]>
AuthorDate: Tue Nov 4 14:45:03 2025 +0100
[AMQ-9444] Upgrade to Shiro 2.0.5 (#1168)
---
.../java/org/apache/activemq/shiro/env/IniEnvironment.java | 12 ++++++------
pom.xml | 2 +-
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git
a/activemq-shiro/src/main/java/org/apache/activemq/shiro/env/IniEnvironment.java
b/activemq-shiro/src/main/java/org/apache/activemq/shiro/env/IniEnvironment.java
index 9ca1980b9a..bc1959cc38 100644
---
a/activemq-shiro/src/main/java/org/apache/activemq/shiro/env/IniEnvironment.java
+++
b/activemq-shiro/src/main/java/org/apache/activemq/shiro/env/IniEnvironment.java
@@ -18,17 +18,17 @@ package org.apache.activemq.shiro.env;
import org.apache.activemq.shiro.authz.ActiveMQPermissionResolver;
import org.apache.activemq.shiro.mgt.DefaultActiveMqSecurityManager;
-import org.apache.shiro.ShiroException;
import org.apache.shiro.config.ConfigurationException;
import org.apache.shiro.config.Ini;
-import org.apache.shiro.config.IniSecurityManagerFactory;
import org.apache.shiro.env.DefaultEnvironment;
-import org.apache.shiro.io.ResourceUtils;
+import org.apache.shiro.ini.IniSecurityManagerFactory;
+import org.apache.shiro.lang.ShiroException;
+import org.apache.shiro.lang.io.ResourceUtils;
+import org.apache.shiro.lang.util.Initializable;
+import org.apache.shiro.lang.util.LifecycleUtils;
import org.apache.shiro.mgt.SecurityManager;
import org.apache.shiro.realm.Realm;
import org.apache.shiro.realm.text.IniRealm;
-import org.apache.shiro.util.Initializable;
-import org.apache.shiro.util.LifecycleUtils;
import java.util.Map;
@@ -44,7 +44,7 @@ public class IniEnvironment extends DefaultEnvironment
implements Initializable
public IniEnvironment() {
}
- public IniEnvironment(Ini ini) {
+ public IniEnvironment(Ini ini) throws ShiroException {
this.ini = ini;
init();
}
diff --git a/pom.xml b/pom.xml
index 319e32c82d..d059ae78fa 100644
--- a/pom.xml
+++ b/pom.xml
@@ -86,7 +86,7 @@
<qpid-jms-version>2.4.0</qpid-jms-version>
<netty-version>4.1.94.Final</netty-version>
<rome-version>2.1.0</rome-version>
- <shiro-version>1.13.0</shiro-version>
+ <shiro-version>2.0.5</shiro-version>
<slf4j-version>2.0.17</slf4j-version>
<snappy-version>1.1.2</snappy-version>
<spring-version>6.2.12</spring-version>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
For further information, visit: https://activemq.apache.org/contact
