Code Review
/
openflowplugin.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Make model/pom.xml inherit from odlparent-lite"
[openflowplugin.git]
/
applications
/
reconciliation-framework
/
pom.xml
diff --git
a/applications/reconciliation-framework/pom.xml
b/applications/reconciliation-framework/pom.xml
index f0201b4a019da4f470cbb25e520b64de50034aab..1ef4016643d1c0e33468642d5f708b75c4f61060 100644
(file)
--- a/
applications/reconciliation-framework/pom.xml
+++ b/
applications/reconciliation-framework/pom.xml
@@
-4,7
+4,7
@@
<parent>
<groupId>org.opendaylight.openflowplugin</groupId>
<artifactId>applications</artifactId>
<parent>
<groupId>org.opendaylight.openflowplugin</groupId>
<artifactId>applications</artifactId>
- <version>0.
8
.0-SNAPSHOT</version>
+ <version>0.
10
.0-SNAPSHOT</version>
</parent>
<groupId>org.opendaylight.openflowplugin.applications</groupId>
<artifactId>reconciliation-framework</artifactId>
</parent>
<groupId>org.opendaylight.openflowplugin.applications</groupId>
<artifactId>reconciliation-framework</artifactId>
@@
-16,12
+16,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
+31,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
+40,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>
@@
-73,6
+60,11
@@
<artifactId>javax.inject</artifactId>
<optional>true</optional>
</dependency>
<artifactId>javax.inject</artifactId>
<optional>true</optional>
</dependency>
+ <dependency>
+ <groupId>javax.annotation</groupId>
+ <artifactId>javax.annotation-api</artifactId>
+ <optional>true</optional>
+ </dependency>
<dependency>
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>blueprint-maven-plugin-annotation</artifactId>
<dependency>
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>blueprint-maven-plugin-annotation</artifactId>