Introduce restconf.nb.jaxrs package

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

diff --git a/restconf/restconf-nb/pom.xml b/restconf/restconf-nb/pom.xml
index 818c02bd2fd4027a2366d773bca0106e5f61366e..9e75308014990c35eb0837bf6ec89c455539e658 100644 (file)
--- a/restconf/restconf-nb/pom.xml
+++ b/restconf/restconf-nb/pom.xml
@@ -13,7 +13,7 @@
   <parent>
     <groupId>org.opendaylight.netconf</groupId>
     <artifactId>netconf-parent</artifactId>
-    <version>6.0.0-SNAPSHOT</version>
+    <version>7.0.0-SNAPSHOT</version>
     <relativePath>../../parent</relativePath>
   </parent>
 
@@ -21,6 +21,11 @@
   <packaging>bundle</packaging>
 
   <dependencies>
+    <dependency>
+      <groupId>com.github.spotbugs</groupId>
+      <artifactId>spotbugs-annotations</artifactId>
+      <optional>true</optional>
+    </dependency>
     <dependency>
       <groupId>com.google.code.gson</groupId>
       <artifactId>gson</artifactId>
@@ -54,6 +59,18 @@
       <optional>true</optional>
       <scope>provided</scope>
     </dependency>
+    <dependency>
+      <groupId>org.eclipse.jdt</groupId>
+      <artifactId>org.eclipse.jdt.annotation</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.osgi</groupId>
+      <artifactId>org.osgi.framework</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.osgi</groupId>
+      <artifactId>org.osgi.service.component</artifactId>
+    </dependency>
     <dependency>
       <groupId>org.osgi</groupId>
       <artifactId>org.osgi.service.component.annotations</artifactId>
@@ -120,14 +137,6 @@
       <groupId>org.opendaylight.yangtools</groupId>
       <artifactId>yang-data-impl</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.opendaylight.yangtools</groupId>
-      <artifactId>rfc8528-data-api</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.yangtools</groupId>
-      <artifactId>rfc8528-data-util</artifactId>
-    </dependency>
     <dependency>
       <groupId>org.opendaylight.yangtools</groupId>
       <artifactId>yang-model-api</artifactId>
@@ -175,7 +184,7 @@
     </dependency>
     <dependency>
       <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
-      <artifactId>rfc6991-ietf-yang-types</artifactId>
+      <artifactId>rfc6991-ietf-inet-types</artifactId>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
@@ -191,16 +200,11 @@
     </dependency>
     <dependency>
       <groupId>org.opendaylight.netconf.model</groupId>
-      <artifactId>rfc8040-ietf-restconf-monitoring</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>org.opendaylight.controller</groupId>
-      <artifactId>threadpool-config-api</artifactId>
+      <artifactId>rfc6243</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.opendaylight.controller</groupId>
-      <artifactId>threadpool-config-impl</artifactId>
+      <groupId>org.opendaylight.netconf.model</groupId>
+      <artifactId>rfc8040-ietf-restconf-monitoring</artifactId>
     </dependency>
 
     <dependency>
@@ -235,6 +239,10 @@
       <groupId>org.eclipse.jetty.websocket</groupId>
       <artifactId>websocket-server</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.opendaylight.netconf</groupId>
+      <artifactId>yanglib-mdsal-writer</artifactId>
+    </dependency>
 
     <!-- Testing Dependencies -->
     <dependency>
@@ -280,7 +288,7 @@
     <dependency>
       <groupId>org.json</groupId>
       <artifactId>json</artifactId>
-      <version>20220924</version>
+      <version>20230618</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -307,7 +315,12 @@
     <dependency>
       <groupId>net.javacrumbs.json-unit</groupId>
       <artifactId>json-unit-assertj</artifactId>
-      <version>2.36.1</version>
+      <version>3.0.0</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.netconf</groupId>
+      <artifactId>netconf-test-models</artifactId>
       <scope>test</scope>
     </dependency>
   </dependencies>
@@ -320,7 +333,7 @@
         <extensions>true</extensions>
         <configuration>
           <instructions>
-            <Bundle-Name>MD SAL Restconf Connector</Bundle-Name>
+            <Bundle-Name>Restconf Connector</Bundle-Name>
             <Import-Package>org.eclipse.jetty.websocket.server, *</Import-Package>
           </instructions>
         </configuration>