Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Bug 615: Removed xtend from Topology Manager"
[controller.git]
/
opendaylight
/
netconf
/
netconf-util
/
pom.xml
diff --git
a/opendaylight/netconf/netconf-util/pom.xml
b/opendaylight/netconf/netconf-util/pom.xml
index c19506b236a2d8b9cacdc7e03cc263f20a131bfb..af8e4fbc39c502e90c7ad408809dba6c15355ac8 100644
(file)
--- a/
opendaylight/netconf/netconf-util/pom.xml
+++ b/
opendaylight/netconf/netconf-util/pom.xml
@@
-1,11
+1,10
@@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>netconf-subsystem</artifactId>
<groupId>org.opendaylight.controller</groupId>
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>netconf-subsystem</artifactId>
<groupId>org.opendaylight.controller</groupId>
- <version>0.2.
3
-SNAPSHOT</version>
+ <version>0.2.
5
-SNAPSHOT</version>
</parent>
<artifactId>netconf-util</artifactId>
<name>${project.artifactId}</name>
</parent>
<artifactId>netconf-util</artifactId>
<name>${project.artifactId}</name>
@@
-27,12
+26,8
@@
<artifactId>config-api</artifactId>
</dependency>
<dependency>
<artifactId>config-api</artifactId>
</dependency>
<dependency>
- <groupId>org.opendaylight.bgpcep</groupId>
- <artifactId>framework</artifactId>
- </dependency>
- <dependency>
- <groupId>org.opendaylight.bgpcep</groupId>
- <artifactId>util</artifactId>
+ <groupId>org.opendaylight.controller</groupId>
+ <artifactId>protocol-framework</artifactId>
</dependency>
<dependency>
</dependency>
<dependency>
@@
-50,15
+45,22
@@
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-handler</artifactId>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-handler</artifactId>
- <version>${netconf.netty.version}</version>
</dependency>
<dependency>
</dependency>
<dependency>
- <groupId>com.siemens.ct.exi</groupId>
- <artifactId>exificient</artifactId>
+ <groupId>org.opendaylight.controller.thirdparty</groupId>
+ <artifactId>ganymed</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>xmlunit</groupId>
+ <artifactId>xmlunit</artifactId>
</dependency>
<dependency>
<groupId>org.opendaylight.controller.thirdparty</groupId>
</dependency>
<dependency>
<groupId>org.opendaylight.controller.thirdparty</groupId>
- <artifactId>ganymed</artifactId>
+ <artifactId>nagasena</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.opendaylight.controller.thirdparty</groupId>
+ <artifactId>nagasena-rta</artifactId>
</dependency>
</dependencies>
</dependency>
</dependencies>
@@
-76,6
+78,7
@@
org.opendaylight.controller.netconf.util.mapping,
org.opendaylight.controller.netconf.util.messages,
org.opendaylight.controller.netconf.util.handler,
org.opendaylight.controller.netconf.util.mapping,
org.opendaylight.controller.netconf.util.messages,
org.opendaylight.controller.netconf.util.handler,
+ org.opendaylight.controller.netconf.util.handler.*,
</Export-Package>
<Import-Package>
com.google.common.base,
</Export-Package>
<Import-Package>
com.google.common.base,
@@
-101,18
+104,13
@@
org.opendaylight.controller.netconf.api,
org.opendaylight.controller.netconf.mapping.api,
org.opendaylight.protocol.framework,
org.opendaylight.controller.netconf.api,
org.opendaylight.controller.netconf.mapping.api,
org.opendaylight.protocol.framework,
- org.opendaylight.protocol.util,
org.osgi.framework,
org.slf4j,
org.w3c.dom,
org.xml.sax,
org.osgi.framework,
org.slf4j,
org.w3c.dom,
org.xml.sax,
- com.siemens.ct.exi,
- com.siemens.ct.exi.api.sax,
- com.siemens.ct.exi.grammars,
- com.siemens.ct.exi.helpers,
- com.siemens.ct.exi.exceptions,
- com.siemens.ct.exi.api.dom,
org.xml.sax.helpers,
org.xml.sax.helpers,
+ org.opendaylight.controller.config.api,
+ org.openexi.*,
</Import-Package>
</instructions>
</configuration>
</Import-Package>
</instructions>
</configuration>