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 bug 2554 - XSQL getting stuck on some models"
[controller.git]
/
opendaylight
/
md-sal
/
sal-binding-it
/
pom.xml
diff --git
a/opendaylight/md-sal/sal-binding-it/pom.xml
b/opendaylight/md-sal/sal-binding-it/pom.xml
index 8e47d87a74f6d78f86098e90a6e7fd6dfe9aa71c..3b504f45b10bf62cebc1248c9b4b65a9faac2427 100644
(file)
--- a/
opendaylight/md-sal/sal-binding-it/pom.xml
+++ b/
opendaylight/md-sal/sal-binding-it/pom.xml
@@
-4,7
+4,7
@@
<parent>
<groupId>org.opendaylight.controller</groupId>
<artifactId>sal-parent</artifactId>
<parent>
<groupId>org.opendaylight.controller</groupId>
<artifactId>sal-parent</artifactId>
- <version>1.
1
-SNAPSHOT</version>
+ <version>1.
2.0
-SNAPSHOT</version>
</parent>
<artifactId>sal-binding-it</artifactId>
</parent>
<artifactId>sal-binding-it</artifactId>
@@
-82,10
+82,6
@@
<!--If the dependencies are test scoped, they are not visible to other maven modules depending on sal-binding-it-->
<!--TODO Create generic utilities(extract from this module) for integration tests on the controller-->
<!--If the dependencies are test scoped, they are not visible to other maven modules depending on sal-binding-it-->
<!--TODO Create generic utilities(extract from this module) for integration tests on the controller-->
- <dependency>
- <groupId>org.opendaylight.yangtools.thirdparty</groupId>
- <artifactId>xtend-lib-osgi</artifactId>
- </dependency>
<dependency>
<groupId>org.openexi</groupId>
<artifactId>nagasena</artifactId>
<dependency>
<groupId>org.openexi</groupId>
<artifactId>nagasena</artifactId>
@@
-122,11
+118,6
@@
<groupId>org.slf4j</groupId>
<artifactId>log4j-over-slf4j</artifactId>
</dependency>
<groupId>org.slf4j</groupId>
<artifactId>log4j-over-slf4j</artifactId>
</dependency>
- <dependency>
- <groupId>org.opendaylight.controller.model</groupId>
- <artifactId>model-flow-management</artifactId>
- <scope>provided</scope>
- </dependency>
<dependency>
<groupId>org.opendaylight.controller.model</groupId>
<artifactId>model-flow-service</artifactId>
<dependency>
<groupId>org.opendaylight.controller.model</groupId>
<artifactId>model-flow-service</artifactId>