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
/
sal-remoterpc-connector
/
pom.xml
diff --git
a/opendaylight/md-sal/sal-remoterpc-connector/pom.xml
b/opendaylight/md-sal/sal-remoterpc-connector/pom.xml
index da0e62f5aab2ec35f6650a4970ad1fbfdc600d14..ba62ce5cc8d17ffe49fed77abcfa9e18cd63a744 100644
(file)
--- a/
opendaylight/md-sal/sal-remoterpc-connector/pom.xml
+++ b/
opendaylight/md-sal/sal-remoterpc-connector/pom.xml
@@
-4,13
+4,11
@@
<parent>
<groupId>org.opendaylight.controller</groupId>
<artifactId>mdsal-parent</artifactId>
<parent>
<groupId>org.opendaylight.controller</groupId>
<artifactId>mdsal-parent</artifactId>
- <version>
1.12.0-SNAPSHOT
</version>
+ <version>
2.0.3
</version>
<relativePath>../parent</relativePath>
</parent>
<relativePath>../parent</relativePath>
</parent>
- <groupId>org.opendaylight.controller</groupId>
<artifactId>sal-remoterpc-connector</artifactId>
<artifactId>sal-remoterpc-connector</artifactId>
- <version>1.12.0-SNAPSHOT</version>
<packaging>bundle</packaging>
<dependencies>
<packaging>bundle</packaging>
<dependencies>
@@
-34,6
+32,12
@@
<dependency>
<groupId>com.typesafe.akka</groupId>
<artifactId>akka-osgi_2.13</artifactId>
<dependency>
<groupId>com.typesafe.akka</groupId>
<artifactId>akka-osgi_2.13</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.compendium</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>com.typesafe.akka</groupId>
</dependency>
<dependency>
<groupId>com.typesafe.akka</groupId>
@@
-79,22
+83,13
@@
</dependency>
<dependency>
<groupId>org.osgi</groupId>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
+ <artifactId>osgi.cmpn</artifactId>
</dependency>
<dependency>
<groupId>org.scala-lang</groupId>
<artifactId>scala-library</artifactId>
</dependency>
<!-- Test Dependencies -->
</dependency>
<dependency>
<groupId>org.scala-lang</groupId>
<artifactId>scala-library</artifactId>
</dependency>
<!-- Test Dependencies -->
- <dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-core</artifactId>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>