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 "Fixed unneeded wrapping of guava for karaf"
[controller.git]
/
opendaylight
/
md-sal
/
pom.xml
diff --git
a/opendaylight/md-sal/pom.xml
b/opendaylight/md-sal/pom.xml
index 451edfdf78cb84c734590472507898b9a7b99ac2..2cddbbf354737e3117bf9d065f5337cceb093d58 100644
(file)
--- a/
opendaylight/md-sal/pom.xml
+++ b/
opendaylight/md-sal/pom.xml
@@
-43,6
+43,7
@@
<!-- Connectors -->
<module>sal-connector-api</module>
<module>sal-rest-connector</module>
<!-- Connectors -->
<module>sal-connector-api</module>
<module>sal-rest-connector</module>
+ <module>sal-rest-connector-config</module>
<module>sal-netconf-connector</module>
<module>inventory-manager</module>
<module>sal-netconf-connector</module>
<module>inventory-manager</module>
@@
-54,13
+55,17
@@
<!-- Compability Packages -->
<module>compatibility</module>
<!-- Compability Packages -->
<module>compatibility</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>
<!-- Documentation -->
<module>sal-rest-docgen</module>
+
+ <!--InMemory DOM DataStore-->
+ <module>sal-inmemory-datastore</module>
+
+ <!--sal-protocolbuffer-encoding-->
+ <module>sal-protocolbuffer-encoding</module>
+
+ <!-- Yang Test Models for MD-SAL -->
+ <module>sal-test-model</module>
</modules>
<build>
</modules>
<build>
@@
-86,7
+91,7
@@
<plugin>
<groupId>org.eclipse.m2e</groupId>
<artifactId>lifecycle-mapping</artifactId>
<plugin>
<groupId>org.eclipse.m2e</groupId>
<artifactId>lifecycle-mapping</artifactId>
- <version>
1.0.0
</version>
+ <version>
${lifecycle.mapping.version}
</version>
<configuration>
<lifecycleMappingMetadata>
<pluginExecutions>
<configuration>
<lifecycleMappingMetadata>
<pluginExecutions>
@@
-139,17
+144,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>
@@
-157,7
+151,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>
@@
-173,7
+166,7
@@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>findbugs-maven-plugin</artifactId>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>findbugs-maven-plugin</artifactId>
- <version>
2.4.0
</version>
+ <version>
${findbugs.maven.plugin.version}
</version>
<configuration>
<effort>Max</effort>
<threshold>Low</threshold>
<configuration>
<effort>Max</effort>
<threshold>Low</threshold>
@@
-183,7
+176,7
@@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>jdepend-maven-plugin</artifactId>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>jdepend-maven-plugin</artifactId>
- <version>
2.0-beta-2
</version>
+ <version>
${jdepend.maven.plugin.version}
</version>
</plugin>
</plugins>
</reporting>
</plugin>
</plugins>
</reporting>
@@
-203,10
+196,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>