Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Remove FinalizableScheduledExecutorService
[controller.git]
/
karaf
/
pom.xml
diff --git
a/karaf/pom.xml
b/karaf/pom.xml
index 85d85b717c365bd4f74704f8c4df794628013ada..57d1dfa0d6b607b99d732ae465a509e5a0bb1900 100644
(file)
--- a/
karaf/pom.xml
+++ b/
karaf/pom.xml
@@
-16,16
+16,16
@@
</parent>
<groupId>org.opendaylight.controller</groupId>
</parent>
<groupId>org.opendaylight.controller</groupId>
- <artifactId>
distribution.opendayligh
t-karaf</artifactId>
- <version>
1.15.0
-SNAPSHOT</version>
+ <artifactId>
controller-tes
t-karaf</artifactId>
+ <version>
2.0.1
-SNAPSHOT</version>
<packaging>pom</packaging>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.opendaylight.controller</groupId>
<packaging>pom</packaging>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.opendaylight.controller</groupId>
- <artifactId>
mdsal-parent
</artifactId>
- <version>
1.12.0-SNAPSHOT
</version>
+ <artifactId>
controller-artifacts
</artifactId>
+ <version>
${project.version}
</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<type>pom</type>
<scope>import</scope>
</dependency>
@@
-48,21
+48,21
@@
-->
<dependency>
<groupId>org.opendaylight.controller</groupId>
-->
<dependency>
<groupId>org.opendaylight.controller</groupId>
- <artifactId>features-controller
-experimental
</artifactId>
+ <artifactId>features-controller</artifactId>
<classifier>features</classifier>
<type>xml</type>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.opendaylight.controller</groupId>
<classifier>features</classifier>
<type>xml</type>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.opendaylight.controller</groupId>
- <artifactId>features-controller</artifactId>
+ <artifactId>features-controller
-experimental
</artifactId>
<classifier>features</classifier>
<type>xml</type>
<scope>runtime</scope>
</dependency>
<dependency>
<classifier>features</classifier>
<type>xml</type>
<scope>runtime</scope>
</dependency>
<dependency>
- <groupId>org.opendaylight.
mdsal
</groupId>
- <artifactId>features-
mdsal
</artifactId>
+ <groupId>org.opendaylight.
controller
</groupId>
+ <artifactId>features-
controller-testing
</artifactId>
<classifier>features</classifier>
<type>xml</type>
<scope>runtime</scope>
<classifier>features</classifier>
<type>xml</type>
<scope>runtime</scope>