Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Cleanup cds-access-api dependencies
[controller.git]
/
opendaylight
/
md-sal
/
cds-access-api
/
pom.xml
diff --git
a/opendaylight/md-sal/cds-access-api/pom.xml
b/opendaylight/md-sal/cds-access-api/pom.xml
index 15cf802e039279985b772a87db606a2ece49b396..b1de245fe38bffb45dca42480c1cccd09513c88d 100644
(file)
--- a/
opendaylight/md-sal/cds-access-api/pom.xml
+++ b/
opendaylight/md-sal/cds-access-api/pom.xml
@@
-1,38
+1,41
@@
<?xml version="1.0" encoding="UTF-8"?>
<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>
<?xml version="1.0" encoding="UTF-8"?>
<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.controller</groupId>
<artifactId>mdsal-parent</artifactId>
<parent>
<groupId>org.opendaylight.controller</groupId>
<artifactId>mdsal-parent</artifactId>
- <version>
1.1
0.0-SNAPSHOT</version>
+ <version>
4.
0.0-SNAPSHOT</version>
<relativePath>../parent</relativePath>
</parent>
<relativePath>../parent</relativePath>
</parent>
- <groupId>org.opendaylight.controller</groupId>
<artifactId>cds-access-api</artifactId>
<artifactId>cds-access-api</artifactId>
- <version>1.6.0-SNAPSHOT</version>
<packaging>bundle</packaging>
<dependencies>
<dependency>
<packaging>bundle</packaging>
<dependencies>
<dependency>
- <groupId>
com.typesafe.akka
</groupId>
- <artifactId>
akka-actor_2.12
</artifactId>
+ <groupId>
org.opendaylight.controller
</groupId>
+ <artifactId>
repackaged-akka
</artifactId>
</dependency>
<dependency>
<groupId>org.opendaylight.yangtools</groupId>
<artifactId>concepts</artifactId>
</dependency>
</dependency>
<dependency>
<groupId>org.opendaylight.yangtools</groupId>
<artifactId>concepts</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.opendaylight.yangtools</groupId>
+ <artifactId>yang-common</artifactId>
+ </dependency>
<dependency>
<groupId>org.opendaylight.yangtools</groupId>
<artifactId>yang-data-api</artifactId>
</dependency>
<dependency>
<groupId>org.opendaylight.yangtools</groupId>
<artifactId>yang-data-api</artifactId>
</dependency>
-
- <!-- Needed for serialization of yang-data-api objects -->
<dependency>
<dependency>
- <groupId>org.opendaylight.controller</groupId>
- <artifactId>sal-clustering-commons</artifactId>
+ <groupId>org.opendaylight.yangtools</groupId>
+ <artifactId>yang-data-impl</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.opendaylight.yangtools</groupId>
+ <artifactId>yang-data-codec-binfmt</artifactId>
</dependency>
<!-- Testing dependencies -->
</dependency>
<!-- Testing dependencies -->
@@
-42,8
+45,7
@@
</dependency>
<dependency>
<groupId>com.typesafe.akka</groupId>
</dependency>
<dependency>
<groupId>com.typesafe.akka</groupId>
- <artifactId>akka-testkit_2.12</artifactId>
- <scope>test</scope>
+ <artifactId>akka-testkit_2.13</artifactId>
</dependency>
<dependency>
<groupId>commons-lang</groupId>
</dependency>
<dependency>
<groupId>commons-lang</groupId>
@@
-52,6
+54,20
@@
</dependency>
</dependencies>
</dependency>
</dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <configuration>
+ <instructions>
+ <Automatic-Module-Name>org.opendaylight.controller.cluster.access.api</Automatic-Module-Name>
+ </instructions>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
<scm>
<connection>scm:git:http://git.opendaylight.org/gerrit/controller.git</connection>
<developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>
<scm>
<connection>scm:git:http://git.opendaylight.org/gerrit/controller.git</connection>
<developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>