Code Review
/
netconf.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Bump versions to 5.0.4-SNAPSHOT
[netconf.git]
/
restconf
/
restconf-nb
/
pom.xml
diff --git
a/restconf/restconf-nb/pom.xml
b/restconf/restconf-nb/pom.xml
index d9fab06a2c8962a0220b182f2c54b8e3e1fa5156..7812fb327d1133d9c21b9b564f5b5f758f8b5421 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>
<parent>
<groupId>org.opendaylight.netconf</groupId>
<artifactId>netconf-parent</artifactId>
- <version>5.0.
0
-SNAPSHOT</version>
+ <version>5.0.
4
-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>
<relativePath>../../parent</relativePath>
</parent>
@@
-58,7
+58,15
@@
<groupId>org.osgi</groupId>
<artifactId>org.osgi.service.component.annotations</artifactId>
</dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.service.component.annotations</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.metatype.annotations</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.opendaylight.netconf</groupId>
+ <artifactId>restconf-api</artifactId>
+ </dependency>
<dependency>
<groupId>org.opendaylight.netconf</groupId>
<artifactId>restconf-common-models</artifactId>
<dependency>
<groupId>org.opendaylight.netconf</groupId>
<artifactId>restconf-common-models</artifactId>
@@
-76,11
+84,6
@@
<artifactId>netconf-dom-api</artifactId>
</dependency>
<artifactId>netconf-dom-api</artifactId>
</dependency>
- <dependency>
- <groupId>org.opendaylight.odlparent</groupId>
- <artifactId>logging-markers</artifactId>
- </dependency>
-
<dependency>
<groupId>org.opendaylight.yangtools</groupId>
<artifactId>concepts</artifactId>
<dependency>
<groupId>org.opendaylight.yangtools</groupId>
<artifactId>concepts</artifactId>
@@
-195,6
+198,10
@@
<groupId>org.opendaylight.controller</groupId>
<artifactId>threadpool-config-api</artifactId>
</dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>threadpool-config-api</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.opendaylight.controller</groupId>
+ <artifactId>threadpool-config-impl</artifactId>
+ </dependency>
<dependency>
<groupId>net.java.dev.stax-utils</groupId>
<dependency>
<groupId>net.java.dev.stax-utils</groupId>
@@
-224,6
+231,10
@@
<groupId>org.eclipse.jetty.websocket</groupId>
<artifactId>websocket-servlet</artifactId>
</dependency>
<groupId>org.eclipse.jetty.websocket</groupId>
<artifactId>websocket-servlet</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty.websocket</groupId>
+ <artifactId>websocket-server</artifactId>
+ </dependency>
<!-- Testing Dependencies -->
<dependency>
<!-- Testing Dependencies -->
<dependency>
@@
-283,11
+294,6
@@
<artifactId>testutils</artifactId>
<scope>test</scope>
</dependency>
<artifactId>testutils</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.opendaylight.controller</groupId>
- <artifactId>threadpool-config-impl</artifactId>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
@@
-301,7
+307,7
@@
<dependency>
<groupId>net.javacrumbs.json-unit</groupId>
<artifactId>json-unit-assertj</artifactId>
<dependency>
<groupId>net.javacrumbs.json-unit</groupId>
<artifactId>json-unit-assertj</artifactId>
- <version>2.36.
0
</version>
+ <version>2.36.
1
</version>
<scope>test</scope>
</dependency>
</dependencies>
<scope>test</scope>
</dependency>
</dependencies>
@@
-315,6
+321,7
@@
<configuration>
<instructions>
<Bundle-Name>MD SAL Restconf Connector</Bundle-Name>
<configuration>
<instructions>
<Bundle-Name>MD SAL Restconf Connector</Bundle-Name>
+ <Import-Package>org.eclipse.jetty.websocket.server, *</Import-Package>
</instructions>
</configuration>
</plugin>
</instructions>
</configuration>
</plugin>