Code Review
/
openflowplugin.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Revert "CSC to provide a view of DPN re-sync"
[openflowplugin.git]
/
applications
/
southbound-cli
/
pom.xml
diff --git
a/applications/southbound-cli/pom.xml
b/applications/southbound-cli/pom.xml
index 37e046c374318f3f6c3ce3a4c6aaf9d6a66ad7de..206733d4456288e688e2f3bc1f978f8d665b5180 100644
(file)
--- a/
applications/southbound-cli/pom.xml
+++ b/
applications/southbound-cli/pom.xml
@@
-3,9
+3,11
@@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.opendaylight.openflowplugin</groupId>
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.opendaylight.openflowplugin</groupId>
- <artifactId>applications</artifactId>
- <version>0.9.0-SNAPSHOT</version>
+ <artifactId>openflowplugin-parent</artifactId>
+ <version>0.10.0-SNAPSHOT</version>
+ <relativePath>../../parent</relativePath>
</parent>
</parent>
+
<groupId>org.opendaylight.openflowplugin.applications</groupId>
<artifactId>southbound-cli</artifactId>
<packaging>bundle</packaging>
<groupId>org.opendaylight.openflowplugin.applications</groupId>
<artifactId>southbound-cli</artifactId>
<packaging>bundle</packaging>
@@
-16,12
+18,8
@@
<artifactId>org.osgi.core</artifactId>
</dependency>
<dependency>
<artifactId>org.osgi.core</artifactId>
</dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </dependency>
- <dependency>
- <groupId>org.opendaylight.controller</groupId>
- <artifactId>sal-binding-api</artifactId>
+ <groupId>org.opendaylight.mdsal</groupId>
+ <artifactId>mdsal-binding-api</artifactId>
</dependency>
<dependency>
<groupId>org.opendaylight.openflowplugin</groupId>
</dependency>
<dependency>
<groupId>org.opendaylight.openflowplugin</groupId>
@@
-35,10
+33,6
@@
<groupId>org.opendaylight.yangtools</groupId>
<artifactId>yang-common</artifactId>
</dependency>
<groupId>org.opendaylight.yangtools</groupId>
<artifactId>yang-common</artifactId>
</dependency>
- <dependency>
- <groupId>org.opendaylight.controller</groupId>
- <artifactId>sal-common-util</artifactId>
- </dependency>
<dependency>
<groupId>org.opendaylight.mdsal</groupId>
<artifactId>mdsal-singleton-common-api</artifactId>
<dependency>
<groupId>org.opendaylight.mdsal</groupId>
<artifactId>mdsal-singleton-common-api</artifactId>
@@
-48,18
+42,13
@@
<artifactId>model-flow-service</artifactId>
</dependency>
<dependency>
<artifactId>model-flow-service</artifactId>
</dependency>
<dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-core</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.opendaylight.controller</groupId>
- <artifactId>sal-binding-broker-impl</artifactId>
+ <groupId>org.opendaylight.mdsal</groupId>
+ <artifactId>mdsal-binding-dom-adapter</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.opendaylight.
controller
</groupId>
- <artifactId>
sal-binding-broker-impl
</artifactId>
+ <groupId>org.opendaylight.
mdsal
</groupId>
+ <artifactId>
mdsal-binding-dom-adapter
</artifactId>
<scope>test</scope>
<type>test-jar</type>
</dependency>
<scope>test</scope>
<type>test-jar</type>
</dependency>
@@
-75,6
+64,7
@@
<dependency>
<groupId>javax.inject</groupId>
<artifactId>javax.inject</artifactId>
<dependency>
<groupId>javax.inject</groupId>
<artifactId>javax.inject</artifactId>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>javax.annotation</groupId>
</dependency>
<dependency>
<groupId>javax.annotation</groupId>