Roll master to Guilin

[ccsdk/sli/core.git] / sli / provider / pom.xml

diff --git a/sli/provider/pom.xml b/sli/provider/pom.xml
index 0e343c8..5dc327f 100755 (executable)
--- a/sli/provider/pom.xml
+++ b/sli/provider/pom.xml
@@ -1,19 +1,17 @@
-<?xml version="1.0"?>
-<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">
+<?xml version="1.0" encoding="UTF-8"?>
+<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.onap.ccsdk.parent</groupId>
                <artifactId>binding-parent</artifactId>
-               <version>1.1.0</version>
-               <relativePath />
+               <version>2.0.0-SNAPSHOT</version>
+               <relativePath/>
        </parent>
 
        <groupId>org.onap.ccsdk.sli.core</groupId>
        <artifactId>sli-provider</artifactId>
-       <version>0.3.1-SNAPSHOT</version>
+       <version>1.0.0-SNAPSHOT</version>
        <packaging>bundle</packaging>
 
        <name>ccsdk-sli-core :: sli :: ${project.artifactId}</name>
@@ -23,7 +21,6 @@
                <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
        </properties>
 
-
        <dependencyManagement>
                <dependencies>
                        <dependency>
@@ -33,7 +30,6 @@
                        </dependency>
                </dependencies>
        </dependencyManagement>
-       
        <dependencies>
                <dependency>
                        <groupId>org.onap.ccsdk.sli.core</groupId>
@@ -47,7 +43,12 @@
                        <version>${project.version}</version>
                        <scope>compile</scope>
                </dependency>
-
+               <dependency>
+                       <groupId>org.onap.ccsdk.sli.core</groupId>
+                       <artifactId>sli-provider-base</artifactId>
+                       <version>${project.version}</version>
+                       <scope>compile</scope>
+               </dependency>
                <dependency>
                        <groupId>org.slf4j</groupId>
                        <artifactId>slf4j-api</artifactId>
@@ -67,7 +68,14 @@
                        <groupId>org.opendaylight.controller</groupId>
                        <artifactId>sal-binding-api</artifactId>
                </dependency>
-
+        <dependency>
+            <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
+            <artifactId>rfc6991</artifactId>
+        </dependency>       
+        <dependency>
+            <groupId>org.opendaylight.controller</groupId>
+            <artifactId>sal-core-api</artifactId>
+        </dependency>
                <!-- Testing Dependencies -->
                <dependency>
                        <groupId>junit</groupId>
@@ -98,9 +106,30 @@
                                                <DynamicImport-Package>*</DynamicImport-Package>
                                        </instructions>
                                </configuration>
-
+                       </plugin>
+                       <!-- Jacoco / Sonar -->
+                       <plugin>
+                               <groupId>org.jacoco</groupId>
+                               <artifactId>jacoco-maven-plugin</artifactId>
+                               <version>${jacoco.version}</version>
+                               <executions>
+                                       <execution>
+                                               <id>aggregate-report</id>
+                                               <phase>verify</phase>
+                                               <goals>
+                                                       <goal>report-aggregate</goal>
+                                               </goals>
+                                               <configuration>
+                                                       <dataFileIncludes>
+                                                               target/code-coverage/jacoco-ut.exec,
+                                                               target/code-coverage/jacoco-it.exec,
+                                                               ../provider-base/target/code-coverage/jacoco-ut.exec,
+                                                               ../provider-base/target/code-coverage/jacoco-it.exec
+                                                       </dataFileIncludes>
+                                               </configuration>
+                                       </execution>
+                               </executions>
                        </plugin>
                </plugins>
-
        </build>
 </project>