Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Introducing ShardManager
[controller.git]
/
opendaylight
/
md-sal
/
pom.xml
diff --git
a/opendaylight/md-sal/pom.xml
b/opendaylight/md-sal/pom.xml
index b003ba15e505c58384fd5c2cc1d04d513f2abf36..8d4901d31b118659980148a20f79c0826b71a171 100644
(file)
--- a/
opendaylight/md-sal/pom.xml
+++ b/
opendaylight/md-sal/pom.xml
@@
-57,8
+57,11
@@
<!-- Clustering -->
<module>remoterpc-routingtable/implementation</module>
<module>sal-remoterpc-connector/implementation</module>
<!-- Clustering -->
<module>remoterpc-routingtable/implementation</module>
<module>sal-remoterpc-connector/implementation</module>
- <!--module>clustered-data-store/implementation</module>
- -->
+ <!-- Documentation -->
+ <module>sal-rest-docgen</module>
+
+ <!-- Karaf feature -->
+ <module>feature</module>
</modules>
</modules>
@@
-138,17
+141,6
@@
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
</plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
</plugin>
- <plugin>
- <!-- FIXME: BUG-272: remove this configuration override -->
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-checkstyle-plugin</artifactId>
- <version>${checkstyle.version}</version>
- <executions>
- <execution>
- <phase>none</phase>
- </execution>
- </executions>
- </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
@@
-156,7
+148,6
@@
<plugin>
<groupId>org.opendaylight.yangtools</groupId>
<artifactId>yang-maven-plugin</artifactId>
<plugin>
<groupId>org.opendaylight.yangtools</groupId>
<artifactId>yang-maven-plugin</artifactId>
- <version>${yangtools.version}</version>
<dependencies>
<dependency>
<groupId>org.opendaylight.controller</groupId>
<dependencies>
<dependency>
<groupId>org.opendaylight.controller</groupId>
@@
-202,10
+193,6
@@
<modules>
<module>sal-binding-it</module>
<module>sal-binding-dom-it</module>
<modules>
<module>sal-binding-it</module>
<module>sal-binding-dom-it</module>
- <!--module>clustered-data-store/integrationtest</module -->
- <!--module>zeromq-routingtable/integrationtest</module -->
- <!--module>sal-remoterpc-connector/integrationtest</module -->
- <!--module>test/sal-rest-connector-it</modulei -->
</modules>
</profile>
</profiles>
</modules>
</profile>
</profiles>