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-distributed-datastore
/
pom.xml
diff --git
a/opendaylight/md-sal/sal-distributed-datastore/pom.xml
b/opendaylight/md-sal/sal-distributed-datastore/pom.xml
index d71573b419bc5379e8a82ecbcac043242b738ebc..a9e215cbe6cfccc053751be929d3356a20c9f01d 100644
(file)
--- a/
opendaylight/md-sal/sal-distributed-datastore/pom.xml
+++ b/
opendaylight/md-sal/sal-distributed-datastore/pom.xml
@@
-4,12
+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.5
</version>
<relativePath>../parent</relativePath>
</parent>
<artifactId>sal-distributed-datastore</artifactId>
<relativePath>../parent</relativePath>
</parent>
<artifactId>sal-distributed-datastore</artifactId>
- <version>1.12.0-SNAPSHOT</version>
<packaging>bundle</packaging>
<dependencies>
<packaging>bundle</packaging>
<dependencies>
@@
-24,39
+23,49
@@
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
</dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>osgi.cmpn</artifactId>
+ </dependency>
<!-- Akka -->
<dependency>
<groupId>com.typesafe.akka</groupId>
<!-- Akka -->
<dependency>
<groupId>com.typesafe.akka</groupId>
- <artifactId>akka-actor_2.1
2
</artifactId>
+ <artifactId>akka-actor_2.1
3
</artifactId>
</dependency>
<dependency>
<groupId>com.typesafe.akka</groupId>
</dependency>
<dependency>
<groupId>com.typesafe.akka</groupId>
- <artifactId>akka-cluster_2.1
2
</artifactId>
+ <artifactId>akka-cluster_2.1
3
</artifactId>
</dependency>
<dependency>
<groupId>com.typesafe.akka</groupId>
</dependency>
<dependency>
<groupId>com.typesafe.akka</groupId>
- <artifactId>akka-osgi_2.12</artifactId>
+ <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>
- <artifactId>akka-persistence_2.1
2
</artifactId>
+ <artifactId>akka-persistence_2.1
3
</artifactId>
</dependency>
<dependency>
<groupId>com.typesafe.akka</groupId>
</dependency>
<dependency>
<groupId>com.typesafe.akka</groupId>
- <artifactId>akka-remote_2.1
2
</artifactId>
+ <artifactId>akka-remote_2.1
3
</artifactId>
</dependency>
<dependency>
<groupId>com.typesafe.akka</groupId>
</dependency>
<dependency>
<groupId>com.typesafe.akka</groupId>
- <artifactId>akka-slf4j_2.1
2
</artifactId>
+ <artifactId>akka-slf4j_2.1
3
</artifactId>
</dependency>
<dependency>
<groupId>org.scala-lang.modules</groupId>
</dependency>
<dependency>
<groupId>org.scala-lang.modules</groupId>
- <artifactId>scala-java8-compat_2.1
2
</artifactId>
+ <artifactId>scala-java8-compat_2.1
3
</artifactId>
</dependency>
<dependency>
<groupId>com.typesafe.akka</groupId>
</dependency>
<dependency>
<groupId>com.typesafe.akka</groupId>
- <artifactId>akka-testkit_2.1
2
</artifactId>
+ <artifactId>akka-testkit_2.1
3
</artifactId>
<scope>test</scope>
</dependency>
<scope>test</scope>
</dependency>
@@
-111,26
+120,14
@@
<type>test-jar</type>
<scope>test</scope>
</dependency>
<type>test-jar</type>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.opendaylight.controller</groupId>
- <artifactId>sal-binding-api</artifactId>
- </dependency>
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>sal-clustering-commons</artifactId>
</dependency>
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>sal-clustering-commons</artifactId>
</dependency>
- <dependency>
- <groupId>org.opendaylight.controller</groupId>
- <artifactId>sal-common-api</artifactId>
- </dependency>
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>sal-common-util</artifactId>
</dependency>
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>sal-common-util</artifactId>
</dependency>
- <dependency>
- <groupId>org.opendaylight.controller</groupId>
- <artifactId>sal-core-compat</artifactId>
- </dependency>
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>sal-akka-segmented-journal</artifactId>
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>sal-akka-segmented-journal</artifactId>
@@
-139,24
+136,12
@@
<dependency>
<groupId>org.opendaylight.mdsal</groupId>
<dependency>
<groupId>org.opendaylight.mdsal</groupId>
- <artifactId>mdsal-dom-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.opendaylight.mdsal</groupId>
- <artifactId>mdsal-dom-spi</artifactId>
+ <artifactId>mdsal-binding-dom-codec-api</artifactId>
</dependency>
<dependency>
<groupId>org.opendaylight.mdsal</groupId>
<artifactId>mdsal-dom-broker</artifactId>
</dependency>
</dependency>
<dependency>
<groupId>org.opendaylight.mdsal</groupId>
<artifactId>mdsal-dom-broker</artifactId>
</dependency>
- <dependency>
- <groupId>org.opendaylight.mdsal</groupId>
- <artifactId>mdsal-binding-dom-codec</artifactId>
- </dependency>
- <dependency>
- <groupId>org.opendaylight.controller</groupId>
- <artifactId>sal-core-spi</artifactId>
- </dependency>
<dependency>
<groupId>org.opendaylight.yangtools</groupId>
<dependency>
<groupId>org.opendaylight.yangtools</groupId>
@@
-194,10
+179,6
@@
<groupId>org.apache.commons</groupId>
<artifactId>commons-text</artifactId>
</dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-text</artifactId>
</dependency>
- <dependency>
- <groupId>org.opendaylight.mdsal</groupId>
- <artifactId>mdsal-dom-inmemory-datastore</artifactId>
- </dependency>
<dependency>
<groupId>io.atomix</groupId>
<dependency>
<groupId>io.atomix</groupId>
@@
-230,6
+211,10
@@
<groupId>org.opendaylight.yangtools</groupId>
<artifactId>yang-test-util</artifactId>
</dependency>
<groupId>org.opendaylight.yangtools</groupId>
<artifactId>yang-test-util</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.opendaylight.mdsal</groupId>
+ <artifactId>mdsal-binding-test-utils</artifactId>
+ </dependency>
</dependencies>
<build>
</dependencies>
<build>
@@
-241,6
+226,10
@@
<configuration>
<instructions>
<Bundle-Name>${project.groupId}.${project.artifactId}</Bundle-Name>
<configuration>
<instructions>
<Bundle-Name>${project.groupId}.${project.artifactId}</Bundle-Name>
+
+ <!-- Karaf cannot handle Factory Component requirements, see https://issues.apache.org/jira/browse/KARAF-6625 -->
+ <_dsannotations-options>norequirements</_dsannotations-options>
+
<Export-Package>
org.opendaylight.controller.cluster.datastore;
org.opendaylight.controller.cluster.datastore.config;
<Export-Package>
org.opendaylight.controller.cluster.datastore;
org.opendaylight.controller.cluster.datastore.config;
@@
-260,7
+249,6
@@
</plugin>
<plugin>
</plugin>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<executions>
<execution>
<artifactId>maven-jar-plugin</artifactId>
<executions>
<execution>
@@
-270,6
+258,16
@@
</execution>
</executions>
</plugin>
</execution>
</executions>
</plugin>
+ <plugin>
+ <artifactId>maven-source-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>test-jar-no-fork</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
</plugins>
</build>