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 "Fix issues related to checkstyle enforcement"
[openflowplugin.git]
/
drop-test-karaf
/
pom.xml
diff --git
a/drop-test-karaf/pom.xml
b/drop-test-karaf/pom.xml
index 75666a472b8c69715cbf2664afff7dc47aeef702..fa61e501adbd3893a0ba42b88b3a86e4d9197abc 100644
(file)
--- a/
drop-test-karaf/pom.xml
+++ b/
drop-test-karaf/pom.xml
@@
-4,7
+4,7
@@
<parent>
<groupId>org.opendaylight.openflowplugin</groupId>
<artifactId>openflowplugin-parent</artifactId>
<parent>
<groupId>org.opendaylight.openflowplugin</groupId>
<artifactId>openflowplugin-parent</artifactId>
- <version>0.
4
.0-SNAPSHOT</version>
+ <version>0.
6
.0-SNAPSHOT</version>
<relativePath>../parent</relativePath>
</parent>
<artifactId>drop-test-karaf</artifactId>
<relativePath>../parent</relativePath>
</parent>
<artifactId>drop-test-karaf</artifactId>
@@
-26,10
+26,6
@@
<groupId>org.opendaylight.controller</groupId>
<artifactId>sal-binding-api</artifactId>
</dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>sal-binding-api</artifactId>
</dependency>
- <dependency>
- <groupId>org.opendaylight.controller</groupId>
- <artifactId>sal-binding-config</artifactId>
- </dependency>
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>sal-binding-broker-impl</artifactId>
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>sal-binding-broker-impl</artifactId>
@@
-49,7
+45,6
@@
<dependency>
<groupId>org.apache.karaf.shell</groupId>
<artifactId>org.apache.karaf.shell.console</artifactId>
<dependency>
<groupId>org.apache.karaf.shell</groupId>
<artifactId>org.apache.karaf.shell.console</artifactId>
- <version>${karaf.version}</version>
</dependency>
<dependency>
<groupId>commons-lang</groupId>
</dependency>
<dependency>
<groupId>commons-lang</groupId>