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 raw references to Promise"
[controller.git]
/
features
/
base
/
pom.xml
diff --git
a/features/base/pom.xml
b/features/base/pom.xml
index b7ab3ca75774c0c4e8875893adf418c619267b55..3dbb9391b0606c6c1cfd9238d77bfaaddff136bf 100644
(file)
--- a/
features/base/pom.xml
+++ b/
features/base/pom.xml
@@
-31,10
+31,6
@@
<groupId>org.opendaylight.controller</groupId>
<artifactId>karaf-tomcat-security</artifactId>
</dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>karaf-tomcat-security</artifactId>
</dependency>
- <dependency>
- <groupId>org.opendaylight.controller.thirdparty</groupId>
- <artifactId>ganymed</artifactId>
- </dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
@@
-447,7
+443,6
@@
<dependency>
<groupId>org.opendaylight.yangtools</groupId>
<artifactId>features-test</artifactId>
<dependency>
<groupId>org.opendaylight.yangtools</groupId>
<artifactId>features-test</artifactId>
- <version>0.7.0-SNAPSHOT</version>
</dependency>
<!-- dependency for opendaylight-karaf-empty for use by testing -->
<dependency>
</dependency>
<!-- dependency for opendaylight-karaf-empty for use by testing -->
<dependency>