This is an automated email from the ASF dual-hosted git repository.
lprimak pushed a commit to branch 3.x
in repository https://gitbox.apache.org/repos/asf/shiro.git
The following commit(s) were added to refs/heads/3.x by this push:
new 866bd8456 [support] Update Karaf feature and bundle maven plugin
configuration (#2517)
866bd8456 is described below
commit 866bd8456c61425a81c5298b2ff1bad1897fa3d9
Author: François Papon <[email protected]>
AuthorDate: Sun Feb 8 01:46:45 2026 +0100
[support] Update Karaf feature and bundle maven plugin configuration (#2517)
---
core/pom.xml | 2 +-
crypto/support/hashes/argon2/pom.xml | 2 +-
crypto/support/hashes/bcrypt/pom.xml | 2 +-
pom.xml | 4 +-
support/aspectj/pom.xml | 2 +-
support/features/pom.xml | 70 +++++++++++++++---------
support/features/src/main/resources/features.xml | 52 +++++-------------
support/guice/pom.xml | 2 +-
support/pom.xml | 2 +-
support/spring/pom.xml | 2 +-
10 files changed, 67 insertions(+), 73 deletions(-)
diff --git a/core/pom.xml b/core/pom.xml
index 3978a149f..1972e29a4 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -82,7 +82,7 @@
org.apache.shiro.realm*;version=${project.version},
org.apache.shiro.session*;version=${project.version},
org.apache.shiro.subject*;version=${project.version},
- org.apache.shiro.util;version=${project.version},
+ org.apache.shiro.util;version=${project.version}
</Export-Package>
<Import-Package>
org.apache.shiro.lang*;version="${shiro.osgi.importRange}",
diff --git a/crypto/support/hashes/argon2/pom.xml
b/crypto/support/hashes/argon2/pom.xml
index 58b38a25d..7f7b29c87 100644
--- a/crypto/support/hashes/argon2/pom.xml
+++ b/crypto/support/hashes/argon2/pom.xml
@@ -69,7 +69,7 @@
<Import-Package>
org.apache.shiro*;version="${shiro.osgi.importRange}",
org.aopalliance*;version="[1.0.0, 2.0.0)",
- com.google.inject*;version="1.3",
+ com.google.inject*;version="[7.0.0, 8.0.0)",
*
</Import-Package>
<Require-Capability>
diff --git a/crypto/support/hashes/bcrypt/pom.xml
b/crypto/support/hashes/bcrypt/pom.xml
index 937b34ced..fd4cb21a8 100644
--- a/crypto/support/hashes/bcrypt/pom.xml
+++ b/crypto/support/hashes/bcrypt/pom.xml
@@ -69,7 +69,7 @@
<Import-Package>
org.apache.shiro*;version="${shiro.osgi.importRange}",
org.aopalliance*;version="[1.0.0, 2.0.0)",
- com.google.inject*;version="1.3",
+ com.google.inject*;version="[7.0.0, 8.0.0)",
*
</Import-Package>
<Require-Capability>
diff --git a/pom.xml b/pom.xml
index 8231943fd..d7197c7e7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -70,7 +70,7 @@
<shiro.previousVersion>3.0.0</shiro.previousVersion>
<!-- Replaced by the build number plugin at build time: -->
<buildNumber>${user.name}-${maven.build.timestamp}</buildNumber>
-
<project.build.outputTimestamp>2026-01-15T21:40:21Z</project.build.outputTimestamp>
+
<project.build.outputTimestamp>2026-02-07T22:56:07Z</project.build.outputTimestamp>
<root.dir>${maven.multiModuleProjectDirectory}</root.dir>
<jacoco.skip>true</jacoco.skip>
<!-- workaround for gmavenplus plugin until maven 4 is being used -->
@@ -85,7 +85,7 @@
<nexus-staging-profile>nexus-staging</nexus-staging-profile>
<jacocoAgent/>
<!-- non-dependency-based properties: -->
- <shiro.osgi.importRange>[3, 4)</shiro.osgi.importRange>
+ <shiro.osgi.importRange>[3.0.0,999.999.999]</shiro.osgi.importRange>
<jcache.osgi.importRange>[1.1,2)</jcache.osgi.importRange>
<!-- Compile 3rd party dependencies: -->
diff --git a/support/aspectj/pom.xml b/support/aspectj/pom.xml
index 9c0e2c4bb..714cff7a9 100644
--- a/support/aspectj/pom.xml
+++ b/support/aspectj/pom.xml
@@ -101,7 +101,7 @@
<Export-Package>org.apache.shiro.aspectj*;version=${project.version}</Export-Package>
<Import-Package>
org.apache.shiro*;version="${shiro.osgi.importRange}",
- org.aspectj*;version="[1.6.0, 2.0.0)",
+ org.aspectj*;version="[1.9.0, 2.0.0)",
*
</Import-Package>
<_removeheaders>Bnd-LastModified</_removeheaders>
diff --git a/support/features/pom.xml b/support/features/pom.xml
index 58c586459..0cfaa9acc 100644
--- a/support/features/pom.xml
+++ b/support/features/pom.xml
@@ -36,7 +36,7 @@
<c3p0-bundle-version>0.9.5.4_1</c3p0-bundle-version>
<ehcache.bundle.version>3.10.8_1</ehcache.bundle.version>
<hikaricp-version>2.4.13</hikaricp-version>
- <quartz.bundle.version>2.3.2_1</quartz.bundle.version>
+ <!-- <quartz.bundle.version>2.3.2_1</quartz.bundle.version>-->
<!-- Not a Shiro dependency - used for quartz bundle resolution only
(see features.xml): -->
<commons.collections.version>3.2.2</commons.collections.version>
<!-- karaf plugin version -->
@@ -110,33 +110,51 @@
<groupId>org.apache.karaf.tooling</groupId>
<artifactId>karaf-maven-plugin</artifactId>
<version>${karaf.version}</version>
- <executions>
- <execution>
- <id>verify</id>
- <phase>process-resources</phase>
- <goals>
- <goal>verify</goal>
- </goals>
- <configuration>
- <descriptors>
-
<descriptor>mvn:org.apache.karaf.features/framework/${karaf.version}/xml/features</descriptor>
-
<descriptor>mvn:org.apache.karaf.features/enterprise/${karaf.version}/xml/features</descriptor>
-
<descriptor>mvn:org.apache.karaf.features/spring-legacy/${karaf.version}/xml/features</descriptor>
-
<descriptor>file:${project.build.directory}/classes/features.xml</descriptor>
- </descriptors>
-
<distribution>org.apache.karaf.features:framework</distribution>
- <javase>${jdk.version}</javase>
- <framework>
- <feature>framework</feature>
- </framework>
- <features>
- <feature>shiro*</feature>
- </features>
- </configuration>
- </execution>
- </executions>
</plugin>
</plugins>
</build>
+ <profiles>
+ <profile>
+ <id>karaf-jdk-25</id>
+ <activation>
+ <jdk>[25,)</jdk>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.karaf.tooling</groupId>
+ <artifactId>karaf-maven-plugin</artifactId>
+ <version>${karaf.version}</version>
+ <executions>
+ <execution>
+ <id>verify</id>
+ <phase>process-resources</phase>
+ <goals>
+ <goal>verify</goal>
+ </goals>
+ <configuration>
+ <descriptors>
+
<descriptor>mvn:org.apache.karaf.features/framework/${karaf.version}/xml/features</descriptor>
+
<descriptor>mvn:org.apache.karaf.features/enterprise/${karaf.version}/xml/features</descriptor>
+
<descriptor>mvn:org.apache.karaf.features/specs/${karaf.version}/xml/features</descriptor>
+
<descriptor>mvn:org.apache.karaf.features/spring-legacy/${karaf.version}/xml/features</descriptor>
+
<descriptor>file:${project.build.directory}/classes/features.xml</descriptor>
+ </descriptors>
+
<distribution>org.apache.karaf.features:framework</distribution>
+ <javase>${jdk.version}</javase>
+ <framework>
+ <feature>framework</feature>
+ </framework>
+ <features>
+ <feature>shiro*</feature>
+ </features>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
diff --git a/support/features/src/main/resources/features.xml
b/support/features/src/main/resources/features.xml
index cf816c962..f9e09412c 100644
--- a/support/features/src/main/resources/features.xml
+++ b/support/features/src/main/resources/features.xml
@@ -19,10 +19,9 @@
-->
<features name="shiro-${project.version}"
xmlns="http://karaf.apache.org/xmlns/features/v1.4.0";>
- <!-- Shiro core features: -->
-
+ <!-- Shiro core features -->
<feature name="shiro-core" version="${project.version}">
- <feature version="[1,2)">spifly</feature>
+ <feature prerequisite="true" version="[1,2)">spifly</feature>
<bundle
dependency="true">mvn:commons-beanutils/commons-beanutils/${commons.beanutils.version}</bundle>
<bundle
dependency="true">mvn:org.apache.commons/commons-configuration2/${commons.configuration2.version}</bundle>
<bundle
dependency="true">mvn:commons-collections/commons-collections/${commons.collection.version}</bundle>
@@ -40,13 +39,13 @@
<feature name="shiro-web" version="${project.version}">
<feature version="${project.version}">shiro-core</feature>
- <feature version="[2,5)">war</feature>
+ <feature version="[4,5)">pax-web-http-war</feature>
+ <bundle
dependency="true">mvn:jakarta.servlet/jakarta.servlet-api/6.1.0</bundle>
<bundle>mvn:org.owasp.encoder/encoder/${owasp.java.encoder.version}</bundle>
<bundle>mvn:org.apache.shiro/shiro-web/${project.version}</bundle>
</feature>
- <!-- 3rd party support (alphabetized please): -->
-
+ <!-- 3rd party support -->
<feature name="shiro-aspectj" version="${project.version}">
<feature version="${project.version}">shiro-core</feature>
<bundle
dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.aspectj/${aspectj.bundle.version}</bundle>
@@ -59,38 +58,15 @@
<bundle>mvn:org.apache.shiro/shiro-cache/${project.version}</bundle>
</feature>
- <feature name="shiro-ehcache" version="${project.version}">
- <feature version="${project.version}">shiro-core</feature>
- <bundle
dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.ehcache/${ehcache.bundle.version}</bundle>
- <bundle>mvn:org.apache.shiro/shiro-ehcache/${project.version}</bundle>
- </feature>
-
- <feature name="shiro-hazelcast" version="${project.version}">
- <feature version="${project.version}">shiro-core</feature>
- <bundle>mvn:com.hazelcast/hazelcast-all/${hazelcast.version}</bundle>
-
<bundle>mvn:org.apache.shiro/shiro-hazelcast/${project.version}</bundle>
- </feature>
-
- <!--
- TODO enable when openid4j module is done
- <feature name="shiro-openid4j" version="${project.version}">
- <feature version="${project.version}">shiro-core</feature>
- <feature version="${project.version}">shiro-web</feature>
- <feature version="[3,4)">spring</feature>
- TODO: is there an openid4j OSGi bundle?
- <bundle
dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.openid4j/${openid4j.version}</bundle>
- <bundle>mvn:org.apache.shiro/shiro-openid4j/${project.version}</bundle>
- </feature>
- -->
-
- <feature name="shiro-quartz" version="${project.version}">
- <feature version="${project.version}">shiro-core</feature>
- <bundle
dependency="true">mvn:commons-collections/commons-collections/${commons.collections.version}</bundle>
- <bundle
dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.c3p0/${c3p0-bundle-version}</bundle>
- <bundle
dependency="true">mvn:com.zaxxer/HikariCP-java7/${hikaricp-version}</bundle>
- <bundle
dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.quartz/${quartz.bundle.version}</bundle>
- <bundle>mvn:org.apache.shiro/shiro-quartz/${project.version}</bundle>
- </feature>
+ <!-- need release of servicemix bundles quartz 2.5.x -->
+<!-- <feature name="shiro-quartz" version="${project.version}">-->
+<!-- <feature version="${project.version}">shiro-core</feature>-->
+<!-- <bundle
dependency="true">mvn:commons-collections/commons-collections/${commons.collections.version}</bundle>-->
+<!-- <bundle
dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.c3p0/${c3p0-bundle-version}</bundle>-->
+<!-- <bundle
dependency="true">mvn:com.zaxxer/HikariCP-java7/${hikaricp-version}</bundle>-->
+<!-- <bundle
dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.quartz/${quartz.bundle.version}</bundle>-->
+<!--
<bundle>mvn:org.apache.shiro/shiro-quartz/${project.version}</bundle>-->
+<!-- </feature>-->
<feature name="shiro-spring" version="${project.version}">
<feature version="${project.version}">shiro-web</feature>
diff --git a/support/guice/pom.xml b/support/guice/pom.xml
index 81b3b9061..cad9dacb0 100644
--- a/support/guice/pom.xml
+++ b/support/guice/pom.xml
@@ -103,7 +103,7 @@
<Import-Package>
org.apache.shiro*;version="${shiro.osgi.importRange}",
org.aopalliance*;version="[1.0.0, 2.0.0)",
- com.google.inject*;version="1.3",
+ com.google.inject*;version="[7.0.0, 8.0.0)",
*
</Import-Package>
<_removeheaders>Bnd-LastModified</_removeheaders>
diff --git a/support/pom.xml b/support/pom.xml
index e6b71e950..004480ccc 100644
--- a/support/pom.xml
+++ b/support/pom.xml
@@ -43,6 +43,6 @@
<module>spring</module>
<module>spring-boot</module>
<!-- Disabled for 3.x until we can verify fix it -->
-<!-- <module>features</module>-->
+ <module>features</module>
</modules>
</project>
diff --git a/support/spring/pom.xml b/support/spring/pom.xml
index bc60daebf..7c5396c33 100644
--- a/support/spring/pom.xml
+++ b/support/spring/pom.xml
@@ -105,7 +105,7 @@
<Import-Package>
org.apache.shiro*;version="${shiro.osgi.importRange}",
org.aopalliance*;version="[1.0.0, 2.0.0)",
- org.springframework*;version="[4.0.0, 6.0.0)",
+ org.springframework*;version="[6.0.0, 7.0.0)",
*
</Import-Package>
<_removeheaders>Bnd-LastModified</_removeheaders>
