X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=odlparent%2Fkaraf4-parent%2Fpom.xml;h=27fbd8859a444623d29d80f09c71df057d93295d;hb=742c4e19fb69a60ffa3a052c1e3f55a88b353008;hp=8615e1490c3e02aa138277932530aed475b42d77;hpb=edba67d4a1c93df84f0717294f49cfd0ef242dbd;p=ccsdk%2Fparent.git

diff --git a/odlparent/karaf4-parent/pom.xml b/odlparent/karaf4-parent/pom.xml
index 8615e149..27fbd885 100644
--- a/odlparent/karaf4-parent/pom.xml
+++ b/odlparent/karaf4-parent/pom.xml
@@ -8,13 +8,13 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>karaf4-parent</artifactId>
-        <version>8.1.2</version>
+        <version>12.0.5</version>
         <relativePath/>
     </parent>
 
     <groupId>org.onap.ccsdk.parent</groupId>
     <artifactId>karaf4-parent</artifactId>
-    <version>2.3.0-SNAPSHOT</version>
+    <version>2.6.0</version>
     <packaging>pom</packaging>
 
     <name>ONAP :: ${project.groupId} :: ${project.artifactId}</name>
@@ -50,7 +50,7 @@
         <sonar.exclusions>**/gen/**,**/generated-sources/**,**/yang-gen**,**/pax/**</sonar.exclusions>
 
         <!-- Jacoco properties -->
-        <jacoco.version>0.8.5</jacoco.version>
+        <jacoco.version>0.8.8</jacoco.version>
 
         <!-- properties from oparent -->
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -81,15 +81,15 @@
         <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>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>
+        <java.version>17</java.version>
+        <maven-surefire-plugin.version>3.0.0-M8</maven-surefire-plugin.version>
+        <maven-failsafe-plugin.version>3.0.0-M8</maven-failsafe-plugin.version>
+        <bundle.plugin.version>5.1.1</bundle.plugin.version>
+        <maven-compiler-plugin.version>3.10.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.plugin.version>3.2.1</checkstyle.plugin.version>
         <checkstyle.skip>true</checkstyle.skip>
         <odlparent.spotbugs.enforce>false</odlparent.spotbugs.enforce>
 
@@ -97,10 +97,10 @@
         <logging-analytics.version>1.6.9</logging-analytics.version>
 
         <!-- CCSDK component versions -->
-        <ccsdk.cds.version>(1.1.99999, 1.2.99999-SNAPSHOT)</ccsdk.cds.version>
-        <ccsdk.features.version>(1.1.99999, 1.2.99999-SNAPSHOT)</ccsdk.features.version>
-        <ccsdk.distribution.version>(1.1.99999, 1.2.99999-SNAPSHOT)</ccsdk.distribution.version>
-        <ccsdk.sli.version>1.3.1</ccsdk.sli.version>
+        <ccsdk.cds.version>(1.5.99999, 1.6.99999]</ccsdk.cds.version>
+        <ccsdk.features.version>(1.5.99999, 1.6.99999]</ccsdk.features.version>
+        <ccsdk.distribution.version>(1.5.99999, 1.6.99999]</ccsdk.distribution.version>
+        <ccsdk.sli.version>(1.6.99999, 1.7.99999]</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,62 +111,59 @@
         <sdnctl.slipluginutils.version>${ccsdk.sli.version}</sdnctl.slipluginutils.version>
 
         <!-- Support libraries used by OpenDaylight -->
-        <odl.controller.mdsal.version>1.13.2</odl.controller.mdsal.version>
-        <odl.mdsal.version>7.0.7</odl.mdsal.version>
-        <odl.mdsal.model.version>7.0.7</odl.mdsal.model.version>
-        <odl.netconf.restconf.version>1.13.2</odl.netconf.restconf.version>
-        <odl.netconf.netconf.version>1.13.2</odl.netconf.netconf.version>
-        <odl.netconf.sal.rest.docgen.version>1.13.2</odl.netconf.sal.rest.docgen.version>
+        <odl.mdsal.version>11.0.9</odl.mdsal.version>
+        <odl.mdsal.model.version>11.0.9</odl.mdsal.model.version>
+        <odl.mdsal.generator.version>11.0.9</odl.mdsal.generator.version>
+        <odl.netconf.restconf.version>5.0.6</odl.netconf.restconf.version>
+        <odl.netconf.netconf.version>5.0.6</odl.netconf.netconf.version>
+        <odl.netconf.sal.rest.docgen.version>5.0.6</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.11</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.8.0</commons.net.version>
         <!-- Used by neutron -->
-        <eclipse.persistence.version>2.7.7</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.10.1</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.14.2</jackson.version>
         <!-- Used by snmp4sdn, yangtools -->
-        <javassist.version>3.27.0-GA</javassist.version>
+        <javassist.version>3.29.2-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.27</jersey.version>
+        <jersey.version>2.39.1</jersey.version>
         <!-- Used by sfc -->
-        <jersey.client.version>2.27</jersey.client.version>
-
-        <!-- New packages for jersey migration 1.17 to 2.8 -->
-        <!-- appache.geronimo.bundle for DocGen -->
-        <!-- Used by aaa, iotdm, netconf, ovsdb, sfc -->
-        <org.json.version>20131018</org.json.version>
+        <jersey.client.version>2.39.1</jersey.client.version>
 
         <!-- Used everywhere -->
         <junit.version>4.13.2</junit.version>
         <!-- Used by coretutorials, sfc, snmp4sdn, sxp; see also affinity, toolkit -->
-        <logback.version>1.11.7</logback.version>
+        <logback.version>1.2.11</logback.version>
         <!-- Used by nic, sfc, sxp, tsdr -->
-        <mockito.version>3.3.3</mockito.version>
+        <mockito.version>3.12.4</mockito.version>
         <!-- Used by bgpcep, netconf, ovsdb, sxp; see also opendove, toolkit -->
-        <netty.version>4.1.63.Final</netty.version>
+        <netty.version>4.1.91.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>
 
         <!-- 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.12.0</antlr.version>
+        <antlr4.version>4.12.0</antlr4.version>
+
 
         <eelf.maven.plugin.version>1.0.0</eelf.maven.plugin.version>
 
@@ -176,11 +173,13 @@
         <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.7.3</mariadb.connector.version>
+        <log4j.version>2.17.1</log4j.version>
+        <log4j2.version>2.17.1</log4j2.version>
+        <jetty.version>9.4.49.v20220914</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>
-        <jetty.version>9.4.38.v20210224</jetty.version>
         <skip.karaf.featureTest>true</skip.karaf.featureTest>
         <dependency-list.file>direct-dependencies.txt</dependency-list.file>
     </properties>
@@ -193,14 +192,14 @@
             <dependency>
                 <groupId>org.onap.ccsdk.parent</groupId>
                 <artifactId>dependencies-odl-bom</artifactId>
-                <version>2.3.0-SNAPSHOT</version>
+                <version>2.6.0</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
             <dependency>
                 <groupId>org.onap.ccsdk.parent</groupId>
                 <artifactId>dependencies-bom</artifactId>
-                <version>2.3.0-SNAPSHOT</version>
+                <version>2.6.0</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
@@ -211,6 +210,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>
@@ -221,6 +225,16 @@
                 <artifactId>logging-filter-base</artifactId>
                 <version>${logging-analytics.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.antlr</groupId>
+                <artifactId>antlr4-runtime</artifactId>
+                <version>${antlr.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.antlr</groupId>
+                <artifactId>antlr4</artifactId>
+                <version>${antlr.version}</version>
+            </dependency>
             <dependency>
                 <groupId>junit</groupId>
                 <artifactId>junit</artifactId>
@@ -357,17 +371,6 @@
                 <enabled>true</enabled>
             </snapshots>
         </pluginRepository>
-        <!-- Black Duck plugin dependencies -->
-        <pluginRepository>
-            <id>JCenter</id>
-            <name>JCenter Repository</name>
-            <url>http://jcenter.bintray.com</url>
-        </pluginRepository>
-        <pluginRepository>
-            <id>Restlet</id>
-            <name>Restlet Repository</name>
-            <url>http://maven.restlet.com</url>
-        </pluginRepository>
     </pluginRepositories>
 
     <build>
@@ -741,6 +744,16 @@
                         <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>
@@ -1263,61 +1276,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>