X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=odlparent%2Fodlparent%2Fpom.xml;h=30b38bc3c05aedb52379b87968c8a5ea7e855c4b;hb=d3168e3c16aa87dce72c540b0a4bd97e914b3fc4;hp=2c0b548d7e923094d0c9a27127f0bfb33de6dde5;hpb=7dc9fd91d3914b0bafae371bde44d13bf1e03e03;p=ccsdk%2Fparent.git

diff --git a/odlparent/odlparent/pom.xml b/odlparent/odlparent/pom.xml
index 2c0b548d..30b38bc3 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>8.1.3</version>
+        <version>10.0.0</version>
         <relativePath/>
     </parent>
 
     <groupId>org.onap.ccsdk.parent</groupId>
     <artifactId>odlparent</artifactId>
-    <version>2.3.2-SNAPSHOT</version>
+    <version>2.4.1-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>ONAP :: ${project.groupId} :: ${project.artifactId}</name>
@@ -97,10 +97,10 @@
         <logging-analytics.version>1.6.9</logging-analytics.version>
 
         <!-- CCSDK component versions -->
-        <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.cds.version>(1.3.99999, 1.4.99999-SNAPSHOT]</ccsdk.cds.version>
+        <ccsdk.features.version>(1.3.99999, 1.4.99999-SNAPSHOT]</ccsdk.features.version>
+        <ccsdk.distribution.version>(1.3.99999, 1.4.99999-SNAPSHOT]</ccsdk.distribution.version>
+        <ccsdk.sli.version>(1.4.99999, 1.5.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,12 +111,13 @@
         <sdnctl.slipluginutils.version>${ccsdk.sli.version}</sdnctl.slipluginutils.version>
 
         <!-- Support libraries used by OpenDaylight -->
-        <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>
+        <odl.controller.mdsal.version>9.0.2</odl.controller.mdsal.version>
+        <odl.mdsal.version>10.0.0</odl.mdsal.version>
+        <odl.mdsal.model.version>10.0.0</odl.mdsal.model.version>
+        <odl.mdsal.generator.version>8.0.5</odl.mdsal.generator.version>
+        <odl.netconf.restconf.version>9.0.2</odl.netconf.restconf.version>
+        <odl.netconf.netconf.version>9.0.2</odl.netconf.netconf.version>
+        <odl.netconf.sal.rest.docgen.version>9.0.2</odl.netconf.sal.rest.docgen.version>
 
         <!-- Used by aaa, vtn -->
         <commons.codec.version>1.15</commons.codec.version>
@@ -127,18 +128,18 @@
         <!-- Used by neutron; see also controller, vtn -->
         <commons.net.version>3.8.0</commons.net.version>
         <!-- Used by neutron -->
-        <eclipse.persistence.version>2.7.8</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.9.0</gson.version>
         <!-- Used by aaa, dlux, persistence, snmp4sdn, sxp -->
-        <guava.version>29.0-jre</guava.version>
+        <guava.version>31.1-jre</guava.version>
         <!-- Used by aaa, alto, netconf, ovsdb, sfc; see also affinity, defense4all,
             integration/distribution, snmp4sdn, toolkit, ttp -->
-        <jackson.version>2.11.4</jackson.version>
+        <jackson.version>2.12.6</jackson.version>
         <!-- Used by snmp4sdn, yangtools -->
-        <javassist.version>3.27.0-GA</javassist.version>
+        <javassist.version>3.28.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 -->
@@ -158,9 +159,9 @@
         <!-- 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.65.Final</netty.version>
+        <netty.version>4.1.74.Final</netty.version>
         <!-- Used by openflowjava, persistence, sfc, snmp4sdn, sxp; see also affinity, toolkit -->
-        <slf4j.version>1.7.29</slf4j.version>
+        <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>
 
@@ -176,14 +177,13 @@
         <derby.version>10.14.2.0</derby.version>
         <eelf.version>1.0.0</eelf.version>
         <grpc.version>1.21.1</grpc.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>
+        <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>
@@ -196,14 +196,14 @@
             <dependency>
                 <groupId>org.onap.ccsdk.parent</groupId>
                 <artifactId>dependencies-odl-bom</artifactId>
-                <version>2.3.2-SNAPSHOT</version>
+                <version>2.4.1-SNAPSHOT</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
             <dependency>
                 <groupId>org.onap.ccsdk.parent</groupId>
                 <artifactId>dependencies-bom</artifactId>
-                <version>2.3.2-SNAPSHOT</version>
+                <version>2.4.1-SNAPSHOT</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
@@ -214,6 +214,11 @@
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>
+            <dependency>
+                <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>
@@ -1276,61 +1281,6 @@
         </profile>
         <!-- End of profiles from ONAP oparent -->
 
-        <profile>
-            <id>yang-compile</id>
-            <activation>
-                <file>
-                    <exists>src/main/yang</exists>
-                </file>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.opendaylight.yangtools</groupId>
-                        <artifactId>yang-maven-plugin</artifactId>
-                        <version>6.0.6</version>
-                        <dependencies>
-                            <dependency>
-                                <groupId>org.opendaylight.mdsal</groupId>
-                                <artifactId>maven-sal-api-gen-plugin</artifactId>
-                                <version>${odl.mdsal.model.version}</version>
-                                <type>jar</type>
-                                <scope>compile</scope>
-                            </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>
-                        <executions>
-                            <execution>
-                                <id>binding</id>
-                                <goals>
-                                    <goal>generate-sources</goal>
-                                </goals>
-                                <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>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
+       
     </profiles>
 </project>