X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=pom.xml;h=ecfd412be02d8f0659626c129bde3ae6b83c15c0;hb=6259acaf0e2f86706b64b9b9559ebab38531a02b;hp=c5e687ebb2f92d83a8a77f7409420cd18abfbfc6;hpb=48625a2bafbdcf7e7fc5911f14293a18530b6bf0;p=lispflowmapping.git

diff --git a/pom.xml b/pom.xml
index c5e687ebb..ecfd412be 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,60 +1,41 @@
+<?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.1.11-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
     <relativePath>commons/parent</relativePath>
   </parent>
 
   <artifactId>lispflowmapping-all</artifactId>
   <packaging>pom</packaging>
-  <name>LISP Flow Mapping All modules</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>
+  <!-- Used by Sonar to set project name -->
+  <name>lispflowmapping</name>
 
   <modules>
     <module>commons/parent</module>
     <module>commons/build_tools</module>
-    <module>commons/code-parent</module>
     <module>commons/unittest_tools</module>
     <module>mappingservice</module>
     <module>features</module>
-    <module>distribution</module>
+    <module>artifacts</module>
+    <module>distribution-karaf</module>
   </modules>
 
   <build>
-    <resources>
-      <resource>
-        <directory>${basedir}/src/main/resources</directory>
-      </resource>
-      <resource>
-        <directory>${project.build.directory}/generated-resources</directory>
-        <filtering>true</filtering>
-      </resource>
-    </resources>
     <plugins>
       <plugin>
+        <!-- In this project we want to automatically sort all poms, thus we
+             add the invocation of this plugin to the root parent. Configuration is in
+             odlparent. -->
+        <groupId>com.google.code.sortpom</groupId>
+        <artifactId>maven-sortpom-plugin</artifactId>
+      </plugin>
+      <plugin>
+        <!-- Check for coding style violations.  Configuration in odlparent. -->
         <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-dependency-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>unpack-shared-resources</id>
-            <goals>
-              <goal>unpack-dependencies</goal>
-            </goals>
-            <phase>generate-resources</phase>
-            <configuration>
-             <outputDirectory>${project.build.directory}/generated-resources</outputDirectory>
-             <excludeTransitive>true</excludeTransitive>
-            </configuration>
-          </execution>
-        </executions>
+        <artifactId>maven-checkstyle-plugin</artifactId>
       </plugin>
     </plugins>
   </build>