Migrate restconf dependencies to new groupId

Change-Id: I6ade2b415512c225562a90226b808f6ee7404284
Signed-off-by: Tomas Cere <tcere@cisco.com>

diff --git a/features/pom.xml b/features/pom.xml
index 5dfa39f28b85375078e02ba705f68e5d3954d6cd..7dfb3bd784dc8f888d37bc3d3e1e48d313e35c0c 100644 (file)
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -25,6 +25,7 @@
       <karaf.resources.version>1.6.0-SNAPSHOT</karaf.resources.version>
       <feature.test.version>1.6.0-SNAPSHOT</feature.test.version>
       <karaf.empty.version>1.6.0-SNAPSHOT</karaf.empty.version>
+      <restconf.version>1.3.0-SNAPSHOT</restconf.version>
    </properties>
    <dependencies>
       <dependency>
@@ -36,9 +37,9 @@
          <scope>compile</scope>
       </dependency>
       <dependency>
-         <groupId>org.opendaylight.controller</groupId>
+         <groupId>org.opendaylight.netconf</groupId>
          <artifactId>features-restconf</artifactId>
-         <version>${controller.version}</version>
+         <version>${restconf.version}</version>
          <classifier>features</classifier>
          <type>xml</type>
          <scope>compile</scope>
@@ -108,6 +109,11 @@
         <version>${project.version}</version>
       </dependency>
     -->
+   <dependency>
+       <groupId>org.opendaylight.netconf</groupId>
+       <artifactId>sal-rest-docgen</artifactId>
+       <version>${restconf.version}</version>
+   </dependency>
 
     <!--
       Done TODO: Put dependencies for configfiles directly referenced

diff --git a/features/src/main/resources/features.xml b/features/src/main/resources/features.xml
index 995f3faa31cb2ac8ad4efbcecfa7708961a66e05..237903ac81908abe1b488d427915788c20221c55 100644 (file)
--- a/features/src/main/resources/features.xml
+++ b/features/src/main/resources/features.xml
@@ -12,7 +12,7 @@
 
     <!-- Karaf Features repositories that TTP depends on -->
     <repository>mvn:org.opendaylight.yangtools/features-yangtools/${yangtools.version}/xml/features</repository>
-    <repository>mvn:org.opendaylight.controller/features-restconf/${controller.version}/xml/features</repository>
+    <repository>mvn:org.opendaylight.netconf/features-restconf/${restconf.version}/xml/features</repository>
     <!-- We currently don't use this
     <repository>mvn:org.opendaylight.openflowjava/features-openflowjava/${openflowjava.version}/xml/features</repository>
     -->
@@ -37,8 +37,8 @@
     <!-- TTP Model feature -->
     <feature name='odl-ttp-model-rest' version='${project.version}' description='OpenDaylight :: ttp :: Model'>
         <feature version='${project.version}'>odl-ttp-model</feature>
-        <feature version='${controller.version}'>odl-mdsal-apidocs</feature>
-        <feature version='${controller.version}'>odl-restconf</feature>
+        <feature version='${restconf.version}'>odl-mdsal-apidocs</feature>
+        <feature version='${restconf.version}'>odl-restconf</feature>
         <feature version='${controller.version}'>odl-mdsal-broker</feature>
     </feature>