Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Handle odl-mdsal-common with Karaf 4.0.9
[controller.git]
/
opendaylight
/
md-sal
/
mdsal-it-parent
/
pom.xml
diff --git
a/opendaylight/md-sal/mdsal-it-parent/pom.xml
b/opendaylight/md-sal/mdsal-it-parent/pom.xml
index 127307712e51e18b406bfd190daadc5e7dfeb6ee..59e0e38c6fd0efdcd17cc39dcbf72e7c5adf936f 100644
(file)
--- a/
opendaylight/md-sal/mdsal-it-parent/pom.xml
+++ b/
opendaylight/md-sal/mdsal-it-parent/pom.xml
@@
-11,17
+11,17
@@
and is available at http://www.eclipse.org/legal/epl-v10.html
<parent>
<groupId>org.opendaylight.controller</groupId>
<artifactId>config-parent</artifactId>
<parent>
<groupId>org.opendaylight.controller</groupId>
<artifactId>config-parent</artifactId>
- <version>0.
4
.0-SNAPSHOT</version>
- <relativePath
/
>
+ <version>0.
6
.0-SNAPSHOT</version>
+ <relativePath
>../../config/config-parent</relativePath
>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>mdsal-it-parent</artifactId>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>mdsal-it-parent</artifactId>
- <version>1.
3
.0-SNAPSHOT</version>
+ <version>1.
5
.0-SNAPSHOT</version>
<packaging>pom</packaging>
<properties>
<packaging>pom</packaging>
<properties>
- <karaf.distro.groupId>org.opendaylight.
controller
</karaf.distro.groupId>
+ <karaf.distro.groupId>org.opendaylight.
odlparent
</karaf.distro.groupId>
<karaf.distro.artifactId>opendaylight-karaf-empty</karaf.distro.artifactId>
<karaf.distro.artifactId>opendaylight-karaf-empty</karaf.distro.artifactId>
- <karaf.distro.version>1.
6
.0-SNAPSHOT</karaf.distro.version>
+ <karaf.distro.version>1.
8
.0-SNAPSHOT</karaf.distro.version>
<karaf.distro.type>zip</karaf.distro.type>
<karaf.keep.unpack>false</karaf.keep.unpack>
</properties>
<karaf.distro.type>zip</karaf.distro.type>
<karaf.keep.unpack>false</karaf.keep.unpack>
</properties>
@@
-79,22
+79,11
@@
and is available at http://www.eclipse.org/legal/epl-v10.html
<groupId>junit</groupId>
<artifactId>junit</artifactId>
</dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.karaf.tooling</groupId>
- <artifactId>karaf-maven-plugin</artifactId>
- <version>${karaf.version}</version>
- </dependency>
<!-- Testing Dependencies -->
<!-- Testing Dependencies -->
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
-
<dependency>
<groupId>org.mockito</groupId>
<dependency>
<groupId>org.mockito</groupId>
- <artifactId>mockito-
all
</artifactId>
+ <artifactId>mockito-
core
</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
<scope>test</scope>
</dependency>
</dependencies>