Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Extract dom-serializer-api|impl from binding-broker-impl
[controller.git]
/
opendaylight
/
md-sal
/
pom.xml
diff --git
a/opendaylight/md-sal/pom.xml
b/opendaylight/md-sal/pom.xml
index d383162748b327a8dc794621099f3b282caaf126..50304ff41af03eb06bb1e48c14f50de06222cf09 100644
(file)
--- a/
opendaylight/md-sal/pom.xml
+++ b/
opendaylight/md-sal/pom.xml
@@
-1,6
+1,14
@@
<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>
<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>commons.opendaylight</artifactId>
+ <version>1.4.1-SNAPSHOT</version>
+ <relativePath>../commons/opendaylight</relativePath>
+ </parent>
+
<groupId>org.opendaylight.controller</groupId>
<artifactId>sal-parent</artifactId>
<version>1.0-SNAPSHOT</version>
<groupId>org.opendaylight.controller</groupId>
<artifactId>sal-parent</artifactId>
<version>1.0-SNAPSHOT</version>
@@
-45,11
+53,7
@@
<module>sal-rest-connector</module>
<module>sal-netconf-connector</module>
<module>sal-rest-connector</module>
<module>sal-netconf-connector</module>
- <module>remoterpc-routingtable/implementation</module>
- <module>sal-remoterpc-connector/implementation</module>
- <!-- Clustered Data Store -->
- <module>clustered-data-store/implementation</module>
-
+
<module>inventory-manager</module>
<module>statistics-manager</module>
<module>topology-manager</module>
<module>inventory-manager</module>
<module>statistics-manager</module>
<module>topology-manager</module>
@@
-58,6
+62,13
@@
<!-- 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>
+ -->
+
</modules>
</modules>
@@
-69,7
+80,7
@@
</activation>
<modules>
<module>sal-binding-it</module>
</activation>
<modules>
<module>sal-binding-it</module>
- <
module>clustered-data-store/integrationtest</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 -->
<!--module>zeromq-routingtable/integrationtest</module -->
<!--module>sal-remoterpc-connector/integrationtest</module -->
<!--module>test/sal-rest-connector-it</modulei -->
@@
-83,7
+94,7
@@
</property>
</activation>
<build>
</property>
</activation>
<build>
- <!-- Put the IDE's build output in a folder other than target,
+ <!-- Put the IDE's build output in a folder other than target,
so that IDE builds don't interact with Maven builds -->
<directory>target-ide</directory>
</build>
so that IDE builds don't interact with Maven builds -->
<directory>target-ide</directory>
</build>
@@
-104,7
+115,7
@@
<!-- Dependency Versions -->
<slf4j.version>1.7.2</slf4j.version>
<!-- Dependency Versions -->
<slf4j.version>1.7.2</slf4j.version>
-
<yang.codegen.version>0.6.0-SNAPSHOT
</yang.codegen.version>
+
<yang.codegen.version>${yangtools.version}
</yang.codegen.version>
<guava.version>14.0.1</guava.version>
<osgi.core.version>5.0.0</osgi.core.version>
<junit.version>4.8.1</junit.version>
<guava.version>14.0.1</guava.version>
<osgi.core.version>5.0.0</osgi.core.version>
<junit.version>4.8.1</junit.version>
@@
-300,12
+311,12
@@
<dependency>
<groupId>org.opendaylight.yangtools</groupId>
<artifactId>binding-generator-impl</artifactId>
<dependency>
<groupId>org.opendaylight.yangtools</groupId>
<artifactId>binding-generator-impl</artifactId>
-
<version>0.6.0-SNAPSHOT
</version>
+
<version>${yangtools.version}
</version>
</dependency>
<dependency>
<groupId>org.opendaylight.yangtools</groupId>
<artifactId>yang-parser-impl</artifactId>
</dependency>
<dependency>
<groupId>org.opendaylight.yangtools</groupId>
<artifactId>yang-parser-impl</artifactId>
-
<version>0.6.0-SNAPSHOT
</version>
+
<version>${yangtools.version}
</version>
</dependency>
</dependencies>
</dependencyManagement>
</dependency>
</dependencies>
</dependencyManagement>
@@
-322,8
+333,8
@@
<artifactId>maven-bundle-plugin</artifactId>
<version>${bundle.plugin.version}</version>
<extensions>true</extensions>
<artifactId>maven-bundle-plugin</artifactId>
<version>${bundle.plugin.version}</version>
<extensions>true</extensions>
- <!--executions> <execution> <id>bundle-manifest</id>
- <phase>process-classes</phase> <goals> <goal>manifest</goal> </goals> </execution>
+ <!--executions> <execution> <id>bundle-manifest</id>
+ <phase>process-classes</phase> <goals> <goal>manifest</goal> </goals> </execution>
</executions -->
<configuration>
<instructions>
</executions -->
<configuration>
<instructions>
@@
-366,7
+377,7
@@
<artifactId>jacoco-maven-plugin</artifactId>
<version>${jacoco.version}</version>
</plugin>
<artifactId>jacoco-maven-plugin</artifactId>
<version>${jacoco.version}</version>
</plugin>
- <!--This plugin's configuration is used to store Eclipse
+ <!--This plugin's configuration is used to store Eclipse
m2e settings only. It has no influence on the Maven build itself. -->
<plugin>
<groupId>org.eclipse.m2e</groupId>
m2e settings only. It has no influence on the Maven build itself. -->
<plugin>
<groupId>org.eclipse.m2e</groupId>
@@
-470,6
+481,17
@@
</execution>
</executions>
</plugin>
</execution>
</executions>
</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>
</plugins>
</build>
<reporting>
</plugins>
</build>
<reporting>