Skip to content

Commit 6a57e68

Browse files
fpaponfpapon
committed
[SHIRO-652] Upgrade Shiro Feature to Karaf 4.x
1 parent eeb7e95 commit 6a57e68

6 files changed

Lines changed: 68 additions & 22 deletions

File tree

‎core/pom.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@
5656
<Import-Package>
5757
org.apache.shiro*;version="${shiro.osgi.importRange}",
5858
org.apache.commons.beanutils*;resolution:=optional,
59+
org.apache.commons.configuration2*;resolution:=optional,
5960
*
6061
</Import-Package>
6162
</instructions>

‎pom.xml‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,11 @@
7676
<!-- Don't change this version without also changing the shiro-aspect and shiro-features
7777
modules' OSGi metadata: -->
7878
<aspectj.version>1.8.9</aspectj.version>
79+
<cas.client.core.version>3.2.2</cas.client.core.version>
7980
<commons.cli.version>1.3.1</commons.cli.version>
8081
<commons.codec.version>1.10</commons.codec.version>
82+
<commons.configuration2.version>2.2</commons.configuration2.version>
83+
<commons.lang3.version>3.3.2</commons.lang3.version>
8184
<crowd.version>1.5.2</crowd.version>
8285
<!-- Don't change this version without also changing the shiro-ehcache and shiro-features
8386
modules' OSGi metadata: -->
@@ -791,7 +794,7 @@
791794
<!-- optional dep for the reflection builder -->
792795
<groupId>org.apache.commons</groupId>
793796
<artifactId>commons-configuration2</artifactId>
794-
<version>2.2</version>
797+
<version>${commons.configuration2.version}</version>
795798
<exclusions>
796799
<exclusion>
797800
<groupId>commons-logging</groupId>

‎support/cas/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
<dependency>
4040
<groupId>org.jasig.cas.client</groupId>
4141
<artifactId>cas-client-core</artifactId>
42-
<version>3.2.2</version>
42+
<version>${cas.client.core.version}</version>
4343
</dependency>
4444
<dependency>
4545
<!-- for Optional SAML ticket validation: -->

‎support/features/pom.xml‎

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,20 @@
3838
<quartz.bundle.version>1.6.1_1</quartz.bundle.version>
3939
<!-- Not a Shiro dependency - used for quartz bundle resolution only (see features.xml): -->
4040
<commons.collections.version>3.2.1</commons.collections.version>
41+
<!-- karaf plugin version -->
42+
<karaf.version>4.2.4</karaf.version>
4143
</properties>
4244

45+
<dependencies>
46+
<dependency>
47+
<groupId>org.apache.karaf.features</groupId>
48+
<artifactId>framework</artifactId>
49+
<version>${karaf.version}</version>
50+
<type>kar</type>
51+
<scope>provided</scope>
52+
</dependency>
53+
</dependencies>
54+
4355
<build>
4456
<resources>
4557
<resource>
@@ -93,6 +105,36 @@
93105
</execution>
94106
</executions>
95107
</plugin>
108+
<plugin>
109+
<groupId>org.apache.karaf.tooling</groupId>
110+
<artifactId>karaf-maven-plugin</artifactId>
111+
<version>${karaf.version}</version>
112+
<executions>
113+
<execution>
114+
<id>verify</id>
115+
<phase>process-resources</phase>
116+
<goals>
117+
<goal>verify</goal>
118+
</goals>
119+
<configuration>
120+
<descriptors>
121+
<descriptor>mvn:org.apache.karaf.features/framework/${karaf.version}/xml/features</descriptor>
122+
<descriptor>mvn:org.apache.karaf.features/enterprise/${karaf.version}/xml/features</descriptor>
123+
<descriptor>mvn:org.apache.karaf.features/spring-legacy/${karaf.version}/xml/features</descriptor>
124+
<descriptor>file:${project.build.directory}/classes/features.xml</descriptor>
125+
</descriptors>
126+
<distribution>org.apache.karaf.features:framework</distribution>
127+
<javase>1.8</javase>
128+
<framework>
129+
<feature>framework</feature>
130+
</framework>
131+
<features>
132+
<feature>shiro*</feature>
133+
</features>
134+
</configuration>
135+
</execution>
136+
</executions>
137+
</plugin>
96138
</plugins>
97139
</build>
98140

‎support/features/src/main/resources/features.xml‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -17,52 +17,52 @@
1717
~ specific language governing permissions and limitations
1818
~ under the License.
1919
-->
20-
<features name="shiro-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.0.0">
20+
<features name="shiro-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.4.0">
2121

2222
<!-- Shiro core features: -->
2323

24-
<feature name="shiro-core" version="${project.version}" resolver="(obr)">
24+
<feature name="shiro-core" version="${project.version}">
2525
<bundle>mvn:org.apache.shiro/shiro-core/${project.version}</bundle>
2626
</feature>
2727

28-
<feature name="shiro-web" version="${project.version}" resolver="(obr)">
28+
<feature name="shiro-web" version="${project.version}">
2929
<feature version="${project.version}">shiro-core</feature>
30-
<feature version="[2,4)">war</feature>
30+
<feature version="[2,5)">war</feature>
3131
<bundle>mvn:org.apache.shiro/shiro-web/${project.version}</bundle>
3232
</feature>
3333

3434
<!-- 3rd party support (alphabetized please): -->
3535

36-
<feature name="shiro-aspectj" version="${project.version}" resolver="(obr)">
36+
<feature name="shiro-aspectj" version="${project.version}">
3737
<feature version="${project.version}">shiro-core</feature>
3838
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.aspectj/${aspectj.bundle.version}</bundle>
3939
<bundle>mvn:org.apache.shiro/shiro-aspectj/${project.version}</bundle>
4040
</feature>
4141

42-
<feature name="shiro-cas" version="${project.version}" resolver="(obr)">
43-
<feature version="${project.version}">shiro-core</feature>
44-
<!-- Is there a CAS client osgi bundle somewhere?
45-
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.aspectj/${casclient.bundle.version}</bundle>
46-
-->
42+
<feature name="shiro-cas" version="${project.version}">
43+
<feature prerequisite='true'>wrap</feature>
44+
<feature version="${project.version}">shiro-web</feature>
45+
<bundle dependency='true'>wrap:mvn:org.jasig.cas.client/cas-client-core/${cas.client.core.version}$Export-Package=org.jasig*;version=${cas.client.core.version}</bundle>
4746
<bundle>mvn:org.apache.shiro/shiro-cas/${project.version}</bundle>
4847
</feature>
4948

50-
<feature name="shiro-ehcache" version="${project.version}" resolver="(obr)">
49+
<feature name="shiro-ehcache" version="${project.version}">
5150
<feature version="${project.version}">shiro-core</feature>
5251
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.ehcache/${ehcache.bundle.version}</bundle>
5352
<bundle>mvn:org.apache.shiro/shiro-ehcache/${project.version}</bundle>
5453
</feature>
5554

56-
<feature name="shiro-hazelcast" version="${project.version}" resolver="(obr)">
55+
<feature name="shiro-hazelcast" version="${project.version}">
5756
<feature version="${project.version}">shiro-core</feature>
58-
<!-- Is there a Hazelcast osgi bundle somewhere? The following line just assumes it exists: -->
59-
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.hazelcast/${hazelcast.bundle.version}</bundle>
57+
<bundle>mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/1.1.1</bundle>
58+
<bundle>mvn:org.apache.geronimo.specs/geronimo-annotation_1.3_spec/1.1</bundle>
59+
<bundle>mvn:com.hazelcast/hazelcast-all/${hazelcast.version}</bundle>
6060
<bundle>mvn:org.apache.shiro/shiro-hazelcast/${project.version}</bundle>
6161
</feature>
6262

6363
<!--
6464
TODO enable when openid4j module is done
65-
<feature name="shiro-openid4j" version="${project.version}" resolver="(obr)">
65+
<feature name="shiro-openid4j" version="${project.version}">
6666
<feature version="${project.version}">shiro-core</feature>
6767
<feature version="${project.version}">shiro-web</feature>
6868
<feature version="[3,4)">spring</feature>
@@ -72,16 +72,16 @@
7272
</feature>
7373
-->
7474

75-
<feature name="shiro-quartz" version="${project.version}" resolver="(obr)">
75+
<feature name="shiro-quartz" version="${project.version}">
7676
<feature version="${project.version}">shiro-core</feature>
7777
<bundle dependency='true'>mvn:commons-collections/commons-collections/${commons.collections.version}</bundle>
7878
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.quartz/${quartz.bundle.version}</bundle>
7979
<bundle>mvn:org.apache.shiro/shiro-quartz/${project.version}</bundle>
8080
</feature>
8181

82-
<feature name="shiro-spring" version="${project.version}" resolver="(obr)">
83-
<feature version="${project.version}">shiro-core</feature>
84-
<feature version="[3,4)">spring</feature>
82+
<feature name="shiro-spring" version="${project.version}">
83+
<feature version="${project.version}">shiro-web</feature>
84+
<feature version="[4,5)">spring</feature>
8585
<bundle>mvn:org.apache.shiro/shiro-spring/${project.version}</bundle>
8686
</feature>
8787

‎support/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,11 @@
3838
<module>quartz</module>
3939
<module>spring</module>
4040
<module>guice</module>
41-
<module>features</module>
4241
<module>cas</module>
4342
<module>spring-boot</module>
4443
<module>servlet-plugin</module>
4544
<module>jaxrs</module>
45+
<module>features</module>
4646
</modules>
4747

4848
</project>

0 commit comments

Comments
 (0)