[maven-release-plugin] prepare for next development iteration

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

diff --git a/mappingservice/api/pom.xml b/mappingservice/api/pom.xml
index ddf81e93085ff207db69b1a2595d88ed854913c1..e1c3d4138b30fa5f8f1f2f717847f1b50a5b76d5 100644 (file)
--- a/mappingservice/api/pom.xml
+++ b/mappingservice/api/pom.xml
@@ -1,16 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project
-       xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
-       xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<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.lispflowmapping</groupId>
                <artifactId>mappingservice-parent</artifactId>
-               <version>1.0.0-SNAPSHOT</version>
+               <version>1.1.8-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
        <artifactId>mappingservice.api</artifactId>
-       <version>1.0.0-SNAPSHOT</version>
        <packaging>bundle</packaging>
        <scm>
                <connection>scm:git:https://git.opendaylight.org/gerrit/p/lispflowmapping.git</connection>
@@ -18,12 +15,6 @@
                <url>https://wiki.opendaylight.org/view/OpenDaylight_Lisp_Flow_Mapping:Main</url>
                <tag>HEAD</tag>
        </scm>
-       <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>
        <build>
                <plugins>
                        <plugin>
@@ -50,6 +41,7 @@
                                                        org.opendaylight.yang.gen.v1.lispflowmapping.rev131031.lispaddress.lispaddresscontainer.address,
                                                        org.opendaylight.yang.gen.v1.lispflowmapping.rev131031.lispsimpleaddress,
                                                        org.opendaylight.yang.gen.v1.lispflowmapping.rev131031.lispsimpleaddress.primitiveaddress,
+                                                       org.opendaylight.yang.gen.v1.lispflowmapping.rev131031.transportaddress,
                                                        org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev100924,
                                                        org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev100924,
                                                        org.opendaylight.controller.sal.binding.api,
@@ -57,7 +49,8 @@
                                                        javax.xml.bind,
                                                        javax.xml.bind.annotation,
                                                        org.slf4j,
-                                                       org.opendaylight.yangtools.yang.common
+                                                       org.opendaylight.yangtools.yang.common,
+                                                       com.google.common.collect
                                                </Import-Package>
                                                <Bundle-Activator>
                                                </Bundle-Activator>
@@ -67,27 +60,8 @@
                                </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>
+                               <groupId>org.codehaus.mojo</groupId>
+                               <artifactId>build-helper-maven-plugin</artifactId>
                        </plugin>
                </plugins>
        </build>
@@ -107,7 +81,6 @@
                <dependency>
                        <groupId>org.opendaylight.lispflowmapping</groupId>
                        <artifactId>mappingservice.yangmodel</artifactId>
-                       <version>${lispflowmapping.version}</version>
                </dependency>
        </dependencies>
 </project>