BUG-8923: Bump odlparent to 2.0.4

[netconf.git] / features / restconf / odl-restconf-noauth / pom.xml

diff --git a/features/restconf/odl-restconf-noauth/pom.xml b/features/restconf/odl-restconf-noauth/pom.xml
index 9d8fe92084fe60d53c0e41885411a72668fd1ba9..5386df222f807953ccf8f0117b98a9ebe27797b2 100644 (file)
--- a/features/restconf/odl-restconf-noauth/pom.xml
+++ b/features/restconf/odl-restconf-noauth/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>1.9.0</version>
+        <version>2.0.4</version>
         <relativePath/>
     </parent>
 
@@ -25,18 +25,12 @@
 
     <name>OpenDaylight :: Restconf</name>
 
-    <properties>
-        <config.configfile.directory>etc/opendaylight/karaf</config.configfile.directory>
-        <config.restconf.configfile>10-rest-connector.xml</config.restconf.configfile>
-        <config.restconf.service.configfile>10-restconf-service.xml</config.restconf.service.configfile>
-    </properties>
-
     <dependencyManagement>
         <dependencies>
             <dependency>
                 <groupId>org.opendaylight.odlparent</groupId>
                 <artifactId>odlparent-artifacts</artifactId>
-                <version>1.9.0</version>
+                <version>2.0.4</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
@@ -88,8 +82,7 @@
         </dependency>
         <dependency>
             <groupId>org.opendaylight.odlparent</groupId>
-            <artifactId>odl4-netty-4</artifactId>
-            <version>1.9.0</version>
+            <artifactId>odl-netty-4</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
@@ -116,32 +109,11 @@
             <artifactId>sal-rest-connector</artifactId>
         </dependency>
         <dependency>
-            <groupId>com.google.code.gson</groupId>
-            <artifactId>gson</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.yangtools</groupId>
-            <artifactId>yang-data-codec-gson</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.yangtools</groupId>
-            <artifactId>yang-model-export</artifactId>
-        </dependency>
-        <dependency>
-            <!-- finalname="${config.configfile.directory}/${config.restconf.configfile}" -->
             <groupId>org.opendaylight.netconf</groupId>
             <artifactId>sal-rest-connector-config</artifactId>
             <version>${project.version}</version>
-            <type>xml</type>
-            <classifier>config</classifier>
-        </dependency>
-        <dependency>
-            <!-- finalname="${config.configfile.directory}/${config.restconf.service.configfile}" -->
-            <groupId>org.opendaylight.netconf</groupId>
-            <artifactId>sal-rest-connector-config</artifactId>
-            <version>${project.version}</version>
-            <type>xml</type>
-            <classifier>configrestconfservice</classifier>
-        </dependency>
+            <type>cfg</type>
+            <classifier>restconf</classifier>
+         </dependency>
     </dependencies>
 </project>