<parent>
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>bundle-parent</artifactId>
- <version>7.0.7</version>
+ <version>8.1.2</version>
<relativePath/>
</parent>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>bundle-parent</artifactId>
- <version>2.1.2-SNAPSHOT</version>
+ <version>2.2.0</version>
<packaging>pom</packaging>
<name>ONAP :: ${project.groupId} :: ${project.artifactId}</name>
<!-- 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>
<!-- 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>
<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.1.1-SNAPSHOT</ccsdk.cds.version>
- <ccsdk.features.version>1.1.1-SNAPSHOT</ccsdk.features.version>
- <ccsdk.distribution.version>1.1.1-SNAPSHOT</ccsdk.distribution.version>
- <ccsdk.sli.version>1.2.0-SNAPSHOT</ccsdk.sli.version>
+ <ccsdk.cds.version>(1.1.99999, 1.2.99999)</ccsdk.cds.version>
+ <ccsdk.features.version>(1.1.99999, 1.2.99999)</ccsdk.features.version>
+ <ccsdk.distribution.version>(1.1.99999, 1.2.99999)</ccsdk.distribution.version>
+ <ccsdk.sli.version>(1.2.99999, 1.3.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>
<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.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.11</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>
<!-- Used by aaa -->
<!-- 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>
<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.1.2-SNAPSHOT</version>
+ <version>2.2.0</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>dependencies-bom</artifactId>
- <version>2.1.2-SNAPSHOT</version>
+ <version>2.2.0</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<enabled>true</enabled>
</snapshots>
</repository>
-
</repositories>
+
<pluginRepositories>
<pluginRepository>
<id>onap-public</id>
<name>JCenter Repository</name>
<url>http://jcenter.bintray.com</url>
</pluginRepository>
-
<pluginRepository>
<id>Restlet</id>
<name>Restlet Repository</name>
<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>
</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>
</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>5.0.5</version>
+ <version>6.0.6</version>
<dependencies>
<dependency>
<groupId>org.opendaylight.mdsal</groupId>
Code Review / ccsdk / parent.git / blobdiff