X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=odlparent%2Fmdsal-it-parent%2Fpom.xml;h=bced9bc14a700f054206eb86deebda16180278e6;hb=7dc9fd91d3914b0bafae371bde44d13bf1e03e03;hp=8293036ba7fe14fe239f45f29f89a470e869d625;hpb=ac582d980f6616ff8b14e084af11698c111e0d10;p=ccsdk%2Fparent.git

diff --git a/odlparent/mdsal-it-parent/pom.xml b/odlparent/mdsal-it-parent/pom.xml
index 8293036b..bced9bc1 100644
--- a/odlparent/mdsal-it-parent/pom.xml
+++ b/odlparent/mdsal-it-parent/pom.xml
@@ -8,13 +8,13 @@
     <parent>
         <groupId>org.opendaylight.controller</groupId>
         <artifactId>mdsal-it-parent</artifactId>
-        <version>2.0.6</version>
+        <version>3.0.10</version>
         <relativePath/>
     </parent>
 
     <groupId>org.onap.ccsdk.parent</groupId>
     <artifactId>mdsal-it-parent</artifactId>
-    <version>2.2.0-SNAPSHOT</version>
+    <version>2.3.2-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>ONAP :: ${project.groupId} :: ${project.artifactId}</name>
@@ -55,7 +55,6 @@
         <!-- properties from oparent -->
         <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>
 
@@ -66,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>
@@ -94,13 +94,13 @@
         <odlparent.spotbugs.enforce>false</odlparent.spotbugs.enforce>
 
         <!-- logging-analytics versions -->
-        <logging-analytics.version>1.6.6</logging-analytics.version>
+        <logging-analytics.version>1.6.9</logging-analytics.version>
 
         <!-- CCSDK component versions -->
-        <ccsdk.cds.version>1.2.0-SNAPSHOT</ccsdk.cds.version>
-        <ccsdk.features.version>1.2.0-SNAPSHOT</ccsdk.features.version>
-        <ccsdk.distribution.version>1.2.0-SNAPSHOT</ccsdk.distribution.version>
-        <ccsdk.sli.version>1.3.0-SNAPSHOT</ccsdk.sli.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>
@@ -111,32 +111,32 @@
         <sdnctl.slipluginutils.version>${ccsdk.sli.version}</sdnctl.slipluginutils.version>
 
         <!-- Support libraries used by OpenDaylight -->
-        <odl.controller.mdsal.version>1.12.1</odl.controller.mdsal.version>
-        <odl.mdsal.version>6.0.7</odl.mdsal.version>
-        <odl.mdsal.model.version>6.0.7</odl.mdsal.model.version>
-        <odl.netconf.restconf.version>1.12.1</odl.netconf.restconf.version>
-        <odl.netconf.netconf.version>1.9.1</odl.netconf.netconf.version>
-        <odl.netconf.sal.rest.docgen.version>1.12.1</odl.netconf.sal.rest.docgen.version>
+        <odl.controller.mdsal.version>1.13.4</odl.controller.mdsal.version>
+        <odl.mdsal.version>7.0.9</odl.mdsal.version>
+        <odl.mdsal.model.version>7.0.9</odl.mdsal.model.version>
+        <odl.netconf.restconf.version>1.13.4</odl.netconf.restconf.version>
+        <odl.netconf.netconf.version>1.13.4</odl.netconf.netconf.version>
+        <odl.netconf.sal.rest.docgen.version>1.13.4</odl.netconf.sal.rest.docgen.version>
 
         <!-- Used by aaa, vtn -->
         <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.7</commons.net.version>
+        <commons.net.version>3.8.0</commons.net.version>
         <!-- Used by neutron -->
-        <eclipse.persistence.version>2.7.7</eclipse.persistence.version>
+        <eclipse.persistence.version>2.7.8</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>
         <!-- Used by aaa, dlux, persistence, snmp4sdn, sxp -->
-        <guava.version>28.2-jre</guava.version>
+        <guava.version>29.0-jre</guava.version>
         <!-- Used by aaa, alto, netconf, ovsdb, sfc; see also affinity, defense4all,
             integration/distribution, snmp4sdn, toolkit, ttp -->
-        <jackson.version>2.10.4</jackson.version>
+        <jackson.version>2.11.4</jackson.version>
         <!-- Used by snmp4sdn, yangtools -->
         <javassist.version>3.27.0-GA</javassist.version>
 
@@ -152,13 +152,13 @@
         <org.json.version>20131018</org.json.version>
 
         <!-- Used everywhere -->
-        <junit.version>4.13</junit.version>
+        <junit.version>4.13.2</junit.version>
         <!-- Used by coretutorials, sfc, snmp4sdn, sxp; see also affinity, toolkit -->
-        <logback.version>1.11.6</logback.version>
+        <logback.version>1.11.7</logback.version>
         <!-- Used by nic, sfc, sxp, tsdr -->
         <mockito.version>3.3.3</mockito.version>
         <!-- Used by bgpcep, netconf, ovsdb, sxp; see also opendove, toolkit -->
-        <netty.version>4.1.51.Final</netty.version>
+        <netty.version>4.1.65.Final</netty.version>
         <!-- Used by openflowjava, persistence, sfc, snmp4sdn, sxp; see also affinity, toolkit -->
         <slf4j.version>1.7.29</slf4j.version>
         <!-- Used in integration/distribution; see also affinity, snmp4sdn, toolkit, tsdr, ttp -->
@@ -166,21 +166,24 @@
 
         <!-- Extra support libraries used by SDN-C -->
         <jvnet.jaxb2.version>0.6.4</jvnet.jaxb2.version>
-        <antlr.version>4.8.1</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.12</apache.httpcomponents.core.version>
-        <apache.httpcomponents.client.version>4.5.10</apache.httpcomponents.client.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.21.1</grpc.version>
-        <mariadb.connector.version>2.4.4</mariadb.connector.version>
+        <jetty.version>9.4.40.v20210413</jetty.version>
+        <log4j.version>2.16.0</log4j.version>
+        <log4j2.version>2.16.0</log4j2.version>
+        <mariadb.connector.version>2.7.3</mariadb.connector.version>
         <mariadb4j.version>2.4.0</mariadb4j.version>
         <testng.version>6.14.3</testng.version>
-        <tomcat-jdbc.version>9.0.30</tomcat-jdbc.version>
-        <jetty.version>9.4.28.v20200408</jetty.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>
@@ -193,14 +196,14 @@
             <dependency>
                 <groupId>org.onap.ccsdk.parent</groupId>
                 <artifactId>dependencies-odl-bom</artifactId>
-                <version>2.2.0-SNAPSHOT</version>
+                <version>2.3.2-SNAPSHOT</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
             <dependency>
                 <groupId>org.onap.ccsdk.parent</groupId>
                 <artifactId>dependencies-bom</artifactId>
-                <version>2.2.0-SNAPSHOT</version>
+                <version>2.3.2-SNAPSHOT</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
@@ -301,8 +304,8 @@
                 <enabled>true</enabled>
             </snapshots>
         </repository>
-
     </repositories>
+
     <pluginRepositories>
         <pluginRepository>
             <id>onap-public</id>
@@ -363,7 +366,6 @@
             <name>JCenter Repository</name>
             <url>http://jcenter.bintray.com</url>
         </pluginRepository>
-
         <pluginRepository>
             <id>Restlet</id>
             <name>Restlet Repository</name>
@@ -461,7 +463,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>
@@ -587,21 +589,6 @@
                         <failOnError>false</failOnError>
                     </configuration>
                 </plugin>
-                <plugin>
-                    <artifactId>maven-checkstyle-plugin</artifactId>
-                    <executions>
-                        <execution>
-                            <phase>process-sources</phase>
-                            <goals>
-                                <goal>check</goal>
-                            </goals>
-                            <configuration>
-                                <failOnViolation>false</failOnViolation>
-                                <skip>false</skip>
-                            </configuration>
-                        </execution>
-                    </executions>
-                </plugin>
                 <plugin>
                     <groupId>com.github.spotbugs</groupId>
                     <artifactId>spotbugs-maven-plugin</artifactId>
@@ -669,6 +656,7 @@
                     </configuration>
                 </plugin>
                 <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-checkstyle-plugin</artifactId>
                     <version>${checkstyle.plugin.version}</version>
                     <dependencies>
@@ -679,6 +667,16 @@
                         </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>
@@ -724,6 +722,38 @@
                         </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>
@@ -751,71 +781,8 @@
 
             <!-- Plugins from oparent -->
             <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>
-                        <!-- overwrite odl default to supress spotbugs code check execution -->
-                        <goals>
-                            <goal>check</goal>
-                        </goals>
-                        <phase>process-sources</phase>
-                        <configuration>
-                            <skip>true</skip>
-                            <failOnViolation>false</failOnViolation>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>onap-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.codehaus.mojo</groupId>
@@ -1321,7 +1288,7 @@
                     <plugin>
                         <groupId>org.opendaylight.yangtools</groupId>
                         <artifactId>yang-maven-plugin</artifactId>
-                        <version>5.0.5</version>
+                        <version>6.0.6</version>
                         <dependencies>
                             <dependency>
                                 <groupId>org.opendaylight.mdsal</groupId>