Merge branch 'release-1.0.X' into develop

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

diff --git a/mappingservice/northbound/pom.xml b/mappingservice/northbound/pom.xml
index 464e3a6af563c53bc9a2aa3deef5a19d2013dc99..3ddf233bef907e21e51a28976f9784d82e8ccf16 100644 (file)
--- a/mappingservice/northbound/pom.xml
+++ b/mappingservice/northbound/pom.xml
@@ -17,12 +17,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>
@@ -88,7 +82,6 @@
                                                        javax.xml.bind.annotation,
                                                        org.slf4j,
                                                        org.apache.catalina.filters,
-                                                       org.codehaus.jackson.jaxrs,
                                                        !org.codehaus.enunciate.jaxrs,
                                                        org.apache.felix.dm,
                                                        org.apache.commons.lang3.builder,
@@ -108,29 +101,6 @@
                                        <manifestLocation>${project.basedir}/src/main/resources/META-INF</manifestLocation>
                                </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>
@@ -150,23 +120,22 @@
                <dependency>
                        <groupId>org.opendaylight.controller</groupId>
                        <artifactId>sal</artifactId>
-                       <version>0.5.0-SNAPSHOT</version>
                </dependency>
                <dependency>
                        <groupId>org.opendaylight.controller</groupId>
                        <artifactId>containermanager</artifactId>
-                       <version>0.5.0-SNAPSHOT</version>
+                       <version>0.5.1-SNAPSHOT</version>
                </dependency>
                <dependency>
                        <groupId>org.opendaylight.controller</groupId>
                        <artifactId>commons.northbound</artifactId>
-                       <version>0.4.0-SNAPSHOT</version>
+                       <version>0.4.1-SNAPSHOT</version>
                </dependency>
 
                <dependency>
                        <groupId>org.opendaylight.controller.thirdparty</groupId>
                        <artifactId>com.sun.jersey.jersey-servlet</artifactId>
-                       <version>1.17-SNAPSHOT</version>
+                       <version>1.18-SNAPSHOT</version>
                </dependency>
 
                <dependency>