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 "fix of Bug 314"
[controller.git]
/
opendaylight
/
md-sal
/
sal-netconf-connector
/
pom.xml
diff --git
a/opendaylight/md-sal/sal-netconf-connector/pom.xml
b/opendaylight/md-sal/sal-netconf-connector/pom.xml
index 2323b09f996d040360f19e0d9206865bac3ff658..61a84b636b3ae2c396010e297f3ec65ee154a1da 100644
(file)
--- a/
opendaylight/md-sal/sal-netconf-connector/pom.xml
+++ b/
opendaylight/md-sal/sal-netconf-connector/pom.xml
@@
-43,7
+43,6
@@
<dependency>
<groupId>org.opendaylight.yangtools</groupId>
<artifactId>yang-data-impl</artifactId>
<dependency>
<groupId>org.opendaylight.yangtools</groupId>
<artifactId>yang-data-impl</artifactId>
- <version>0.5.9-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.opendaylight.controller</groupId>
</dependency>
<dependency>
<groupId>org.opendaylight.controller</groupId>
@@
-81,12
+80,6
@@
<version>${netconf.version}</version>
<scope>test</scope>
</dependency>
<version>${netconf.version}</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.opendaylight.bgpcep</groupId>
- <artifactId>util</artifactId>
- <scope>test</scope>
- <version>0.3.0-SNAPSHOT</version>
- </dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>netconf-client</artifactId>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>netconf-client</artifactId>
@@
-98,12
+91,6
@@
<scope>test</scope>
<version>${netconf.version}</version>
</dependency>
<scope>test</scope>
<version>${netconf.version}</version>
</dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>yang-test</artifactId>
- <scope>test</scope>
- <version>${netconf.version}</version>
- </dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>config-manager</artifactId>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>config-manager</artifactId>
@@
-212,11
+199,18
@@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
+ <configuration>
+ <instructions>
+ <Import-Package>
+ *
+ </Import-Package>
+ </instructions>
+ </configuration>
</plugin>
<plugin>
<groupId>org.opendaylight.yangtools</groupId>
<artifactId>yang-maven-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.opendaylight.yangtools</groupId>
<artifactId>yang-maven-plugin</artifactId>
- <version>
0.5.9-SNAPSHOT
</version>
+ <version>
${yangtools.version}
</version>
<executions>
<execution>
<goals>
<executions>
<execution>
<goals>