Bug 4749 odl-aaa-shiro feature doesn't import some runtime dependencies

Imports the correct runtime dependencies so that ODL's Shiro wrapper
and Filtering works.  Also updates to use ${project.version} in the
appropriate places.

Change-Id: I2c9eb0fb111909b652a5d551dea238fbfe4d0f44
Signed-off-by: Ryan Goulding <ryandgoulding@gmail.com>

diff --git a/features/shiro/pom.xml b/features/shiro/pom.xml
index c9991f8bbc0bfa21ec990e18dc5cbee938d0b007..fbd95513db94ac6446db54eeb3ea5bff937ea0d4 100644 (file)
--- a/features/shiro/pom.xml
+++ b/features/shiro/pom.xml
@@ -18,6 +18,10 @@
     <version>0.3.0-SNAPSHOT</version>
     <packaging>jar</packaging>
 
+    <properties>
+        <javax.annotation.api.version>1.2</javax.annotation.api.version>
+        <servicemix.version>1.8.3_2</servicemix.version>
+    </properties>
     <dependencyManagement>
         <dependencies>
             <!-- This project -->
@@ -81,7 +85,6 @@
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>servlet-api</artifactId>
-            <version>2.5</version>
         </dependency>
         <dependency>
             <groupId>org.apache.felix</groupId>
@@ -95,6 +98,72 @@
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.opendaylight.aaa</groupId>
+            <artifactId>aaa-shiro</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.aaa</groupId>
+            <artifactId>aaa-authn</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.aaa</groupId>
+            <artifactId>aaa-authn-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.aaa</groupId>
+            <artifactId>aaa-authn-sts</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>javax.annotation</groupId>
+            <artifactId>javax.annotation-api</artifactId>
+            <version>${javax.annotation.api.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.felix</groupId>
+            <artifactId>org.apache.felix.dependencymanager</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.felix</groupId>
+            <artifactId>org.apache.felix.metatype</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.shiro</groupId>
+            <artifactId>shiro-web</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.shiro</groupId>
+            <artifactId>shiro-core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.servicemix.bundles</groupId>
+            <artifactId>org.apache.servicemix.bundles.commons-beanutils</artifactId>
+            <version>${servicemix.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.oltu.oauth2</groupId>
+            <artifactId>org.apache.oltu.oauth2.resourceserver</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.oltu.oauth2</groupId>
+            <artifactId>org.apache.oltu.oauth2.authzserver</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.oltu.oauth2</groupId>
+            <artifactId>org.apache.oltu.oauth2.common</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>javax.ws.rs</groupId>
+            <artifactId>javax.ws.rs-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.json</groupId>
+            <artifactId>json</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>commons-codec</groupId>
+            <artifactId>commons-codec</artifactId>
+        </dependency>
     </dependencies>
 
     <scm>

diff --git a/features/shiro/src/main/features/features.xml b/features/shiro/src/main/features/features.xml
index b1d7beb53619598d34787ea89039d3ecde033f5d..de2e93bcf83a57e1ffc3bc2221fce25f246e63a4 100644 (file)
--- a/features/shiro/src/main/features/features.xml
+++ b/features/shiro/src/main/features/features.xml
@@ -11,32 +11,38 @@
 
     <!-- odl-aaa-shiro feature which combines all aspects of AAA into one feature -->
     <feature name='odl-aaa-shiro' description='OpenDaylight :: AAA :: Shiro'
-             version='0.3.0-SNAPSHOT'>
+             version='${project.version}'>
+
         <!-- OSGI -->
         <bundle>mvn:org.apache.felix/org.apache.felix.dependencymanager/{{VERSION}}</bundle>
         <bundle>mvn:org.apache.felix/org.apache.felix.metatype/{{VERSION}}</bundle>
 
-        <!-- Guava -->
+        <!-- Third Party Shiro & Jersey dependency bundles -->
         <bundle>mvn:com.google.guava/guava/{{VERSION}}</bundle>
-
-        <feature version='0.3.0-SNAPSHOT'>odl-aaa-authn</feature>
-
-        <!-- Apache Shiro & Dependencies -->
-        <bundle>mvn:org.apache.shiro/shiro-core/1.2.3</bundle>
-        <bundle>mvn:org.apache.shiro/shiro-web/1.2.3</bundle>
-        <bundle>wrap:mvn:javax.servlet/servlet-api/2.5</bundle>
+        <bundle>wrap:mvn:javax.annotation/javax.annotation-api/{{VERSION}}</bundle>
+        <bundle>wrap:mvn:commons-codec/commons-codec/{{VERSION}}</bundle>
+        <bundle>wrap:mvn:org.apache.oltu.oauth2/org.apache.oltu.oauth2.resourceserver/{{VERSION}}</bundle>
+        <bundle>wrap:mvn:org.apache.oltu.oauth2/org.apache.oltu.oauth2.authzserver/{{VERSION}}</bundle>
+        <bundle>wrap:mvn:org.apache.oltu.oauth2/org.apache.oltu.oauth2.common/{{VERSION}}</bundle>
+        <bundle>wrap:mvn:org.json/json/{{VERSION}}</bundle>
+        <bundle>wrap:mvn:javax.ws.rs/javax.ws.rs-api/{{VERSION}}</bundle>
+        <bundle>wrap:mvn:javax.servlet/servlet-api/{{VERSION}}</bundle>
         <bundle>mvn:com.sun.jersey/jersey-server/{{VERSION}}</bundle>
         <bundle>mvn:com.sun.jersey/jersey-servlet/{{VERSION}}</bundle>
         <bundle>mvn:com.sun.jersey/jersey-core/{{VERSION}}</bundle>
+        <bundle>mvn:org.apache.shiro/shiro-web/{{VERSION}}</bundle>
+        <bundle>mvn:org.apache.shiro/shiro-core/{{VERSION}}</bundle>
+        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-beanutils/{{VERSION}}</bundle>
 
-        <!-- AAA bundles relating to stand-alone shiro feature -->
-        <configfile finalname="/etc/shiro.ini">mvn:org.opendaylight.aaa/aaa-shiro/{{VERSION}}/cfg/configuration</configfile>
-        <!--<bundle>mvn:org.opendaylight.aaa/aaa-authn-api/{{VERSION}}</bundle>
+        <!-- Existing AAA infrastructure -->
+        <feature version='${project.version}'>odl-aaa-authn</feature>
         <bundle>mvn:org.opendaylight.aaa/aaa-authn/{{VERSION}}</bundle>
+        <bundle>mvn:org.opendaylight.aaa/aaa-authn-api/{{VERSION}}</bundle>
         <bundle>mvn:org.opendaylight.aaa/aaa-authn-sts/{{VERSION}}</bundle>
-        -->
         <bundle>mvn:org.opendaylight.aaa/aaa-shiro/{{VERSION}}</bundle>
-        <bundle>mvn:org.opendaylight.aaa/aaa-shiro-act/{{VERSION}}</bundle>
+
+        <!-- AAA configuration file -->
+        <configfile finalname="/etc/shiro.ini">mvn:org.opendaylight.aaa/aaa-shiro/{{VERSION}}/cfg/configuration</configfile>
     </feature>
 
 </features>