Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Release controller
[controller.git]
/
opendaylight
/
md-sal
/
mdsal-it-base
/
pom.xml
diff --git
a/opendaylight/md-sal/mdsal-it-base/pom.xml
b/opendaylight/md-sal/mdsal-it-base/pom.xml
index 2aa33dcf9311027d2a65066ce4db30a40b02690c..9d7c400614a778fe3a50ca9817ee863006a001f3 100644
(file)
--- a/
opendaylight/md-sal/mdsal-it-base/pom.xml
+++ b/
opendaylight/md-sal/mdsal-it-base/pom.xml
@@
-12,13
+12,13
@@
and is available at http://www.eclipse.org/legal/epl-v10.html
<parent>
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>bundle-parent</artifactId>
<parent>
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>bundle-parent</artifactId>
- <version>
9.0.6
</version>
+ <version>
12.0.1
</version>
<relativePath/>
</parent>
<groupId>org.opendaylight.controller</groupId>
<artifactId>mdsal-it-base</artifactId>
<relativePath/>
</parent>
<groupId>org.opendaylight.controller</groupId>
<artifactId>mdsal-it-base</artifactId>
- <version>
4.0.3-SNAPSHOT
</version>
+ <version>
7.0.1
</version>
<packaging>bundle</packaging>
<dependencyManagement>
<packaging>bundle</packaging>
<dependencyManagement>
@@
-26,7
+26,7
@@
and is available at http://www.eclipse.org/legal/epl-v10.html
<dependency>
<groupId>org.opendaylight.mdsal</groupId>
<artifactId>mdsal-artifacts</artifactId>
<dependency>
<groupId>org.opendaylight.mdsal</groupId>
<artifactId>mdsal-artifacts</artifactId>
- <version>
8.0.5
</version>
+ <version>
11.0.3
</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<type>pom</type>
<scope>import</scope>
</dependency>
@@
-93,6
+93,8
@@
and is available at http://www.eclipse.org/legal/epl-v10.html
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-atinject_1.0_spec</artifactId>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-atinject_1.0_spec</artifactId>
+ <!-- FIXME: remove this override once pax-exam is aligned with pax-web -->
+ <version>1.0</version>
</dependency>
<dependency>
</dependency>
<dependency>
@@
-102,7
+104,7
@@
and is available at http://www.eclipse.org/legal/epl-v10.html
</dependency>
<dependency>
<groupId>org.osgi</groupId>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>o
sgi.core
</artifactId>
+ <artifactId>o
rg.osgi.framework
</artifactId>
<scope>compile</scope>
</dependency>
<dependency>
<scope>compile</scope>
</dependency>
<dependency>