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 "Increase timeout for waiting for broker service in sal-binding-it."
[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 2f6da9e3c6f0d04c048985a7ff5e539be0e275ca..0e06ab372f26a6761498fb76817a2020df74e839 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.
4
-SNAPSHOT</version>
</parent>
<artifactId>netconf-util</artifactId>
<name>${project.artifactId}</name>
</parent>
<artifactId>netconf-util</artifactId>
<name>${project.artifactId}</name>
@@
-27,8
+26,8
@@
<artifactId>config-api</artifactId>
</dependency>
<dependency>
<artifactId>config-api</artifactId>
</dependency>
<dependency>
- <groupId>org.opendaylight.
bgpcep
</groupId>
- <artifactId>framework</artifactId>
+ <groupId>org.opendaylight.
controller
</groupId>
+ <artifactId>
protocol-
framework</artifactId>
</dependency>
<dependency>
</dependency>
<dependency>
@@
-48,10
+47,10
@@
<artifactId>netty-handler</artifactId>
<version>${netconf.netty.version}</version>
</dependency>
<artifactId>netty-handler</artifactId>
<version>${netconf.netty.version}</version>
</dependency>
- <dependency>
+ <
!--
dependency>
<groupId>com.siemens.ct.exi</groupId>
<artifactId>exificient</artifactId>
<groupId>com.siemens.ct.exi</groupId>
<artifactId>exificient</artifactId>
- </dependency>
+ </dependency
--
>
<dependency>
<groupId>org.opendaylight.controller.thirdparty</groupId>
<artifactId>ganymed</artifactId>
<dependency>
<groupId>org.opendaylight.controller.thirdparty</groupId>
<artifactId>ganymed</artifactId>
@@
-102,13
+101,8
@@
org.slf4j,
org.w3c.dom,
org.xml.sax,
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,
</Import-Package>
</instructions>
</configuration>
</Import-Package>
</instructions>
</configuration>