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 "Resolve Bug:445 Remove freemarker from config code generator."
[controller.git]
/
opendaylight
/
netconf
/
netconf-api
/
pom.xml
diff --git
a/opendaylight/netconf/netconf-api/pom.xml
b/opendaylight/netconf/netconf-api/pom.xml
index 856bd77c202ee73ee0cd65758f64ad598fd96f6a..3b5ed82518948fc21c6c4891b7a5ac85ecfa6f0b 100644
(file)
--- a/
opendaylight/netconf/netconf-api/pom.xml
+++ b/
opendaylight/netconf/netconf-api/pom.xml
@@
-1,12
+1,10
@@
<?xml version="1.0" encoding="UTF-8"?>
<?xml version="1.0" encoding="UTF-8"?>
-<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">
<parent>
<artifactId>netconf-subsystem</artifactId>
<groupId>org.opendaylight.controller</groupId>
<parent>
<artifactId>netconf-subsystem</artifactId>
<groupId>org.opendaylight.controller</groupId>
- <version>0.2.
3
-SNAPSHOT</version>
+ <version>0.2.
5
-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>netconf-api</artifactId>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>netconf-api</artifactId>
@@
-18,6
+16,10
@@
<groupId>org.opendaylight.controller</groupId>
<artifactId>config-api</artifactId>
</dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>config-api</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.opendaylight.controller</groupId>
+ <artifactId>protocol-framework</artifactId>
+ </dependency>
<dependency>
<groupId>org.opendaylight.yangtools.model</groupId>
<artifactId>ietf-inet-types</artifactId>
<dependency>
<groupId>org.opendaylight.yangtools.model</groupId>
<artifactId>ietf-inet-types</artifactId>
@@
-35,12
+37,6
@@
<artifactId>ietf-netconf-monitoring-extension</artifactId>
<version>${project.version}</version>
</dependency>
<artifactId>ietf-netconf-monitoring-extension</artifactId>
<version>${project.version}</version>
</dependency>
-
- <dependency>
- <groupId>org.opendaylight.bgpcep</groupId>
- <artifactId>framework</artifactId>
- <version>${bgpcep.version}</version>
- </dependency>
</dependencies>
<build>
</dependencies>
<build>
@@
-54,6
+50,7
@@
</Private-Package>
<Import-Package>
javax.management,
</Private-Package>
<Import-Package>
javax.management,
+ org.opendaylight.controller.config.api,
org.opendaylight.controller.config.api.jmx,
org.opendaylight.protocol.framework,
io.netty.channel,
org.opendaylight.controller.config.api.jmx,
org.opendaylight.protocol.framework,
io.netty.channel,