Fixup netconf-parent path

[netconf.git] / restconf / restconf-nb-rfc8040 / pom.xml

diff --git a/restconf/restconf-nb-rfc8040/pom.xml b/restconf/restconf-nb-rfc8040/pom.xml
index 20d37f1272e015744c7b4ec881393fd6034f1e92..0993493900bb0c3bc83f65ee11515145def30422 100644 (file)
--- a/restconf/restconf-nb-rfc8040/pom.xml
+++ b/restconf/restconf-nb-rfc8040/pom.xml
@@ -12,14 +12,12 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.opendaylight.netconf</groupId>
-    <artifactId>restconf-parent</artifactId>
-    <version>1.13.0-SNAPSHOT</version>
-    <relativePath>../restconf-parent</relativePath>
+    <artifactId>netconf-parent</artifactId>
+    <version>2.0.0-SNAPSHOT</version>
+    <relativePath>../../parent</relativePath>
   </parent>
 
-  <groupId>org.opendaylight.netconf</groupId>
   <artifactId>restconf-nb-rfc8040</artifactId>
-  <version>1.13.0-SNAPSHOT</version>
   <packaging>bundle</packaging>
 
   <dependencies>
@@ -29,7 +27,7 @@
       <optional>true</optional>
     </dependency>
     <dependency>
-      <groupId>javax.inject</groupId>
+      <groupId>com.guicedee.services</groupId>
       <artifactId>javax.inject</artifactId>
       <optional>true</optional>
     </dependency>
@@ -48,7 +46,19 @@
     </dependency>
     <dependency>
       <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
-      <artifactId>rfc7895</artifactId>
+      <artifactId>rfc6991-ietf-yang-types</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
+      <artifactId>rfc8525</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.netconf</groupId>
+      <artifactId>ietf-restconf</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.netconf</groupId>
+      <artifactId>ietf-restconf-monitoring</artifactId>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.netconf</groupId>
@@ -92,19 +102,10 @@
       <artifactId>yang-model-export</artifactId>
     </dependency>
 
-    <dependency>
-      <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
-      <artifactId>rfc6991-ietf-yang-types</artifactId>
-    </dependency>
-
     <dependency>
       <groupId>org.opendaylight.mdsal</groupId>
       <artifactId>mdsal-dom-spi</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.opendaylight.controller</groupId>
-      <artifactId>sal-common-util</artifactId>
-    </dependency>
 
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
@@ -127,6 +128,7 @@
       <groupId>org.json</groupId>
       <artifactId>json</artifactId>
       <version>20131018</version>
+      <scope>test</scope>
     </dependency>
 
     <dependency>
@@ -144,18 +146,10 @@
       <artifactId>aaa-filterchain</artifactId>
     </dependency>
 
-    <dependency>
-      <groupId>org.eclipse.jetty</groupId>
-      <artifactId>jetty-servlets</artifactId>
-    </dependency>
     <dependency>
       <groupId>org.eclipse.jetty.websocket</groupId>
       <artifactId>websocket-server</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.glassfish.jersey.media</groupId>
-      <artifactId>jersey-media-sse</artifactId>
-    </dependency>
 
     <!-- Testing Dependencies -->
     <dependency>
@@ -168,6 +162,11 @@
       <artifactId>jersey-hk2</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.glassfish.jersey.media</groupId>
+      <artifactId>jersey-media-sse</artifactId>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>org.opendaylight.mdsal</groupId>
       <artifactId>mdsal-binding-test-utils</artifactId>
@@ -190,18 +189,19 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.opendaylight.infrautils</groupId>
-      <artifactId>inject.guice.testutils</artifactId>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>threadpool-config-impl</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.opendaylight.netconf</groupId>
-      <artifactId>ietf-restconf</artifactId>
+      <groupId>org.xmlunit</groupId>
+      <artifactId>xmlunit-assertj</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.opendaylight.controller</groupId>
-      <artifactId>threadpool-config-impl</artifactId>
+      <groupId>net.javacrumbs.json-unit</groupId>
+      <artifactId>json-unit-assertj</artifactId>
+      <version>2.18.1</version>
       <scope>test</scope>
     </dependency>
   </dependencies>