Refactor the poms to clean up unused tags and move to odl parent

[lispflowmapping.git] / distribution / pom.xml

diff --git a/distribution/pom.xml b/distribution/pom.xml
index 389e194fb6d784702a0e444187bed781cfd85cc9..54492c7949be0f12200f62d83903700aab53a012 100644 (file)
--- a/distribution/pom.xml
+++ b/distribution/pom.xml
@@ -1,72 +1,70 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.opendaylight.lispflowmapping</groupId>
     <artifactId>lispflowmapping-commons</artifactId>
+    <version>1.2.0-SNAPSHOT</version>
     <relativePath>../commons/parent</relativePath>
-    <version>1.1.11-SNAPSHOT</version>
   </parent>
 
   <artifactId>lispflowmapping-distribution</artifactId>
   <packaging>pom</packaging>
   <name>LISP Flow Mapping Distribution</name>
-
-  <scm>
-    <connection>scm:git:https://git.opendaylight.org/gerrit/p/lispflowmapping.git</connection>
-    <developerConnection>scm:git:ssh://git.opendaylight.org:29418/lispflowmapping.git</developerConnection>
-    <url>https://wiki.opendaylight.org/view/OpenDaylight_Lisp_Flow_Mapping:Main</url>
-    <tag>HEAD</tag>
-  </scm>
   <dependencies>
+
+    <dependency>
+      <groupId>org.opendaylight.lispflowmapping</groupId>
+      <artifactId>mappingservice.api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.lispflowmapping</groupId>
+      <artifactId>mappingservice.clusterdao</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.opendaylight.lispflowmapping</groupId>
+      <artifactId>mappingservice.config</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.opendaylight.lispflowmapping</groupId>
+      <artifactId>mappingservice.implementation</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.opendaylight.lispflowmapping</groupId>
+      <artifactId>mappingservice.netconf</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.opendaylight.lispflowmapping</groupId>
+      <artifactId>mappingservice.neutron</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.opendaylight.lispflowmapping</groupId>
+      <artifactId>mappingservice.northbound</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.opendaylight.lispflowmapping</groupId>
+      <artifactId>mappingservice.southbound</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.opendaylight.lispflowmapping</groupId>
+      <artifactId>mappingservice.yangmodel</artifactId>
+    </dependency>
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>distribution.opendaylight</artifactId>
-      <version>0.1.2-SNAPSHOT</version>
-      <type>zip</type>
       <classifier>osgipackage</classifier>
+      <type>zip</type>
       <!-- Make sure this isn't included on any classpath-->
       <scope>provided</scope>
     </dependency>
 
-               <dependency>
-                       <groupId>org.opendaylight.lispflowmapping</groupId>
-                       <artifactId>mappingservice.yangmodel</artifactId>
-               </dependency>
-               
-               <dependency>
-                       <groupId>org.opendaylight.lispflowmapping</groupId>
-                       <artifactId>mappingservice.api</artifactId>
-               </dependency>
-               
-               <dependency>
-                       <groupId>org.opendaylight.lispflowmapping</groupId>
-                       <artifactId>mappingservice.config</artifactId>
-               </dependency>
-               
-               <dependency>
-                       <groupId>org.opendaylight.lispflowmapping</groupId>
-                       <artifactId>mappingservice.implementation</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.opendaylight.lispflowmapping</groupId>
-                       <artifactId>mappingservice.clusterdao</artifactId>
-               </dependency>
-               
-               <dependency>
-                       <groupId>org.opendaylight.lispflowmapping</groupId>
-                       <artifactId>mappingservice.southbound</artifactId>
-               </dependency>
-               
-               <dependency>
-                       <groupId>org.opendaylight.lispflowmapping</groupId>
-                       <artifactId>mappingservice.northbound</artifactId>
-               </dependency>
-               
-               <dependency>
-                       <groupId>org.opendaylight.lispflowmapping</groupId>
-                       <artifactId>mappingservice.neutron</artifactId>
-               </dependency>           
-               
   </dependencies>
 
   <build>
@@ -75,43 +73,43 @@
         <directory>${basedir}/src/main/resources</directory>
       </resource>
       <resource>
-        <directory>${project.build.directory}/generated-resources</directory>
         <filtering>true</filtering>
+        <directory>${project.build.directory}/generated-resources</directory>
       </resource>
     </resources>
     <plugins>
       <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-dependency-plugin</artifactId>
+        <artifactId>maven-assembly-plugin</artifactId>
         <executions>
           <execution>
-            <id>unpack-shared-resources</id>
+            <id>distro-assembly</id>
             <goals>
-              <goal>unpack-dependencies</goal>
+              <goal>single</goal>
             </goals>
-            <phase>generate-resources</phase>
+            <phase>package</phase>
             <configuration>
-             <outputDirectory>${project.build.directory}/generated-resources</outputDirectory>
-             <includeArtifacIds>distribution.opendaylight</includeArtifacIds>
-             <includeGroupIds>org.opendaylight.controller</includeGroupIds>
-             <excludeTransitive>true</excludeTransitive>
+              <descriptors>
+                <descriptor>src/assemble/bin.xml</descriptor>
+              </descriptors>
             </configuration>
           </execution>
         </executions>
       </plugin>
       <plugin>
-        <artifactId>maven-assembly-plugin</artifactId>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-dependency-plugin</artifactId>
         <executions>
           <execution>
-            <id>distro-assembly</id>
-            <phase>package</phase>
+            <id>unpack-shared-resources</id>
             <goals>
-              <goal>single</goal>
+              <goal>unpack-dependencies</goal>
             </goals>
+            <phase>generate-resources</phase>
             <configuration>
-              <descriptors>
-                <descriptor>src/assemble/bin.xml</descriptor>
-              </descriptors>
+              <outputDirectory>${project.build.directory}/generated-resources</outputDirectory>
+              <includeArtifacIds>distribution.opendaylight</includeArtifacIds>
+              <includeGroupIds>org.opendaylight.controller</includeGroupIds>
+              <excludeTransitive>true</excludeTransitive>
             </configuration>
           </execution>
         </executions>