Merge "Change HostTracker.IntegrationTest to use clustering.stub instead of services...

diff --git a/opendaylight/hosttracker/implementation/pom.xml b/opendaylight/hosttracker/implementation/pom.xml
index 402dfe32e350cd6486d9ca6cc36665e9bd2c746e..e7788d999ab42482b767e6ab812567fa7c60f7c0 100644 (file)
--- a/opendaylight/hosttracker/implementation/pom.xml
+++ b/opendaylight/hosttracker/implementation/pom.xml
@@ -18,7 +18,7 @@
                <!-- Sonar properties using jacoco to retrieve integration test results -->
                <sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
                <sonar.dynamicAnalysis>reuseReports</sonar.dynamicAnalysis>
-               <sonar.jacoco.Reportpath>target/jacobo.exec</sonar.jacoco.Reportpath>
+               <sonar.jacoco.Reportpath>target/jacoco.exec</sonar.jacoco.Reportpath>
                <sonar.jacoco.itReportPath>target/jacoco-it.exec</sonar.jacoco.itReportPath>
                <sonar.language>java</sonar.language>
        </properties>

diff --git a/opendaylight/hosttracker/integrationtest/pom.xml b/opendaylight/hosttracker/integrationtest/pom.xml
index 0d2d18ca2784edc3dee2830c20a20f2d6ccb43fa..d68189ad0f47e1d096eb1b9d09ec21d9080837fb 100644 (file)
--- a/opendaylight/hosttracker/integrationtest/pom.xml
+++ b/opendaylight/hosttracker/integrationtest/pom.xml
@@ -59,7 +59,7 @@
  \r
        <dependency>\r
       <groupId>org.opendaylight.controller</groupId>\r
-      <artifactId>clustering.services-implementation</artifactId>\r
+      <artifactId>clustering.stub</artifactId>\r
       <version>0.4.0-SNAPSHOT</version>\r
     </dependency>\r
 \r

diff --git a/opendaylight/hosttracker/integrationtest/src/test/java/org/opendaylight/controller/hosttracker/internal/HostTrackerIntegrationTest.java b/opendaylight/hosttracker/integrationtest/src/test/java/org/opendaylight/controller/hosttracker/internal/HostTrackerIntegrationTest.java
index fb5367c528654bd3dbf412cf13f346bc00690dd8..c5407794d25abf8cc0f6d846f96d6346c92edda8 100644 (file)
--- a/opendaylight/hosttracker/integrationtest/src/test/java/org/opendaylight/controller/hosttracker/internal/HostTrackerIntegrationTest.java
+++ b/opendaylight/hosttracker/integrationtest/src/test/java/org/opendaylight/controller/hosttracker/internal/HostTrackerIntegrationTest.java
@@ -121,7 +121,7 @@ public class HostTrackerIntegrationTest {
                mavenBundle("org.opendaylight.controller",\r
                         "clustering.services", "0.4.0-SNAPSHOT"),\r
                mavenBundle("org.opendaylight.controller",\r
-                        "clustering.services-implementation", "0.4.0-SNAPSHOT"),\r
+                        "clustering.stub", "0.4.0-SNAPSHOT"),\r
 \r
                 // needed by forwardingrulesmanager\r
                 mavenBundle("org.opendaylight.controller", "switchmanager",\r

diff --git a/opendaylight/statisticsmanager/implementation/pom.xml b/opendaylight/statisticsmanager/implementation/pom.xml
index 311204b5456b9fca09568f06aabec88eb716c9ec..fdc2efa5c207baf25b7bfe8ca90ae24ce53768c7 100644 (file)
--- a/opendaylight/statisticsmanager/implementation/pom.xml
+++ b/opendaylight/statisticsmanager/implementation/pom.xml
@@ -16,7 +16,7 @@
     <!-- Sonar properties using jacoco to retrieve integration test results -->
     <sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
     <sonar.dynamicAnalysis>reuseReports</sonar.dynamicAnalysis>
-    <sonar.jacoco.Reportpath>target/jacobo.exec</sonar.jacoco.Reportpath>
+    <sonar.jacoco.Reportpath>target/jacoco.exec</sonar.jacoco.Reportpath>
     <sonar.jacoco.itReportPath>target/jacoco-it.exec</sonar.jacoco.itReportPath>
     <sonar.language>java</sonar.language>
   </properties>
@@ -106,4 +106,4 @@
       <version>0.4.0-SNAPSHOT</version>
     </dependency>
   </dependencies>
-</project>
\ No newline at end of file
+</project>