Merge branch 'release-1.0.X' into develop

[lispflowmapping.git] / mappingservice / implementation / pom.xml

diff --git a/mappingservice/implementation/pom.xml b/mappingservice/implementation/pom.xml
index 89a4d5135fb2a2aa2f83427648eb6aa0730f855a..427c90d1d25389208d7c13f8128964bddf318ef9 100644 (file)
--- a/mappingservice/implementation/pom.xml
+++ b/mappingservice/implementation/pom.xml
@@ -6,18 +6,18 @@
        <parent>
                <groupId>org.opendaylight.lispflowmapping</groupId>
                <artifactId>mappingservice-parent</artifactId>
-               <version>0.1.0-SNAPSHOT</version>
+               <version>1.1.0-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
        <artifactId>mappingservice.implementation</artifactId>
-       <version>0.1.0-SNAPSHOT</version>
+       <version>1.1.0-SNAPSHOT</version>
        <packaging>bundle</packaging>
-       <properties>
-               <!-- Sonar properties using jacoco to retrieve integration test results -->
-               <sonar.dynamicAnalysis>reuseReports</sonar.dynamicAnalysis>
-               <sonar.jacoco.Reportpath>target/jacoco.exec</sonar.jacoco.Reportpath>
-               <sonar.jacoco.itReportPath>target/jacoco-it.exec</sonar.jacoco.itReportPath>
-       </properties>
+       <scm>
+               <connection>scm:git:https://git.opendaylight.org/gerrit/p/lispflowmapping.git</connection>
+               <developerConnection>scm:git:ssh://git.opendaylight.org:29418/lispflowmapping.git</developerConnection>
+               <url>https://wiki.opendaylight.org/view/OpenDaylight_Lisp_Flow_Mapping:Main</url>
+               <tag>HEAD</tag>
+       </scm>
        <build>
                <plugins>
                        <plugin>
@@ -60,6 +60,7 @@
                                                        org.opendaylight.controller.sal.core,
                                                        org.apache.felix.dm,
                                                        org.apache.commons.lang3,
+                                                       org.apache.commons.lang3.tuple,
                                                        org.apache.commons.lang3.builder,
                                                        org.osgi.service.component,
                                                        org.slf4j,
@@ -85,32 +86,17 @@
                                        </instructions>
                                </configuration>
                        </plugin>
-                       <plugin>
-                               <groupId>org.jacoco</groupId>
-                               <artifactId>jacoco-maven-plugin</artifactId>
-                               <version>${jacoco.version}</version>
-                               <configuration>
-                                       <includes>org.opendaylight.controller.*</includes>
-                               </configuration>
-                               <executions>
-                                       <execution>
-                                               <id>pre-test</id>
-                                               <goals>
-                                                       <goal>prepare-agent</goal>
-                                               </goals>
-                                       </execution>
-                                       <execution>
-                                               <id>post-test</id>
-                                               <phase>test</phase>
-                                               <goals>
-                                                       <goal>report</goal>
-                                               </goals>
-                                       </execution>
-                               </executions>
-                       </plugin>
                </plugins>
        </build>
        <dependencies>
+       <dependency>
+                       <groupId>org.opendaylight.yangtools.model</groupId>
+                       <artifactId>ietf-inet-types</artifactId>
+               </dependency>
+               <dependency>
+                       <groupId>org.opendaylight.yangtools.model</groupId>
+                       <artifactId>ietf-yang-types</artifactId>
+               </dependency>
                <dependency>
                        <groupId>org.opendaylight.controller</groupId>
                        <artifactId>sal-binding-api</artifactId>
@@ -134,12 +120,12 @@
                <dependency>
                        <groupId>org.opendaylight.lispflowmapping</groupId>
                        <artifactId>mappingservice.yangmodel</artifactId>
-                       <version>0.1.0-SNAPSHOT</version>
+                       <version>${lispflowmapping.version}</version>
                </dependency>
                <dependency>
                        <groupId>org.opendaylight.lispflowmapping</groupId>
                        <artifactId>mappingservice.api</artifactId>
-                       <version>0.1.0-SNAPSHOT</version>
+                       <version>${lispflowmapping.version}</version>
                </dependency>
                <dependency>
                        <groupId>equinoxSDK381</groupId>