Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Created Network Service Functions Features"
[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 ea686d966ffa63b60e1cf3cb839db2f2eb034f1e..3dd44bb8504d530b030da962a2636fa415e293f0 100644
(file)
--- a/
opendaylight/md-sal/sal-distributed-datastore/pom.xml
+++ b/
opendaylight/md-sal/sal-distributed-datastore/pom.xml
@@
-57,15
+57,20
@@
<artifactId>sal-binding-config</artifactId>
</dependency>
<artifactId>sal-binding-config</artifactId>
</dependency>
- <!--
- Adding a temporary dependency on the sal-broker-impl so that we can use InMemoryDOMDataStore
+ <dependency>
+ <groupId>org.opendaylight.yangtools</groupId>
+ <artifactId>yang-data-api</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.opendaylight.yangtools</groupId>
+ <artifactId>yang-data-impl</artifactId>
+ </dependency>
- InMemoryDOMDataStore needs to be moved into its own module and be wired up using config subsystem before
- this bundle can use it
- -->
<dependency>
<groupId>org.opendaylight.controller</groupId>
<dependency>
<groupId>org.opendaylight.controller</groupId>
- <artifactId>sal-broker-impl</artifactId>
+ <artifactId>sal-inmemory-datastore</artifactId>
+ <version>1.1-SNAPSHOT</version>
</dependency>
<dependency>
</dependency>
<dependency>
@@
-113,6
+118,12
@@
<artifactId>scala-library</artifactId>
</dependency>
<artifactId>scala-library</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.opendaylight.controller</groupId>
+ <artifactId>sal-protocolbuffer-encoding</artifactId>
+ <version>1.1-SNAPSHOT</version>
+ </dependency>
+
<!-- Test Dependencies -->
<dependency>
<groupId>junit</groupId>
<!-- Test Dependencies -->
<dependency>
<groupId>junit</groupId>
@@
-131,6
+142,7
@@
<version>${slf4j.version}</version>
<scope>test</scope>
</dependency>
<version>${slf4j.version}</version>
<scope>test</scope>
</dependency>
+
</dependencies>
<build>
</dependencies>
<build>
@@
-145,6
+157,21
@@
<Bundle-Name>${project.groupId}.${project.artifactId}</Bundle-Name>
<Export-package></Export-package>
<Private-Package></Private-Package>
<Bundle-Name>${project.groupId}.${project.artifactId}</Bundle-Name>
<Export-package></Export-package>
<Private-Package></Private-Package>
+ <Import-Package>!*snappy;!org.jboss.*;*</Import-Package>
+ <Embed-Dependency>
+ !sal*;
+ !*config-api*;
+ !*testkit*;
+ akka*;
+ *leveldb*;
+ *config*;
+ *hawt*;
+ *protobuf*;
+ *netty*;
+ *uncommons*;
+ *scala*;
+ </Embed-Dependency>
+ <Embed-Transitive>true</Embed-Transitive>
</instructions>
</configuration>
</plugin>
</instructions>
</configuration>
</plugin>