Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Specialize TransactionContextWrapper
[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 89ed3813e2af16d6f812446e2f2f350c8aa0325e..269a82a95cb2c54ca6af5e44dc255bd08eecbff6 100644
(file)
--- a/
opendaylight/md-sal/mdsal-it-base/pom.xml
+++ b/
opendaylight/md-sal/mdsal-it-base/pom.xml
@@
-8,17
+8,17
@@
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>
7.0.1
</version>
+ <version>
9.0.6
</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.12.0
-SNAPSHOT</version>
+ <version>
4.0.4
-SNAPSHOT</version>
<packaging>bundle</packaging>
<dependencyManagement>
<packaging>bundle</packaging>
<dependencyManagement>
@@
-26,14
+26,14
@@
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>
6.0.0
</version>
+ <version>
8.0.5
</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>controller-artifacts</artifactId>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>controller-artifacts</artifactId>
- <version>
1.12.0-SNAPSHOT
</version>
+ <version>
${project.version}
</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<type>pom</type>
<scope>import</scope>
</dependency>
@@
-83,20
+83,26
@@
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>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-atinject_1.0_spec</artifactId>
</dependency>
</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>
- <version>${karaf.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>o
rg.o
sgi.core</artifactId>
+ <artifactId>osgi.core</artifactId>
<scope>compile</scope>
</dependency>
<dependency>
<scope>compile</scope>
</dependency>
<dependency>