Bug 4313: Remove dependency on netconf

aaa's features-aaa-authz still depends on netconf, which introduces a
cyclic dependency. Dropping the odl-restconf feature from
odl-aaa-authz fixes this.

Change-Id: I77a1de4ef2d9d8892c5fd3886966c8a309dbf953
Signed-off-by: Stephen Kitt <skitt@redhat.com>

diff --git a/features/authz/pom.xml b/features/authz/pom.xml
index e6d6f77880469ca40962291df0afb601b0eebfaa..47da7744fa99f17790aed8af045087b5a911eda1 100644 (file)
--- a/features/authz/pom.xml
+++ b/features/authz/pom.xml
@@ -22,7 +22,6 @@
         <config.version>0.4.0-SNAPSHOT</config.version>
         <mdsal.version>2.0.0-SNAPSHOT</mdsal.version>
         <controller.mdsal.version>1.3.0-SNAPSHOT</controller.mdsal.version>
-        <restconf.version>1.3.0-SNAPSHOT</restconf.version>
         <yangtools.version>0.8.0-SNAPSHOT</yangtools.version>
     </properties>
 
@@ -72,13 +71,6 @@
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
-        <dependency>
-            <groupId>org.opendaylight.netconf</groupId>
-            <artifactId>features-restconf</artifactId>
-            <version>${restconf.version}</version>
-            <classifier>features</classifier>
-            <type>xml</type>
-        </dependency>
         <dependency>
             <groupId>org.opendaylight.aaa</groupId>
             <artifactId>authz-restconf-config</artifactId>

diff --git a/features/authz/src/main/features/features.xml b/features/authz/src/main/features/features.xml
index 51f0d7a1c9e007d274fad6ad99a1cd779a7a30d4..c5239045ee9acbd3375042b09e876f57f82ed875 100644 (file)
--- a/features/authz/src/main/features/features.xml
+++ b/features/authz/src/main/features/features.xml
@@ -11,7 +11,6 @@
     <repository>mvn:org.opendaylight.controller/features-config/{{VERSION}}/xml/features</repository>
     <repository>mvn:org.opendaylight.mdsal/features-mdsal/{{VERSION}}/xml/features</repository>
     <repository>mvn:org.opendaylight.controller/features-mdsal/{{VERSION}}/xml/features</repository>
-    <repository>mvn:org.opendaylight.netconf/features-restconf/{{VERSION}}/xml/features</repository>
     <repository>mvn:org.opendaylight.aaa/features-aaa-api/{{VERSION}}/xml/features</repository>
 
     <feature name='odl-aaa-authz' description='OpenDaylight :: AAA :: Authorization'
@@ -21,7 +20,6 @@
         <feature version='${mdsal.version}'>odl-mdsal-binding-base</feature>
         <feature version='${controller.mdsal.version}'>odl-mdsal-broker</feature>
         <feature version='${config.version}'>odl-config-core</feature>
-        <feature version='${restconf.version}'>odl-restconf</feature>
         <bundle>mvn:org.opendaylight.aaa/aaa-authz-model/{{VERSION}}</bundle>
         <bundle>mvn:org.opendaylight.aaa/aaa-authz-service/{{VERSION}}</bundle>
         <configfile