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-1079: reorder fields within get-schema"
[controller.git]
/
opendaylight
/
netconf
/
netconf-impl
/
pom.xml
diff --git
a/opendaylight/netconf/netconf-impl/pom.xml
b/opendaylight/netconf/netconf-impl/pom.xml
index 9694a90c49ad79ebce01b14971fb3605a9a1195e..c60506ef447d821d5458dbb399c30a1ab0e94325 100644
(file)
--- a/
opendaylight/netconf/netconf-impl/pom.xml
+++ b/
opendaylight/netconf/netconf-impl/pom.xml
@@
-30,6
+30,10
@@
<groupId>${project.groupId}</groupId>
<artifactId>netconf-mapping-api</artifactId>
</dependency>
<groupId>${project.groupId}</groupId>
<artifactId>netconf-mapping-api</artifactId>
</dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>netconf-netty-util</artifactId>
+ </dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>netconf-util</artifactId>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>netconf-util</artifactId>
@@
-105,6
+109,7
@@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
+ <version>2.3.7</version>
<configuration>
<instructions>
<Bundle-Activator>org.opendaylight.controller.netconf.impl.osgi.NetconfImplActivator</Bundle-Activator>
<configuration>
<instructions>
<Bundle-Activator>org.opendaylight.controller.netconf.impl.osgi.NetconfImplActivator</Bundle-Activator>
@@
-117,6
+122,7
@@
io.netty.buffer,
io.netty.handler.codec,
io.netty.channel.nio,
io.netty.buffer,
io.netty.handler.codec,
io.netty.channel.nio,
+ io.netty.channel.local,
javax.annotation,
javax.management,
javax.net.ssl,
javax.annotation,
javax.management,
javax.net.ssl,
@@
-125,18
+131,13
@@
org.opendaylight.controller.netconf.api,
org.opendaylight.controller.netconf.api.jmx,
org.opendaylight.controller.netconf.mapping.api,
org.opendaylight.controller.netconf.api,
org.opendaylight.controller.netconf.api.jmx,
org.opendaylight.controller.netconf.mapping.api,
- org.opendaylight.controller.netconf.util,
- org.opendaylight.controller.netconf.util.mapping,
- org.opendaylight.controller.netconf.util.osgi,
- org.opendaylight.controller.netconf.util.xml,
- org.opendaylight.controller.netconf.util.handler,
+ org.opendaylight.controller.netconf.util.*,
org.opendaylight.protocol.framework,
org.osgi.framework,
org.osgi.util.tracker,
org.slf4j,
org.w3c.dom,
org.xml.sax,
org.opendaylight.protocol.framework,
org.osgi.framework,
org.osgi.util.tracker,
org.slf4j,
org.w3c.dom,
org.xml.sax,
- org.opendaylight.controller.netconf.util.messages,
io.netty.util.internal,
org.opendaylight.controller.netconf.api.monitoring,
org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev100924,
io.netty.util.internal,
org.opendaylight.controller.netconf.api.monitoring,
org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev100924,
@@
-147,7
+148,8
@@
org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.netconf.monitoring.rev101004.netconf.state.schemas,
org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.netconf.monitoring.extension.rev131210,
org.opendaylight.yangtools.yang.binding,
org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.netconf.monitoring.rev101004.netconf.state.schemas,
org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.netconf.monitoring.extension.rev131210,
org.opendaylight.yangtools.yang.binding,
- org.openexi.*,</Import-Package>
+ org.openexi.*,
+ org.opendaylight.controller.netconf.nettyutil.*</Import-Package>
</instructions>
</configuration>
</plugin>
</instructions>
</configuration>
</plugin>