Bump versions by x.(y+1).z

[lispflowmapping.git] / pom.xml

diff --git a/pom.xml b/pom.xml
index 6fb7aff38573326557a44e9c9385eba120d89422..c5c6c784584efd6d762eecd032d5d0432e60d108 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -1,59 +1,52 @@
+<?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.4-SNAPSHOT</version>
+    <version>1.20.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>artifacts</module>
     <module>mappingservice</module>
-    <module>distribution</module>
+    <module>features</module>
+    <module>lispflowmapping-karaf</module>
+    <module>integrationtest</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>
+    <pluginManagement>
+      <plugins>
+          <plugin>
+          <!-- Downgrade javadoc plugin, as 3.1.0+ breaks with maven.compiler.release=11 + javadoc:aggregate -->
+          <artifactId>maven-javadoc-plugin</artifactId>
+          <version>3.0.1</version>
+        </plugin>
+      </plugins>
+    </pluginManagement>
+
     <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>