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 "Fixed for bug 1168 : Issue while update subnet"
[controller.git]
/
opendaylight
/
netconf
/
netconf-it
/
pom.xml
diff --git
a/opendaylight/netconf/netconf-it/pom.xml
b/opendaylight/netconf/netconf-it/pom.xml
index 9509d5fcbe9d22e20d7cd56c59300bd1b28ac658..0e9589d2d21b0bde118440a1a0c683e1bedf3fd5 100644
(file)
--- a/
opendaylight/netconf/netconf-it/pom.xml
+++ b/
opendaylight/netconf/netconf-it/pom.xml
@@
-10,11
+10,12
@@
<artifactId>netconf-it</artifactId>
<name>${project.artifactId}</name>
<artifactId>netconf-it</artifactId>
<name>${project.artifactId}</name>
- <properties>
- <tinybundles.version>2.0.0</tinybundles.version>
- </properties>
<dependencies>
<dependencies>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>netconf-netty-util</artifactId>
+ </dependency>
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>commons.logback_settings</artifactId>
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>commons.logback_settings</artifactId>
@@
-107,42
+108,35
@@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>netconf-ssh</artifactId>
+ <artifactId>netconf-netty-util</artifactId>
+ <type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>netconf-ssh</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>netconf-ssh</artifactId>
- <type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>netconf-
util
</artifactId>
+ <artifactId>netconf-
ssh
</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>netty-config-api</artifactId>
+ <artifactId>netconf-util</artifactId>
+ <type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>sal-binding-it</artifactId>
- <version>${mdsal.version}</version>
+ <artifactId>netty-config-api</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>yang-test</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>yang-test</artifactId>
- <version>${config.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.ops4j.pax.tinybundles</groupId>
- <artifactId>tinybundles</artifactId>
- <version>${tinybundles.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
<scope>test</scope>
</dependency>
</dependencies>
@@
-180,7
+174,6
@@
<plugin>
<groupId>org.ops4j.pax.exam</groupId>
<artifactId>maven-paxexam-plugin</artifactId>
<plugin>
<groupId>org.ops4j.pax.exam</groupId>
<artifactId>maven-paxexam-plugin</artifactId>
- <version>1.2.4</version>
<executions>
<execution>
<id>generate-config</id>
<executions>
<execution>
<id>generate-config</id>