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 a2aa5c3ed Moved Karaf into deferred
a2aa5c3ed is described below
commit a2aa5c3ed5930c0e7006c7b855274bf9b264a5a5
Author: lprimak <[email protected]>
AuthorDate: Wed Jan 28 22:42:17 2026 -0600
Moved Karaf into deferred
---
support/features/pom.xml | 60 ++++++++++++++++++++++++------------------------
support/pom.xml | 2 +-
2 files changed, 31 insertions(+), 31 deletions(-)
diff --git a/support/features/pom.xml b/support/features/pom.xml
index 6b9ddb1cf..58c586459 100644
--- a/support/features/pom.xml
+++ b/support/features/pom.xml
@@ -106,36 +106,36 @@
</execution>
</executions>
</plugin>
- <!-- <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/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>1.8</javase>-->
- <!-- <framework>-->
- <!-- <feature>framework</feature>-->
- <!-- </framework>-->
- <!-- <features>-->
- <!-- <feature>shiro*</feature>-->
- <!-- </features>-->
- <!-- </configuration>-->
- <!-- </execution>-->
- <!-- </executions>-->
- <!-- </plugin>-->
+ <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/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>
diff --git a/support/pom.xml b/support/pom.xml
index 6a7d82e6a..6433b855f 100644
--- a/support/pom.xml
+++ b/support/pom.xml
@@ -40,7 +40,6 @@
<module>guice</module>
<module>servlet-plugin</module>
<module>jaxrs</module>
- <module>features</module>
<module>cdi</module>
<module>jakarta-ee</module>
</modules>
@@ -51,6 +50,7 @@
<modules>
<module>spring</module>
<module>spring-boot</module>
+ <module>features</module>
</modules>
</profile>
</profiles>
