Revert "Clean-up pom.xml layout"

[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..6679d3c1d84ea7f2332a2689aeffb4fbd1b8e7ef 100644 (file)
--- a/opendaylight/md-sal/messagebus-util/pom.xml
+++ b/opendaylight/md-sal/messagebus-util/pom.xml
@@ -12,29 +12,15 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
     <modelVersion>4.0.0</modelVersion>
 
     <parent>

-        <groupId>org.opendaylight.mdsal</groupId>
-        <artifactId>binding-parent</artifactId>
-        <version>0.10.0-SNAPSHOT</version>
-        <relativePath/>
+        <groupId>org.opendaylight.controller</groupId>
+        <artifactId>sal-parent</artifactId>
+        <version>1.5.0-SNAPSHOT</version>

     </parent>
 
     </parent>
 

-    <groupId>org.opendaylight.controller</groupId>
-    <version>1.5.0-SNAPSHOT</version>

     <artifactId>messagebus-util</artifactId>
     <name>${project.artifactId}</name>
     <artifactId>messagebus-util</artifactId>
     <name>${project.artifactId}</name>

-    <packaging>bundle</packaging>

 
 

-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>org.opendaylight.controller</groupId>
-                <artifactId>mdsal-artifacts</artifactId>
-                <version>1.5.0-SNAPSHOT</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
+    <packaging>bundle</packaging>

 
     <dependencies>
         <dependency>
 
     <dependencies>
         <dependency>


@@ -62,7 +48,6 @@ 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>
         <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>
               <scope>test</scope>
         </dependency>
         <dependency>


@@ -71,27 +56,4 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
               <scope>test</scope>
         </dependency>
     </dependencies>
               <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>

 </project>
 </project>