summaryrefslogtreecommitdiffstats
path: root/odlparent
diff options
context:
space:
mode:
authorMichael DÜrre <michael.duerre@highstreet-technologies.com>2020-12-01 13:34:56 +0100
committerDan Timoney <dtimoney@att.com>2021-01-27 18:50:58 +0000
commitb6288f99fbfcc73f115511696f98111ca32b8d2f (patch)
tree9ce2959d1e30416e1bb27440c67be5a6e1a7a08c /odlparent
parentb56e7814288411c208664aceaa60c110ff09d115 (diff)
ccsdk parents for alu-sr0
migrate parents to aluminium-sr0 Issue-ID: CCSDK-3012 Signed-off-by: Michael DÜrre <michael.duerre@highstreet-technologies.com> Change-Id: I8c19abcfa4a0fbac629496835e4caf92aecd2459 Signed-off-by: Michael DÜrre <michael.duerre@highstreet-technologies.com>
Diffstat (limited to 'odlparent')
-rw-r--r--odlparent/binding-parent/pom.xml297
-rw-r--r--odlparent/bundle-parent/pom.xml297
-rw-r--r--odlparent/client-parent/pom.xml51
-rw-r--r--odlparent/feature-repo-parent/pom.xml297
-rw-r--r--odlparent/karaf4-parent/pom.xml297
-rw-r--r--odlparent/mdsal-it-parent/pom.xml297
-rw-r--r--odlparent/odlparent-lite/pom.xml297
-rw-r--r--odlparent/odlparent/pom.xml297
-rwxr-xr-xodlparent/setup/pom.xml2
-rw-r--r--odlparent/setup/src/main/properties/binding-parent.properties2
-rw-r--r--odlparent/setup/src/main/properties/bundle-parent.properties2
-rw-r--r--odlparent/setup/src/main/properties/feature-repo-parent.properties2
-rw-r--r--odlparent/setup/src/main/properties/karaf4-parent.properties2
-rw-r--r--odlparent/setup/src/main/properties/mdsal-it-parent.properties2
-rw-r--r--odlparent/setup/src/main/properties/odlparent-lite.properties2
-rw-r--r--odlparent/setup/src/main/properties/odlparent.properties2
-rw-r--r--odlparent/setup/src/main/properties/single-feature-parent.properties2
-rwxr-xr-xodlparent/setup/src/main/resources/pom-template.xml297
-rw-r--r--odlparent/single-feature-parent/pom.xml297
19 files changed, 2184 insertions, 558 deletions
diff --git a/odlparent/binding-parent/pom.xml b/odlparent/binding-parent/pom.xml
index b75800e3..ffedc52c 100644
--- a/odlparent/binding-parent/pom.xml
+++ b/odlparent/binding-parent/pom.xml
@@ -8,7 +8,7 @@
<parent>
<groupId>org.opendaylight.mdsal</groupId>
<artifactId>binding-parent</artifactId>
- <version>4.0.17</version>
+ <version>6.0.7</version>
<relativePath/>
</parent>
@@ -53,8 +53,6 @@
<jacoco.version>0.8.5</jacoco.version>
<!-- properties from oparent -->
- <maven.compiler.source>8</maven.compiler.source>
- <maven.compiler.target>8</maven.compiler.target>
<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>
@@ -83,14 +81,17 @@
<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.source>8</java.version.source>
- <java.version.target>8</java.version.target>
- <bundle.plugin.version>2.5.0</bundle.plugin.version>
- <maven.compile.plugin.version>2.5.1</maven.compile.plugin.version>
+ <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>
<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.skip>true</checkstyle.skip>
+ <odlparent.spotbugs.enforce>false</odlparent.spotbugs.enforce>
<!-- logging-analytics versions -->
<logging-analytics.version>1.6.6</logging-analytics.version>
@@ -110,40 +111,40 @@
<sdnctl.slipluginutils.version>${ccsdk.sli.version}</sdnctl.slipluginutils.version>
<!-- Support libraries used by OpenDaylight -->
- <odl.controller.mdsal.version>1.10.3</odl.controller.mdsal.version>
- <odl.mdsal.version>4.0.14</odl.mdsal.version>
- <odl.mdsal.model.version>2.0.14</odl.mdsal.model.version>
- <odl.netconf.restconf.version>1.10.3</odl.netconf.restconf.version>
- <odl.netconf.netconf.version>1.7.3</odl.netconf.netconf.version>
- <odl.netconf.sal.rest.docgen.version>1.10.3</odl.netconf.sal.rest.docgen.version>
+ <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>
<!-- Used by aaa, vtn -->
- <commons.codec.version>1.13</commons.codec.version>
+ <commons.codec.version>1.15</commons.codec.version>
<!-- Used by netconf, ovsdb -->
<commons.lang3.version>3.8.1</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.6</commons.net.version>
+ <commons.net.version>3.7</commons.net.version>
<!-- Used by neutron -->
- <eclipse.persistence.version>2.7.4</eclipse.persistence.version>
+ <eclipse.persistence.version>2.7.7</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>25.1-jre</guava.version>
+ <guava.version>28.2-jre</guava.version>
<!-- Used by aaa, alto, netconf, ovsdb, sfc; see also affinity, defense4all,
integration/distribution, snmp4sdn, toolkit, ttp -->
- <jackson.version>2.9.10</jackson.version>
+ <jackson.version>2.10.4</jackson.version>
<!-- Used by snmp4sdn, yangtools -->
- <javassist.version>3.24.1-GA</javassist.version>
+ <javassist.version>3.27.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 -->
- <jersey.version>2.25.1</jersey.version>
+ <jersey.version>2.27</jersey.version>
<!-- Used by sfc -->
- <jersey.client.version>2.25.1</jersey.client.version>
+ <jersey.client.version>2.27</jersey.client.version>
<!-- New packages for jersey migration 1.17 to 2.8 -->
<!-- appache.geronimo.bundle for DocGen -->
@@ -151,21 +152,21 @@
<org.json.version>20131018</org.json.version>
<!-- Used everywhere -->
- <junit.version>4.12</junit.version>
+ <junit.version>4.13</junit.version>
<!-- Used by coretutorials, sfc, snmp4sdn, sxp; see also affinity, toolkit -->
- <logback.version>1.2.3</logback.version>
+ <logback.version>1.11.6</logback.version>
<!-- Used by nic, sfc, sxp, tsdr -->
- <mockito.version>1.10.19</mockito.version>
+ <mockito.version>3.3.3</mockito.version>
<!-- Used by bgpcep, netconf, ovsdb, sxp; see also opendove, toolkit -->
- <netty.version>4.1.42.Final</netty.version>
+ <netty.version>4.1.51.Final</netty.version>
<!-- Used by openflowjava, persistence, sfc, snmp4sdn, sxp; see also affinity, toolkit -->
- <slf4j.version>1.7.25</slf4j.version>
+ <slf4j.version>1.7.29</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.7.2</antlr.version>
+ <antlr.version>4.8.1</antlr.version>
<eelf.maven.plugin.version>1.0.0</eelf.maven.plugin.version>
@@ -179,7 +180,7 @@
<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.12.v20180830</jetty.version>
+ <jetty.version>9.4.28.v20200408</jetty.version>
<skip.karaf.featureTest>true</skip.karaf.featureTest>
<dependency-list.file>direct-dependencies.txt</dependency-list.file>
</properties>
@@ -197,6 +198,20 @@
<scope>import</scope>
</dependency>
<dependency>
+ <groupId>org.onap.ccsdk.parent</groupId>
+ <artifactId>dependencies-bom</artifactId>
+ <version>2.1.1-SNAPSHOT</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-dependencies</artifactId>
+ <version>2.3.8.RELEASE</version>
+ <scope>import</scope>
+ <type>pom</type>
+ </dependency>
+ <dependency>
<groupId>org.onap.logging-analytics</groupId>
<artifactId>logging-slf4j</artifactId>
<version>${logging-analytics.version}</version>
@@ -215,6 +230,14 @@
</dependencies>
</dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>javax.annotation</groupId>
+ <artifactId>javax.annotation-api</artifactId>
+ <version>1.3.2</version>
+ </dependency>
+ </dependencies>
+
<repositories>
<repository>
<id>onap-public</id>
@@ -421,35 +444,35 @@
<execution>
<id>enforce-maven</id>
<goals>
- <goal>enforce</goal>
+ <goal>enforce</goal>
</goals>
<configuration>
- <rules>
- <requireJavaVersion>
- <version>8</version>
- </requireJavaVersion>
- <requireMavenVersion>
- <version>[3.5.0,)</version>
- </requireMavenVersion>
- </rules>
+ <rules>
+ <requireJavaVersion>
+ <version>8</version>
+ </requireJavaVersion>
+ <requireMavenVersion>
+ <version>[3.5.0,)</version>
+ </requireMavenVersion>
+ </rules>
</configuration>
</execution>
<execution>
<id>enforce-banned-dependencies</id>
<goals>
- <goal>enforce</goal>
+ <goal>enforce</goal>
</goals>
<configuration>
- <rules>
- <bannedDependencies>
- <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> -->
- </excludes>
- </bannedDependencies>
- </rules>
- <fail>true</fail>
+ <rules>
+ <bannedDependencies>
+ <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> -->
+ </excludes>
+ </bannedDependencies>
+ </rules>
+ <fail>true</fail>
</configuration>
</execution>
</executions>
@@ -461,12 +484,11 @@
<version>${sonar.scanner.version}</version>
</plugin>
<!-- end of plugins from ONAP version (parent of oparent) -->
-
<!-- Plugins from ONAP oparent -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.22.0</version>
+ <version>${maven-surefire-plugin.version}</version>
<configuration>
<!-- Sets the VM argument line used when unit tests are run. -->
<argLine>${surefireArgLine}</argLine>
@@ -479,7 +501,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
- <version>2.22.0</version>
+ <version>${maven-failsafe-plugin.version}</version>
<executions>
<!-- Ensures that both integration-test and verify goals of the Failsafe
Maven plugin are executed. -->
@@ -572,6 +594,143 @@
<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>
+ <version>3.1.12.2</version>
+ <executions>
+ <execution>
+ <id>analyze-compile</id>
+ <phase>compile</phase>
+ <goals>
+ <goal>check</goal>
+ </goals>
+ <configuration>
+ <plugins>
+ <plugin>
+ <groupId>jp.skypencil.findbugs.slf4j</groupId>
+ <artifactId>bug-pattern</artifactId>
+ <version>1.5.0</version>
+ </plugin>
+ </plugins>
+ <effort>Max</effort>
+ <threshold>Low</threshold>
+ <failOnError>false</failOnError>
+ <skip>true</skip>
+ <excludeFilterFile>spotbugs-exclude.xml</excludeFilterFile>
+ <xmlOutput>true</xmlOutput>
+ <findbugsXmlOutputDirectory>/home/jack/onap/onap-sdnr/features/sdnr/wt-aluminium-sr0-2/target/wt/common/target-ide/spotbugs</findbugsXmlOutputDirectory>
+ </configuration>
+ </execution>
+ </executions>
+ <dependencies>
+ <dependency>
+ <groupId>com.github.spotbugs</groupId>
+ <artifactId>spotbugs</artifactId>
+ <version>3.1.12</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.opendaylight.odlparent</groupId>
+ <artifactId>spotbugs</artifactId>
+ <version>7.0.5</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ <version>1.8.0-beta2</version>
+ <scope>compile</scope>
+ </dependency>
+ </dependencies>
+ <configuration>
+ <plugins>
+ <plugin>
+ <groupId>jp.skypencil.findbugs.slf4j</groupId>
+ <artifactId>bug-pattern</artifactId>
+ <version>1.5.0</version>
+ </plugin>
+ </plugins>
+ <effort>Max</effort>
+ <threshold>Low</threshold>
+ <failOnError>false</failOnError>
+ <skip>true</skip>
+ <excludeFilterFile>spotbugs-exclude.xml</excludeFilterFile>
+ <xmlOutput>true</xmlOutput>
+ <findbugsXmlOutputDirectory>/home/jack/onap/onap-sdnr/features/sdnr/wt-aluminium-sr0-2/target/wt/common/target-ide/spotbugs</findbugsXmlOutputDirectory>
+ </configuration>
+ </plugin>
+ <plugin>
+ <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>
+ <id>check-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>
</plugins>
</pluginManagement>
<plugins>
@@ -584,13 +743,24 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
+ <!--
+ <configuration>
+ <reportPlugins>
+ <reportPlugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ <version>${checkstyle.plugin.version}</version>
+ </reportPlugin>
+ </reportPlugins>
+ </configuration>
+ -->
</plugin>
<!-- end of plugins from oparent version (parent of oparent) -->
<!-- Plugins from oparent -->
<plugin>
<artifactId>maven-checkstyle-plugin</artifactId>
- <version>2.17</version>
+ <version>${checkstyle.plugin.version}</version>
<dependencies>
<dependency>
<groupId>org.onap.oparent</groupId>
@@ -610,7 +780,9 @@
<includeResources>false</includeResources>
<includeTestSourceDirectory>true</includeTestSourceDirectory>
<includeTestResources>false</includeTestResources>
- <sourceDirectory>${project.build.sourceDirectory}</sourceDirectory>
+ <sourceDirectories>
+ <directory>${project.build.sourceDirectory}</directory>
+ </sourceDirectories>
<excludes>
</excludes>
<consoleOutput>true</consoleOutput>
@@ -628,7 +800,9 @@
with minor changes -->
<configLocation>onap-checkstyle/onap-java-style.xml</configLocation>
<!-- <sourceDirectory> is needed so that checkstyle ignores the generated sources directory -->
- <sourceDirectory>${project.build.sourceDirectory}/src/main/java</sourceDirectory>
+ <sourceDirectories>
+ <directory>${project.build.sourceDirectory}/src/main/java</directory>
+ </sourceDirectories>
<includeResources>true</includeResources>
<includeTestSourceDirectory>true</includeTestSourceDirectory>
<includeTestResources>true</includeTestResources>
@@ -777,7 +951,8 @@
<requireProperty>
<property>onap.nexus.url</property>
<message>You must set a onap.nexus.url property in your
- ~/.m2/settings.xml. See oparent/settings.xml for an example.</message>
+ ~/.m2/settings.xml. See oparent/settings.xml for an example.
+ </message>
</requireProperty>
</rules>
<fail>true</fail>
@@ -984,16 +1159,16 @@
<then>
<property name="swagger.sdk.script.file" value="generated-source-script.bat"/>
<echo file="${project.build.directory}${file.separator}generated-source-script.bat" append="true"
- message="cd ${project.build.directory}${file.separator}generated-sources${line.separator}"/>
+ message="cd ${project.build.directory}${file.separator}generated-sources${line.separator}"/>
<echo file="${project.build.directory}${file.separator}generated-source-script.bat" append="true"
- message="mvn clean install -Dmaven.test.skip=true${line.separator}"/>
+ message="mvn clean install -Dmaven.test.skip=true${line.separator}"/>
</then>
<else>
<property name="swagger.sdk.script.file" value="generated-source-script.sh"/>
<echo file="${project.build.directory}${file.separator}generated-source-script.sh" append="true"
- message="cd ${project.build.directory}${file.separator}generated-sources${line.separator}"/>
+ message="cd ${project.build.directory}${file.separator}generated-sources${line.separator}"/>
<echo file="${project.build.directory}${file.separator}generated-source-script.sh" append="true"
- message="mvn clean install -Dmaven.test.skip=true${line.separator}"/>
+ message="mvn clean install -Dmaven.test.skip=true${line.separator}"/>
<chmod file="${project.build.directory}${file.separator}generated-source-script.sh" perm="755"/>
</else>
</if>
@@ -1143,7 +1318,7 @@
<plugin>
<groupId>org.opendaylight.yangtools</groupId>
<artifactId>yang-maven-plugin</artifactId>
- <version>3.0.11</version>
+ <version>5.0.5</version>
<dependencies>
<dependency>
<groupId>org.opendaylight.mdsal</groupId>
@@ -1172,10 +1347,12 @@
<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>
diff --git a/odlparent/bundle-parent/pom.xml b/odlparent/bundle-parent/pom.xml
index 081691fe..3cd3257c 100644
--- a/odlparent/bundle-parent/pom.xml
+++ b/odlparent/bundle-parent/pom.xml
@@ -8,7 +8,7 @@
<parent>
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>bundle-parent</artifactId>
- <version>5.0.11</version>
+ <version>7.0.7</version>
<relativePath/>
</parent>
@@ -53,8 +53,6 @@
<jacoco.version>0.8.5</jacoco.version>
<!-- properties from oparent -->
- <maven.compiler.source>8</maven.compiler.source>
- <maven.compiler.target>8</maven.compiler.target>
<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>
@@ -83,14 +81,17 @@
<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.source>8</java.version.source>
- <java.version.target>8</java.version.target>
- <bundle.plugin.version>2.5.0</bundle.plugin.version>
- <maven.compile.plugin.version>2.5.1</maven.compile.plugin.version>
+ <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>
<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.skip>true</checkstyle.skip>
+ <odlparent.spotbugs.enforce>false</odlparent.spotbugs.enforce>
<!-- logging-analytics versions -->
<logging-analytics.version>1.6.6</logging-analytics.version>
@@ -110,40 +111,40 @@
<sdnctl.slipluginutils.version>${ccsdk.sli.version}</sdnctl.slipluginutils.version>
<!-- Support libraries used by OpenDaylight -->
- <odl.controller.mdsal.version>1.10.3</odl.controller.mdsal.version>
- <odl.mdsal.version>4.0.14</odl.mdsal.version>
- <odl.mdsal.model.version>2.0.14</odl.mdsal.model.version>
- <odl.netconf.restconf.version>1.10.3</odl.netconf.restconf.version>
- <odl.netconf.netconf.version>1.7.3</odl.netconf.netconf.version>
- <odl.netconf.sal.rest.docgen.version>1.10.3</odl.netconf.sal.rest.docgen.version>
+ <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>
<!-- Used by aaa, vtn -->
- <commons.codec.version>1.13</commons.codec.version>
+ <commons.codec.version>1.15</commons.codec.version>
<!-- Used by netconf, ovsdb -->
<commons.lang3.version>3.8.1</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.6</commons.net.version>
+ <commons.net.version>3.7</commons.net.version>
<!-- Used by neutron -->
- <eclipse.persistence.version>2.7.4</eclipse.persistence.version>
+ <eclipse.persistence.version>2.7.7</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>25.1-jre</guava.version>
+ <guava.version>28.2-jre</guava.version>
<!-- Used by aaa, alto, netconf, ovsdb, sfc; see also affinity, defense4all,
integration/distribution, snmp4sdn, toolkit, ttp -->
- <jackson.version>2.9.10</jackson.version>
+ <jackson.version>2.10.4</jackson.version>
<!-- Used by snmp4sdn, yangtools -->
- <javassist.version>3.24.1-GA</javassist.version>
+ <javassist.version>3.27.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 -->
- <jersey.version>2.25.1</jersey.version>
+ <jersey.version>2.27</jersey.version>
<!-- Used by sfc -->
- <jersey.client.version>2.25.1</jersey.client.version>
+ <jersey.client.version>2.27</jersey.client.version>
<!-- New packages for jersey migration 1.17 to 2.8 -->
<!-- appache.geronimo.bundle for DocGen -->
@@ -151,21 +152,21 @@
<org.json.version>20131018</org.json.version>
<!-- Used everywhere -->
- <junit.version>4.12</junit.version>
+ <junit.version>4.13</junit.version>
<!-- Used by coretutorials, sfc, snmp4sdn, sxp; see also affinity, toolkit -->
- <logback.version>1.2.3</logback.version>
+ <logback.version>1.11.6</logback.version>
<!-- Used by nic, sfc, sxp, tsdr -->
- <mockito.version>1.10.19</mockito.version>
+ <mockito.version>3.3.3</mockito.version>
<!-- Used by bgpcep, netconf, ovsdb, sxp; see also opendove, toolkit -->
- <netty.version>4.1.42.Final</netty.version>
+ <netty.version>4.1.51.Final</netty.version>
<!-- Used by openflowjava, persistence, sfc, snmp4sdn, sxp; see also affinity, toolkit -->
- <slf4j.version>1.7.25</slf4j.version>
+ <slf4j.version>1.7.29</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.7.2</antlr.version>
+ <antlr.version>4.8.1</antlr.version>
<eelf.maven.plugin.version>1.0.0</eelf.maven.plugin.version>
@@ -179,7 +180,7 @@
<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.12.v20180830</jetty.version>
+ <jetty.version>9.4.28.v20200408</jetty.version>
<skip.karaf.featureTest>true</skip.karaf.featureTest>
<dependency-list.file>direct-dependencies.txt</dependency-list.file>
</properties>
@@ -197,6 +198,20 @@
<scope>import</scope>
</dependency>
<dependency>
+ <groupId>org.onap.ccsdk.parent</groupId>
+ <artifactId>dependencies-bom</artifactId>
+ <version>2.1.1-SNAPSHOT</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-dependencies</artifactId>
+ <version>2.3.8.RELEASE</version>
+ <scope>import</scope>
+ <type>pom</type>
+ </dependency>
+ <dependency>
<groupId>org.onap.logging-analytics</groupId>
<artifactId>logging-slf4j</artifactId>
<version>${logging-analytics.version}</version>
@@ -215,6 +230,14 @@
</dependencies>
</dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>javax.annotation</groupId>
+ <artifactId>javax.annotation-api</artifactId>
+ <version>1.3.2</version>
+ </dependency>
+ </dependencies>
+
<repositories>
<repository>
<id>onap-public</id>
@@ -421,35 +444,35 @@
<execution>
<id>enforce-maven</id>
<goals>
- <goal>enforce</goal>
+ <goal>enforce</goal>
</goals>
<configuration>
- <rules>
- <requireJavaVersion>
- <version>8</version>
- </requireJavaVersion>
- <requireMavenVersion>
- <version>[3.5.0,)</version>
- </requireMavenVersion>
- </rules>
+ <rules>
+ <requireJavaVersion>
+ <version>8</version>
+ </requireJavaVersion>
+ <requireMavenVersion>
+ <version>[3.5.0,)</version>
+ </requireMavenVersion>
+ </rules>
</configuration>
</execution>
<execution>
<id>enforce-banned-dependencies</id>
<goals>
- <goal>enforce</goal>
+ <goal>enforce</goal>
</goals>
<configuration>
- <rules>
- <bannedDependencies>
- <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> -->
- </excludes>
- </bannedDependencies>
- </rules>
- <fail>true</fail>
+ <rules>
+ <bannedDependencies>
+ <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> -->
+ </excludes>
+ </bannedDependencies>
+ </rules>
+ <fail>true</fail>
</configuration>
</execution>
</executions>
@@ -461,12 +484,11 @@
<version>${sonar.scanner.version}</version>
</plugin>
<!-- end of plugins from ONAP version (parent of oparent) -->
-
<!-- Plugins from ONAP oparent -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.22.0</version>
+ <version>${maven-surefire-plugin.version}</version>
<configuration>
<!-- Sets the VM argument line used when unit tests are run. -->
<argLine>${surefireArgLine}</argLine>
@@ -479,7 +501,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
- <version>2.22.0</version>
+ <version>${maven-failsafe-plugin.version}</version>
<executions>
<!-- Ensures that both integration-test and verify goals of the Failsafe
Maven plugin are executed. -->
@@ -572,6 +594,143 @@
<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>
+ <version>3.1.12.2</version>
+ <executions>
+ <execution>
+ <id>analyze-compile</id>
+ <phase>compile</phase>
+ <goals>
+ <goal>check</goal>
+ </goals>
+ <configuration>
+ <plugins>
+ <plugin>
+ <groupId>jp.skypencil.findbugs.slf4j</groupId>
+ <artifactId>bug-pattern</artifactId>
+ <version>1.5.0</version>
+ </plugin>
+ </plugins>
+ <effort>Max</effort>
+ <threshold>Low</threshold>
+ <failOnError>false</failOnError>
+ <skip>true</skip>
+ <excludeFilterFile>spotbugs-exclude.xml</excludeFilterFile>
+ <xmlOutput>true</xmlOutput>
+ <findbugsXmlOutputDirectory>/home/jack/onap/onap-sdnr/features/sdnr/wt-aluminium-sr0-2/target/wt/common/target-ide/spotbugs</findbugsXmlOutputDirectory>
+ </configuration>
+ </execution>
+ </executions>
+ <dependencies>
+ <dependency>
+ <groupId>com.github.spotbugs</groupId>
+ <artifactId>spotbugs</artifactId>
+ <version>3.1.12</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.opendaylight.odlparent</groupId>
+ <artifactId>spotbugs</artifactId>
+ <version>7.0.5</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ <version>1.8.0-beta2</version>
+ <scope>compile</scope>
+ </dependency>
+ </dependencies>
+ <configuration>
+ <plugins>
+ <plugin>
+ <groupId>jp.skypencil.findbugs.slf4j</groupId>
+ <artifactId>bug-pattern</artifactId>
+ <version>1.5.0</version>
+ </plugin>
+ </plugins>
+ <effort>Max</effort>
+ <threshold>Low</threshold>
+ <failOnError>false</failOnError>
+ <skip>true</skip>
+ <excludeFilterFile>spotbugs-exclude.xml</excludeFilterFile>
+ <xmlOutput>true</xmlOutput>
+ <findbugsXmlOutputDirectory>/home/jack/onap/onap-sdnr/features/sdnr/wt-aluminium-sr0-2/target/wt/common/target-ide/spotbugs</findbugsXmlOutputDirectory>
+ </configuration>
+ </plugin>
+ <plugin>
+ <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>
+ <id>check-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>
</plugins>
</pluginManagement>
<plugins>
@@ -584,13 +743,24 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
+ <!--
+ <configuration>
+ <reportPlugins>
+ <reportPlugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ <version>${checkstyle.plugin.version}</version>
+ </reportPlugin>
+ </reportPlugins>
+ </configuration>
+ -->
</plugin>
<!-- end of plugins from oparent version (parent of oparent) -->
<!-- Plugins from oparent -->
<plugin>
<artifactId>maven-checkstyle-plugin</artifactId>
- <version>2.17</version>
+ <version>${checkstyle.plugin.version}</version>
<dependencies>
<dependency>
<groupId>org.onap.oparent</groupId>
@@ -610,7 +780,9 @@
<includeResources>false</includeResources>
<includeTestSourceDirectory>true</includeTestSourceDirectory>
<includeTestResources>false</includeTestResources>
- <sourceDirectory>${project.build.sourceDirectory}</sourceDirectory>
+ <sourceDirectories>
+ <directory>${project.build.sourceDirectory}</directory>
+ </sourceDirectories>
<excludes>
</excludes>
<consoleOutput>true</consoleOutput>
@@ -628,7 +800,9 @@
with minor changes -->
<configLocation>onap-checkstyle/onap-java-style.xml</configLocation>
<!-- <sourceDirectory> is needed so that checkstyle ignores the generated sources directory -->
- <sourceDirectory>${project.build.sourceDirectory}/src/main/java</sourceDirectory>
+ <sourceDirectories>
+ <directory>${project.build.sourceDirectory}/src/main/java</directory>
+ </sourceDirectories>
<includeResources>true</includeResources>
<includeTestSourceDirectory>true</includeTestSourceDirectory>
<includeTestResources>true</includeTestResources>
@@ -777,7 +951,8 @@
<requireProperty>
<property>onap.nexus.url</property>
<message>You must set a onap.nexus.url property in your
- ~/.m2/settings.xml. See oparent/settings.xml for an example.</message>
+ ~/.m2/settings.xml. See oparent/settings.xml for an example.
+ </message>
</requireProperty>
</rules>
<fail>true</fail>
@@ -984,16 +1159,16 @@
<then>
<property name="swagger.sdk.script.file" value="generated-source-script.bat"/>
<echo file="${project.build.directory}${file.separator}generated-source-script.bat" append="true"
- message="cd ${project.build.directory}${file.separator}generated-sources${line.separator}"/>
+ message="cd ${project.build.directory}${file.separator}generated-sources${line.separator}"/>
<echo file="${project.build.directory}${file.separator}generated-source-script.bat" append="true"
- message="mvn clean install -Dmaven.test.skip=true${line.separator}"/>
+ message="mvn clean install -Dmaven.test.skip=true${line.separator}"/>
</then>
<else>
<property name="swagger.sdk.script.file" value="generated-source-script.sh"/>
<echo file="${project.build.directory}${file.separator}generated-source-script.sh" append="true"
- message="cd ${project.build.directory}${file.separator}generated-sources${line.separator}"/>
+ message="cd ${project.build.directory}${file.separator}generated-sources${line.separator}"/>
<echo file="${project.build.directory}${file.separator}generated-source-script.sh" append="true"
- message="mvn clean install -Dmaven.test.skip=true${line.separator}"/>
+ message="mvn clean install -Dmaven.test.skip=true${line.separator}"/>
<chmod file="${project.build.directory}${file.separator}generated-source-script.sh" perm="755"/>
</else>
</if>
@@ -1143,7 +1318,7 @@
<plugin>
<groupId>org.opendaylight.yangtools</groupId>
<artifactId>yang-maven-plugin</artifactId>
- <version>3.0.11</version>
+ <version>5.0.5</version>
<dependencies>
<dependency>
<groupId>org.opendaylight.mdsal</groupId>
@@ -1172,10 +1347,12 @@
<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>
diff --git a/odlparent/client-parent/pom.xml b/odlparent/client-parent/pom.xml
index c2427933..cdf44089 100644
--- a/odlparent/client-parent/pom.xml
+++ b/odlparent/client-parent/pom.xml
@@ -32,8 +32,6 @@
<properties>
<!-- properties from oparent -->
- <maven.compiler.source>1.8</maven.compiler.source>
- <maven.compiler.target>1.8</maven.compiler.target>
<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>
@@ -55,9 +53,10 @@
<opendaylight.nexus.public-url>https://nexus.opendaylight.org/content/repositories/public/</opendaylight.nexus.public-url>
<opendaylight.nexus.snapshot-url>https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/</opendaylight.nexus.snapshot-url>
- <java.version.source>1.8</java.version.source>
- <java.version.target>1.8</java.version.target>
- <maven.compiler.version>3.6.1</maven.compiler.version>
+ <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>
+ <maven-compiler-plugin.version>3.8.1</maven-compiler-plugin.version>
<checkstyle.skip>true</checkstyle.skip>
@@ -66,7 +65,7 @@
<!-- Need to stick to JUnit 4.11 until https://github.com/jayway/powermock/issues/560
is fixed (either in PowerMock or with a new JUnit release) -->
<!-- Used everywhere -->
- <junit.version>4.11</junit.version>
+ <junit.version>4.13</junit.version>
<mockito.version>2.8.9</mockito.version>
<lombok.version>1.18.0</lombok.version>
<openpojo.version>0.8.10</openpojo.version>
@@ -349,14 +348,48 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>${maven.compiler.version}</version>
+ <version>${maven-compiler-plugin.version}</version>
<configuration>
- <source>${java.version.source}</source>
- <target>${java.version.target}</target>
+ <release>${java.version}</release>
+ <!--explicitly remove source and target-->
+ <source combine.self="override"/>
+ <target combine.self="override"/>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>${maven-surefire-plugin.version}</version>
+ <configuration>
+ <!-- Sets the VM argument line used when unit tests are run. -->
+ <argLine>${surefireArgLine}</argLine>
+ <!-- Excludes integration tests when unit tests are run. -->
+ <excludes>
+ <exclude>**/IT*.java</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-failsafe-plugin</artifactId>
+ <version>${maven-failsafe-plugin.version}</version>
+ <executions>
+ <!-- Ensures that both integration-test and verify goals of the Failsafe Maven plugin are executed. -->
+ <execution>
+ <id>integration-tests</id>
+ <goals>
+ <goal>integration-test</goal>
+ <goal>verify</goal>
+ </goals>
+ <configuration>
+ <!-- Sets the VM argument line used when integration tests are run. -->
+ <argLine>${failsafeArgLine}</argLine>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>3.0.1</version>
<executions>
diff --git a/odlparent/feature-repo-parent/pom.xml b/odlparent/feature-repo-parent/pom.xml
index f228a576..b35a7004 100644
--- a/odlparent/feature-repo-parent/pom.xml
+++ b/odlparent/feature-repo-parent/pom.xml
@@ -8,7 +8,7 @@
<parent>
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>feature-repo-parent</artifactId>
- <version>5.0.11</version>
+ <version>7.0.7</version>
<relativePath/>
</parent>
@@ -53,8 +53,6 @@
<jacoco.version>0.8.5</jacoco.version>
<!-- properties from oparent -->
- <maven.compiler.source>8</maven.compiler.source>
- <maven.compiler.target>8</maven.compiler.target>
<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>
@@ -83,14 +81,17 @@
<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.source>8</java.version.source>
- <java.version.target>8</java.version.target>
- <bundle.plugin.version>2.5.0</bundle.plugin.version>
- <maven.compile.plugin.version>2.5.1</maven.compile.plugin.version>
+ <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>
<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.skip>true</checkstyle.skip>
+ <odlparent.spotbugs.enforce>false</odlparent.spotbugs.enforce>
<!-- logging-analytics versions -->
<logging-analytics.version>1.6.6</logging-analytics.version>
@@ -110,40 +111,40 @@
<sdnctl.slipluginutils.version>${ccsdk.sli.version}</sdnctl.slipluginutils.version>
<!-- Support libraries used by OpenDaylight -->
- <odl.controller.mdsal.version>1.10.3</odl.controller.mdsal.version>
- <odl.mdsal.version>4.0.14</odl.mdsal.version>
- <odl.mdsal.model.version>2.0.14</odl.mdsal.model.version>
- <odl.netconf.restconf.version>1.10.3</odl.netconf.restconf.version>
- <odl.netconf.netconf.version>1.7.3</odl.netconf.netconf.version>
- <odl.netconf.sal.rest.docgen.version>1.10.3</odl.netconf.sal.rest.docgen.version>
+ <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>
<!-- Used by aaa, vtn -->
- <commons.codec.version>1.13</commons.codec.version>
+ <commons.codec.version>1.15</commons.codec.version>
<!-- Used by netconf, ovsdb -->
<commons.lang3.version>3.8.1</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.6</commons.net.version>
+ <commons.net.version>3.7</commons.net.version>
<!-- Used by neutron -->
- <eclipse.persistence.version>2.7.4</eclipse.persistence.version>
+ <eclipse.persistence.version>2.7.7</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>25.1-jre</guava.version>
+ <guava.version>28.2-jre</guava.version>
<!-- Used by aaa, alto, netconf, ovsdb, sfc; see also affinity, defense4all,
integration/distribution, snmp4sdn, toolkit, ttp -->
- <jackson.version>2.9.10</jackson.version>
+ <jackson.version>2.10.4</jackson.version>
<!-- Used by snmp4sdn, yangtools -->
- <javassist.version>3.24.1-GA</javassist.version>
+ <javassist.version>3.27.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 -->
- <jersey.version>2.25.1</jersey.version>
+ <jersey.version>2.27</jersey.version>
<!-- Used by sfc -->
- <jersey.client.version>2.25.1</jersey.client.version>
+ <jersey.client.version>2.27</jersey.client.version>
<!-- New packages for jersey migration 1.17 to 2.8 -->
<!-- appache.geronimo.bundle for DocGen -->
@@ -151,21 +152,21 @@
<org.json.version>20131018</org.json.version>
<!-- Used everywhere -->
- <junit.version>4.12</junit.version>
+ <junit.version>4.13</junit.version>
<!-- Used by coretutorials, sfc, snmp4sdn, sxp; see also affinity, toolkit -->
- <logback.version>1.2.3</logback.version>
+ <logback.version>1.11.6</logback.version>
<!-- Used by nic, sfc, sxp, tsdr -->
- <mockito.version>1.10.19</mockito.version>
+ <mockito.version>3.3.3</mockito.version>
<!-- Used by bgpcep, netconf, ovsdb, sxp; see also opendove, toolkit -->
- <netty.version>4.1.42.Final</netty.version>
+ <netty.version>4.1.51.Final</netty.version>
<!-- Used by openflowjava, persistence, sfc, snmp4sdn, sxp; see also affinity, toolkit -->
- <slf4j.version>1.7.25</slf4j.version>
+ <slf4j.version>1.7.29</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.7.2</antlr.version>
+ <antlr.version>4.8.1</antlr.version>
<eelf.maven.plugin.version>1.0.0</eelf.maven.plugin.version>
@@ -179,7 +180,7 @@
<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.12.v20180830</jetty.version>
+ <jetty.version>9.4.28.v20200408</jetty.version>
<skip.karaf.featureTest>true</skip.karaf.featureTest>
<dependency-list.file>direct-dependencies.txt</dependency-list.file>
</properties>
@@ -197,6 +198,20 @@
<scope>import</scope>
</dependency>
<dependency>
+ <groupId>org.onap.ccsdk.parent</groupId>
+ <artifactId>dependencies-bom</artifactId>
+ <version>2.1.1-SNAPSHOT</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-dependencies</artifactId>
+ <version>2.3.8.RELEASE</version>
+ <scope>import</scope>
+ <type>pom</type>
+ </dependency>
+ <dependency>
<groupId>org.onap.logging-analytics</groupId>
<artifactId>logging-slf4j</artifactId>
<version>${logging-analytics.version}</version>
@@ -215,6 +230,14 @@
</dependencies>
</dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>javax.annotation</groupId>
+ <artifactId>javax.annotation-api</artifactId>
+ <version>1.3.2</version>
+ </dependency>
+ </dependencies>
+
<repositories>
<repository>
<id>onap-public</id>
@@ -421,35 +444,35 @@
<execution>
<id>enforce-maven</id>
<goals>
- <goal>enforce</goal>
+ <goal>enforce</goal>
</goals>
<configuration>
- <rules>
- <requireJavaVersion>
- <version>8</version>
- </requireJavaVersion>
- <requireMavenVersion>
- <version>[3.5.0,)</version>
- </requireMavenVersion>
- </rules>
+ <rules>
+ <requireJavaVersion>
+ <version>8</version>
+ </requireJavaVersion>
+ <requireMavenVersion>
+ <version>[3.5.0,)</version>
+ </requireMavenVersion>
+ </rules>
</configuration>
</execution>
<execution>
<id>enforce-banned-dependencies</id>
<goals>
- <goal>enforce</goal>
+ <goal>enforce</goal>
</goals>
<configuration>
- <rules>
- <bannedDependencies>
- <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> -->
- </excludes>
- </bannedDependencies>
- </rules>
- <fail>true</fail>
+ <rules>
+ <bannedDependencies>
+ <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> -->
+ </excludes>
+ </bannedDependencies>
+ </rules>
+ <fail>true</fail>
</configuration>
</execution>
</executions>
@@ -461,12 +484,11 @@
<version>${sonar.scanner.version}</version>
</plugin>
<!-- end of plugins from ONAP version (parent of oparent) -->
-
<!-- Plugins from ONAP oparent -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.22.0</version>
+ <version>${maven-surefire-plugin.version}</version>
<configuration>
<!-- Sets the VM argument line used when unit tests are run. -->
<argLine>${surefireArgLine}</argLine>
@@ -479,7 +501,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
- <version>2.22.0</version>
+ <version>${maven-failsafe-plugin.version}</version>
<executions>
<!-- Ensures that both integration-test and verify goals of the Failsafe
Maven plugin are executed. -->
@@ -572,6 +594,143 @@
<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>
+ <version>3.1.12.2</version>
+ <executions>
+ <execution>
+ <id>analyze-compile</id>
+ <phase>compile</phase>
+ <goals>
+ <goal>check</goal>
+ </goals>
+ <configuration>
+ <plugins>
+ <plugin>
+ <groupId>jp.skypencil.findbugs.slf4j</groupId>
+ <artifactId>bug-pattern</artifactId>
+ <version>1.5.0</version>
+ </plugin>
+ </plugins>
+ <effort>Max</effort>
+ <threshold>Low</threshold>
+ <failOnError>false</failOnError>
+ <skip>true</skip>
+ <excludeFilterFile>spotbugs-exclude.xml</excludeFilterFile>
+ <xmlOutput>true</xmlOutput>
+ <findbugsXmlOutputDirectory>/home/jack/onap/onap-sdnr/features/sdnr/wt-aluminium-sr0-2/target/wt/common/target-ide/spotbugs</findbugsXmlOutputDirectory>
+ </configuration>
+ </execution>
+ </executions>
+ <dependencies>
+ <dependency>
+ <groupId>com.github.spotbugs</groupId>
+ <artifactId>spotbugs</artifactId>
+ <version>3.1.12</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.opendaylight.odlparent</groupId>
+ <artifactId>spotbugs</artifactId>
+ <version>7.0.5</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ <version>1.8.0-beta2</version>
+ <scope>compile</scope>
+ </dependency>
+ </dependencies>
+ <configuration>
+ <plugins>
+ <plugin>
+ <groupId>jp.skypencil.findbugs.slf4j</groupId>
+ <artifactId>bug-pattern</artifactId>
+ <version>1.5.0</version>
+ </plugin>
+ </plugins>
+ <effort>Max</effort>
+ <threshold>Low</threshold>
+ <failOnError>false</failOnError>
+ <skip>true</skip>
+ <excludeFilterFile>spotbugs-exclude.xml</excludeFilterFile>
+ <xmlOutput>true</xmlOutput>
+ <findbugsXmlOutputDirectory>/home/jack/onap/onap-sdnr/features/sdnr/wt-aluminium-sr0-2/target/wt/common/target-ide/spotbugs</findbugsXmlOutputDirectory>
+ </configuration>
+ </plugin>
+ <plugin>
+ <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>
+ <id>check-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>
</plugins>
</pluginManagement>
<plugins>
@@ -584,13 +743,24 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
+ <!--
+ <configuration>
+ <reportPlugins>
+ <reportPlugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ <version>${checkstyle.plugin.version}</version>
+ </reportPlugin>
+ </reportPlugins>
+ </configuration>
+ -->
</plugin>
<!-- end of plugins from oparent version (parent of oparent) -->
<!-- Plugins from oparent -->
<plugin>
<artifactId>maven-checkstyle-plugin</artifactId>
- <version>2.17</version>
+ <version>${checkstyle.plugin.version}</version>
<dependencies>
<dependency>
<groupId>org.onap.oparent</groupId>
@@ -610,7 +780,9 @@
<includeResources>false</includeResources>
<includeTestSourceDirectory>true</includeTestSourceDirectory>
<includeTestResources>false</includeTestResources>
- <sourceDirectory>${project.build.sourceDirectory}</sourceDirectory>
+ <sourceDirectories>
+ <directory>${project.build.sourceDirectory}</directory>
+ </sourceDirectories>
<excludes>
</excludes>
<consoleOutput>true</consoleOutput>
@@ -628,7 +800,9 @@
with minor changes -->
<configLocation>onap-checkstyle/onap-java-style.xml</configLocation>
<!-- <sourceDirectory> is needed so that checkstyle ignores the generated sources directory -->
- <sourceDirectory>${project.build.sourceDirectory}/src/main/java</sourceDirectory>
+ <sourceDirectories>
+ <directory>${project.build.sourceDirectory}/src/main/java</directory>
+ </sourceDirectories>
<includeResources>true</includeResources>
<includeTestSourceDirectory>true</includeTestSourceDirectory>
<includeTestResources>true</includeTestResources>
@@ -777,7 +951,8 @@
<requireProperty>
<property>onap.nexus.url</property>
<message>You must set a onap.nexus.url property in your
- ~/.m2/settings.xml. See oparent/settings.xml for an example.</message>
+ ~/.m2/settings.xml. See oparent/settings.xml for an example.
+ </message>
</requireProperty>
</rules>
<fail>true</fail>
@@ -984,16 +1159,16 @@
<then>
<property name="swagger.sdk.script.file" value="generated-source-script.bat"/>
<echo file="${project.build.directory}${file.separator}generated-source-script.bat" append="true"
- message="cd ${project.build.directory}${file.separator}generated-sources${line.separator}"/>
+ message="cd ${project.build.directory}${file.separator}generated-sources${line.separator}"/>
<echo file="${project.build.directory}${file.separator}generated-source-script.bat" append="true"
- message="mvn clean install -Dmaven.test.skip=true${line.separator}"/>
+ message="mvn clean install -Dmaven.test.skip=true${line.separator}"/>
</then>
<else>
<property name="swagger.sdk.script.file" value="generated-source-script.sh"/>
<echo file="${project.build.directory}${file.separator}generated-source-script.sh" append="true"
- message="cd ${project.build.directory}${file.separator}generated-sources${line.separator}"/>
+ message="cd ${project.build.directory}${file.separator}generated-sources${line.separator}"/>
<echo file="${project.build.directory}${file.separator}generated-source-script.sh" append="true"
- message="mvn clean install -Dmaven.test.skip=true${line.separator}"/>
+ message="mvn clean install -Dmaven.test.skip=true${line.separator}"/>
<chmod file="${project.build.directory}${file.separator}generated-source-script.sh" perm="755"/>
</else>
</if>
@@ -1143,7 +1318,7 @@
<plugin>
<groupId>org.opendaylight.yangtools</groupId>
<artifactId>yang-maven-plugin</artifactId>
- <version>3.0.11</version>
+ <version>5.0.5</version>
<dependencies>
<dependency>
<groupId>org.opendaylight.mdsal</groupId>
@@ -1172,10 +1347,12 @@
<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>
diff --git a/odlparent/karaf4-parent/pom.xml b/odlparent/karaf4-parent/pom.xml
index bd98f4d3..22a69362 100644
--- a/odlparent/karaf4-parent/pom.xml
+++ b/odlparent/karaf4-parent/pom.xml
@@ -8,7 +8,7 @@
<parent>
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>karaf4-parent</artifactId>
- <version>5.0.11</version>
+ <version>7.0.7</version>
<relativePath/>
</parent>
@@ -53,8 +53,6 @@
<jacoco.version>0.8.5</jacoco.version>
<!-- properties from oparent -->
- <maven.compiler.source>8</maven.compiler.source>
- <maven.compiler.target>8</maven.compiler.target>
<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>
@@ -83,14 +81,17 @@
<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.source>8</java.version.source>
- <java.version.target>8</java.version.target>
- <bundle.plugin.version>2.5.0</bundle.plugin.version>
- <maven.compile.plugin.version>2.5.1</maven.compile.plugin.version>
+ <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>
<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.skip>true</checkstyle.skip>
+ <odlparent.spotbugs.enforce>false</odlparent.spotbugs.enforce>
<!-- logging-analytics versions -->
<logging-analytics.version>1.6.6</logging-analytics.version>
@@ -110,40 +111,40 @@
<sdnctl.slipluginutils.version>${ccsdk.sli.version}</sdnctl.slipluginutils.version>
<!-- Support libraries used by OpenDaylight -->
- <odl.controller.mdsal.version>1.10.3</odl.controller.mdsal.version>
- <odl.mdsal.version>4.0.14</odl.mdsal.version>
- <odl.mdsal.model.version>2.0.14</odl.mdsal.model.version>
- <odl.netconf.restconf.version>1.10.3</odl.netconf.restconf.version>
- <odl.netconf.netconf.version>1.7.3</odl.netconf.netconf.version>
- <odl.netconf.sal.rest.docgen.version>1.10.3</odl.netconf.sal.rest.docgen.version>
+ <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>
<!-- Used by aaa, vtn -->
- <commons.codec.version>1.13</commons.codec.version>
+ <commons.codec.version>1.15</commons.codec.version>
<!-- Used by netconf, ovsdb -->
<commons.lang3.version>3.8.1</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.6</commons.net.version>
+ <commons.net.version>3.7</commons.net.version>
<!-- Used by neutron -->
- <eclipse.persistence.version>2.7.4</eclipse.persistence.version>
+ <eclipse.persistence.version>2.7.7</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>25.1-jre</guava.version>
+ <guava.version>28.2-jre</guava.version>
<!-- Used by aaa, alto, netconf, ovsdb, sfc; see also affinity, defense4all,
integration/distribution, snmp4sdn, toolkit, ttp -->
- <jackson.version>2.9.10</jackson.version>
+ <jackson.version>2.10.4</jackson.version>
<!-- Used by snmp4sdn, yangtools -->
- <javassist.version>3.24.1-GA</javassist.version>
+ <javassist.version>3.27.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 -->
- <jersey.version>2.25.1</jersey.version>
+ <jersey.version>2.27</jersey.version>
<!-- Used by sfc -->
- <jersey.client.version>2.25.1</jersey.client.version>
+ <jersey.client.version>2.27</jersey.client.version>
<!-- New packages for jersey migration 1.17 to 2.8 -->
<!-- appache.geronimo.bundle for DocGen -->
@@ -151,21 +152,21 @@
<org.json.version>20131018</org.json.version>
<!-- Used everywhere -->
- <junit.version>4.12</junit.version>
+ <junit.version>4.13</junit.version>
<!-- Used by coretutorials, sfc, snmp4sdn, sxp; see also affinity, toolkit -->
- <logback.version>1.2.3</logback.version>
+ <logback.version>1.11.6</logback.version>
<!-- Used by nic, sfc, sxp, tsdr -->
- <mockito.version>1.10.19</mockito.version>
+ <mockito.version>3.3.3</mockito.version>
<!-- Used by bgpcep, netconf, ovsdb, sxp; see also opendove, toolkit -->
- <netty.version>4.1.42.Final</netty.version>
+ <netty.version>4.1.51.Final</netty.version>
<!-- Used by openflowjava, persistence, sfc, snmp4sdn, sxp; see also affinity, toolkit -->
- <slf4j.version>1.7.25</slf4j.version>
+ <slf4j.version>1.7.29</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.7.2</antlr.version>
+ <antlr.version>4.8.1</antlr.version>
<eelf.maven.plugin.version>1.0.0</eelf.maven.plugin.version>
@@ -179,7 +180,7 @@
<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.12.v20180830</jetty.version>
+ <jetty.version>9.4.28.v20200408</jetty.version>
<skip.karaf.featureTest>true</skip.karaf.featureTest>
<dependency-list.file>direct-dependencies.txt</dependency-list.file>
</properties>
@@ -197,6 +198,20 @@
<scope>import</scope>
</dependency>
<dependency>
+ <groupId>org.onap.ccsdk.parent</groupId>
+ <artifactId>dependencies-bom</artifactId>
+ <version>2.1.1-SNAPSHOT</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-dependencies</artifactId>
+ <version>2.3.8.RELEASE</version>
+ <scope>import</scope>
+ <type>pom</type>
+ </dependency>
+ <dependency>
<groupId>org.onap.logging-analytics</groupId>
<artifactId>logging-slf4j</artifactId>
<version>${logging-analytics.version}</version>
@@ -215,6 +230,14 @@
</dependencies>
</dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>javax.annotation</groupId>
+ <artifactId>javax.annotation-api</artifactId>
+ <version>1.3.2</version>
+ </dependency>
+ </dependencies>
+
<repositories>
<repository>
<id>onap-public</id>
@@ -421,35 +444,35 @@
<execution>
<id>enforce-maven</id>
<goals>
- <goal>enforce</goal>
+ <goal>enforce</goal>
</goals>
<configuration>
- <rules>
- <requireJavaVersion>
- <version>8</version>
- </requireJavaVersion>
- <requireMavenVersion>
- <version>[3.5.0,)</version>
- </requireMavenVersion>
- </rules>
+ <rules>
+ <requireJavaVersion>
+ <version>8</version>
+ </requireJavaVersion>
+ <requireMavenVersion>
+ <version>[3.5.0,)</version>
+ </requireMavenVersion>
+ </rules>
</configuration>
</execution>
<execution>
<id>enforce-banned-dependencies</id>
<goals>
- <goal>enforce</goal>
+ <goal>enforce</goal>
</goals>
<configuration>
- <rules>
- <bannedDependencies>
- <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> -->
- </excludes>
- </bannedDependencies>
- </rules>
- <fail>true</fail>
+ <rules>
+ <bannedDependencies>
+ <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> -->
+ </excludes>
+ </bannedDependencies>
+ </rules>
+ <fail>true</fail>
</configuration>
</execution>
</executions>
@@ -461,12 +484,11 @@
<version>${sonar.scanner.version}</version>
</plugin>
<!-- end of plugins from ONAP version (parent of oparent) -->
-
<!-- Plugins from ONAP oparent -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.22.0</version>
+ <version>${maven-surefire-plugin.version}</version>
<configuration>
<!-- Sets the VM argument line used when unit tests are run. -->
<argLine>${surefireArgLine}</argLine>
@@ -479,7 +501,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
- <version>2.22.0</version>
+ <version>${maven-failsafe-plugin.version}</version>
<executions>
<!-- Ensures that both integration-test and verify goals of the Failsafe
Maven plugin are executed. -->
@@ -572,6 +594,143 @@
<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>
+ <version>3.1.12.2</version>
+ <executions>
+ <execution>
+ <id>analyze-compile</id>
+ <phase>compile</phase>
+ <goals>
+ <goal>check</goal>
+ </goals>
+ <configuration>
+ <plugins>
+ <plugin>
+ <groupId>jp.skypencil.findbugs.slf4j</groupId>
+ <artifactId>bug-pattern</artifactId>
+ <version>1.5.0</version>
+ </plugin>
+ </plugins>
+ <effort>Max</effort>
+ <threshold>Low</threshold>
+ <failOnError>false</failOnError>
+ <skip>true</skip>
+ <excludeFilterFile>spotbugs-exclude.xml</excludeFilterFile>
+ <xmlOutput>true</xmlOutput>
+ <findbugsXmlOutputDirectory>/home/jack/onap/onap-sdnr/features/sdnr/wt-aluminium-sr0-2/target/wt/common/target-ide/spotbugs</findbugsXmlOutputDirectory>
+ </configuration>
+ </execution>
+ </executions>
+ <dependencies>
+ <dependency>
+ <groupId>com.github.spotbugs</groupId>
+ <artifactId>spotbugs</artifactId>
+ <version>3.1.12</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.opendaylight.odlparent</groupId>
+ <artifactId>spotbugs</artifactId>
+ <version>7.0.5</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ <version>1.8.0-beta2</version>
+ <scope>compile</scope>
+ </dependency>
+ </dependencies>
+ <configuration>
+ <plugins>
+ <plugin>
+ <groupId>jp.skypencil.findbugs.slf4j</groupId>
+ <artifactId>bug-pattern</artifactId>
+ <version>1.5.0</version>
+ </plugin>
+ </plugins>
+ <effort>Max</effort>
+ <threshold>Low</threshold>
+ <failOnError>false</failOnError>
+ <skip>true</skip>
+ <excludeFilterFile>spotbugs-exclude.xml</excludeFilterFile>
+ <xmlOutput>true</xmlOutput>
+ <findbugsXmlOutputDirectory>/home/jack/onap/onap-sdnr/features/sdnr/wt-aluminium-sr0-2/target/wt/common/target-ide/spotbugs</findbugsXmlOutputDirectory>
+ </configuration>
+ </plugin>
+ <plugin>
+ <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>
+ <id>check-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>
</plugins>
</pluginManagement>
<plugins>
@@ -584,13 +743,24 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
+ <!--
+ <configuration>
+ <reportPlugins>
+ <reportPlugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ <version>${checkstyle.plugin.version}</version>
+ </reportPlugin>
+ </reportPlugins>
+ </configuration>
+ -->
</plugin>
<!-- end of plugins from oparent version (parent of oparent) -->
<!-- Plugins from oparent -->
<plugin>
<artifactId>maven-checkstyle-plugin</artifactId>
- <version>2.17</version>
+ <version>${checkstyle.plugin.version}</version>
<dependencies>
<dependency>
<groupId>org.onap.oparent</groupId>
@@ -610,7 +780,9 @@
<includeResources>false</includeResources>
<includeTestSourceDirectory>true</includeTestSourceDirectory>
<includeTestResources>false</includeTestResources>
- <sourceDirectory>${project.build.sourceDirectory}</sourceDirectory>
+ <sourceDirectories>
+ <directory>${project.build.sourceDirectory}</directory>
+ </sourceDirectories>
<excludes>
</excludes>
<consoleOutput>true</consoleOutput>
@@ -628,7 +800,9 @@
with minor changes -->
<configLocation>onap-checkstyle/onap-java-style.xml</configLocation>
<!-- <sourceDirectory> is needed so that checkstyle ignores the generated sources directory -->
- <sourceDirectory>${project.build.sourceDirectory}/src/main/java</sourceDirectory>
+ <sourceDirectories>
+ <directory>${project.build.sourceDirectory}/src/main/java</directory>
+ </sourceDirectories>
<includeResources>true</includeResources>
<includeTestSourceDirectory>true</includeTestSourceDirectory>
<includeTestResources>true</includeTestResources>
@@ -777,7 +951,8 @@
<requireProperty>
<property>onap.nexus.url</property>
<message>You must set a onap.nexus.url property in your
- ~/.m2/settings.xml. See oparent/settings.xml for an example.</message>
+ ~/.m2/settings.xml. See oparent/settings.xml for an example.
+ </message>
</requireProperty>
</rules>
<fail>true</fail>
@@ -984,16 +1159,16 @@
<then>
<property name="swagger.sdk.script.file" value="generated-source-script.bat"/>
<echo file="${project.build.directory}${file.separator}generated-source-script.bat" append="true"
- message="cd ${project.build.directory}${file.separator}generated-sources${line.separator}"/>
+ message="cd ${project.build.directory}${file.separator}generated-sources${line.separator}"/>
<echo file="${project.build.directory}${file.separator}generated-source-script.bat" append="true"
- message="mvn clean install -Dmaven.test.skip=true${line.separator}"/>
+ message="mvn clean install -Dmaven.test.skip=true${line.separator}"/>
</then>
<else>
<property name="swagger.sdk.script.file" value="generated-source-script.sh"/>
<echo file="${project.build.directory}${file.separator}generated-source-script.sh" append="true"
- message="cd ${project.build.directory}${file.separator}generated-sources${line.separator}"/>
+ message="cd ${project.build.directory}${file.separator}generated-sources${line.separator}"/>
<echo file="${project.build.directory}${file.separator}generated-source-script.sh" append="true"
- message="mvn clean install -Dmaven.test.skip=true${line.separator}"/>
+ message="mvn clean install -Dmaven.test.skip=true${line.separator}"/>
<chmod file="${project.build.directory}${file.separator}generated-source-script.sh" perm="755"/>
</else>
</if>
@@ -1143,7 +1318,7 @@
<plugin>
<groupId>org.opendaylight.yangtools</groupId>
<artifactId>yang-maven-plugin</artifactId>
- <version>3.0.11</version>
+ <version>5.0.5</version>
<dependencies>
<dependency>
<groupId>org.opendaylight.mdsal</groupId>
@@ -1172,10 +1347,12 @@
<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>
diff --git a/odlparent/mdsal-it-parent/pom.xml b/odlparent/mdsal-it-parent/pom.xml
index c6018217..9154a44c 100644
--- a/odlparent/mdsal-it-parent/pom.xml
+++ b/odlparent/mdsal-it-parent/pom.xml
@@ -8,7 +8,7 @@
<parent>
<groupId>org.opendaylight.controller</groupId>
<artifactId>mdsal-it-parent</artifactId>
- <version>1.10.4</version>
+ <version>2.0.6</version>
<relativePath/>
</parent>
@@ -53,8 +53,6 @@
<jacoco.version>0.8.5</jacoco.version>
<!-- properties from oparent -->
- <maven.compiler.source>8</maven.compiler.source>
- <maven.compiler.target>8</maven.compiler.target>
<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>
@@ -83,14 +81,17 @@
<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.source>8</java.version.source>
- <java.version.target>8</java.version.target>
- <bundle.plugin.version>2.5.0</bundle.plugin.version>
- <maven.compile.plugin.version>2.5.1</maven.compile.plugin.version>
+ <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>
<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.skip>true</checkstyle.skip>
+ <odlparent.spotbugs.enforce>false</odlparent.spotbugs.enforce>
<!-- logging-analytics versions -->
<logging-analytics.version>1.6.6</logging-analytics.version>
@@ -110,40 +111,40 @@
<sdnctl.slipluginutils.version>${ccsdk.sli.version}</sdnctl.slipluginutils.version>
<!-- Support libraries used by OpenDaylight -->
- <odl.controller.mdsal.version>1.10.3</odl.controller.mdsal.version>
- <odl.mdsal.version>4.0.14</odl.mdsal.version>
- <odl.mdsal.model.version>2.0.14</odl.mdsal.model.version>
- <odl.netconf.restconf.version>1.10.3</odl.netconf.restconf.version>
- <odl.netconf.netconf.version>1.7.3</odl.netconf.netconf.version>
- <odl.netconf.sal.rest.docgen.version>1.10.3</odl.netconf.sal.rest.docgen.version>
+ <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>
<!-- Used by aaa, vtn -->
- <commons.codec.version>1.13</commons.codec.version>
+ <commons.codec.version>1.15</commons.codec.version>
<!-- Used by netconf, ovsdb -->
<commons.lang3.version>3.8.1</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.6</commons.net.version>
+ <commons.net.version>3.7</commons.net.version>
<!-- Used by neutron -->
- <eclipse.persistence.version>2.7.4</eclipse.persistence.version>
+ <eclipse.persistence.version>2.7.7</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>25.1-jre</guava.version>
+ <guava.version>28.2-jre</guava.version>
<!-- Used by aaa, alto, netconf, ovsdb, sfc; see also affinity, defense4all,
integration/distribution, snmp4sdn, toolkit, ttp -->
- <jackson.version>2.9.10</jackson.version>
+ <jackson.version>2.10.4</jackson.version>
<!-- Used by snmp4sdn, yangtools -->
- <javassist.version>3.24.1-GA</javassist.version>
+ <javassist.version>3.27.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 -->
- <jersey.version>2.25.1</jersey.version>
+ <jersey.version>2.27</jersey.version>
<!-- Used by sfc -->
- <jersey.client.version>2.25.1</jersey.client.version>
+ <jersey.client.version>2.27</jersey.client.version>
<!-- New packages for jersey migration 1.17 to 2.8 -->
<!-- appache.geronimo.bundle for DocGen -->
@@ -151,21 +152,21 @@
<org.json.version>20131018</org.json.version>
<!-- Used everywhere -->
- <junit.version>4.12</junit.version>
+ <junit.version>4.13</junit.version>
<!-- Used by coretutorials, sfc, snmp4sdn, sxp; see also affinity, toolkit -->
- <logback.version>1.2.3</logback.version>
+ <logback.version>1.11.6</logback.version>
<!-- Used by nic, sfc, sxp, tsdr -->
- <mockito.version>1.10.19</mockito.version>
+ <mockito.version>3.3.3</mockito.version>
<!-- Used by bgpcep, netconf, ovsdb, sxp; see also opendove, toolkit -->
- <netty.version>4.1.42.Final</netty.version>
+ <netty.version>4.1.51.Final</netty.version>
<!-- Used by openflowjava, persistence, sfc, snmp4sdn, sxp; see also affinity, toolkit -->
- <slf4j.version>1.7.25</slf4j.version>
+ <slf4j.version>1.7.29</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.7.2</antlr.version>
+ <antlr.version>4.8.1</antlr.version>
<eelf.maven.plugin.version>1.0.0</eelf.maven.plugin.version>
@@ -179,7 +180,7 @@
<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.12.v20180830</jetty.version>
+ <jetty.version>9.4.28.v20200408</jetty.version>
<skip.karaf.featureTest>true</skip.karaf.featureTest>
<dependency-list.file>direct-dependencies.txt</dependency-list.file>
</properties>
@@ -197,6 +198,20 @@
<scope>import</scope>
</dependency>
<dependency>
+ <groupId>org.onap.ccsdk.parent</groupId>
+ <artifactId>dependencies-bom</artifactId>
+ <version>2.1.1-SNAPSHOT</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-dependencies</artifactId>
+ <version>2.3.8.RELEASE</version>
+ <scope>import</scope>
+ <type>pom</type>
+ </dependency>
+ <dependency>
<groupId>org.onap.logging-analytics</groupId>
<artifactId>logging-slf4j</artifactId>
<version>${logging-analytics.version}</version>
@@ -215,6 +230,14 @@
</dependencies>
</dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>javax.annotation</groupId>
+ <artifactId>javax.annotation-api</artifactId>
+ <version>1.3.2</version>
+ </dependency>
+ </dependencies>
+
<repositories>
<repository>
<id>onap-public</id>
@@ -421,35 +444,35 @@
<execution>
<id>enforce-maven</id>
<goals>
- <goal>enforce</goal>
+ <goal>enforce</goal>
</goals>
<configuration>
- <rules>
- <requireJavaVersion>
- <version>8</version>
- </requireJavaVersion>
- <requireMavenVersion>
- <version>[3.5.0,)</version>
- </requireMavenVersion>
- </rules>
+ <rules>
+ <requireJavaVersion>
+ <version>8</version>
+ </requireJavaVersion>
+ <requireMavenVersion>
+ <version>[3.5.0,)</version>
+ </requireMavenVersion>
+ </rules>
</configuration>
</execution>
<execution>
<id>enforce-banned-dependencies</id>
<goals>
- <goal>enforce</goal>
+ <goal>enforce</goal>
</goals>
<configuration>
- <rules>
- <bannedDependencies>
- <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> -->
- </excludes>
- </bannedDependencies>
- </rules>
- <fail>true</fail>
+ <rules>
+ <bannedDependencies>
+ <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> -->
+ </excludes>
+ </bannedDependencies>
+ </rules>
+ <fail>true</fail>
</configuration>
</execution>
</executions>
@@ -461,12 +484,11 @@
<version>${sonar.scanner.version}</version>
</plugin>
<!-- end of plugins from ONAP version (parent of oparent) -->
-
<!-- Plugins from ONAP oparent -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.22.0</version>
+ <version>${maven-surefire-plugin.version}</version>
<configuration>
<!-- Sets the VM argument line used when unit tests are run. -->
<argLine>${surefireArgLine}</argLine>
@@ -479,7 +501,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
- <version>2.22.0</version>
+ <version>${maven-failsafe-plugin.version}</version>
<executions>
<!-- Ensures that both integration-test and verify goals of the Failsafe
Maven plugin are executed. -->
@@ -572,6 +594,143 @@
<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>
+ <version>3.1.12.2</version>
+ <executions>
+ <execution>
+ <id>analyze-compile</id>
+ <phase>compile</phase>
+ <goals>
+ <goal>check</goal>
+ </goals>
+ <configuration>
+ <plugins>
+ <plugin>
+ <groupId>jp.skypencil.findbugs.slf4j</groupId>
+ <artifactId>bug-pattern</artifactId>
+ <version>1.5.0</version>
+ </plugin>
+ </plugins>
+ <effort>Max</effort>
+ <threshold>Low</threshold>
+ <failOnError>false</failOnError>
+ <skip>true</skip>
+ <excludeFilterFile>spotbugs-exclude.xml</excludeFilterFile>
+ <xmlOutput>true</xmlOutput>
+ <findbugsXmlOutputDirectory>/home/jack/onap/onap-sdnr/features/sdnr/wt-aluminium-sr0-2/target/wt/common/target-ide/spotbugs</findbugsXmlOutputDirectory>
+ </configuration>
+ </execution>
+ </executions>
+ <dependencies>
+ <dependency>
+ <groupId>com.github.spotbugs</groupId>
+ <artifactId>spotbugs</artifactId>
+ <version>3.1.12</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.opendaylight.odlparent</groupId>
+ <artifactId>spotbugs</artifactId>
+ <version>7.0.5</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ <version>1.8.0-beta2</version>
+ <scope>compile</scope>
+ </dependency>
+ </dependencies>
+ <configuration>
+ <plugins>
+ <plugin>
+ <groupId>jp.skypencil.findbugs.slf4j</groupId>
+ <artifactId>bug-pattern</artifactId>
+ <version>1.5.0</version>
+ </plugin>
+ </plugins>
+ <effort>Max</effort>
+ <threshold>Low</threshold>
+ <failOnError>false</failOnError>
+ <skip>true</skip>
+ <excludeFilterFile>spotbugs-exclude.xml</excludeFilterFile>
+ <xmlOutput>true</xmlOutput>
+ <findbugsXmlOutputDirectory>/home/jack/onap/onap-sdnr/features/sdnr/wt-aluminium-sr0-2/target/wt/common/target-ide/spotbugs</findbugsXmlOutputDirectory>
+ </configuration>
+ </plugin>
+ <plugin>
+ <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>
+ <id>check-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>
</plugins>
</pluginManagement>
<plugins>
@@ -584,13 +743,24 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
+ <!--
+ <configuration>
+ <reportPlugins>
+ <reportPlugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ <version>${checkstyle.plugin.version}</version>
+ </reportPlugin>
+ </reportPlugins>
+ </configuration>
+ -->
</plugin>
<!-- end of plugins from oparent version (parent of oparent) -->
<!-- Plugins from oparent -->
<plugin>
<artifactId>maven-checkstyle-plugin</artifactId>
- <version>2.17</version>
+ <version>${checkstyle.plugin.version}</version>
<dependencies>
<dependency>
<groupId>org.onap.oparent</groupId>
@@ -610,7 +780,9 @@
<includeResources>false</includeResources>
<includeTestSourceDirectory>true</includeTestSourceDirectory>
<includeTestResources>false</includeTestResources>
- <sourceDirectory>${project.build.sourceDirectory}</sourceDirectory>
+ <sourceDirectories>
+ <directory>${project.build.sourceDirectory}</directory>
+ </sourceDirectories>
<excludes>
</excludes>
<consoleOutput>true</consoleOutput>
@@ -628,7 +800,9 @@
with minor changes -->
<configLocation>onap-checkstyle/onap-java-style.xml</configLocation>
<!-- <sourceDirectory> is needed so that checkstyle ignores the generated sources directory -->
- <sourceDirectory>${project.build.sourceDirectory}/src/main/java</sourceDirectory>
+ <sourceDirectories>
+ <directory>${project.build.sourceDirectory}/src/main/java</directory>
+ </sourceDirectories>
<includeResources>true</includeResources>
<includeTestSourceDirectory>true</includeTestSourceDirectory>
<includeTestResources>true</includeTestResources>
@@ -777,7 +951,8 @@
<requireProperty>
<property>onap.nexus.url</property>
<message>You must set a onap.nexus.url property in your
- ~/.m2/settings.xml. See oparent/settings.xml for an example.</message>
+ ~/.m2/settings.xml. See oparent/settings.xml for an example.
+ </message>
</requireProperty>
</rules>
<fail>true</fail>
@@ -984,16 +1159,16 @@
<then>
<property name="swagger.sdk.script.file" value="generated-source-script.bat"/>
<echo file="${project.build.directory}${file.separator}generated-source-script.bat" append="true"
- message="cd ${project.build.directory}${file.separator}generated-sources${line.separator}"/>
+ message="cd ${project.build.directory}${file.separator}generated-sources${line.separator}"/>
<echo file="${project.build.directory}${file.separator}generated-source-script.bat" append="true"
- message="mvn clean install -Dmaven.test.skip=true${line.separator}"/>
+ message="mvn clean install -Dmaven.test.skip=true${line.separator}"/>
</then>
<else>
<property name="swagger.sdk.script.file" value="generated-source-script.sh"/>
<echo file="${project.build.directory}${file.separator}generated-source-script.sh" append="true"
- message="cd ${project.build.directory}${file.separator}generated-sources${line.separator}"/>
+ message="cd ${project.build.directory}${file.separator}generated-sources${line.separator}"/>
<echo file="${project.build.directory}${file.separator}generated-source-script.sh" append="true"
- message="mvn clean install -Dmaven.test.skip=true${line.separator}"/>
+ message="mvn clean install -Dmaven.test.skip=true${line.separator}"/>
<chmod file="${project.build.directory}${file.separator}generated-source-script.sh" perm="755"/>
</else>
</if>
@@ -1143,7 +1318,7 @@
<plugin>
<groupId>org.opendaylight.yangtools</groupId>
<artifactId>yang-maven-plugin</artifactId>
- <version>3.0.11</version>
+ <version>5.0.5</version>
<dependencies>
<dependency>
<groupId>org.opendaylight.mdsal</groupId>
@@ -1172,10 +1347,12 @@
<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>
diff --git a/odlparent/odlparent-lite/pom.xml b/odlparent/odlparent-lite/pom.xml
index 96978d04..ab1ac822 100644
--- a/odlparent/odlparent-lite/pom.xml
+++ b/odlparent/odlparent-lite/pom.xml
@@ -8,7 +8,7 @@
<parent>
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>odlparent-lite</artifactId>
- <version>5.0.11</version>
+ <version>7.0.7</version>
<relativePath/>
</parent>
@@ -53,8 +53,6 @@
<jacoco.version>0.8.5</jacoco.version>
<!-- properties from oparent -->
- <maven.compiler.source>8</maven.compiler.source>
- <maven.compiler.target>8</maven.compiler.target>
<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>
@@ -83,14 +81,17 @@
<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.source>8</java.version.source>
- <java.version.target>8</java.version.target>
- <bundle.plugin.version>2.5.0</bundle.plugin.version>
- <maven.compile.plugin.version>2.5.1</maven.compile.plugin.version>
+ <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>
<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.skip>true</checkstyle.skip>
+ <odlparent.spotbugs.enforce>false</odlparent.spotbugs.enforce>
<!-- logging-analytics versions -->
<logging-analytics.version>1.6.6</logging-analytics.version>
@@ -110,40 +111,40 @@
<sdnctl.slipluginutils.version>${ccsdk.sli.version}</sdnctl.slipluginutils.version>
<!-- Support libraries used by OpenDaylight -->
- <odl.controller.mdsal.version>1.10.3</odl.controller.mdsal.version>
- <odl.mdsal.version>4.0.14</odl.mdsal.version>
- <odl.mdsal.model.version>2.0.14</odl.mdsal.model.version>
- <odl.netconf.restconf.version>1.10.3</odl.netconf.restconf.version>
- <odl.netconf.netconf.version>1.7.3</odl.netconf.netconf.version>
- <odl.netconf.sal.rest.docgen.version>1.10.3</odl.netconf.sal.rest.docgen.version>
+ <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>
<!-- Used by aaa, vtn -->
- <commons.codec.version>1.13</commons.codec.version>
+ <commons.codec.version>1.15</commons.codec.version>
<!-- Used by netconf, ovsdb -->
<commons.lang3.version>3.8.1</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.6</commons.net.version>
+ <commons.net.version>3.7</commons.net.version>
<!-- Used by neutron -->
- <eclipse.persistence.version>2.7.4</eclipse.persistence.version>
+ <eclipse.persistence.version>2.7.7</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>25.1-jre</guava.version>
+ <guava.version>28.2-jre</guava.version>
<!-- Used by aaa, alto, netconf, ovsdb, sfc; see also affinity, defense4all,
integration/distribution, snmp4sdn, toolkit, ttp -->
- <jackson.version>2.9.10</jackson.version>
+ <jackson.version>2.10.4</jackson.version>
<!-- Used by snmp4sdn, yangtools -->
- <javassist.version>3.24.1-GA</javassist.version>
+ <javassist.version>3.27.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 -->
- <jersey.version>2.25.1</jersey.version>
+ <jersey.version>2.27</jersey.version>
<!-- Used by sfc -->
- <jersey.client.version>2.25.1</jersey.client.version>
+ <jersey.client.version>2.27</jersey.client.version>
<!-- New packages for jersey migration 1.17 to 2.8 -->
<!-- appache.geronimo.bundle for DocGen -->
@@ -151,21 +152,21 @@
<org.json.version>20131018</org.json.version>
<!-- Used everywhere -->
- <junit.version>4.12</junit.version>
+ <junit.version>4.13</junit.version>
<!-- Used by coretutorials, sfc, snmp4sdn, sxp; see also affinity, toolkit -->
- <logback.version>1.2.3</logback.version>
+ <logback.version>1.11.6</logback.version>
<!-- Used by nic, sfc, sxp, tsdr -->
- <mockito.version>1.10.19</mockito.version>
+ <mockito.version>3.3.3</mockito.version>
<!-- Used by bgpcep, netconf, ovsdb, sxp; see also opendove, toolkit -->
- <netty.version>4.1.42.Final</netty.version>
+ <netty.version>4.1.51.Final</netty.version>
<!-- Used by openflowjava, persistence, sfc, snmp4sdn, sxp; see also affinity, toolkit -->
- <slf4j.version>1.7.25</slf4j.version>
+ <slf4j.version>1.7.29</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.7.2</antlr.version>
+ <antlr.version>4.8.1</antlr.version>
<eelf.maven.plugin.version>1.0.0</eelf.maven.plugin.version>
@@ -179,7 +180,7 @@
<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.12.v20180830</jetty.version>
+ <jetty.version>9.4.28.v20200408</jetty.version>
<skip.karaf.featureTest>true</skip.karaf.featureTest>
<dependency-list.file>direct-dependencies.txt</dependency-list.file>
</properties>
@@ -197,6 +198,20 @@
<scope>import</scope>
</dependency>
<dependency>
+ <groupId>org.onap.ccsdk.parent</groupId>
+ <artifactId>dependencies-bom</artifactId>
+ <version>2.1.1-SNAPSHOT</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-dependencies</artifactId>
+ <version>2.3.8.RELEASE</version>
+ <scope>import</scope>
+ <type>pom</type>
+ </dependency>
+ <dependency>
<groupId>org.onap.logging-analytics</groupId>
<artifactId>logging-slf4j</artifactId>
<version>${logging-analytics.version}</version>
@@ -215,6 +230,14 @@
</dependencies>
</dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>javax.annotation</groupId>
+ <artifactId>javax.annotation-api</artifactId>
+ <version>1.3.2</version>
+ </dependency>
+ </dependencies>
+
<repositories>
<repository>
<id>onap-public</id>
@@ -421,35 +444,35 @@
<execution>
<id>enforce-maven</id>
<goals>
- <goal>enforce</goal>
+ <goal>enforce</goal>
</goals>
<configuration>
- <rules>
- <requireJavaVersion>
- <version>8</version>
- </requireJavaVersion>
- <requireMavenVersion>
- <version>[3.5.0,)</version>
- </requireMavenVersion>
- </rules>
+ <rules>
+ <requireJavaVersion>
+ <version>8</version>
+ </requireJavaVersion>
+ <requireMavenVersion>
+ <version>[3.5.0,)</version>
+ </requireMavenVersion>
+ </rules>
</configuration>
</execution>
<execution>
<id>enforce-banned-dependencies</id>
<goals>
- <goal>enforce</goal>
+ <goal>enforce</goal>
</goals>
<configuration>
- <rules>
- <bannedDependencies>
- <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> -->
- </excludes>
- </bannedDependencies>
- </rules>
- <fail>true</fail>
+ <rules>
+ <bannedDependencies>
+ <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> -->
+ </excludes>
+ </bannedDependencies>
+ </rules>
+ <fail>true</fail>
</configuration>
</execution>
</executions>
@@ -461,12 +484,11 @@
<version>${sonar.scanner.version}</version>
</plugin>
<!-- end of plugins from ONAP version (parent of oparent) -->
-
<!-- Plugins from ONAP oparent -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.22.0</version>
+ <version>${maven-surefire-plugin.version}</version>
<configuration>
<!-- Sets the VM argument line used when unit tests are run. -->
<argLine>${surefireArgLine}</argLine>
@@ -479,7 +501,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
- <version>2.22.0</version>
+ <version>${maven-failsafe-plugin.version}</version>
<executions>
<!-- Ensures that both integration-test and verify goals of the Failsafe
Maven plugin are executed. -->
@@ -572,6 +594,143 @@
<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>
+ <version>3.1.12.2</version>
+ <executions>
+ <execution>
+ <id>analyze-compile</id>
+ <phase>compile</phase>
+ <goals>
+ <goal>check</goal>
+ </goals>
+ <configuration>
+ <plugins>
+ <plugin>
+ <groupId>jp.skypencil.findbugs.slf4j</groupId>
+ <artifactId>bug-pattern</artifactId>
+ <version>1.5.0</version>
+ </plugin>
+ </plugins>
+ <effort>Max</effort>
+ <threshold>Low</threshold>
+ <failOnError>false</failOnError>
+ <skip>true</skip>
+ <excludeFilterFile>spotbugs-exclude.xml</excludeFilterFile>
+ <xmlOutput>true</xmlOutput>
+ <findbugsXmlOutputDirectory>/home/jack/onap/onap-sdnr/features/sdnr/wt-aluminium-sr0-2/target/wt/common/target-ide/spotbugs</findbugsXmlOutputDirectory>
+ </configuration>
+ </execution>
+ </executions>
+ <dependencies>
+ <dependency>
+ <groupId>com.github.spotbugs</groupId>
+ <artifactId>spotbugs</artifactId>
+ <version>3.1.12</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.opendaylight.odlparent</groupId>
+ <artifactId>spotbugs</artifactId>
+ <version>7.0.5</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ <version>1.8.0-beta2</version>
+ <scope>compile</scope>
+ </dependency>
+ </dependencies>
+ <configuration>
+ <plugins>
+ <plugin>
+ <groupId>jp.skypencil.findbugs.slf4j</groupId>
+ <artifactId>bug-pattern</artifactId>
+ <version>1.5.0</version>
+ </plugin>
+ </plugins>
+ <effort>Max</effort>
+ <threshold>Low</threshold>
+ <failOnError>false</failOnError>
+ <skip>true</skip>
+ <excludeFilterFile>spotbugs-exclude.xml</excludeFilterFile>
+ <xmlOutput>true</xmlOutput>
+ <findbugsXmlOutputDirectory>/home/jack/onap/onap-sdnr/features/sdnr/wt-aluminium-sr0-2/target/wt/common/target-ide/spotbugs</findbugsXmlOutputDirectory>
+ </configuration>
+ </plugin>
+ <plugin>
+ <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>
+ <id>check-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>
</plugins>
</pluginManagement>
<plugins>
@@ -584,13 +743,24 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
+ <!--
+ <configuration>
+ <reportPlugins>
+ <reportPlugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ <version>${checkstyle.plugin.version}</version>
+ </reportPlugin>
+ </reportPlugins>
+ </configuration>
+ -->
</plugin>
<!-- end of plugins from oparent version (parent of oparent) -->
<!-- Plugins from oparent -->
<plugin>
<artifactId>maven-checkstyle-plugin</artifactId>
- <version>2.17</version>
+ <version>${checkstyle.plugin.version}</version>
<dependencies>
<dependency>
<groupId>org.onap.oparent</groupId>
@@ -610,7 +780,9 @@
<includeResources>false</includeResources>
<includeTestSourceDirectory>true</includeTestSourceDirectory>
<includeTestResources>false</includeTestResources>
- <sourceDirectory>${project.build.sourceDirectory}</sourceDirectory>
+ <sourceDirectories>
+ <directory>${project.build.sourceDirectory}</directory>
+ </sourceDirectories>
<excludes>
</excludes>
<consoleOutput>true</consoleOutput>
@@ -628,7 +800,9 @@
with minor changes -->
<configLocation>onap-checkstyle/onap-java-style.xml</configLocation>
<!-- <sourceDirectory> is needed so that checkstyle ignores the generated sources directory -->
- <sourceDirectory>${project.build.sourceDirectory}/src/main/java</sourceDirectory>
+ <sourceDirectories>
+ <directory>${project.build.sourceDirectory}/src/main/java</directory>
+ </sourceDirectories>
<includeResources>true</includeResources>
<includeTestSourceDirectory>true</includeTestSourceDirectory>
<includeTestResources>true</includeTestResources>
@@ -777,7 +951,8 @@
<requireProperty>
<property>onap.nexus.url</property>
<message>You must set a onap.nexus.url property in your
- ~/.m2/settings.xml. See oparent/settings.xml for an example.</message>
+ ~/.m2/settings.xml. See oparent/settings.xml for an example.
+ </message>
</requireProperty>
</rules>
<fail>true</fail>
@@ -984,16 +1159,16 @@
<then>
<property name="swagger.sdk.script.file" value="generated-source-script.bat"/>
<echo file="${project.build.directory}${file.separator}generated-source-script.bat" append="true"
- message="cd ${project.build.directory}${file.separator}generated-sources${line.separator}"/>
+ message="cd ${project.build.directory}${file.separator}generated-sources${line.separator}"/>
<echo file="${project.build.directory}${file.separator}generated-source-script.bat" append="true"
- message="mvn clean install -Dmaven.test.skip=true${line.separator}"/>
+ message="mvn clean install -Dmaven.test.skip=true${line.separator}"/>
</then>
<else>
<property name="swagger.sdk.script.file" value="generated-source-script.sh"/>
<echo file="${project.build.directory}${file.separator}generated-source-script.sh" append="true"
- message="cd ${project.build.directory}${file.separator}generated-sources${line.separator}"/>
+ message="cd ${project.build.directory}${file.separator}generated-sources${line.separator}"/>
<echo file="${project.build.directory}${file.separator}generated-source-script.sh" append="true"
- message="mvn clean install -Dmaven.test.skip=true${line.separator}"/>
+ message="mvn clean install -Dmaven.test.skip=true${line.separator}"/>
<chmod file="${project.build.directory}${file.separator}generated-source-script.sh" perm="755"/>
</else>
</if>
@@ -1143,7 +1318,7 @@
<plugin>
<groupId>org.opendaylight.yangtools</groupId>
<artifactId>yang-maven-plugin</artifactId>
- <version>3.0.11</version>
+ <version>5.0.5</version>
<dependencies>
<dependency>
<groupId>org.opendaylight.mdsal</groupId>
@@ -1172,10 +1347,12 @@
<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>
diff --git a/odlparent/odlparent/pom.xml b/odlparent/odlparent/pom.xml
index 16550600..1ace0d39 100644
--- a/odlparent/odlparent/pom.xml
+++ b/odlparent/odlparent/pom.xml
@@ -8,7 +8,7 @@
<parent>
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>odlparent</artifactId>
- <version>5.0.11</version>
+ <version>7.0.7</version>
<relativePath/>
</parent>
@@ -53,8 +53,6 @@
<jacoco.version>0.8.5</jacoco.version>
<!-- properties from oparent -->
- <maven.compiler.source>8</maven.compiler.source>
- <maven.compiler.target>8</maven.compiler.target>
<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>
@@ -83,14 +81,17 @@
<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.source>8</java.version.source>
- <java.version.target>8</java.version.target>
- <bundle.plugin.version>2.5.0</bundle.plugin.version>
- <maven.compile.plugin.version>2.5.1</maven.compile.plugin.version>
+ <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>
<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.skip>true</checkstyle.skip>
+ <odlparent.spotbugs.enforce>false</odlparent.spotbugs.enforce>
<!-- logging-analytics versions -->
<logging-analytics.version>1.6.6</logging-analytics.version>
@@ -110,40 +111,40 @@
<sdnctl.slipluginutils.version>${ccsdk.sli.version}</sdnctl.slipluginutils.version>
<!-- Support libraries used by OpenDaylight -->
- <odl.controller.mdsal.version>1.10.3</odl.controller.mdsal.version>
- <odl.mdsal.version>4.0.14</odl.mdsal.version>
- <odl.mdsal.model.version>2.0.14</odl.mdsal.model.version>
- <odl.netconf.restconf.version>1.10.3</odl.netconf.restconf.version>
- <odl.netconf.netconf.version>1.7.3</odl.netconf.netconf.version>
- <odl.netconf.sal.rest.docgen.version>1.10.3</odl.netconf.sal.rest.docgen.version>
+ <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>
<!-- Used by aaa, vtn -->
- <commons.codec.version>1.13</commons.codec.version>
+ <commons.codec.version>1.15</commons.codec.version>
<!-- Used by netconf, ovsdb -->
<commons.lang3.version>3.8.1</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.6</commons.net.version>
+ <commons.net.version>3.7</commons.net.version>
<!-- Used by neutron -->
- <eclipse.persistence.version>2.7.4</eclipse.persistence.version>
+ <eclipse.persistence.version>2.7.7</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>25.1-jre</guava.version>
+ <guava.version>28.2-jre</guava.version>
<!-- Used by aaa, alto, netconf, ovsdb, sfc; see also affinity, defense4all,
integration/distribution, snmp4sdn, toolkit, ttp -->
- <jackson.version>2.9.10</jackson.version>
+ <jackson.version>2.10.4</jackson.version>
<!-- Used by snmp4sdn, yangtools -->
- <javassist.version>3.24.1-GA</javassist.version>
+ <javassist.version>3.27.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 -->
- <jersey.version>2.25.1</jersey.version>
+ <jersey.version>2.27</jersey.version>
<!-- Used by sfc -->
- <jersey.client.version>2.25.1</jersey.client.version>
+ <jersey.client.version>2.27</jersey.client.version>
<!-- New packages for jersey migration 1.17 to 2.8 -->
<!-- appache.geronimo.bundle for DocGen -->
@@ -151,21 +152,21 @@
<org.json.version>20131018</org.json.version>
<!-- Used everywhere -->
- <junit.version>4.12</junit.version>
+ <junit.version>4.13</junit.version>
<!-- Used by coretutorials, sfc, snmp4sdn, sxp; see also affinity, toolkit -->
- <logback.version>1.2.3</logback.version>
+ <logback.version>1.11.6</logback.version>
<!-- Used by nic, sfc, sxp, tsdr -->
- <mockito.version>1.10.19</mockito.version>
+ <mockito.version>3.3.3</mockito.version>
<!-- Used by bgpcep, netconf, ovsdb, sxp; see also opendove, toolkit -->
- <netty.version>4.1.42.Final</netty.version>
+ <netty.version>4.1.51.Final</netty.version>
<!-- Used by openflowjava, persistence, sfc, snmp4sdn, sxp; see also affinity, toolkit -->
- <slf4j.version>1.7.25</slf4j.version>
+ <slf4j.version>1.7.29</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.7.2</antlr.version>
+ <antlr.version>4.8.1</antlr.version>
<eelf.maven.plugin.version>1.0.0</eelf.maven.plugin.version>
@@ -179,7 +180,7 @@
<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.12.v20180830</jetty.version>
+ <jetty.version>9.4.28.v20200408</jetty.version>
<skip.karaf.featureTest>true</skip.karaf.featureTest>
<dependency-list.file>direct-dependencies.txt</dependency-list.file>
</properties>
@@ -197,6 +198,20 @@
<scope>import</scope>
</dependency>
<dependency>
+ <groupId>org.onap.ccsdk.parent</groupId>
+ <artifactId>dependencies-bom</artifactId>
+ <version>2.1.1-SNAPSHOT</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-dependencies</artifactId>
+ <version>2.3.8.RELEASE</version>
+ <scope>import</scope>
+ <type>pom</type>
+ </dependency>
+ <dependency>
<groupId>org.onap.logging-analytics</groupId>
<artifactId>logging-slf4j</artifactId>
<version>${logging-analytics.version}</version>
@@ -215,6 +230,14 @@
</dependencies>
</dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>javax.annotation</groupId>
+ <artifactId>javax.annotation-api</artifactId>
+ <version>1.3.2</version>
+ </dependency>
+ </dependencies>
+
<repositories>
<repository>
<id>onap-public</id>
@@ -421,35 +444,35 @@
<execution>
<id>enforce-maven</id>
<goals>
- <goal>enforce</goal>
+ <goal>enforce</goal>
</goals>
<configuration>
- <rules>
- <requireJavaVersion>
- <version>8</version>
- </requireJavaVersion>
- <requireMavenVersion>
- <version>[3.5.0,)</version>
- </requireMavenVersion>
- </rules>
+ <rules>
+ <requireJavaVersion>
+ <version>8</version>
+ </requireJavaVersion>
+ <requireMavenVersion>
+ <version>[3.5.0,)</version>
+ </requireMavenVersion>
+ </rules>
</configuration>
</execution>
<execution>
<id>enforce-banned-dependencies</id>
<goals>
- <goal>enforce</goal>
+ <goal>enforce</goal>
</goals>
<configuration>
- <rules>
- <bannedDependencies>
- <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> -->
- </excludes>
- </bannedDependencies>
- </rules>
- <fail>true</fail>
+ <rules>
+ <bannedDependencies>
+ <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> -->
+ </excludes>
+ </bannedDependencies>
+ </rules>
+ <fail>true</fail>
</configuration>
</execution>
</executions>
@@ -461,12 +484,11 @@
<version>${sonar.scanner.version}</version>
</plugin>
<!-- end of plugins from ONAP version (parent of oparent) -->
-
<!-- Plugins from ONAP oparent -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.22.0</version>
+ <version>${maven-surefire-plugin.version}</version>
<configuration>
<!-- Sets the VM argument line used when unit tests are run. -->
<argLine>${surefireArgLine}</argLine>
@@ -479,7 +501,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
- <version>2.22.0</version>
+ <version>${maven-failsafe-plugin.version}</version>
<executions>
<!-- Ensures that both integration-test and verify goals of the Failsafe
Maven plugin are executed. -->
@@ -572,6 +594,143 @@
<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>
+ <version>3.1.12.2</version>
+ <executions>
+ <execution>
+ <id>analyze-compile</id>
+ <phase>compile</phase>
+ <goals>
+ <goal>check</goal>
+ </goals>
+ <configuration>
+ <plugins>
+ <plugin>
+ <groupId>jp.skypencil.findbugs.slf4j</groupId>
+ <artifactId>bug-pattern</artifactId>
+ <version>1.5.0</version>
+ </plugin>
+ </plugins>
+ <effort>Max</effort>
+ <threshold>Low</threshold>
+ <failOnError>false</failOnError>
+ <skip>true</skip>
+ <excludeFilterFile>spotbugs-exclude.xml</excludeFilterFile>
+ <xmlOutput>true</xmlOutput>
+ <findbugsXmlOutputDirectory>/home/jack/onap/onap-sdnr/features/sdnr/wt-aluminium-sr0-2/target/wt/common/target-ide/spotbugs</findbugsXmlOutputDirectory>
+ </configuration>
+ </execution>
+ </executions>
+ <dependencies>
+ <dependency>
+ <groupId>com.github.spotbugs</groupId>
+ <artifactId>spotbugs</artifactId>
+ <version>3.1.12</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.opendaylight.odlparent</groupId>
+ <artifactId>spotbugs</artifactId>
+ <version>7.0.5</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ <version>1.8.0-beta2</version>
+ <scope>compile</scope>
+ </dependency>
+ </dependencies>
+ <configuration>
+ <plugins>
+ <plugin>
+ <groupId>jp.skypencil.findbugs.slf4j</groupId>
+ <artifactId>bug-pattern</artifactId>
+ <version>1.5.0</version>
+ </plugin>
+ </plugins>
+ <effort>Max</effort>
+ <threshold>Low</threshold>
+ <failOnError>false</failOnError>
+ <skip>true</skip>
+ <excludeFilterFile>spotbugs-exclude.xml</excludeFilterFile>
+ <xmlOutput>true</xmlOutput>
+ <findbugsXmlOutputDirectory>/home/jack/onap/onap-sdnr/features/sdnr/wt-aluminium-sr0-2/target/wt/common/target-ide/spotbugs</findbugsXmlOutputDirectory>
+ </configuration>
+ </plugin>
+ <plugin>
+ <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>
+ <id>check-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>
</plugins>
</pluginManagement>
<plugins>
@@ -584,13 +743,24 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
+ <!--
+ <configuration>
+ <reportPlugins>
+ <reportPlugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ <version>${checkstyle.plugin.version}</version>
+ </reportPlugin>
+ </reportPlugins>
+ </configuration>
+ -->
</plugin>
<!-- end of plugins from oparent version (parent of oparent) -->
<!-- Plugins from oparent -->
<plugin>
<artifactId>maven-checkstyle-plugin</artifactId>
- <version>2.17</version>
+ <version>${checkstyle.plugin.version}</version>
<dependencies>
<dependency>
<groupId>org.onap.oparent</groupId>
@@ -610,7 +780,9 @@
<includeResources>false</includeResources>
<includeTestSourceDirectory>true</includeTestSourceDirectory>
<includeTestResources>false</includeTestResources>
- <sourceDirectory>${project.build.sourceDirectory}</sourceDirectory>
+ <sourceDirectories>
+ <directory>${project.build.sourceDirectory}</directory>
+ </sourceDirectories>
<excludes>
</excludes>
<consoleOutput>true</consoleOutput>
@@ -628,7 +800,9 @@
with minor changes -->
<configLocation>onap-checkstyle/onap-java-style.xml</configLocation>
<!-- <sourceDirectory> is needed so that checkstyle ignores the generated sources directory -->
- <sourceDirectory>${project.build.sourceDirectory}/src/main/java</sourceDirectory>
+ <sourceDirectories>
+ <directory>${project.build.sourceDirectory}/src/main/java</directory>
+ </sourceDirectories>
<includeResources>true</includeResources>
<includeTestSourceDirectory>true</includeTestSourceDirectory>
<includeTestResources>true</includeTestResources>
@@ -777,7 +951,8 @@
<requireProperty>
<property>onap.nexus.url</property>
<message>You must set a onap.nexus.url property in your
- ~/.m2/settings.xml. See oparent/settings.xml for an example.</message>
+ ~/.m2/settings.xml. See oparent/settings.xml for an example.
+ </message>
</requireProperty>
</rules>
<fail>true</fail>
@@ -984,16 +1159,16 @@
<then>
<property name="swagger.sdk.script.file" value="generated-source-script.bat"/>
<echo file="${project.build.directory}${file.separator}generated-source-script.bat" append="true"
- message="cd ${project.build.directory}${file.separator}generated-sources${line.separator}"/>
+ message="cd ${project.build.directory}${file.separator}generated-sources${line.separator}"/>
<echo file="${project.build.directory}${file.separator}generated-source-script.bat" append="true"
- message="mvn clean install -Dmaven.test.skip=true${line.separator}"/>
+ message="mvn clean install -Dmaven.test.skip=true${line.separator}"/>
</then>
<else>
<property name="swagger.sdk.script.file" value="generated-source-script.sh"/>
<echo file="${project.build.directory}${file.separator}generated-source-script.sh" append="true"
- message="cd ${project.build.directory}${file.separator}generated-sources${line.separator}"/>
+ message="cd ${project.build.directory}${file.separator}generated-sources${line.separator}"/>
<echo file="${project.build.directory}${file.separator}generated-source-script.sh" append="true"
- message="mvn clean install -Dmaven.test.skip=true${line.separator}"/>
+ message="mvn clean install -Dmaven.test.skip=true${line.separator}"/>
<chmod file="${project.build.directory}${file.separator}generated-source-script.sh" perm="755"/>
</else>
</if>
@@ -1143,7 +1318,7 @@
<plugin>
<groupId>org.opendaylight.yangtools</groupId>
<artifactId>yang-maven-plugin</artifactId>
- <version>3.0.11</version>
+ <version>5.0.5</version>
<dependencies>
<dependency>
<groupId>org.opendaylight.mdsal</groupId>
@@ -1172,10 +1347,12 @@
<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>
diff --git a/odlparent/setup/pom.xml b/odlparent/setup/pom.xml
index 67111a8b..6b5cdfaa 100755
--- a/odlparent/setup/pom.xml
+++ b/odlparent/setup/pom.xml
@@ -92,7 +92,7 @@
<filters>
<filter>${basedir}/src/main/properties/feature-repo-parent.properties</filter>
</filters>
- <encoding>UTF-8</encoding>
+ <encoding>UTF-8</encoding>
</configuration>
</execution>
<execution>
diff --git a/odlparent/setup/src/main/properties/binding-parent.properties b/odlparent/setup/src/main/properties/binding-parent.properties
index bf6cce1c..dd00c086 100644
--- a/odlparent/setup/src/main/properties/binding-parent.properties
+++ b/odlparent/setup/src/main/properties/binding-parent.properties
@@ -1,3 +1,3 @@
odlparent.artifactId=binding-parent
odlparent.groupId=org.opendaylight.mdsal
-odlparent.version=4.0.17
+odlparent.version=6.0.7
diff --git a/odlparent/setup/src/main/properties/bundle-parent.properties b/odlparent/setup/src/main/properties/bundle-parent.properties
index 43025bb0..bbe4524f 100644
--- a/odlparent/setup/src/main/properties/bundle-parent.properties
+++ b/odlparent/setup/src/main/properties/bundle-parent.properties
@@ -1,3 +1,3 @@
odlparent.artifactId=bundle-parent
odlparent.groupId=org.opendaylight.odlparent
-odlparent.version=5.0.11
+odlparent.version=7.0.7
diff --git a/odlparent/setup/src/main/properties/feature-repo-parent.properties b/odlparent/setup/src/main/properties/feature-repo-parent.properties
index 955bdc8f..97e5a281 100644
--- a/odlparent/setup/src/main/properties/feature-repo-parent.properties
+++ b/odlparent/setup/src/main/properties/feature-repo-parent.properties
@@ -1,3 +1,3 @@
odlparent.artifactId=feature-repo-parent
odlparent.groupId=org.opendaylight.odlparent
-odlparent.version=5.0.11
+odlparent.version=7.0.7
diff --git a/odlparent/setup/src/main/properties/karaf4-parent.properties b/odlparent/setup/src/main/properties/karaf4-parent.properties
index d5b0fe71..0f8077d7 100644
--- a/odlparent/setup/src/main/properties/karaf4-parent.properties
+++ b/odlparent/setup/src/main/properties/karaf4-parent.properties
@@ -1,3 +1,3 @@
odlparent.artifactId=karaf4-parent
odlparent.groupId=org.opendaylight.odlparent
-odlparent.version=5.0.11
+odlparent.version=7.0.7
diff --git a/odlparent/setup/src/main/properties/mdsal-it-parent.properties b/odlparent/setup/src/main/properties/mdsal-it-parent.properties
index 75ebf4e0..b3f808a5 100644
--- a/odlparent/setup/src/main/properties/mdsal-it-parent.properties
+++ b/odlparent/setup/src/main/properties/mdsal-it-parent.properties
@@ -1,3 +1,3 @@
odlparent.artifactId=mdsal-it-parent
odlparent.groupId=org.opendaylight.controller
-odlparent.version=1.10.4
+odlparent.version=2.0.6
diff --git a/odlparent/setup/src/main/properties/odlparent-lite.properties b/odlparent/setup/src/main/properties/odlparent-lite.properties
index f2eda6d4..befd86c4 100644
--- a/odlparent/setup/src/main/properties/odlparent-lite.properties
+++ b/odlparent/setup/src/main/properties/odlparent-lite.properties
@@ -1,3 +1,3 @@
odlparent.artifactId=odlparent-lite
odlparent.groupId=org.opendaylight.odlparent
-odlparent.version=5.0.11
+odlparent.version=7.0.7
diff --git a/odlparent/setup/src/main/properties/odlparent.properties b/odlparent/setup/src/main/properties/odlparent.properties
index 462906bc..ca218faa 100644
--- a/odlparent/setup/src/main/properties/odlparent.properties
+++ b/odlparent/setup/src/main/properties/odlparent.properties
@@ -1,3 +1,3 @@
odlparent.artifactId=odlparent
odlparent.groupId=org.opendaylight.odlparent
-odlparent.version=5.0.11
+odlparent.version=7.0.7
diff --git a/odlparent/setup/src/main/properties/single-feature-parent.properties b/odlparent/setup/src/main/properties/single-feature-parent.properties
index a43593f8..362cd2b1 100644
--- a/odlparent/setup/src/main/properties/single-feature-parent.properties
+++ b/odlparent/setup/src/main/properties/single-feature-parent.properties
@@ -1,3 +1,3 @@
odlparent.artifactId=single-feature-parent
odlparent.groupId=org.opendaylight.odlparent
-odlparent.version=5.0.11
+odlparent.version=7.0.7
diff --git a/odlparent/setup/src/main/resources/pom-template.xml b/odlparent/setup/src/main/resources/pom-template.xml
index c37ba4a8..60e5fce7 100755
--- a/odlparent/setup/src/main/resources/pom-template.xml
+++ b/odlparent/setup/src/main/resources/pom-template.xml
@@ -53,8 +53,6 @@
<jacoco.version>0.8.5</jacoco.version>
<!-- properties from oparent -->
- <maven.compiler.source>8</maven.compiler.source>
- <maven.compiler.target>8</maven.compiler.target>
<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>
@@ -83,14 +81,17 @@
<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.source>8</java.version.source>
- <java.version.target>8</java.version.target>
- <bundle.plugin.version>2.5.0</bundle.plugin.version>
- <maven.compile.plugin.version>2.5.1</maven.compile.plugin.version>
+ <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>
<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.skip>true</checkstyle.skip>
+ <odlparent.spotbugs.enforce>false</odlparent.spotbugs.enforce>
<!-- logging-analytics versions -->
<logging-analytics.version>1.6.6</logging-analytics.version>
@@ -110,40 +111,40 @@
<sdnctl.slipluginutils.version>\${ccsdk.sli.version}</sdnctl.slipluginutils.version>
<!-- Support libraries used by OpenDaylight -->
- <odl.controller.mdsal.version>1.10.3</odl.controller.mdsal.version>
- <odl.mdsal.version>4.0.14</odl.mdsal.version>
- <odl.mdsal.model.version>2.0.14</odl.mdsal.model.version>
- <odl.netconf.restconf.version>1.10.3</odl.netconf.restconf.version>
- <odl.netconf.netconf.version>1.7.3</odl.netconf.netconf.version>
- <odl.netconf.sal.rest.docgen.version>1.10.3</odl.netconf.sal.rest.docgen.version>
+ <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>
<!-- Used by aaa, vtn -->
- <commons.codec.version>1.13</commons.codec.version>
+ <commons.codec.version>1.15</commons.codec.version>
<!-- Used by netconf, ovsdb -->
<commons.lang3.version>3.8.1</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.6</commons.net.version>
+ <commons.net.version>3.7</commons.net.version>
<!-- Used by neutron -->
- <eclipse.persistence.version>2.7.4</eclipse.persistence.version>
+ <eclipse.persistence.version>2.7.7</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>25.1-jre</guava.version>
+ <guava.version>28.2-jre</guava.version>
<!-- Used by aaa, alto, netconf, ovsdb, sfc; see also affinity, defense4all,
integration/distribution, snmp4sdn, toolkit, ttp -->
- <jackson.version>2.9.10</jackson.version>
+ <jackson.version>2.10.4</jackson.version>
<!-- Used by snmp4sdn, yangtools -->
- <javassist.version>3.24.1-GA</javassist.version>
+ <javassist.version>3.27.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 -->
- <jersey.version>2.25.1</jersey.version>
+ <jersey.version>2.27</jersey.version>
<!-- Used by sfc -->
- <jersey.client.version>2.25.1</jersey.client.version>
+ <jersey.client.version>2.27</jersey.client.version>
<!-- New packages for jersey migration 1.17 to 2.8 -->
<!-- appache.geronimo.bundle for DocGen -->
@@ -151,21 +152,21 @@
<org.json.version>20131018</org.json.version>
<!-- Used everywhere -->
- <junit.version>4.12</junit.version>
+ <junit.version>4.13</junit.version>
<!-- Used by coretutorials, sfc, snmp4sdn, sxp; see also affinity, toolkit -->
- <logback.version>1.2.3</logback.version>
+ <logback.version>1.11.6</logback.version>
<!-- Used by nic, sfc, sxp, tsdr -->
- <mockito.version>1.10.19</mockito.version>
+ <mockito.version>3.3.3</mockito.version>
<!-- Used by bgpcep, netconf, ovsdb, sxp; see also opendove, toolkit -->
- <netty.version>4.1.42.Final</netty.version>
+ <netty.version>4.1.51.Final</netty.version>
<!-- Used by openflowjava, persistence, sfc, snmp4sdn, sxp; see also affinity, toolkit -->
- <slf4j.version>1.7.25</slf4j.version>
+ <slf4j.version>1.7.29</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.7.2</antlr.version>
+ <antlr.version>4.8.1</antlr.version>
<eelf.maven.plugin.version>1.0.0</eelf.maven.plugin.version>
@@ -179,7 +180,7 @@
<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.12.v20180830</jetty.version>
+ <jetty.version>9.4.28.v20200408</jetty.version>
<skip.karaf.featureTest>true</skip.karaf.featureTest>
<dependency-list.file>direct-dependencies.txt</dependency-list.file>
</properties>
@@ -190,13 +191,27 @@
parent pom, inherited value takes precedence. This seems more like
a bug than a feature, but this is how maven 3.6 works -->
<dependency>
- <groupId>org.onap.ccsdk.parent</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>dependencies-odl-bom</artifactId>
<version>${project.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>dependencies-bom</artifactId>
+ <version>${project.version}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-dependencies</artifactId>
+ <version>2.3.8.RELEASE</version>
+ <scope>import</scope>
+ <type>pom</type>
+ </dependency>
+ <dependency>
<groupId>org.onap.logging-analytics</groupId>
<artifactId>logging-slf4j</artifactId>
<version>\${logging-analytics.version}</version>
@@ -215,6 +230,14 @@
</dependencies>
</dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>javax.annotation</groupId>
+ <artifactId>javax.annotation-api</artifactId>
+ <version>1.3.2</version>
+ </dependency>
+ </dependencies>
+
<repositories>
<repository>
<id>onap-public</id>
@@ -421,35 +444,35 @@
<execution>
<id>enforce-maven</id>
<goals>
- <goal>enforce</goal>
+ <goal>enforce</goal>
</goals>
<configuration>
- <rules>
- <requireJavaVersion>
- <version>8</version>
- </requireJavaVersion>
- <requireMavenVersion>
- <version>[3.5.0,)</version>
- </requireMavenVersion>
- </rules>
+ <rules>
+ <requireJavaVersion>
+ <version>8</version>
+ </requireJavaVersion>
+ <requireMavenVersion>
+ <version>[3.5.0,)</version>
+ </requireMavenVersion>
+ </rules>
</configuration>
</execution>
<execution>
<id>enforce-banned-dependencies</id>
<goals>
- <goal>enforce</goal>
+ <goal>enforce</goal>
</goals>
<configuration>
- <rules>
- <bannedDependencies>
- <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> -->
- </excludes>
- </bannedDependencies>
- </rules>
- <fail>true</fail>
+ <rules>
+ <bannedDependencies>
+ <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> -->
+ </excludes>
+ </bannedDependencies>
+ </rules>
+ <fail>true</fail>
</configuration>
</execution>
</executions>
@@ -461,12 +484,11 @@
<version>${sonar.scanner.version}</version>
</plugin>
<!-- end of plugins from ONAP version (parent of oparent) -->
-
<!-- Plugins from ONAP oparent -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.22.0</version>
+ <version>${maven-surefire-plugin.version}</version>
<configuration>
<!-- Sets the VM argument line used when unit tests are run. -->
<argLine>\${surefireArgLine}</argLine>
@@ -479,7 +501,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
- <version>2.22.0</version>
+ <version>${maven-failsafe-plugin.version}</version>
<executions>
<!-- Ensures that both integration-test and verify goals of the Failsafe
Maven plugin are executed. -->
@@ -572,6 +594,143 @@
<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>
+ <version>3.1.12.2</version>
+ <executions>
+ <execution>
+ <id>analyze-compile</id>
+ <phase>compile</phase>
+ <goals>
+ <goal>check</goal>
+ </goals>
+ <configuration>
+ <plugins>
+ <plugin>
+ <groupId>jp.skypencil.findbugs.slf4j</groupId>
+ <artifactId>bug-pattern</artifactId>
+ <version>1.5.0</version>
+ </plugin>
+ </plugins>
+ <effort>Max</effort>
+ <threshold>Low</threshold>
+ <failOnError>false</failOnError>
+ <skip>true</skip>
+ <excludeFilterFile>spotbugs-exclude.xml</excludeFilterFile>
+ <xmlOutput>true</xmlOutput>
+ <findbugsXmlOutputDirectory>/home/jack/onap/onap-sdnr/features/sdnr/wt-aluminium-sr0-2/target/wt/common/target-ide/spotbugs</findbugsXmlOutputDirectory>
+ </configuration>
+ </execution>
+ </executions>
+ <dependencies>
+ <dependency>
+ <groupId>com.github.spotbugs</groupId>
+ <artifactId>spotbugs</artifactId>
+ <version>3.1.12</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.opendaylight.odlparent</groupId>
+ <artifactId>spotbugs</artifactId>
+ <version>7.0.5</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ <version>1.8.0-beta2</version>
+ <scope>compile</scope>
+ </dependency>
+ </dependencies>
+ <configuration>
+ <plugins>
+ <plugin>
+ <groupId>jp.skypencil.findbugs.slf4j</groupId>
+ <artifactId>bug-pattern</artifactId>
+ <version>1.5.0</version>
+ </plugin>
+ </plugins>
+ <effort>Max</effort>
+ <threshold>Low</threshold>
+ <failOnError>false</failOnError>
+ <skip>true</skip>
+ <excludeFilterFile>spotbugs-exclude.xml</excludeFilterFile>
+ <xmlOutput>true</xmlOutput>
+ <findbugsXmlOutputDirectory>/home/jack/onap/onap-sdnr/features/sdnr/wt-aluminium-sr0-2/target/wt/common/target-ide/spotbugs</findbugsXmlOutputDirectory>
+ </configuration>
+ </plugin>
+ <plugin>
+ <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>
+ <id>check-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>
</plugins>
</pluginManagement>
<plugins>
@@ -584,13 +743,24 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
+ <!--
+ <configuration>
+ <reportPlugins>
+ <reportPlugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ <version>${checkstyle.plugin.version}</version>
+ </reportPlugin>
+ </reportPlugins>
+ </configuration>
+ -->
</plugin>
<!-- end of plugins from oparent version (parent of oparent) -->
<!-- Plugins from oparent -->
<plugin>
<artifactId>maven-checkstyle-plugin</artifactId>
- <version>2.17</version>
+ <version>${checkstyle.plugin.version}</version>
<dependencies>
<dependency>
<groupId>org.onap.oparent</groupId>
@@ -610,7 +780,9 @@
<includeResources>false</includeResources>
<includeTestSourceDirectory>true</includeTestSourceDirectory>
<includeTestResources>false</includeTestResources>
- <sourceDirectory>\${project.build.sourceDirectory}</sourceDirectory>
+ <sourceDirectories>
+ <directory>\${project.build.sourceDirectory}</directory>
+ </sourceDirectories>
<excludes>
</excludes>
<consoleOutput>true</consoleOutput>
@@ -628,7 +800,9 @@
with minor changes -->
<configLocation>onap-checkstyle/onap-java-style.xml</configLocation>
<!-- <sourceDirectory> is needed so that checkstyle ignores the generated sources directory -->
- <sourceDirectory>\${project.build.sourceDirectory}/src/main/java</sourceDirectory>
+ <sourceDirectories>
+ <directory>\${project.build.sourceDirectory}/src/main/java</directory>
+ </sourceDirectories>
<includeResources>true</includeResources>
<includeTestSourceDirectory>true</includeTestSourceDirectory>
<includeTestResources>true</includeTestResources>
@@ -777,7 +951,8 @@
<requireProperty>
<property>onap.nexus.url</property>
<message>You must set a onap.nexus.url property in your
- ~/.m2/settings.xml. See oparent/settings.xml for an example.</message>
+ ~/.m2/settings.xml. See oparent/settings.xml for an example.
+ </message>
</requireProperty>
</rules>
<fail>true</fail>
@@ -984,16 +1159,16 @@
<then>
<property name="swagger.sdk.script.file" value="generated-source-script.bat"/>
<echo file="\${project.build.directory}\${file.separator}generated-source-script.bat" append="true"
- message="cd \${project.build.directory}\${file.separator}generated-sources\${line.separator}"/>
+ message="cd \${project.build.directory}\${file.separator}generated-sources\${line.separator}"/>
<echo file="\${project.build.directory}\${file.separator}generated-source-script.bat" append="true"
- message="mvn clean install -Dmaven.test.skip=true\${line.separator}"/>
+ message="mvn clean install -Dmaven.test.skip=true\${line.separator}"/>
</then>
<else>
<property name="swagger.sdk.script.file" value="generated-source-script.sh"/>
<echo file="\${project.build.directory}\${file.separator}generated-source-script.sh" append="true"
- message="cd \${project.build.directory}\${file.separator}generated-sources\${line.separator}"/>
+ message="cd \${project.build.directory}\${file.separator}generated-sources\${line.separator}"/>
<echo file="\${project.build.directory}\${file.separator}generated-source-script.sh" append="true"
- message="mvn clean install -Dmaven.test.skip=true\${line.separator}"/>
+ message="mvn clean install -Dmaven.test.skip=true\${line.separator}"/>
<chmod file="\${project.build.directory}\${file.separator}generated-source-script.sh" perm="755"/>
</else>
</if>
@@ -1143,7 +1318,7 @@
<plugin>
<groupId>org.opendaylight.yangtools</groupId>
<artifactId>yang-maven-plugin</artifactId>
- <version>3.0.11</version>
+ <version>5.0.5</version>
<dependencies>
<dependency>
<groupId>org.opendaylight.mdsal</groupId>
@@ -1172,10 +1347,12 @@
<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>
diff --git a/odlparent/single-feature-parent/pom.xml b/odlparent/single-feature-parent/pom.xml
index 4d1f66f6..c828e60e 100644
--- a/odlparent/single-feature-parent/pom.xml
+++ b/odlparent/single-feature-parent/pom.xml
@@ -8,7 +8,7 @@
<parent>
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>single-feature-parent</artifactId>
- <version>5.0.11</version>
+ <version>7.0.7</version>
<relativePath/>
</parent>
@@ -53,8 +53,6 @@
<jacoco.version>0.8.5</jacoco.version>
<!-- properties from oparent -->
- <maven.compiler.source>8</maven.compiler.source>
- <maven.compiler.target>8</maven.compiler.target>
<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>
@@ -83,14 +81,17 @@
<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.source>8</java.version.source>
- <java.version.target>8</java.version.target>
- <bundle.plugin.version>2.5.0</bundle.plugin.version>
- <maven.compile.plugin.version>2.5.1</maven.compile.plugin.version>
+ <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>
<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.skip>true</checkstyle.skip>
+ <odlparent.spotbugs.enforce>false</odlparent.spotbugs.enforce>
<!-- logging-analytics versions -->
<logging-analytics.version>1.6.6</logging-analytics.version>
@@ -110,40 +111,40 @@
<sdnctl.slipluginutils.version>${ccsdk.sli.version}</sdnctl.slipluginutils.version>
<!-- Support libraries used by OpenDaylight -->
- <odl.controller.mdsal.version>1.10.3</odl.controller.mdsal.version>
- <odl.mdsal.version>4.0.14</odl.mdsal.version>
- <odl.mdsal.model.version>2.0.14</odl.mdsal.model.version>
- <odl.netconf.restconf.version>1.10.3</odl.netconf.restconf.version>
- <odl.netconf.netconf.version>1.7.3</odl.netconf.netconf.version>
- <odl.netconf.sal.rest.docgen.version>1.10.3</odl.netconf.sal.rest.docgen.version>
+ <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>
<!-- Used by aaa, vtn -->
- <commons.codec.version>1.13</commons.codec.version>
+ <commons.codec.version>1.15</commons.codec.version>
<!-- Used by netconf, ovsdb -->
<commons.lang3.version>3.8.1</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.6</commons.net.version>
+ <commons.net.version>3.7</commons.net.version>
<!-- Used by neutron -->
- <eclipse.persistence.version>2.7.4</eclipse.persistence.version>
+ <eclipse.persistence.version>2.7.7</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>25.1-jre</guava.version>
+ <guava.version>28.2-jre</guava.version>
<!-- Used by aaa, alto, netconf, ovsdb, sfc; see also affinity, defense4all,
integration/distribution, snmp4sdn, toolkit, ttp -->
- <jackson.version>2.9.10</jackson.version>
+ <jackson.version>2.10.4</jackson.version>
<!-- Used by snmp4sdn, yangtools -->
- <javassist.version>3.24.1-GA</javassist.version>
+ <javassist.version>3.27.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 -->
- <jersey.version>2.25.1</jersey.version>
+ <jersey.version>2.27</jersey.version>
<!-- Used by sfc -->
- <jersey.client.version>2.25.1</jersey.client.version>
+ <jersey.client.version>2.27</jersey.client.version>
<!-- New packages for jersey migration 1.17 to 2.8 -->
<!-- appache.geronimo.bundle for DocGen -->
@@ -151,21 +152,21 @@
<org.json.version>20131018</org.json.version>
<!-- Used everywhere -->
- <junit.version>4.12</junit.version>
+ <junit.version>4.13</junit.version>
<!-- Used by coretutorials, sfc, snmp4sdn, sxp; see also affinity, toolkit -->
- <logback.version>1.2.3</logback.version>
+ <logback.version>1.11.6</logback.version>
<!-- Used by nic, sfc, sxp, tsdr -->
- <mockito.version>1.10.19</mockito.version>
+ <mockito.version>3.3.3</mockito.version>
<!-- Used by bgpcep, netconf, ovsdb, sxp; see also opendove, toolkit -->
- <netty.version>4.1.42.Final</netty.version>
+ <netty.version>4.1.51.Final</netty.version>
<!-- Used by openflowjava, persistence, sfc, snmp4sdn, sxp; see also affinity, toolkit -->
- <slf4j.version>1.7.25</slf4j.version>
+ <slf4j.version>1.7.29</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.7.2</antlr.version>
+ <antlr.version>4.8.1</antlr.version>
<eelf.maven.plugin.version>1.0.0</eelf.maven.plugin.version>
@@ -179,7 +180,7 @@
<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.12.v20180830</jetty.version>
+ <jetty.version>9.4.28.v20200408</jetty.version>
<skip.karaf.featureTest>true</skip.karaf.featureTest>
<dependency-list.file>direct-dependencies.txt</dependency-list.file>
</properties>
@@ -197,6 +198,20 @@
<scope>import</scope>
</dependency>
<dependency>
+ <groupId>org.onap.ccsdk.parent</groupId>
+ <artifactId>dependencies-bom</artifactId>
+ <version>2.1.1-SNAPSHOT</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-dependencies</artifactId>
+ <version>2.3.8.RELEASE</version>
+ <scope>import</scope>
+ <type>pom</type>
+ </dependency>
+ <dependency>
<groupId>org.onap.logging-analytics</groupId>
<artifactId>logging-slf4j</artifactId>
<version>${logging-analytics.version}</version>
@@ -215,6 +230,14 @@
</dependencies>
</dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>javax.annotation</groupId>
+ <artifactId>javax.annotation-api</artifactId>
+ <version>1.3.2</version>
+ </dependency>
+ </dependencies>
+
<repositories>
<repository>
<id>onap-public</id>
@@ -421,35 +444,35 @@
<execution>
<id>enforce-maven</id>
<goals>
- <goal>enforce</goal>
+ <goal>enforce</goal>
</goals>
<configuration>
- <rules>
- <requireJavaVersion>
- <version>8</version>
- </requireJavaVersion>
- <requireMavenVersion>
- <version>[3.5.0,)</version>
- </requireMavenVersion>
- </rules>
+ <rules>
+ <requireJavaVersion>
+ <version>8</version>
+ </requireJavaVersion>
+ <requireMavenVersion>
+ <version>[3.5.0,)</version>
+ </requireMavenVersion>
+ </rules>
</configuration>
</execution>
<execution>
<id>enforce-banned-dependencies</id>
<goals>
- <goal>enforce</goal>
+ <goal>enforce</goal>
</goals>
<configuration>
- <rules>
- <bannedDependencies>
- <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> -->
- </excludes>
- </bannedDependencies>
- </rules>
- <fail>true</fail>
+ <rules>
+ <bannedDependencies>
+ <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> -->
+ </excludes>
+ </bannedDependencies>
+ </rules>
+ <fail>true</fail>
</configuration>
</execution>
</executions>
@@ -461,12 +484,11 @@
<version>${sonar.scanner.version}</version>
</plugin>
<!-- end of plugins from ONAP version (parent of oparent) -->
-
<!-- Plugins from ONAP oparent -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.22.0</version>
+ <version>${maven-surefire-plugin.version}</version>
<configuration>
<!-- Sets the VM argument line used when unit tests are run. -->
<argLine>${surefireArgLine}</argLine>
@@ -479,7 +501,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
- <version>2.22.0</version>
+ <version>${maven-failsafe-plugin.version}</version>
<executions>
<!-- Ensures that both integration-test and verify goals of the Failsafe
Maven plugin are executed. -->
@@ -572,6 +594,143 @@
<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>
+ <version>3.1.12.2</version>
+ <executions>
+ <execution>
+ <id>analyze-compile</id>
+ <phase>compile</phase>
+ <goals>
+ <goal>check</goal>
+ </goals>
+ <configuration>
+ <plugins>
+ <plugin>
+ <groupId>jp.skypencil.findbugs.slf4j</groupId>
+ <artifactId>bug-pattern</artifactId>
+ <version>1.5.0</version>
+ </plugin>
+ </plugins>
+ <effort>Max</effort>
+ <threshold>Low</threshold>
+ <failOnError>false</failOnError>
+ <skip>true</skip>
+ <excludeFilterFile>spotbugs-exclude.xml</excludeFilterFile>
+ <xmlOutput>true</xmlOutput>
+ <findbugsXmlOutputDirectory>/home/jack/onap/onap-sdnr/features/sdnr/wt-aluminium-sr0-2/target/wt/common/target-ide/spotbugs</findbugsXmlOutputDirectory>
+ </configuration>
+ </execution>
+ </executions>
+ <dependencies>
+ <dependency>
+ <groupId>com.github.spotbugs</groupId>
+ <artifactId>spotbugs</artifactId>
+ <version>3.1.12</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.opendaylight.odlparent</groupId>
+ <artifactId>spotbugs</artifactId>
+ <version>7.0.5</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ <version>1.8.0-beta2</version>
+ <scope>compile</scope>
+ </dependency>
+ </dependencies>
+ <configuration>
+ <plugins>
+ <plugin>
+ <groupId>jp.skypencil.findbugs.slf4j</groupId>
+ <artifactId>bug-pattern</artifactId>
+ <version>1.5.0</version>
+ </plugin>
+ </plugins>
+ <effort>Max</effort>
+ <threshold>Low</threshold>
+ <failOnError>false</failOnError>
+ <skip>true</skip>
+ <excludeFilterFile>spotbugs-exclude.xml</excludeFilterFile>
+ <xmlOutput>true</xmlOutput>
+ <findbugsXmlOutputDirectory>/home/jack/onap/onap-sdnr/features/sdnr/wt-aluminium-sr0-2/target/wt/common/target-ide/spotbugs</findbugsXmlOutputDirectory>
+ </configuration>
+ </plugin>
+ <plugin>
+ <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>
+ <id>check-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>
</plugins>
</pluginManagement>
<plugins>
@@ -584,13 +743,24 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
+ <!--
+ <configuration>
+ <reportPlugins>
+ <reportPlugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ <version>${checkstyle.plugin.version}</version>
+ </reportPlugin>
+ </reportPlugins>
+ </configuration>
+ -->
</plugin>
<!-- end of plugins from oparent version (parent of oparent) -->
<!-- Plugins from oparent -->
<plugin>
<artifactId>maven-checkstyle-plugin</artifactId>
- <version>2.17</version>
+ <version>${checkstyle.plugin.version}</version>
<dependencies>
<dependency>
<groupId>org.onap.oparent</groupId>
@@ -610,7 +780,9 @@
<includeResources>false</includeResources>
<includeTestSourceDirectory>true</includeTestSourceDirectory>
<includeTestResources>false</includeTestResources>
- <sourceDirectory>${project.build.sourceDirectory}</sourceDirectory>
+ <sourceDirectories>
+ <directory>${project.build.sourceDirectory}</directory>
+ </sourceDirectories>
<excludes>
</excludes>
<consoleOutput>true</consoleOutput>
@@ -628,7 +800,9 @@
with minor changes -->
<configLocation>onap-checkstyle/onap-java-style.xml</configLocation>
<!-- <sourceDirectory> is needed so that checkstyle ignores the generated sources directory -->
- <sourceDirectory>${project.build.sourceDirectory}/src/main/java</sourceDirectory>
+ <sourceDirectories>
+ <directory>${project.build.sourceDirectory}/src/main/java</directory>
+ </sourceDirectories>
<includeResources>true</includeResources>
<includeTestSourceDirectory>true</includeTestSourceDirectory>
<includeTestResources>true</includeTestResources>
@@ -777,7 +951,8 @@
<requireProperty>
<property>onap.nexus.url</property>
<message>You must set a onap.nexus.url property in your
- ~/.m2/settings.xml. See oparent/settings.xml for an example.</message>
+ ~/.m2/settings.xml. See oparent/settings.xml for an example.
+ </message>
</requireProperty>
</rules>
<fail>true</fail>
@@ -984,16 +1159,16 @@
<then>
<property name="swagger.sdk.script.file" value="generated-source-script.bat"/>
<echo file="${project.build.directory}${file.separator}generated-source-script.bat" append="true"
- message="cd ${project.build.directory}${file.separator}generated-sources${line.separator}"/>
+ message="cd ${project.build.directory}${file.separator}generated-sources${line.separator}"/>
<echo file="${project.build.directory}${file.separator}generated-source-script.bat" append="true"
- message="mvn clean install -Dmaven.test.skip=true${line.separator}"/>
+ message="mvn clean install -Dmaven.test.skip=true${line.separator}"/>
</then>
<else>
<property name="swagger.sdk.script.file" value="generated-source-script.sh"/>
<echo file="${project.build.directory}${file.separator}generated-source-script.sh" append="true"
- message="cd ${project.build.directory}${file.separator}generated-sources${line.separator}"/>
+ message="cd ${project.build.directory}${file.separator}generated-sources${line.separator}"/>
<echo file="${project.build.directory}${file.separator}generated-source-script.sh" append="true"
- message="mvn clean install -Dmaven.test.skip=true${line.separator}"/>
+ message="mvn clean install -Dmaven.test.skip=true${line.separator}"/>
<chmod file="${project.build.directory}${file.separator}generated-source-script.sh" perm="755"/>
</else>
</if>
@@ -1143,7 +1318,7 @@
<plugin>
<groupId>org.opendaylight.yangtools</groupId>
<artifactId>yang-maven-plugin</artifactId>
- <version>3.0.11</version>
+ <version>5.0.5</version>
<dependencies>
<dependency>
<groupId>org.opendaylight.mdsal</groupId>
@@ -1172,10 +1347,12 @@
<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>