Fix intermittent testOwnerChangesOnPeerAvailabilityChanges failure

[controller.git] / opendaylight / md-sal / messagebus-util / pom.xml

diff --git a/opendaylight/md-sal/messagebus-util/pom.xml b/opendaylight/md-sal/messagebus-util/pom.xml
index f0d453bac50c68e3dea1729fd8a2cda0386118d7..a547d7ce63f50f4c6002e6b45014acd6ebf7a263 100644 (file)
--- a/opendaylight/md-sal/messagebus-util/pom.xml
+++ b/opendaylight/md-sal/messagebus-util/pom.xml
@@ -12,21 +12,31 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.opendaylight.controller</groupId>
-        <artifactId>sal-parent</artifactId>
-        <version>1.4.0-SNAPSHOT</version>
+        <groupId>org.opendaylight.odlparent</groupId>
+        <artifactId>bundle-parent</artifactId>
+        <version>2.0.4</version>
+        <relativePath/>
     </parent>
 
+    <groupId>org.opendaylight.controller</groupId>
     <artifactId>messagebus-util</artifactId>
+    <version>1.7.0-SNAPSHOT</version>
+    <packaging>bundle</packaging>
     <name>${project.artifactId}</name>
 
-    <packaging>bundle</packaging>
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.opendaylight.controller</groupId>
+                <artifactId>mdsal-artifacts</artifactId>
+                <version>1.7.0-SNAPSHOT</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
 
     <dependencies>
-        <dependency>
-            <groupId>org.osgi</groupId>
-            <artifactId>org.osgi.core</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>sal-core-api</artifactId>
@@ -48,12 +58,29 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
         <dependency>
               <groupId>org.glassfish.jersey.test-framework.providers</groupId>
               <artifactId>jersey-test-framework-provider-grizzly2</artifactId>
+              <version>2.4</version>
               <scope>test</scope>
         </dependency>
         <dependency>
               <groupId>org.mockito</groupId>
-              <artifactId>mockito-all</artifactId>
+              <artifactId>mockito-core</artifactId>
               <scope>test</scope>
         </dependency>
     </dependencies>
+
+    <!--
+        Maven Site Configuration
+ 
+        The following configuration is necessary for maven-site-plugin to
+        correctly identify the correct deployment path for OpenDaylight Maven
+        sites.
+    -->
+    <url>${odl.site.url}/${project.groupId}/${stream}/${project.artifactId}/</url>
+ 
+    <distributionManagement>
+        <site>
+            <id>opendaylight-site</id>
+            <url>${nexus.site.url}/${project.artifactId}/</url>
+        </site>
+    </distributionManagement>
 </project>