Merge "Remove unused reference to Broker in NetconfDeviceSalProviderTest"

diff --git a/features/restconf/odl-restconf-common/pom.xml b/features/restconf/odl-restconf-common/pom.xml
index 08838f52b247f0d353398f1c036b7258cc35ae8f..f9954438fed543927cbe77e1d5c2bc85d1e54e35 100644 (file)
--- a/features/restconf/odl-restconf-common/pom.xml
+++ b/features/restconf/odl-restconf-common/pom.xml
@@ -124,5 +124,35 @@
             <groupId>org.opendaylight.netconf</groupId>
             <artifactId>restconf-common</artifactId>
         </dependency>
+
+        <!-- TODO: Remove this when RESTCONF is converted to GSON -->
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-annotations</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.datatype</groupId>
+            <artifactId>jackson-datatype-json-org</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.jaxrs</groupId>
+            <artifactId>jackson-jaxrs-base</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.jaxrs</groupId>
+            <artifactId>jackson-jaxrs-json-provider</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.module</groupId>
+            <artifactId>jackson-module-jaxb-annotations</artifactId>
+        </dependency>
     </dependencies>
 </project>

diff --git a/features/restconf/odl-restconf-nb-rfc8040/pom.xml b/features/restconf/odl-restconf-nb-rfc8040/pom.xml
index ac477a8c2ed984d20c7c90f23a91eff420c8f4b9..8c17cf9d22f78561fad9492831b7b6f192b89a69 100644 (file)
--- a/features/restconf/odl-restconf-nb-rfc8040/pom.xml
+++ b/features/restconf/odl-restconf-nb-rfc8040/pom.xml
@@ -25,13 +25,14 @@
 
     <name>OpenDaylight :: Restconf NB - RFC8040</name>
 
-    <!-- Enables AAA through the odl-shiro-act bundle Activator -->
-
     <dependencies>
+        <!-- Enables AAA through aaa-shiro-act -->
         <dependency>
             <groupId>org.opendaylight.aaa</groupId>
-            <artifactId>aaa-shiro-act</artifactId>
+            <artifactId>odl-aaa-shiro-act</artifactId>
             <version>0.8.0-SNAPSHOT</version>
+            <type>xml</type>
+            <classifier>features</classifier>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.netconf</groupId>

diff --git a/features/restconf/odl-restconf-noauth/pom.xml b/features/restconf/odl-restconf-noauth/pom.xml
index 840526ecbe4214987bc175e8ff813d96ad66e79e..3c1fb76b11d4a145ababcfe2bb02da01410465e5 100644 (file)
--- a/features/restconf/odl-restconf-noauth/pom.xml
+++ b/features/restconf/odl-restconf-noauth/pom.xml
@@ -56,6 +56,6 @@
             <version>${project.version}</version>
             <type>cfg</type>
             <classifier>restconf</classifier>
-         </dependency>
+        </dependency>
     </dependencies>
 </project>

diff --git a/features/restconf/odl-restconf/pom.xml b/features/restconf/odl-restconf/pom.xml
index 14127b600f3b3bf4bf27f75085bf0dd0208255cd..194a6d6b89c2285e634073d86a2ea9a656844985 100644 (file)
--- a/features/restconf/odl-restconf/pom.xml
+++ b/features/restconf/odl-restconf/pom.xml
@@ -25,13 +25,14 @@
 
     <name>OpenDaylight :: Restconf</name>
 
-    <!-- Enables AAA through the odl-shiro-act bundle Activator -->
-
     <dependencies>
+        <!-- Enables AAA through aaa-shiro-act -->
         <dependency>
             <groupId>org.opendaylight.aaa</groupId>
-            <artifactId>aaa-shiro-act</artifactId>
+            <artifactId>odl-aaa-shiro-act</artifactId>
             <version>0.8.0-SNAPSHOT</version>
+            <type>xml</type>
+            <classifier>features</classifier>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.netconf</groupId>