<parent>
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>karaf4-parent</artifactId>
- <version>8.1.1</version>
+ <version>8.1.2</version>
<relativePath/>
</parent>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>karaf4-parent</artifactId>
- <version>2.2.0-SNAPSHOT</version>
+ <version>2.3.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>ONAP :: ${project.groupId} :: ${project.artifactId}</name>
<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>
<sdnctl.slipluginutils.version>${ccsdk.sli.version}</sdnctl.slipluginutils.version>
<!-- Support libraries used by OpenDaylight -->
- <odl.controller.mdsal.version>1.13.0</odl.controller.mdsal.version>
- <odl.mdsal.version>7.0.6</odl.mdsal.version>
- <odl.mdsal.model.version>7.0.6</odl.mdsal.model.version>
- <odl.netconf.restconf.version>1.13.0</odl.netconf.restconf.version>
- <odl.netconf.netconf.version>1.13.1</odl.netconf.netconf.version>
- <odl.netconf.sal.rest.docgen.version>1.13.0</odl.netconf.sal.rest.docgen.version>
+ <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>
<!-- 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.8</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 -->
<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.63.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 -->
<!-- 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>
+ <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>
+ <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>
<dependency>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>dependencies-odl-bom</artifactId>
- <version>2.2.0-SNAPSHOT</version>
+ <version>2.3.0-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.0-SNAPSHOT</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<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>
<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>
</configuration>
</plugin>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
<version>${checkstyle.plugin.version}</version>
<dependencies>
</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>
<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 -->
<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>
<plugin>
<groupId>org.opendaylight.yangtools</groupId>
<artifactId>yang-maven-plugin</artifactId>
- <version>6.0.5</version>
+ <version>6.0.6</version>
<dependencies>
<dependency>
<groupId>org.opendaylight.mdsal</groupId>