Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Fix test failure in ShardTest
[controller.git]
/
opendaylight
/
md-sal
/
pom.xml
diff --git
a/opendaylight/md-sal/pom.xml
b/opendaylight/md-sal/pom.xml
index baa85ff78813f97c2443a64417cf478736442377..dfdbac05a7aad8b38f58f7bdd20ade4573b96853 100644
(file)
--- a/
opendaylight/md-sal/pom.xml
+++ b/
opendaylight/md-sal/pom.xml
@@
-5,12
+5,12
@@
<parent>
<groupId>org.opendaylight.controller</groupId>
<artifactId>commons.opendaylight</artifactId>
<parent>
<groupId>org.opendaylight.controller</groupId>
<artifactId>commons.opendaylight</artifactId>
- <version>1.
6
.0-SNAPSHOT</version>
+ <version>1.
7
.0-SNAPSHOT</version>
<relativePath>../commons/opendaylight</relativePath>
</parent>
<artifactId>sal-parent</artifactId>
<relativePath>../commons/opendaylight</relativePath>
</parent>
<artifactId>sal-parent</artifactId>
- <version>1.
3
.0-SNAPSHOT</version>
+ <version>1.
4
.0-SNAPSHOT</version>
<packaging>pom</packaging>
<modules>
<packaging>pom</packaging>
<modules>
@@
-25,6
+25,7
@@
<module>sal-dom-api</module>
<module>sal-dom-broker</module>
<module>sal-dom-spi</module>
<module>sal-dom-api</module>
<module>sal-dom-broker</module>
<module>sal-dom-spi</module>
+ <module>sal-schema-service</module>
<!-- Binding Aware -->
<module>sal-binding-api</module>
<!-- Binding Aware -->
<module>sal-binding-api</module>
@@
-45,16
+46,9
@@
<!-- Base Models -->
<module>sal-remote</module>
<!-- Base Models -->
<module>sal-remote</module>
- <module>sal-restconf-broker</module>
<!-- Connectors -->
<module>sal-connector-api</module>
<!-- Connectors -->
<module>sal-connector-api</module>
- <module>sal-rest-connector</module>
- <module>sal-rest-connector-config</module>
-
- <!-- Documentation -->
- <module>sal-rest-docgen</module>
- <module>sal-rest-docgen-maven</module>
<module>sal-akka-raft</module>
<module>sal-akka-raft-example</module>
<module>sal-akka-raft</module>
<module>sal-akka-raft-example</module>
@@
-62,8
+56,8
@@
<!--InMemory DOM DataStore-->
<module>sal-inmemory-datastore</module>
<!--InMemory DOM DataStore-->
<module>sal-inmemory-datastore</module>
- <!--sal-protocolbuffer-encoding is now part of sal-clutering-commons-->
<module>sal-clustering-commons</module>
<module>sal-clustering-commons</module>
+ <module>cds-access-api</module>
<!-- sal clustering configuration -->
<module>sal-clustering-config</module>
<!-- sal clustering configuration -->
<module>sal-clustering-config</module>
@@
-71,6
+65,7
@@
<!-- sal-distributed-datastore -->
<module>sal-distributed-datastore</module>
<module>sal-dummy-distributed-datastore</module>
<!-- sal-distributed-datastore -->
<module>sal-distributed-datastore</module>
<module>sal-dummy-distributed-datastore</module>
+ <module>sal-cluster-admin</module>
<!-- XSQL -->
<module>sal-dom-xsql</module>
<!-- XSQL -->
<module>sal-dom-xsql</module>
@@
-171,11
+166,6
@@
</lifecycleMappingMetadata>
</configuration>
</plugin>
</lifecycleMappingMetadata>
</configuration>
</plugin>
- <plugin>
- <groupId>org.jacoco</groupId>
- <artifactId>jacoco-maven-plugin</artifactId>
- <version>${jacoco.version}</version>
- </plugin>
</plugins>
</pluginManagement>
</plugins>
</pluginManagement>
@@
-213,11
+203,6
@@
<goal>site</goal>
</configuration>
</plugin>
<goal>site</goal>
</configuration>
</plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>jdepend-maven-plugin</artifactId>
- <version>${jdepend.maven.plugin.version}</version>
- </plugin>
</plugins>
</reporting>
<scm>
</plugins>
</reporting>
<scm>