X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=odlparent%2Ffeature-repo-parent%2Fpom.xml;h=e55d26b37330e2c1f692f970c58155cb897db61d;hb=2d071d42b8c333ffadd084960f85a3822e414815;hp=ebcbb961858d6924129f24cd685c01941630bc2b;hpb=f15762deff2e139fa225b899801ec3e46416435d;p=ccsdk%2Fparent.git

diff --git a/odlparent/feature-repo-parent/pom.xml b/odlparent/feature-repo-parent/pom.xml
index ebcbb961..e55d26b3 100644
--- a/odlparent/feature-repo-parent/pom.xml
+++ b/odlparent/feature-repo-parent/pom.xml
@@ -8,13 +8,13 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>feature-repo-parent</artifactId>
-        <version>4.0.10</version>
+        <version>9.0.8</version>
         <relativePath/>
     </parent>
 
     <groupId>org.onap.ccsdk.parent</groupId>
     <artifactId>feature-repo-parent</artifactId>
-    <version>1.5.1-SNAPSHOT</version>
+    <version>2.3.4-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>ONAP :: ${project.groupId} :: ${project.artifactId}</name>
@@ -31,32 +31,33 @@
     <distributionManagement>
         <repository>
             <id>ecomp-releases</id>
-            <url>https://nexus.onap.org/content/repositories/releases</url>
+            <url>${onap.nexus.release-url}</url>
         </repository>
         <snapshotRepository>
             <id>ecomp-snapshots</id>
-            <url>https://nexus.onap.org/content/repositories/snapshots</url>
+            <url>${onap.nexus.snapshot-url}</url>
         </snapshotRepository>
     </distributionManagement>
 
     <properties>
+        <!-- Sonar properties -->
+        <sonar.scanner.version>3.7.0.1746</sonar.scanner.version>
+        <sonar-jacoco-listeners.version>3.2</sonar-jacoco-listeners.version>
+        <sonar.core.codeCoveragePlugin>jacoco</sonar.core.codeCoveragePlugin>
+        <!-- Default Sonar configuration -->
+        <sonar.coverage.jacoco.xmlReportPaths>${project.reporting.outputDirectory}/jacoco-ut/jacoco.xml,${project.reporting.outputDirectory}/jacoco-it/jacoco.xml</sonar.coverage.jacoco.xmlReportPaths>
+        <!-- Note: This list should match jacoco-maven-plugin's exclusion list below -->
+        <sonar.exclusions>**/gen/**,**/generated-sources/**,**/yang-gen**,**/pax/**</sonar.exclusions>
+
+        <!-- Jacoco properties -->
+        <jacoco.version>0.8.5</jacoco.version>
 
         <!-- properties from oparent -->
-        <maven.compiler.source>1.8</maven.compiler.source>
-        <maven.compiler.target>1.8</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <onap.nexus.url>https://nexus.onap.org</onap.nexus.url>
         <!-- sitePath may be overridden in the inheriting POM if desired -->
         <sitePath>/content/sites/site/${project.groupId}/${project.artifactId}/${project.version}</sitePath>
-        <jacoco.version>0.7.7.201606060606</jacoco.version>
-        <sonar-jacoco-listeners.version>3.2</sonar-jacoco-listeners.version>
-        <sonar.core.codeCoveragePlugin>jacoco</sonar.core.codeCoveragePlugin>
-        <!-- Default Sonar configuration -->
-        <sonar.jacoco.reportPaths>target/code-coverage/jacoco-ut.exec,target/code-coverage/jacoco-it.exec</sonar.jacoco.reportPaths>
-        <!-- Note: This list should match jacoco-maven-plugin's exclusion list
-            below -->
-        <sonar.exclusions>**/gen/**,**/generated-sources/**,**/yang-gen**,**/pax/**</sonar.exclusions>
+
         <!-- If following file exist, auto-generation of swagger.json will be done -->
         <swagger-properties>${basedir}/src/main/resources/swagger.properties</swagger-properties>
         <!-- If following file exist, auto-generation of sdk will be done -->
@@ -64,6 +65,7 @@
         <!-- end of properties from oparent -->
 
         <!-- ONAP repositories -->
+        <onap.nexus.url>https://nexus.onap.org</onap.nexus.url>
         <onap.nexus.host>nexus.onap.org</onap.nexus.host>
         <onap.nexus.port>443</onap.nexus.port>
         <onap.nexus.protocol>https</onap.nexus.protocol>
@@ -79,70 +81,71 @@
         <opendaylight.nexus.snapshot-url>https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/</opendaylight.nexus.snapshot-url>
 
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <java.version.source>1.8</java.version.source>
-        <java.version.target>1.8</java.version.target>
-        <bundle.plugin.version>2.5.0</bundle.plugin.version>
-        <maven.compile.plugin.version>2.5.1</maven.compile.plugin.version>
+        <java.version>11</java.version>
+        <maven-surefire-plugin.version>3.0.0-M5</maven-surefire-plugin.version>
+        <maven-failsafe-plugin.version>3.0.0-M5</maven-failsafe-plugin.version>
+        <bundle.plugin.version>4.2.1</bundle.plugin.version>
+        <maven-compiler-plugin.version>3.8.1</maven-compiler-plugin.version>
         <features.file>features.xml</features.file>
         <jmxGeneratorPath>src/main/yang-gen-config</jmxGeneratorPath>
         <salGeneratorPath>src/main/yang-gen-sal</salGeneratorPath>
+        <checkstyle.plugin.version>3.1.1</checkstyle.plugin.version>
         <checkstyle.skip>true</checkstyle.skip>
+        <odlparent.spotbugs.enforce>false</odlparent.spotbugs.enforce>
 
-        <sonar.language>java</sonar.language>
-        <sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
-        <sonar.surefire.reportsPath>${project.build.directory}/surefire-reports</sonar.surefire.reportsPath>
-        <sonar.jacoco.reportMissing.force.zero>true</sonar.jacoco.reportMissing.force.zero>
-        <sonar.projectVersion>${project.version}</sonar.projectVersion>
+        <!-- logging-analytics versions -->
+        <logging-analytics.version>1.6.9</logging-analytics.version>
 
         <!-- CCSDK component versions -->
-        <ccsdk.sli.core.version>0.7.0-SNAPSHOT</ccsdk.sli.core.version>
-        <ccsdk.sli.adaptors.version>0.7.0-SNAPSHOT</ccsdk.sli.adaptors.version>
-        <ccsdk.sli.northbound.version>0.7.0-SNAPSHOT</ccsdk.sli.northbound.version>
-        <ccsdk.sli.plugins.version>0.7.0-SNAPSHOT</ccsdk.sli.plugins.version>
-        <ccsdk.distribution.version>0.7.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.2.99999, 1.3.99999-SNAPSHOT]</ccsdk.cds.version>
+        <ccsdk.features.version>(1.2.99999, 1.3.99999-SNAPSHOT]</ccsdk.features.version>
+        <ccsdk.distribution.version>(1.2.99999, 1.3.99999-SNAPSHOT]</ccsdk.distribution.version>
+        <ccsdk.sli.version>(1.3.99999, 1.4.99999-SNAPSHOT]</ccsdk.sli.version>
+        <ccsdk.sli.core.version>${ccsdk.sli.version}</ccsdk.sli.core.version>
+        <ccsdk.sli.adaptors.version>${ccsdk.sli.version}</ccsdk.sli.adaptors.version>
+        <ccsdk.sli.northbound.version>${ccsdk.sli.version}</ccsdk.sli.northbound.version>
+        <ccsdk.sli.plugins.version>${ccsdk.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.9.1</odl.controller.mdsal.version>
-        <odl.mdsal.version>3.0.8</odl.mdsal.version>
-        <odl.mdsal.model.version>1.0.8</odl.mdsal.model.version>
-        <odl.netconf.restconf.version>1.9.1</odl.netconf.restconf.version>
-        <odl.netconf.netconf.version>1.6.1</odl.netconf.netconf.version>
-        <odl.netconf.sal.rest.docgen.version>1.9.1</odl.netconf.sal.rest.docgen.version>
+        <odl.controller.mdsal.version>8.0.7</odl.controller.mdsal.version>
+        <odl.mdsal.version>9.0.8</odl.mdsal.version>
+        <odl.mdsal.model.version>9.0.8</odl.mdsal.model.version>
+        <odl.mdsal.generator.version>8.0.5</odl.mdsal.generator.version>
+        <odl.netconf.restconf.version>8.0.7</odl.netconf.restconf.version>
+        <odl.netconf.netconf.version>8.0.7</odl.netconf.netconf.version>
+        <odl.netconf.sal.rest.docgen.version>8.0.7</odl.netconf.sal.rest.docgen.version>
 
         <!-- Used by aaa, vtn -->
-        <commons.codec.version>1.12</commons.codec.version>
+        <commons.codec.version>1.15</commons.codec.version>
         <!-- Used by netconf, ovsdb -->
-        <commons.lang3.version>3.8.1</commons.lang3.version>
+        <commons.lang3.version>3.12.0</commons.lang3.version>
         <!-- Used by sfc, snmp4sdn; see also affinity, toolkit -->
         <commons.lang.version>2.6</commons.lang.version>
         <!-- Used by neutron; see also controller, vtn -->
-        <commons.net.version>3.6</commons.net.version>
+        <commons.net.version>3.8.0</commons.net.version>
         <!-- Used by neutron -->
-        <eclipse.persistence.version>2.7.3</eclipse.persistence.version>
+        <eclipse.persistence.version>None</eclipse.persistence.version>
         <!-- Used by aaa -->
         <felix.dependencymanager.version>4.4.1</felix.dependencymanager.version>
         <!-- Used by lacp, netconf, ovsdb, sfc, toolkit; see also vtn -->
-        <gson.version>2.8.5</gson.version>
+        <gson.version>2.8.8</gson.version>
         <!-- Used by aaa, dlux, persistence, snmp4sdn, sxp -->
-        <guava.version>25.1-jre</guava.version>
+        <guava.version>30.1.1-jre</guava.version>
         <!-- Used by aaa, alto, netconf, ovsdb, sfc; see also affinity, defense4all,
             integration/distribution, snmp4sdn, toolkit, ttp -->
-        <jackson.version>2.9.8</jackson.version>
+        <jackson.version>2.12.5</jackson.version>
         <!-- Used by snmp4sdn, yangtools -->
-        <javassist.version>3.24.1-GA</javassist.version>
+        <javassist.version>3.27.0-GA</javassist.version>
 
-        <!-- FIXME remove all dependencies for jersey 1.17 after migration all
-            projects -->
-        <!-- Used by aaa, alto, netconf, neutron, sfc; see also affinity, defense4all,
-            snmp4sdn, toolkit -->
-        <jersey.version>2.25.1</jersey.version>
+        <!-- FIXME remove all dependencies for jersey 1.17 after migration all projects -->
+        <!-- Used by aaa, alto, netconf, neutron, sfc; see also affinity, defense4all, snmp4sdn, toolkit -->
+        <jersey.version>2.27</jersey.version>
         <!-- Used by sfc -->
-        <jersey.client.version>2.25.1</jersey.client.version>
+        <jersey.client.version>2.27</jersey.client.version>
 
         <!-- New packages for jersey migration 1.17 to 2.8 -->
         <!-- appache.geronimo.bundle for DocGen -->
@@ -150,116 +153,95 @@
         <org.json.version>20131018</org.json.version>
 
         <!-- Used everywhere -->
-        <junit.version>4.12</junit.version>
+        <junit.version>4.13.2</junit.version>
         <!-- Used by coretutorials, sfc, snmp4sdn, sxp; see also affinity, toolkit -->
-        <logback.version>1.2.3</logback.version>
+        <logback.version>1.11.7</logback.version>
         <!-- Used by nic, sfc, sxp, tsdr -->
-        <mockito.version>1.10.19</mockito.version>
+        <mockito.version>3.3.3</mockito.version>
         <!-- Used by bgpcep, netconf, ovsdb, sxp; see also opendove, toolkit -->
-        <netty.version>4.1.34.Final</netty.version>
-        <!-- Used by openflowjava, persistence, sfc, snmp4sdn, sxp; see also affinity,
-            toolkit -->
-        <slf4j.version>1.7.25</slf4j.version>
-        <!-- Used in integration/distribution; see also affinity, snmp4sdn, toolkit,
-            tsdr, ttp -->
-        <spring.version>4.3.24.RELEASE</spring.version>
+        <netty.version>4.1.69.Final</netty.version>
+        <!-- Used by openflowjava, persistence, sfc, snmp4sdn, sxp; see also affinity, toolkit -->
+        <slf4j.version>1.7.32</slf4j.version>
+        <!-- Used in integration/distribution; see also affinity, snmp4sdn, toolkit, tsdr, ttp -->
+        <spring.version>4.3.25.RELEASE</spring.version>
 
         <!-- Extra support libraries used by SDN-C -->
         <jvnet.jaxb2.version>0.6.4</jvnet.jaxb2.version>
-        <antlr.version>4.7.2</antlr.version>
+        <antlr.version>4.8-1</antlr.version>
 
         <eelf.maven.plugin.version>1.0.0</eelf.maven.plugin.version>
 
         <!-- Managed dependency versions -->
-        <apache.httpcomponents.core.version>4.4.10</apache.httpcomponents.core.version>
-        <apache.httpcomponents.client.version>4.5.6</apache.httpcomponents.client.version>
+        <apache.httpcomponents.core.version>4.4.12</apache.httpcomponents.core.version>
+        <apache.httpcomponents.client.version>4.5.13</apache.httpcomponents.client.version>
         <derby.version>10.14.2.0</derby.version>
         <eelf.version>1.0.0</eelf.version>
-        <grpc.version>1.17.1</grpc.version>
-        <mariadb.connector.version>2.1.1</mariadb.connector.version>
-        <mariadb4j.version>2.2.3</mariadb4j.version>
-        <testng.version>6.11</testng.version>
-        <tomcat-jdbc.version>9.0.27</tomcat-jdbc.version>
-        <jetty.version>9.4.12.v20180830</jetty.version>
+        <grpc.version>1.21.1</grpc.version>
+        <log4j.version>2.17.1</log4j.version>
+        <log4j2.version>2.17.1</log4j2.version>
+        <jetty.version>9.4.43.v20210629</jetty.version>
+        <mariadb.connector.version>2.7.5</mariadb.connector.version>
+        <mariadb4j.version>2.4.0</mariadb4j.version>
+        <testng.version>6.14.3</testng.version>
+        <tomcat-jdbc.version>9.0.52</tomcat-jdbc.version>
         <skip.karaf.featureTest>true</skip.karaf.featureTest>
+        <dependency-list.file>direct-dependencies.txt</dependency-list.file>
     </properties>
 
     <dependencyManagement>
         <dependencies>
-
             <!-- Note: If value in BOM conflicts with value inherited from
             parent pom, inherited value takes precedence.  This seems more like
             a bug than a feature, but this is how maven 3.6 works -->
             <dependency>
                 <groupId>org.onap.ccsdk.parent</groupId>
                 <artifactId>dependencies-odl-bom</artifactId>
-                <version>1.5.1-SNAPSHOT</version>
+                <version>2.3.4-SNAPSHOT</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
-
-            <!-- Override incorrect versions in ODL parent poms -->
-            <!-- to match versions actually installed in ODL Neon -->
-            <dependency>
-                <groupId>com.google.protobuf</groupId>
-                <artifactId>protobuf-java</artifactId>
-                <version>3.6.1</version>
-            </dependency>
             <dependency>
-                <groupId>io.netty</groupId>
-                <artifactId>netty-transport</artifactId>
-                <version>4.1.34.Final</version>
-            </dependency>
-            <dependency>
-                <groupId>io.netty</groupId>
-                <artifactId>netty-all</artifactId>
-                <version>4.1.34.Final</version>
-                <!-- <version>${netty.version}</version> -->
-            </dependency>
-            <dependency>
-                <groupId>junit</groupId>
-                <artifactId>junit</artifactId>
-                <version>4.12</version>
-                <scope>test</scope>
-            </dependency>
-            <dependency>
-                <groupId>org.eclipse.jetty</groupId>
-                <artifactId>jetty-server</artifactId>
-                <version>9.4.12.v20180830</version>
-            </dependency>
-            <dependency>
-                <groupId>org.eclipse.jetty</groupId>
-                <artifactId>jetty-servlets</artifactId>
-                <version>9.4.12.v20180830</version>
+                <groupId>org.onap.ccsdk.parent</groupId>
+                <artifactId>dependencies-bom</artifactId>
+                <version>2.3.4-SNAPSHOT</version>
+                <type>pom</type>
+                <scope>import</scope>
             </dependency>
             <dependency>
-                <groupId>org.glassfish.jersey.bundles.repackaged</groupId>
-                <artifactId>jersey-guava</artifactId>
-                <version>2.25.1</version>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-dependencies</artifactId>
+                <version>2.3.8.RELEASE</version>
+                <scope>import</scope>
+                <type>pom</type>
             </dependency>
             <dependency>
-                <groupId>org.codehaus.jettison</groupId>
-                <artifactId>jettison</artifactId>
-                <version>1.3.8</version>
+                <groupId>org.mariadb.jdbc</groupId>
+                <artifactId>mariadb-java-client</artifactId>
+                <version>${mariadb.connector.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.onap.logging-analytics</groupId>
                 <artifactId>logging-slf4j</artifactId>
-                <version>1.6.1</version>
+                <version>${logging-analytics.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.onap.logging-analytics</groupId>
                 <artifactId>logging-filter-base</artifactId>
-                <version>1.6.1</version>
+                <version>${logging-analytics.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>junit</groupId>
+                <artifactId>junit</artifactId>
+                <version>${junit.version}</version>
+                <scope>test</scope>
             </dependency>
         </dependencies>
-
     </dependencyManagement>
 
     <repositories>
         <repository>
             <id>onap-public</id>
-            <url>https://nexus.onap.org/content/groups/public</url>
+            <url>${onap.nexus.public-url}</url>
             <releases>
                 <enabled>true</enabled>
                 <updatePolicy>never</updatePolicy>
@@ -271,7 +253,7 @@
         </repository>
         <repository>
             <id>onap-staging</id>
-            <url>https://nexus.onap.org/content/groups/staging</url>
+            <url>${onap.nexus.staging-url}</url>
             <releases>
                 <enabled>true</enabled>
                 <updatePolicy>never</updatePolicy>
@@ -284,7 +266,7 @@
         <repository>
             <id>ecomp-release</id>
             <name>onap-repository-releases</name>
-            <url>https://nexus.onap.org/content/repositories/releases</url>
+            <url>${onap.nexus.release-url}</url>
             <releases>
                 <enabled>true</enabled>
                 <updatePolicy>never</updatePolicy>
@@ -296,7 +278,7 @@
         <repository>
             <id>ecomp-snapshot</id>
             <name>onap-repository-snapshots</name>
-            <url>https://nexus.onap.org/content/repositories/snapshots</url>
+            <url>${onap.nexus.snapshot-url}</url>
             <releases>
                 <enabled>false</enabled>
             </releases>
@@ -307,7 +289,7 @@
         <repository>
             <id>opendaylight-mirror</id>
             <name>opendaylight-mirror</name>
-            <url>https://nexus.opendaylight.org/content/repositories/public/</url>
+            <url>${opendaylight.nexus.public-url}</url>
             <releases>
                 <enabled>true</enabled>
                 <updatePolicy>never</updatePolicy>
@@ -319,7 +301,7 @@
         <repository>
             <id>opendaylight-snapshot</id>
             <name>opendaylight-snapshot</name>
-            <url>https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/</url>
+            <url>${opendaylight.nexus.snapshot-url}</url>
             <releases>
                 <enabled>false</enabled>
             </releases>
@@ -327,8 +309,8 @@
                 <enabled>true</enabled>
             </snapshots>
         </repository>
-
     </repositories>
+
     <pluginRepositories>
         <pluginRepository>
             <id>onap-public</id>
@@ -389,7 +371,6 @@
             <name>JCenter Repository</name>
             <url>http://jcenter.bintray.com</url>
         </pluginRepository>
-
         <pluginRepository>
             <id>Restlet</id>
             <name>Restlet Repository</name>
@@ -400,9 +381,7 @@
     <build>
         <pluginManagement>
             <plugins>
-
                 <!-- Plugins from ONAP version (parent of oparent) -->
-
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-deploy-plugin</artifactId>
@@ -410,6 +389,7 @@
                     <version>2.8</version>
                     <configuration>
                         <skip/>
+                        <deployAtEnd>true</deployAtEnd>
                     </configuration>
                 </plugin>
                 <plugin>
@@ -461,98 +441,54 @@
                                 </rules>
                             </configuration>
                         </execution>
-                    </executions>
-                </plugin>
-                <!-- https://mvnrepository.com/artifact/org.sonarsource.scanner.maven/sonar-maven-plugin -->
-                <plugin>
-                    <groupId>org.sonarsource.scanner.maven</groupId>
-                    <artifactId>sonar-maven-plugin</artifactId>
-                    <version>3.6.0.1398</version>
-                </plugin>
-                <!-- end of plugins from ONAP version (parent of oparent) -->
-
-                <!-- Plugins from ONAP oparent -->
-
-                <plugin>
-                    <groupId>org.jacoco</groupId>
-                    <artifactId>jacoco-maven-plugin</artifactId>
-                    <version>${jacoco.version}</version>
-                    <configuration>
-                        <!-- Note: This exclusion list should match <sonar.exclusions> property
-                            above -->
-                        <excludes>
-                            <exclude>**/gen/**</exclude>
-                            <exclude>**/generated-sources/**</exclude>
-                            <exclude>**/yang-gen/**</exclude>
-                            <exclude>**/pax/**</exclude>
-                        </excludes>
-                    </configuration>
-                    <executions>
-                        <!-- Prepares the property pointing to the JaCoCo runtime agent which
-                            is passed as VM argument when Maven the Surefire plugin is executed. -->
-                        <execution>
-                            <id>pre-unit-test</id>
-                            <goals>
-                                <goal>prepare-agent</goal>
-                            </goals>
-                            <configuration>
-                                <!-- Sets the path to the file which contains the execution data. -->
-                                <destFile>${project.build.directory}/code-coverage/jacoco-ut.exec</destFile>
-                                <!-- Sets the name of the property containing the settings for JaCoCo
-                                    runtime agent. -->
-                                <propertyName>surefireArgLine</propertyName>
-                            </configuration>
-                        </execution>
-                        <!-- Ensures that the code coverage report for unit tests is created
-                            after unit tests have been run. -->
                         <execution>
-                            <id>post-unit-test</id>
-                            <phase>test</phase>
+                            <id>enforce-maven</id>
                             <goals>
-                                <goal>report</goal>
-                            </goals>
-                            <configuration>
-                                <!-- Sets the path to the file which contains the execution data. -->
-                                <dataFile>${project.build.directory}/code-coverage/jacoco-ut.exec</dataFile>
-                                <!-- Sets the output directory for the code coverage report. -->
-                                <outputDirectory>${project.reporting.outputDirectory}/jacoco-ut</outputDirectory>
-                            </configuration>
-                        </execution>
-                        <execution>
-                            <id>pre-integration-test</id>
-                            <phase>pre-integration-test</phase>
-                            <goals>
-                                <goal>prepare-agent</goal>
+                                <goal>enforce</goal>
                             </goals>
                             <configuration>
-                                <!-- Sets the path to the file which contains the execution data. -->
-                                <destFile>${project.build.directory}/code-coverage/jacoco-it.exec</destFile>
-                                <!-- Sets the name of the property containing the settings for JaCoCo
-                                    runtime agent. -->
-                                <propertyName>failsafeArgLine</propertyName>
+                                <rules>
+                                    <requireJavaVersion>
+                                        <version>8</version>
+                                    </requireJavaVersion>
+                                    <requireMavenVersion>
+                                        <version>[3.5.0,)</version>
+                                    </requireMavenVersion>
+                                </rules>
                             </configuration>
                         </execution>
-                        <!-- Ensures that the code coverage report for integration tests after
-                            integration tests have been run. -->
                         <execution>
-                            <id>post-integration-test</id>
-                            <phase>post-integration-test</phase>
+                            <id>enforce-banned-dependencies</id>
                             <goals>
-                                <goal>report</goal>
+                                <goal>enforce</goal>
                             </goals>
                             <configuration>
-                                <!-- Sets the path to the file which contains the execution data. -->
-                                <dataFile>${project.build.directory}/code-coverage/jacoco-it.exec</dataFile>
-                                <!-- Sets the output directory for the code coverage report. -->
-                                <outputDirectory>${project.reporting.outputDirectory}/jacoco-it</outputDirectory>
+                                <rules>
+                                    <bannedDependencies>
+                                        <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> -->
+                                        </excludes>
+                                    </bannedDependencies>
+                                </rules>
+                                <fail>true</fail>
                             </configuration>
                         </execution>
                     </executions>
                 </plugin>
+                <!-- https://mvnrepository.com/artifact/org.sonarsource.scanner.maven/sonar-maven-plugin -->
+                <plugin>
+                    <groupId>org.sonarsource.scanner.maven</groupId>
+                    <artifactId>sonar-maven-plugin</artifactId>
+                    <version>${sonar.scanner.version}</version>
+                </plugin>
+                <!-- end of plugins from ONAP version (parent of oparent) -->
+                <!-- Plugins from ONAP oparent -->
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-surefire-plugin</artifactId>
-                    <version>2.22.0</version>
+                    <version>${maven-surefire-plugin.version}</version>
                     <configuration>
                         <!-- Sets the VM argument line used when unit tests are run. -->
                         <argLine>${surefireArgLine}</argLine>
@@ -565,7 +501,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-failsafe-plugin</artifactId>
-                    <version>2.22.0</version>
+                    <version>${maven-failsafe-plugin.version}</version>
                     <executions>
                         <!-- Ensures that both integration-test and verify goals of the Failsafe
                             Maven plugin are executed. -->
@@ -624,10 +560,208 @@
                         <tag>${project.artifactId}-${project.version}</tag>
                     </configuration>
                 </plugin>
+                <plugin>
+                    <groupId>com.github.ferstl</groupId>
+                    <artifactId>depgraph-maven-plugin</artifactId>
+                    <version>3.3.0</version>
+                    <configuration>
+                        <graphFormat>text</graphFormat>
+                        <outputFileName>${dependency-list.file}</outputFileName>
+                        <outputDirectory>${project.basedir}</outputDirectory>
+                        <transitiveExcludes>*</transitiveExcludes>
+                        <showVersions>true</showVersions>
+                        <showGroupIds>true</showGroupIds>
+                    </configuration>
+                </plugin>
+                <plugin>
+                    <groupId>de.jacks-it-lab</groupId>
+                    <artifactId>frontend-maven-plugin</artifactId>
+                    <version>1.7.2</version>
+                </plugin>
+                <plugin>
+                    <groupId>com.github.alexcojocaru</groupId>
+                    <artifactId>elasticsearch-maven-plugin</artifactId>
+                    <version>6.16</version>
+                    <configuration>
+                        <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>
+                <plugin>
+                    <groupId>com.github.spotbugs</groupId>
+                    <artifactId>spotbugs-maven-plugin</artifactId>
+                    <version>3.1.12.2</version>
+                    <executions>
+                        <execution>
+                            <id>analyze-compile</id>
+                            <phase>compile</phase>
+                            <goals>
+                                <goal>check</goal>
+                            </goals>
+                            <configuration>
+                                <plugins>
+                                    <plugin>
+                                        <groupId>jp.skypencil.findbugs.slf4j</groupId>
+                                        <artifactId>bug-pattern</artifactId>
+                                        <version>1.5.0</version>
+                                    </plugin>
+                                </plugins>
+                                <effort>Max</effort>
+                                <threshold>Low</threshold>
+                                <failOnError>false</failOnError>
+                                <skip>true</skip>
+                                <excludeFilterFile>spotbugs-exclude.xml</excludeFilterFile>
+                                <xmlOutput>true</xmlOutput>
+                                <findbugsXmlOutputDirectory>/home/jack/onap/onap-sdnr/features/sdnr/wt-aluminium-sr0-2/target/wt/common/target-ide/spotbugs</findbugsXmlOutputDirectory>
+                            </configuration>
+                        </execution>
+                    </executions>
+                    <dependencies>
+                        <dependency>
+                            <groupId>com.github.spotbugs</groupId>
+                            <artifactId>spotbugs</artifactId>
+                            <version>3.1.12</version>
+                            <scope>compile</scope>
+                        </dependency>
+                        <dependency>
+                            <groupId>org.opendaylight.odlparent</groupId>
+                            <artifactId>spotbugs</artifactId>
+                            <version>7.0.5</version>
+                            <scope>compile</scope>
+                        </dependency>
+                        <dependency>
+                            <groupId>org.slf4j</groupId>
+                            <artifactId>slf4j-simple</artifactId>
+                            <version>1.8.0-beta2</version>
+                            <scope>compile</scope>
+                        </dependency>
+                    </dependencies>
+                    <configuration>
+                        <plugins>
+                            <plugin>
+                                <groupId>jp.skypencil.findbugs.slf4j</groupId>
+                                <artifactId>bug-pattern</artifactId>
+                                <version>1.5.0</version>
+                            </plugin>
+                        </plugins>
+                        <effort>Max</effort>
+                        <threshold>Low</threshold>
+                        <failOnError>false</failOnError>
+                        <skip>true</skip>
+                        <excludeFilterFile>spotbugs-exclude.xml</excludeFilterFile>
+                        <xmlOutput>true</xmlOutput>
+                        <findbugsXmlOutputDirectory>/home/jack/onap/onap-sdnr/features/sdnr/wt-aluminium-sr0-2/target/wt/common/target-ide/spotbugs</findbugsXmlOutputDirectory>
+                    </configuration>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-checkstyle-plugin</artifactId>
+                    <version>${checkstyle.plugin.version}</version>
+                    <dependencies>
+                        <dependency>
+                            <groupId>org.onap.oparent</groupId>
+                            <artifactId>checkstyle</artifactId>
+                            <version>1.2.2</version>
+                        </dependency>
+                    </dependencies>
+                    <executions>
+                        <execution>
+                            <phase>process-sources</phase>
+                            <goals>
+                                <goal>check</goal>
+                            </goals>
+                            <configuration>
+                                <failOnViolation>false</failOnViolation>
+                                <skip>true</skip>
+                            </configuration>
+                        </execution>
+                        <execution>
+                            <id>check-license</id>
+                            <goals>
+                                <goal>check</goal>
+                            </goals>
+                            <phase>process-sources</phase>
+                            <configuration>
+                                <configLocation>onap-checkstyle/check-license.xml</configLocation>
+                                <includeResources>false</includeResources>
+                                <includeTestSourceDirectory>true</includeTestSourceDirectory>
+                                <includeTestResources>false</includeTestResources>
+                                <sourceDirectories>
+                                    <directory>${project.build.sourceDirectory}</directory>
+                                </sourceDirectories>
+                                <excludes>
+                                </excludes>
+                                <consoleOutput>true</consoleOutput>
+                                <failOnViolation>false</failOnViolation>
+                            </configuration>
+                        </execution>
+                        <execution>
+                            <id>onap-java-style</id>
+                            <goals>
+                                <goal>check</goal>
+                            </goals>
+                            <phase>process-sources</phase>
+                            <configuration>
+                                <!-- Use Google Java Style Guide: https://github.com/checkstyle/checkstyle/blob/master/src/main/resources/google_checks.xml
+                                    with minor changes -->
+                                <configLocation>onap-checkstyle/onap-java-style.xml</configLocation>
+                                <!-- <sourceDirectory> is needed so that checkstyle ignores the generated sources directory -->
+                                <sourceDirectories>
+                                    <directory>${project.build.sourceDirectory}/src/main/java</directory>
+                                </sourceDirectories>
+                                <includeResources>true</includeResources>
+                                <includeTestSourceDirectory>true</includeTestSourceDirectory>
+                                <includeTestResources>true</includeTestResources>
+                                <excludes>
+                                </excludes>
+                                <consoleOutput>true</consoleOutput>
+                                <failOnViolation>false</failOnViolation>
+                            </configuration>
+                        </execution>
+                    </executions>
+                </plugin>
+                <plugin>
+                    <groupId>org.gaul</groupId>
+                    <artifactId>modernizer-maven-plugin</artifactId>
+                    <version>2.1.0</version>
+                    <executions>
+                        <execution>
+                            <id>modernizer</id>
+                            <phase>verify</phase>
+                            <goals>
+                                <goal>modernizer</goal>
+                            </goals>
+                            <configuration>
+                                <failOnViolations>false</failOnViolations>
+                                <skip>true</skip>
+                            </configuration>
+                        </execution>
+                    </executions>
+                    <configuration>
+                        <failOnViolations>false</failOnViolations>
+                        <skip>true</skip>
+                    </configuration>
+                </plugin>
+                <!--
+                <plugin>
+                    <groupId>org.apache.karaf.tooling</groupId>
+                    <artifactId>karaf-maven-plugin</artifactId>
+                    <configuration>
+                        <useVersionRange>true</useVersionRange>
+                        <includeTransitiveVersionRanges>true</includeTransitiveVersionRanges>
+                    </configuration>
+                </plugin>
+            -->
             </plugins>
         </pluginManagement>
         <plugins>
-
             <!-- Plugins from oparent version (parent of oparent) -->
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
@@ -636,77 +770,124 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-site-plugin</artifactId>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-enforcer-plugin</artifactId>
+                <!--
+                <configuration>
+                    <reportPlugins>
+                        <reportPlugin>
+                            <groupId>org.apache.maven.plugins</groupId>
+                            <artifactId>maven-checkstyle-plugin</artifactId>
+                            <version>${checkstyle.plugin.version}</version>
+                        </reportPlugin>
+                    </reportPlugins>
+                </configuration>
+                -->
             </plugin>
             <!-- end of plugins from oparent version (parent of oparent) -->
 
             <!-- Plugins from oparent -->
             <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-checkstyle-plugin</artifactId>
-                <version>2.17</version>
-                <dependencies>
-                    <dependency>
-                        <groupId>org.onap.oparent</groupId>
-                        <artifactId>checkstyle</artifactId>
-                        <version>1.2.2</version>
-                    </dependency>
-                </dependencies>
+            </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>build-helper-maven-plugin</artifactId>
+                <version>1.12</version>
+            </plugin>
+            <!-- Jacoco / Sonar -->
+            <plugin>
+                <groupId>org.jacoco</groupId>
+                <artifactId>jacoco-maven-plugin</artifactId>
+                <version>${jacoco.version}</version>
                 <executions>
                     <execution>
-                        <id>onap-license</id>
+                        <id>pre-unit-test</id>
                         <goals>
-                            <goal>check</goal>
+                            <goal>prepare-agent</goal>
+                        </goals>
+                        <configuration>
+                            <!-- Sets the path to the file which contains the execution data. -->
+                            <destFile>${project.build.directory}/code-coverage/jacoco-ut.exec</destFile>
+                            <!-- Sets the name of the property containing the settings for JaCoCo runtime agent. -->
+                            <propertyName>surefireArgLine</propertyName>
+                        </configuration>
+                    </execution>
+                    <!-- Ensures that the code coverage report for unit tests is created after unit tests have been run. -->
+                    <execution>
+                        <id>post-unit-test</id>
+                        <phase>test</phase>
+                        <goals>
+                            <goal>report</goal>
+                        </goals>
+                        <configuration>
+                            <!-- Sets the path to the file which contains the execution data. -->
+                            <dataFile>${project.build.directory}/code-coverage/jacoco-ut.exec</dataFile>
+                            <!-- Sets the output directory for the code coverage report. -->
+                            <outputDirectory>${project.reporting.outputDirectory}/jacoco-ut</outputDirectory>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>pre-integration-test</id>
+                        <phase>pre-integration-test</phase>
+                        <goals>
+                            <goal>prepare-agent</goal>
+                        </goals>
+                        <configuration>
+                            <!-- Sets the path to the file which contains the execution data. -->
+                            <destFile>${project.build.directory}/code-coverage/jacoco-it.exec</destFile>
+                            <!-- Sets the name of the property containing the settings for JaCoCo runtime agent. -->
+                            <propertyName>failsafeArgLine</propertyName>
+                        </configuration>
+                    </execution>
+                    <!-- Ensures that the code coverage report for integration tests after integration tests have been run. -->
+                    <execution>
+                        <id>post-integration-test</id>
+                        <phase>post-integration-test</phase>
+                        <goals>
+                            <goal>report</goal>
                         </goals>
-                        <phase>process-sources</phase>
                         <configuration>
-                            <configLocation>onap-checkstyle/check-license.xml</configLocation>
-                            <includeResources>false</includeResources>
-                            <includeTestSourceDirectory>true</includeTestSourceDirectory>
-                            <includeTestResources>false</includeTestResources>
-                            <sourceDirectory>${project.build.sourceDirectory}</sourceDirectory>
-                            <excludes>
-                            </excludes>
-                            <consoleOutput>true</consoleOutput>
-                            <failOnViolation>false</failOnViolation>
+                            <!-- Sets the path to the file which contains the execution data. -->
+                            <dataFile>${project.build.directory}/code-coverage/jacoco-it.exec</dataFile>
+                            <!-- Sets the output directory for the code coverage report. -->
+                            <outputDirectory>${project.reporting.outputDirectory}/jacoco-it</outputDirectory>
                         </configuration>
                     </execution>
                     <execution>
-                        <id>onap-java-style</id>
+                        <id>default-prepare-agent</id>
+                        <goals>
+                            <goal>prepare-agent</goal>
+                        </goals>
+                    </execution>
+                    <execution>
+                        <id>default-report</id>
+                        <phase>prepare-package</phase>
+                        <goals>
+                            <goal>report</goal>
+                        </goals>
+                    </execution>
+                    <execution>
+                        <id>default-check</id>
                         <goals>
                             <goal>check</goal>
                         </goals>
-                        <phase>process-sources</phase>
                         <configuration>
-                            <!-- Use Google Java Style Guide: https://github.com/checkstyle/checkstyle/blob/master/src/main/resources/google_checks.xml
-                                with minor changes -->
-                            <configLocation>onap-checkstyle/onap-java-style.xml</configLocation>
-                            <!-- <sourceDirectory> is needed so that checkstyle ignores the generated
-                                sources directory -->
-                            <sourceDirectory>${project.build.sourceDirectory}/src/main/java</sourceDirectory>
-                            <includeResources>true</includeResources>
-                            <includeTestSourceDirectory>true</includeTestSourceDirectory>
-                            <includeTestResources>true</includeTestResources>
-                            <excludes>
-                            </excludes>
-                            <consoleOutput>true</consoleOutput>
-                            <failOnViolation>false</failOnViolation>
+                            <rules>
+                                <rule>
+                                    <element>PACKAGE</element>
+                                    <limits>
+                                        <limit>
+                                            <counter>COMPLEXITY</counter>
+                                            <value>COVEREDRATIO</value>
+                                            <minimum>0.0</minimum>
+                                        </limit>
+                                    </limits>
+                                </rule>
+                            </rules>
                         </configuration>
                     </execution>
                 </executions>
             </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>build-helper-maven-plugin</artifactId>
-                <version>1.12</version>
-            </plugin>
-            <!-- Jacoco / Sonar -->
-            <plugin>
-                <groupId>org.jacoco</groupId>
-                <artifactId>jacoco-maven-plugin</artifactId>
-            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
@@ -719,7 +900,6 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
-                <version>2.10.4</version>
                 <executions>
                     <execution>
                         <id>attach-javadocs</id>
@@ -732,6 +912,90 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <artifactId>maven-enforcer-plugin</artifactId>
+                <version>3.0.0-M2</version>
+                <executions>
+                    <execution>
+                        <id>enforce-property</id>
+                        <goals>
+                            <goal>enforce</goal>
+                        </goals>
+                        <configuration>
+                            <rules>
+                                <requireProperty>
+                                    <property>onap.nexus.url</property>
+                                    <message>You must set a onap.nexus.url property in your
+                                        ~/.m2/settings.xml. See oparent/settings.xml for an example.
+                                    </message>
+                                </requireProperty>
+                            </rules>
+                            <fail>true</fail>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>enforce-no-snapshots</id>
+                        <goals>
+                            <goal>enforce</goal>
+                        </goals>
+                        <configuration>
+                            <rules>
+                                <requireReleaseDeps>
+                                    <failWhenParentIsSnapshot>false</failWhenParentIsSnapshot>
+                                    <onlyWhenRelease>true</onlyWhenRelease>
+                                    <level>WARN</level>
+                                </requireReleaseDeps>
+                            </rules>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>enforce-maven</id>
+                        <goals>
+                            <goal>enforce</goal>
+                        </goals>
+                        <configuration>
+                            <rules>
+                                <requireJavaVersion>
+                                    <version>1.8.0</version>
+                                </requireJavaVersion>
+                                <requireMavenVersion>
+                                    <version>[3.5.0,)</version>
+                                </requireMavenVersion>
+                            </rules>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>enforce-banned-dependencies</id>
+                        <goals>
+                            <goal>enforce</goal>
+                        </goals>
+                        <configuration>
+                            <rules>
+                                <bannedDependencies>
+                                    <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> -->
+                                    </excludes>
+                                </bannedDependencies>
+                            </rules>
+                            <fail>true</fail>
+                        </configuration>
+                    </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>
 
@@ -739,7 +1003,6 @@
         <plugins>
             <plugin>
                 <artifactId>maven-javadoc-plugin</artifactId>
-                <version>2.10.4</version>
                 <configuration>
                     <failOnError>false</failOnError>
                     <additionalparam>-Xdoclint:none</additionalparam>
@@ -859,8 +1122,7 @@
                                 <configuration>
                                     <exportAntProperties>true</exportAntProperties>
                                     <tasks>
-                                        <taskdef resource="net/sf/antcontrib/antlib.xml"
-                                                 classpathref="maven.plugin.classpath"/>
+                                        <taskdef resource="net/sf/antcontrib/antlib.xml" classpathref="maven.plugin.classpath"/>
                                         <condition property="is_windows" value="true">
                                             <os family="windows"/>
                                         </condition>
@@ -870,31 +1132,19 @@
                                         <if>
                                             <equals arg1="${is_windows}" arg2="true"/>
                                             <then>
-                                                <property name="swagger.sdk.script.file"
-                                                          value="generated-source-script.bat"/>
-                                                <echo
-                                                  file="${project.build.directory}${file.separator}generated-source-script.bat"
-                                                  append="true"
-                                                  message="cd ${project.build.directory}${file.separator}generated-sources${line.separator}"/>
-                                                <echo
-                                                  file="${project.build.directory}${file.separator}generated-source-script.bat"
-                                                  append="true"
-                                                  message="mvn clean install -Dmaven.test.skip=true${line.separator}"/>
+                                                <property name="swagger.sdk.script.file" value="generated-source-script.bat"/>
+                                                <echo file="${project.build.directory}${file.separator}generated-source-script.bat" append="true"
+                                                      message="cd ${project.build.directory}${file.separator}generated-sources${line.separator}"/>
+                                                <echo file="${project.build.directory}${file.separator}generated-source-script.bat" append="true"
+                                                      message="mvn clean install -Dmaven.test.skip=true${line.separator}"/>
                                             </then>
                                             <else>
-                                                <property name="swagger.sdk.script.file"
-                                                          value="generated-source-script.sh"/>
-                                                <echo
-                                                  file="${project.build.directory}${file.separator}generated-source-script.sh"
-                                                  append="true"
-                                                  message="cd ${project.build.directory}${file.separator}generated-sources${line.separator}"/>
-                                                <echo
-                                                  file="${project.build.directory}${file.separator}generated-source-script.sh"
-                                                  append="true"
-                                                  message="mvn clean install -Dmaven.test.skip=true${line.separator}"/>
-                                                <chmod
-                                                  file="${project.build.directory}${file.separator}generated-source-script.sh"
-                                                  perm="755"/>
+                                                <property name="swagger.sdk.script.file" value="generated-source-script.sh"/>
+                                                <echo file="${project.build.directory}${file.separator}generated-source-script.sh" append="true"
+                                                      message="cd ${project.build.directory}${file.separator}generated-sources${line.separator}"/>
+                                                <echo file="${project.build.directory}${file.separator}generated-source-script.sh" append="true"
+                                                      message="mvn clean install -Dmaven.test.skip=true${line.separator}"/>
+                                                <chmod file="${project.build.directory}${file.separator}generated-source-script.sh" perm="755"/>
                                             </else>
                                         </if>
                                     </tasks>
@@ -993,54 +1243,35 @@
                 </dependency>
             </dependencies>
         </profile>
-
-        <!-- End of profiles from ONAP oparent -->
-
         <profile>
-            <id>yang-compile</id>
+            <id>sonar-jacoco-aggregate</id>
             <activation>
-                <file>
-                    <exists>src/main/yang</exists>
-                </file>
+                <property>
+                    <name>onap.jacoco.aggregateFile</name>
+                </property>
             </activation>
             <build>
                 <plugins>
                     <plugin>
-                        <groupId>org.opendaylight.yangtools</groupId>
-                        <artifactId>yang-maven-plugin</artifactId>
-                        <version>2.1.8</version>
-                        <dependencies>
-                            <dependency>
-                                <groupId>org.opendaylight.mdsal</groupId>
-                                <artifactId>maven-sal-api-gen-plugin</artifactId>
-                                <version>${odl.mdsal.model.version}</version>
-                                <type>jar</type>
-                            </dependency>
-                            <dependency>
-                                <groupId>org.opendaylight.netconf</groupId>
-                                <artifactId>sal-rest-docgen-maven</artifactId>
-                                <version>${odl.netconf.sal.rest.docgen.version}</version>
-                                <type>jar</type>
-                            </dependency>
-                        </dependencies>
+                        <groupId>org.jacoco</groupId>
+                        <artifactId>jacoco-maven-plugin</artifactId>
                         <executions>
                             <execution>
+                                <id>merge</id>
                                 <goals>
-                                    <goal>generate-sources</goal>
+                                    <goal>merge</goal>
                                 </goals>
+                                <phase>generate-resources</phase>
                                 <configuration>
-                                    <yangFilesRootDir>${yang.file.directory}</yangFilesRootDir>
-                                    <codeGenerators>
-                                        <generator>
-                                            <codeGeneratorClass>org.opendaylight.mdsal.binding.maven.api.gen.plugin.CodeGeneratorImpl</codeGeneratorClass>
-                                            <outputBaseDir>${salGeneratorPath}</outputBaseDir>
-                                        </generator>
-                                        <generator>
-                                            <codeGeneratorClass>org.opendaylight.netconf.sal.rest.doc.maven.StaticDocGenerator</codeGeneratorClass>
-                                            <outputBaseDir>target/swagger</outputBaseDir>
-                                        </generator>
-                                    </codeGenerators>
-                                    <inspectDependencies>true</inspectDependencies>
+                                    <destFile>${onap.jacoco.aggregateFile}</destFile>
+                                    <fileSets>
+                                        <fileSet>
+                                            <directory>${project.basedir}</directory>
+                                            <includes>
+                                                <include>**/target/code-coverage/*.exec</include>
+                                            </includes>
+                                        </fileSet>
+                                    </fileSets>
                                 </configuration>
                             </execution>
                         </executions>
@@ -1048,6 +1279,8 @@
                 </plugins>
             </build>
         </profile>
+        <!-- End of profiles from ONAP oparent -->
 
+       
     </profiles>
 </project>