You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@shiro.apache.org by fp...@apache.org on 2020/04/16 17:20:27 UTC
[shiro] branch master updated: [SHIRO-759] Upgrade to Karaf 4.2.8
This is an automated email from the ASF dual-hosted git repository.
fpapon pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shiro.git
The following commit(s) were added to refs/heads/master by this push:
new 2238667 [SHIRO-759] Upgrade to Karaf 4.2.8
new 1e078c8 Merge pull request #217 from fpapon/SHIRO-759
2238667 is described below
commit 22386673c58e03052f2d368c128fc5189439636f
Author: Francois Papon <fp...@apache.org>
AuthorDate: Thu Apr 16 16:45:21 2020 +0200
[SHIRO-759] Upgrade to Karaf 4.2.8
---
support/features/pom.xml | 62 ++++++++++++++++++++++++------------------------
1 file changed, 31 insertions(+), 31 deletions(-)
diff --git a/support/features/pom.xml b/support/features/pom.xml
index 0ba70b8..af25791 100644
--- a/support/features/pom.xml
+++ b/support/features/pom.xml
@@ -40,7 +40,7 @@
<!-- 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 -->
- <karaf.version>4.2.7</karaf.version>
+ <karaf.version>4.2.8</karaf.version>
</properties>
<dependencies>
@@ -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>1.8</javase>
+ <framework>
+ <feature>framework</feature>
+ </framework>
+ <features>
+ <feature>shiro*</feature>
+ </features>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>