Bump odlparent to 5.0.0

[aaa.git] / features / odl-aaa-shiro / pom.xml

diff --git a/features/odl-aaa-shiro/pom.xml b/features/odl-aaa-shiro/pom.xml
index fdce3233a147fb2f9d82e1e5567e22840516f59d..19259b74fdbdce6583083391902ea7227f0da794 100644 (file)
--- a/features/odl-aaa-shiro/pom.xml
+++ b/features/odl-aaa-shiro/pom.xml
@@ -12,13 +12,13 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>4.0.2</version>
+        <version>5.0.0</version>
         <relativePath/>
     </parent>
 
     <groupId>org.opendaylight.aaa</groupId>
     <artifactId>odl-aaa-shiro</artifactId>
-    <version>0.9.0-SNAPSHOT</version>
+    <version>0.10.0-SNAPSHOT</version>
     <packaging>feature</packaging>
 
     <!-- odl-aaa-shiro feature which combines all aspects of AAA into one feature -->
@@ -65,7 +65,7 @@
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>odl-jolokia</artifactId>
-            <version>1.12.0-SNAPSHOT</version>
+            <version>1.13.0-SNAPSHOT</version>
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
@@ -116,10 +116,6 @@
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
-        <dependency>
-            <groupId>org.json</groupId>
-            <artifactId>json</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.apache.shiro</groupId>
             <artifactId>shiro-web</artifactId>
@@ -132,18 +128,6 @@
             <groupId>commons-codec</groupId>
             <artifactId>commons-codec</artifactId>
         </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>org.opendaylight.aaa</groupId>
             <artifactId>aaa-shiro</artifactId>
@@ -164,6 +148,12 @@
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
+        <dependency>
+            <groupId>org.opendaylight.odlparent</groupId>
+            <artifactId>odl-apache-commons-codec</artifactId>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
 
         <!-- EhCache -->
         <dependency>