Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Enable checkstyle in the mdsal-parent pom
[controller.git]
/
opendaylight
/
md-sal
/
sal-dom-broker
/
pom.xml
diff --git
a/opendaylight/md-sal/sal-dom-broker/pom.xml
b/opendaylight/md-sal/sal-dom-broker/pom.xml
index 9ac51a48565eeee62a33d20494eca1cc476ef24a..dd4253cc86b5685dfd9f03beb3041cee4e08ad03 100644
(file)
--- a/
opendaylight/md-sal/sal-dom-broker/pom.xml
+++ b/
opendaylight/md-sal/sal-dom-broker/pom.xml
@@
-3,17
+3,17
@@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.opendaylight.controller</groupId>
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.opendaylight.controller</groupId>
- <artifactId>sal-parent</artifactId>
- <version>1.5.0-SNAPSHOT</version>
+ <artifactId>mdsal-parent</artifactId>
+ <version>1.8.0-SNAPSHOT</version>
+ <relativePath>../parent</relativePath>
</parent>
</parent>
+
+ <groupId>org.opendaylight.controller</groupId>
<artifactId>sal-broker-impl</artifactId>
<artifactId>sal-broker-impl</artifactId>
+ <version>1.8.0-SNAPSHOT</version>
<packaging>bundle</packaging>
<dependencies>
<packaging>bundle</packaging>
<dependencies>
- <dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- </dependency>
<dependency>
<groupId>com.lmax</groupId>
<artifactId>disruptor</artifactId>
<dependency>
<groupId>com.lmax</groupId>
<artifactId>disruptor</artifactId>
@@
-46,10
+46,6
@@
<groupId>org.opendaylight.controller</groupId>
<artifactId>sal-core-spi</artifactId>
</dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>sal-core-spi</artifactId>
</dependency>
- <dependency>
- <groupId>org.opendaylight.controller</groupId>
- <artifactId>sal-inmemory-datastore</artifactId>
- </dependency>
<dependency>
<groupId>org.opendaylight.yangtools</groupId>
<artifactId>util</artifactId>
<dependency>
<groupId>org.opendaylight.yangtools</groupId>
<artifactId>util</artifactId>
@@
-59,10
+55,6
@@
<artifactId>yang-data-impl</artifactId>
</dependency>
<artifactId>yang-data-impl</artifactId>
</dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
@@
-82,11
+74,16
@@
<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.controller</groupId>
+ <artifactId>sal-inmemory-datastore</artifactId>
+ <!-- FIXME: this should be scope=test
+ <scope>test</scope-->
+ </dependency>
</dependencies>
<build>
<plugins>
</dependencies>
<build>
<plugins>
-
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
@@
-107,7
+104,6
@@
org.opendaylight.controller.md.sal.dom.broker.impl.*,
org.opendaylight.controller.md.sal.dom.clustering.impl,
</Export-Package>
org.opendaylight.controller.md.sal.dom.broker.impl.*,
org.opendaylight.controller.md.sal.dom.clustering.impl,
</Export-Package>
- <Import-Package>*</Import-Package>
</instructions>
</configuration>
</plugin>
</instructions>
</configuration>
</plugin>
@@
-119,4
+115,5
@@
<tag>HEAD</tag>
<url>https://wiki.opendaylight.org/view/OpenDaylight_Controller:MD-SAL</url>
</scm>
<tag>HEAD</tag>
<url>https://wiki.opendaylight.org/view/OpenDaylight_Controller:MD-SAL</url>
</scm>
+
</project>
</project>