Merge pull request #153 from coheigea/SHIRO-709
SHIRO-709 - Fix Shiro Spring feature
diff --git a/support/features/pom.xml b/support/features/pom.xml
index 8fb0b2c..d8c9c86 100644
--- a/support/features/pom.xml
+++ b/support/features/pom.xml
@@ -32,12 +32,11 @@
<packaging>pom</packaging>
<properties>
- <aspectj.bundle.version>1.8.9_1</aspectj.bundle.version>
+ <aspectj.bundle.version>1.9.4_1</aspectj.bundle.version>
<ehcache.bundle.version>2.6.11_1</ehcache.bundle.version>
- <hazelcast.bundle.version>3.7.2_1</hazelcast.bundle.version>
<quartz.bundle.version>1.6.1_1</quartz.bundle.version>
<!-- Not a Shiro dependency - used for quartz bundle resolution only (see features.xml): -->
- <commons.collections.version>3.2.1</commons.collections.version>
+ <commons.collections.version>3.2.2</commons.collections.version>
<!-- karaf plugin version -->
<karaf.version>4.2.5</karaf.version>
</properties>
diff --git a/support/features/src/main/resources/features.xml b/support/features/src/main/resources/features.xml
index 767e338..6486d90 100644
--- a/support/features/src/main/resources/features.xml
+++ b/support/features/src/main/resources/features.xml
@@ -81,7 +81,7 @@
<feature name="shiro-spring" version="${project.version}">
<feature version="${project.version}">shiro-web</feature>
- <feature version="[4,5)">spring</feature>
+ <feature version="[4,6)">spring</feature>
<bundle>mvn:org.apache.shiro/shiro-spring/${project.version}</bundle>
</feature>
diff --git a/support/spring-boot/spring-boot-starter/pom.xml b/support/spring-boot/spring-boot-starter/pom.xml
index 9fe0b24..7c0f722 100644
--- a/support/spring-boot/spring-boot-starter/pom.xml
+++ b/support/spring-boot/spring-boot-starter/pom.xml
@@ -70,7 +70,7 @@
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
- <version>1.2</version>
+ <version>${commons.logging.version}</version>
<scope>test</scope>
</dependency>
diff --git a/support/spring/pom.xml b/support/spring/pom.xml
index 5db3333..a0b4d55 100644
--- a/support/spring/pom.xml
+++ b/support/spring/pom.xml
@@ -91,7 +91,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, 5.0.0)",
+ org.springframework*;version="[4.0.0, 6.0.0)",
*
</Import-Package>
</instructions>
