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 faedbe5ff7a23741bb5b605c6986426c8c9889bb..a547d7ce63f50f4c6002e6b45014acd6ebf7a263 100644 (file)
--- a/opendaylight/md-sal/messagebus-util/pom.xml
+++ b/opendaylight/md-sal/messagebus-util/pom.xml
@@ -12,24 +12,24 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.opendaylight.mdsal</groupId>
-        <artifactId>binding-parent</artifactId>
-        <version>0.10.0-SNAPSHOT</version>
+        <groupId>org.opendaylight.odlparent</groupId>
+        <artifactId>bundle-parent</artifactId>
+        <version>2.0.4</version>
         <relativePath/>
     </parent>
 
     <groupId>org.opendaylight.controller</groupId>
-    <version>1.5.0-SNAPSHOT</version>
     <artifactId>messagebus-util</artifactId>
-    <name>${project.artifactId}</name>
+    <version>1.7.0-SNAPSHOT</version>
     <packaging>bundle</packaging>
+    <name>${project.artifactId}</name>
 
     <dependencyManagement>
         <dependencies>
             <dependency>
                 <groupId>org.opendaylight.controller</groupId>
                 <artifactId>mdsal-artifacts</artifactId>
-                <version>1.5.0-SNAPSHOT</version>
+                <version>1.7.0-SNAPSHOT</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
@@ -37,10 +37,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     </dependencyManagement>
 
     <dependencies>
-        <dependency>
-            <groupId>org.osgi</groupId>
-            <artifactId>org.osgi.core</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>sal-core-api</artifactId>
@@ -67,31 +63,24 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
         </dependency>
         <dependency>
               <groupId>org.mockito</groupId>
-              <artifactId>mockito-all</artifactId>
+              <artifactId>mockito-core</artifactId>
               <scope>test</scope>
         </dependency>
     </dependencies>
 
-
-    <profiles>
-        <!-- Turn off doclint on aggregated API javadoc build. -->
-        <profile>
-            <id>jdk8</id>
-            <activation>
-                <jdk>[1.8,)</jdk>
-            </activation>
-
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-javadoc-plugin</artifactId>
-                        <configuration>
-                            <additionalparam>-Xdoclint:none</additionalparam>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
+    <!--
+        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>