Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Bump upstream versions
[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 066054d9d6f4920c75148929525ca2e7c85cd62d..dbebf649a8bd6d956858b7f71db6b771157d8198 100644
(file)
--- a/
opendaylight/md-sal/mdsal-it-base/pom.xml
+++ b/
opendaylight/md-sal/mdsal-it-base/pom.xml
@@
-8,24
+8,31
@@
terms of the Eclipse Public License v1.0 which accompanies this distribution,
and is available at http://www.eclipse.org/legal/epl-v10.html
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
and is available at http://www.eclipse.org/legal/epl-v10.html
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
+ <modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>bundle-parent</artifactId>
<parent>
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>bundle-parent</artifactId>
- <version>
6.0.
0</version>
+ <version>
7.0.1
0</version>
<relativePath/>
</parent>
<relativePath/>
</parent>
- <modelVersion>4.0.0</modelVersion>
+
<groupId>org.opendaylight.controller</groupId>
<artifactId>mdsal-it-base</artifactId>
<groupId>org.opendaylight.controller</groupId>
<artifactId>mdsal-it-base</artifactId>
- <version>
1.11.0
-SNAPSHOT</version>
+ <version>
2.0.8
-SNAPSHOT</version>
<packaging>bundle</packaging>
<dependencyManagement>
<dependencies>
<dependency>
<packaging>bundle</packaging>
<dependencyManagement>
<dependencies>
<dependency>
- <groupId>org.opendaylight.
controller
</groupId>
+ <groupId>org.opendaylight.
mdsal
</groupId>
<artifactId>mdsal-artifacts</artifactId>
<artifactId>mdsal-artifacts</artifactId>
+ <version>6.0.10</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.opendaylight.controller</groupId>
+ <artifactId>controller-artifacts</artifactId>
<version>${project.version}</version>
<type>pom</type>
<scope>import</scope>
<version>${project.version}</version>
<type>pom</type>
<scope>import</scope>
@@
-40,8
+47,8
@@
and is available at http://www.eclipse.org/legal/epl-v10.html
<type>zip</type>
</dependency>
<dependency>
<type>zip</type>
</dependency>
<dependency>
- <groupId>org.opendaylight.
controller
</groupId>
- <artifactId>sal-binding-api</artifactId>
+ <groupId>org.opendaylight.
mdsal
</groupId>
+ <artifactId>
md
sal-binding-api</artifactId>
</dependency>
<!-- Dependencies for pax exam karaf container -->
<dependency>
</dependency>
<!-- Dependencies for pax exam karaf container -->
<dependency>
@@
-76,11
+83,19
@@
and is available at http://www.eclipse.org/legal/epl-v10.html
<artifactId>pax-url-aether</artifactId>
<scope>compile</scope>
</dependency>
<artifactId>pax-url-aether</artifactId>
<scope>compile</scope>
</dependency>
+
+ <!-- Referenced by pax-exam-features, needs to be pulled into local repository -->
<dependency>
<dependency>
- <groupId>
javax.inject
</groupId>
- <artifactId>
javax.inject
</artifactId>
- <
scope>compile</scope
>
+ <groupId>
org.ops4j.base
</groupId>
+ <artifactId>
ops4j-base-monitors
</artifactId>
+ <
version>1.5.1</version
>
</dependency>
</dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-atinject_1.0_spec</artifactId>
+ <version>1.0</version>
+ </dependency>
+
<dependency>
<groupId>org.apache.karaf.features</groupId>
<artifactId>org.apache.karaf.features.core</artifactId>
<dependency>
<groupId>org.apache.karaf.features</groupId>
<artifactId>org.apache.karaf.features.core</artifactId>