X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=odlparent%2Fodlparent%2Fpom.xml;h=56409dc9b80d7d287a62415be03b75f72ca5776e;hb=a265d5be417269a7814e2e71e7dad7c0719f4770;hp=8b605eee82ca909b98aa0b1d71147d26b94573b1;hpb=66430cc882f1802fb99a5a1354d24fc3d28d5a9d;p=ccsdk%2Fparent.git

diff --git a/odlparent/odlparent/pom.xml b/odlparent/odlparent/pom.xml
index 8b605eee..56409dc9 100644
--- a/odlparent/odlparent/pom.xml
+++ b/odlparent/odlparent/pom.xml
@@ -8,13 +8,13 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent</artifactId>
-        <version>5.0.7</version>
+        <version>5.0.11</version>
         <relativePath/>
     </parent>
 
     <groupId>org.onap.ccsdk.parent</groupId>
     <artifactId>odlparent</artifactId>
-    <version>2.0.1-SNAPSHOT</version>
+    <version>2.1.1-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>ONAP :: ${project.groupId} :: ${project.artifactId}</name>
@@ -96,18 +96,18 @@
         <logging-analytics.version>1.6.6</logging-analytics.version>
 
         <!-- CCSDK component versions -->
-        <ccsdk.cds.version>1.0.0-SNAPSHOT</ccsdk.cds.version>
-        <ccsdk.features.version>1.0.1-SNAPSHOT</ccsdk.features.version>
-        <ccsdk.sli.core.version>1.0.1-SNAPSHOT</ccsdk.sli.core.version>
-        <ccsdk.sli.adaptors.version>1.0.1-SNAPSHOT</ccsdk.sli.adaptors.version>
-        <ccsdk.sli.northbound.version>1.0.1-SNAPSHOT</ccsdk.sli.northbound.version>
-        <ccsdk.sli.plugins.version>1.0.1-SNAPSHOT</ccsdk.sli.plugins.version>
-        <ccsdk.distribution.version>1.0.0-SNAPSHOT</ccsdk.distribution.version>
-        <sdnctl.sli.version>${ccsdk.sli.core.version}</sdnctl.sli.version>
-        <sdnctl.aai.service.version>${ccsdk.sli.adaptors.version}</sdnctl.aai.service.version>
-        <sdnctl.dblib.version>${ccsdk.sli.core.version}</sdnctl.dblib.version>
-        <sdnctl.mdsal.resource.version>${ccsdk.sli.adaptors.version}</sdnctl.mdsal.resource.version>
-        <sdnctl.slipluginutils.version>${ccsdk.sli.core.version}</sdnctl.slipluginutils.version>
+        <ccsdk.cds.version>1.1.1-SNAPSHOT</ccsdk.cds.version>
+        <ccsdk.features.version>1.1.1-SNAPSHOT</ccsdk.features.version>
+        <ccsdk.distribution.version>1.1.1-SNAPSHOT</ccsdk.distribution.version>
+        <ccsdk.sli.version>1.2.0-SNAPSHOT</ccsdk.sli.version>
+        <ccsdk.sli.core.version>${ccsdk.sli.version}</ccsdk.sli.core.version>
+        <ccsdk.sli.adaptors.version>${ccsdl.sli.version}</ccsdk.sli.adaptors.version>
+        <ccsdk.sli.northbound.version>${ccsdl.sli.version}</ccsdk.sli.northbound.version>
+        <ccsdk.sli.plugins.version>${ccsdl.sli.version}</ccsdk.sli.plugins.version>
+        <sdnctl.aai.service.version>${ccsdk.sli.version}</sdnctl.aai.service.version>
+        <sdnctl.dblib.version>${ccsdk.sli.version}</sdnctl.dblib.version>
+        <sdnctl.mdsal.resource.version>${ccsdk.sli.version}</sdnctl.mdsal.resource.version>
+        <sdnctl.slipluginutils.version>${ccsdk.sli.version}</sdnctl.slipluginutils.version>
 
         <!-- Support libraries used by OpenDaylight -->
         <odl.controller.mdsal.version>1.10.3</odl.controller.mdsal.version>
@@ -192,7 +192,7 @@
             <dependency>
                 <groupId>org.onap.ccsdk.parent</groupId>
                 <artifactId>dependencies-odl-bom</artifactId>
-                <version>2.0.1-SNAPSHOT</version>
+                <version>2.1.1-SNAPSHOT</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
@@ -564,6 +564,14 @@
                         <version>7.1.1</version>
                     </configuration>
                 </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-javadoc-plugin</artifactId>
+                    <version>3.2.0</version>
+                    <configuration>
+                        <failOnError>false</failOnError>
+                    </configuration>
+                </plugin>
             </plugins>
         </pluginManagement>
         <plugins>
@@ -817,7 +825,7 @@
                                     <message>Please always use mockito-core instead of mockito-all (see https://bugs.opendaylight.org/show_bug.cgi?id=7662), and spotbugs:annotations instead of findbugs:annotations</message>
                                     <excludes>
                                         <exclude>org.mockito:mockito-all</exclude>
-<!--                                         <exclude>com.google.code.findbugs:annotations</exclude> -->
+                                        <!-- <exclude>com.google.code.findbugs:annotations</exclude> -->
                                     </excludes>
                                 </bannedDependencies>
                             </rules>
@@ -826,6 +834,18 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>pl.project13.maven</groupId>
+                <artifactId>git-commit-id-plugin</artifactId>
+                <version>4.0.0</version>
+                <configuration>
+                    <commitIdGenerationMode>full</commitIdGenerationMode>
+                    <includeOnlyProperties>
+                        <includeOnlyProperty>^git.build.(time|version)$</includeOnlyProperty>
+                        <includeOnlyProperty>^git.commit.id.(abbrev|full)$</includeOnlyProperty>
+                    </includeOnlyProperties>
+                </configuration>
+            </plugin>
         </plugins>
     </build>