diff options
Diffstat (limited to 'odlparent')
| -rw-r--r-- | odlparent/binding-parent/pom.xml | 119 | ||||
| -rw-r--r-- | odlparent/bundle-parent/pom.xml | 119 | ||||
| -rw-r--r-- | odlparent/feature-repo-parent/pom.xml | 119 | ||||
| -rw-r--r-- | odlparent/karaf4-parent/pom.xml | 119 | ||||
| -rw-r--r-- | odlparent/mdsal-it-parent/pom.xml | 119 | ||||
| -rw-r--r-- | odlparent/odlparent-lite/pom.xml | 119 | ||||
| -rw-r--r-- | odlparent/odlparent/pom.xml | 119 | ||||
| -rwxr-xr-x | odlparent/setup/src/main/resources/pom-template.xml | 119 | ||||
| -rw-r--r-- | odlparent/single-feature-parent/pom.xml | 119 |
9 files changed, 234 insertions, 837 deletions
diff --git a/odlparent/binding-parent/pom.xml b/odlparent/binding-parent/pom.xml index 642b28c4..1b2c0508 100644 --- a/odlparent/binding-parent/pom.xml +++ b/odlparent/binding-parent/pom.xml @@ -111,21 +111,21 @@ <sdnctl.slipluginutils.version>${ccsdk.sli.version}</sdnctl.slipluginutils.version> <!-- Support libraries used by OpenDaylight --> - <odl.controller.mdsal.version>1.12.1</odl.controller.mdsal.version> - <odl.mdsal.version>6.0.7</odl.mdsal.version> - <odl.mdsal.model.version>6.0.7</odl.mdsal.model.version> - <odl.netconf.restconf.version>1.12.1</odl.netconf.restconf.version> - <odl.netconf.netconf.version>1.9.1</odl.netconf.netconf.version> - <odl.netconf.sal.rest.docgen.version>1.12.1</odl.netconf.sal.rest.docgen.version> + <odl.controller.mdsal.version>1.12.3</odl.controller.mdsal.version> + <odl.mdsal.version>6.0.8</odl.mdsal.version> + <odl.mdsal.model.version>6.0.8</odl.mdsal.model.version> + <odl.netconf.restconf.version>1.12.3</odl.netconf.restconf.version> + <odl.netconf.netconf.version>1.9.3</odl.netconf.netconf.version> + <odl.netconf.sal.rest.docgen.version>1.12.3</odl.netconf.sal.rest.docgen.version> <!-- Used by aaa, vtn --> <commons.codec.version>1.15</commons.codec.version> <!-- Used by netconf, ovsdb --> - <commons.lang3.version>3.8.1</commons.lang3.version> + <commons.lang3.version>3.11</commons.lang3.version> <!-- Used by sfc, snmp4sdn; see also affinity, toolkit --> <commons.lang.version>2.6</commons.lang.version> <!-- Used by neutron; see also controller, vtn --> - <commons.net.version>3.7</commons.net.version> + <commons.net.version>3.7.2</commons.net.version> <!-- Used by neutron --> <eclipse.persistence.version>2.7.7</eclipse.persistence.version> <!-- Used by aaa --> @@ -136,7 +136,7 @@ <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.10.4</jackson.version> + <jackson.version>2.10.5</jackson.version> <!-- Used by snmp4sdn, yangtools --> <javassist.version>3.27.0-GA</javassist.version> @@ -154,19 +154,19 @@ <!-- Used everywhere --> <junit.version>4.13</junit.version> <!-- Used by coretutorials, sfc, snmp4sdn, sxp; see also affinity, toolkit --> - <logback.version>1.11.6</logback.version> + <logback.version>1.11.7</logback.version> <!-- Used by nic, sfc, sxp, tsdr --> <mockito.version>3.3.3</mockito.version> <!-- Used by bgpcep, netconf, ovsdb, sxp; see also opendove, toolkit --> - <netty.version>4.1.51.Final</netty.version> + <netty.version>4.1.56.Final</netty.version> <!-- Used by openflowjava, persistence, sfc, snmp4sdn, sxp; see also affinity, toolkit --> - <slf4j.version>1.7.29</slf4j.version> + <slf4j.version>1.7.28</slf4j.version> <!-- Used in integration/distribution; see also affinity, snmp4sdn, toolkit, tsdr, ttp --> <spring.version>4.3.25.RELEASE</spring.version> <!-- Extra support libraries used by SDN-C --> <jvnet.jaxb2.version>0.6.4</jvnet.jaxb2.version> - <antlr.version>4.8.1</antlr.version> + <antlr.version>4.8-1</antlr.version> <eelf.maven.plugin.version>1.0.0</eelf.maven.plugin.version> @@ -180,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.28.v20200408</jetty.version> + <jetty.version>9.4.31.v20200723</jetty.version> <skip.karaf.featureTest>true</skip.karaf.featureTest> <dependency-list.file>direct-dependencies.txt</dependency-list.file> </properties> @@ -587,21 +587,6 @@ </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> @@ -668,6 +653,7 @@ </configuration> </plugin> <plugin> + <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-checkstyle-plugin</artifactId> <version>${checkstyle.plugin.version}</version> <dependencies> @@ -679,6 +665,16 @@ </dependencies> <executions> <execution> + <phase>process-sources</phase> + <goals> + <goal>check</goal> + </goals> + <configuration> + <failOnViolation>false</failOnViolation> + <skip>true</skip> + </configuration> + </execution> + <execution> <id>check-license</id> <goals> <goal>check</goal> @@ -750,71 +746,8 @@ <!-- Plugins from oparent --> <plugin> + <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-checkstyle-plugin</artifactId> - <version>${checkstyle.plugin.version}</version> - <dependencies> - <dependency> - <groupId>org.onap.oparent</groupId> - <artifactId>checkstyle</artifactId> - <version>1.2.2</version> - </dependency> - </dependencies> - <executions> - <execution> - <!-- overwrite odl default to supress spotbugs code check execution --> - <goals> - <goal>check</goal> - </goals> - <phase>process-sources</phase> - <configuration> - <skip>true</skip> - <failOnViolation>false</failOnViolation> - </configuration> - </execution> - <execution> - <id>onap-license</id> - <goals> - <goal>check</goal> - </goals> - <phase>process-sources</phase> - <configuration> - <configLocation>onap-checkstyle/check-license.xml</configLocation> - <includeResources>false</includeResources> - <includeTestSourceDirectory>true</includeTestSourceDirectory> - <includeTestResources>false</includeTestResources> - <sourceDirectories> - <directory>${project.build.sourceDirectory}</directory> - </sourceDirectories> - <excludes> - </excludes> - <consoleOutput>true</consoleOutput> - <failOnViolation>false</failOnViolation> - </configuration> - </execution> - <execution> - <id>onap-java-style</id> - <goals> - <goal>check</goal> - </goals> - <phase>process-sources</phase> - <configuration> - <!-- Use Google Java Style Guide: https://github.com/checkstyle/checkstyle/blob/master/src/main/resources/google_checks.xml - with minor changes --> - <configLocation>onap-checkstyle/onap-java-style.xml</configLocation> - <!-- <sourceDirectory> is needed so that checkstyle ignores the generated sources directory --> - <sourceDirectories> - <directory>${project.build.sourceDirectory}/src/main/java</directory> - </sourceDirectories> - <includeResources>true</includeResources> - <includeTestSourceDirectory>true</includeTestSourceDirectory> - <includeTestResources>true</includeTestResources> - <excludes> - </excludes> - <consoleOutput>true</consoleOutput> - <failOnViolation>false</failOnViolation> - </configuration> - </execution> - </executions> </plugin> <plugin> <groupId>org.codehaus.mojo</groupId> diff --git a/odlparent/bundle-parent/pom.xml b/odlparent/bundle-parent/pom.xml index ac69b6db..76ff6284 100644 --- a/odlparent/bundle-parent/pom.xml +++ b/odlparent/bundle-parent/pom.xml @@ -111,21 +111,21 @@ <sdnctl.slipluginutils.version>${ccsdk.sli.version}</sdnctl.slipluginutils.version> <!-- Support libraries used by OpenDaylight --> - <odl.controller.mdsal.version>1.12.1</odl.controller.mdsal.version> - <odl.mdsal.version>6.0.7</odl.mdsal.version> - <odl.mdsal.model.version>6.0.7</odl.mdsal.model.version> - <odl.netconf.restconf.version>1.12.1</odl.netconf.restconf.version> - <odl.netconf.netconf.version>1.9.1</odl.netconf.netconf.version> - <odl.netconf.sal.rest.docgen.version>1.12.1</odl.netconf.sal.rest.docgen.version> + <odl.controller.mdsal.version>1.12.3</odl.controller.mdsal.version> + <odl.mdsal.version>6.0.8</odl.mdsal.version> + <odl.mdsal.model.version>6.0.8</odl.mdsal.model.version> + <odl.netconf.restconf.version>1.12.3</odl.netconf.restconf.version> + <odl.netconf.netconf.version>1.9.3</odl.netconf.netconf.version> + <odl.netconf.sal.rest.docgen.version>1.12.3</odl.netconf.sal.rest.docgen.version> <!-- Used by aaa, vtn --> <commons.codec.version>1.15</commons.codec.version> <!-- Used by netconf, ovsdb --> - <commons.lang3.version>3.8.1</commons.lang3.version> + <commons.lang3.version>3.11</commons.lang3.version> <!-- Used by sfc, snmp4sdn; see also affinity, toolkit --> <commons.lang.version>2.6</commons.lang.version> <!-- Used by neutron; see also controller, vtn --> - <commons.net.version>3.7</commons.net.version> + <commons.net.version>3.7.2</commons.net.version> <!-- Used by neutron --> <eclipse.persistence.version>2.7.7</eclipse.persistence.version> <!-- Used by aaa --> @@ -136,7 +136,7 @@ <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.10.4</jackson.version> + <jackson.version>2.10.5</jackson.version> <!-- Used by snmp4sdn, yangtools --> <javassist.version>3.27.0-GA</javassist.version> @@ -154,19 +154,19 @@ <!-- Used everywhere --> <junit.version>4.13</junit.version> <!-- Used by coretutorials, sfc, snmp4sdn, sxp; see also affinity, toolkit --> - <logback.version>1.11.6</logback.version> + <logback.version>1.11.7</logback.version> <!-- Used by nic, sfc, sxp, tsdr --> <mockito.version>3.3.3</mockito.version> <!-- Used by bgpcep, netconf, ovsdb, sxp; see also opendove, toolkit --> - <netty.version>4.1.51.Final</netty.version> + <netty.version>4.1.56.Final</netty.version> <!-- Used by openflowjava, persistence, sfc, snmp4sdn, sxp; see also affinity, toolkit --> - <slf4j.version>1.7.29</slf4j.version> + <slf4j.version>1.7.28</slf4j.version> <!-- Used in integration/distribution; see also affinity, snmp4sdn, toolkit, tsdr, ttp --> <spring.version>4.3.25.RELEASE</spring.version> <!-- Extra support libraries used by SDN-C --> <jvnet.jaxb2.version>0.6.4</jvnet.jaxb2.version> - <antlr.version>4.8.1</antlr.version> + <antlr.version>4.8-1</antlr.version> <eelf.maven.plugin.version>1.0.0</eelf.maven.plugin.version> @@ -180,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.28.v20200408</jetty.version> + <jetty.version>9.4.31.v20200723</jetty.version> <skip.karaf.featureTest>true</skip.karaf.featureTest> <dependency-list.file>direct-dependencies.txt</dependency-list.file> </properties> @@ -587,21 +587,6 @@ </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> @@ -668,6 +653,7 @@ </configuration> </plugin> <plugin> + <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-checkstyle-plugin</artifactId> <version>${checkstyle.plugin.version}</version> <dependencies> @@ -679,6 +665,16 @@ </dependencies> <executions> <execution> + <phase>process-sources</phase> + <goals> + <goal>check</goal> + </goals> + <configuration> + <failOnViolation>false</failOnViolation> + <skip>true</skip> + </configuration> + </execution> + <execution> <id>check-license</id> <goals> <goal>check</goal> @@ -750,71 +746,8 @@ <!-- Plugins from oparent --> <plugin> + <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-checkstyle-plugin</artifactId> - <version>${checkstyle.plugin.version}</version> - <dependencies> - <dependency> - <groupId>org.onap.oparent</groupId> - <artifactId>checkstyle</artifactId> - <version>1.2.2</version> - </dependency> - </dependencies> - <executions> - <execution> - <!-- overwrite odl default to supress spotbugs code check execution --> - <goals> - <goal>check</goal> - </goals> - <phase>process-sources</phase> - <configuration> - <skip>true</skip> - <failOnViolation>false</failOnViolation> - </configuration> - </execution> - <execution> - <id>onap-license</id> - <goals> - <goal>check</goal> - </goals> - <phase>process-sources</phase> - <configuration> - <configLocation>onap-checkstyle/check-license.xml</configLocation> - <includeResources>false</includeResources> - <includeTestSourceDirectory>true</includeTestSourceDirectory> - <includeTestResources>false</includeTestResources> - <sourceDirectories> - <directory>${project.build.sourceDirectory}</directory> - </sourceDirectories> - <excludes> - </excludes> - <consoleOutput>true</consoleOutput> - <failOnViolation>false</failOnViolation> - </configuration> - </execution> - <execution> - <id>onap-java-style</id> - <goals> - <goal>check</goal> - </goals> - <phase>process-sources</phase> - <configuration> - <!-- Use Google Java Style Guide: https://github.com/checkstyle/checkstyle/blob/master/src/main/resources/google_checks.xml - with minor changes --> - <configLocation>onap-checkstyle/onap-java-style.xml</configLocation> - <!-- <sourceDirectory> is needed so that checkstyle ignores the generated sources directory --> - <sourceDirectories> - <directory>${project.build.sourceDirectory}/src/main/java</directory> - </sourceDirectories> - <includeResources>true</includeResources> - <includeTestSourceDirectory>true</includeTestSourceDirectory> - <includeTestResources>true</includeTestResources> - <excludes> - </excludes> - <consoleOutput>true</consoleOutput> - <failOnViolation>false</failOnViolation> - </configuration> - </execution> - </executions> </plugin> <plugin> <groupId>org.codehaus.mojo</groupId> diff --git a/odlparent/feature-repo-parent/pom.xml b/odlparent/feature-repo-parent/pom.xml index 6eb8f2d7..941ced19 100644 --- a/odlparent/feature-repo-parent/pom.xml +++ b/odlparent/feature-repo-parent/pom.xml @@ -111,21 +111,21 @@ <sdnctl.slipluginutils.version>${ccsdk.sli.version}</sdnctl.slipluginutils.version> <!-- Support libraries used by OpenDaylight --> - <odl.controller.mdsal.version>1.12.1</odl.controller.mdsal.version> - <odl.mdsal.version>6.0.7</odl.mdsal.version> - <odl.mdsal.model.version>6.0.7</odl.mdsal.model.version> - <odl.netconf.restconf.version>1.12.1</odl.netconf.restconf.version> - <odl.netconf.netconf.version>1.9.1</odl.netconf.netconf.version> - <odl.netconf.sal.rest.docgen.version>1.12.1</odl.netconf.sal.rest.docgen.version> + <odl.controller.mdsal.version>1.12.3</odl.controller.mdsal.version> + <odl.mdsal.version>6.0.8</odl.mdsal.version> + <odl.mdsal.model.version>6.0.8</odl.mdsal.model.version> + <odl.netconf.restconf.version>1.12.3</odl.netconf.restconf.version> + <odl.netconf.netconf.version>1.9.3</odl.netconf.netconf.version> + <odl.netconf.sal.rest.docgen.version>1.12.3</odl.netconf.sal.rest.docgen.version> <!-- Used by aaa, vtn --> <commons.codec.version>1.15</commons.codec.version> <!-- Used by netconf, ovsdb --> - <commons.lang3.version>3.8.1</commons.lang3.version> + <commons.lang3.version>3.11</commons.lang3.version> <!-- Used by sfc, snmp4sdn; see also affinity, toolkit --> <commons.lang.version>2.6</commons.lang.version> <!-- Used by neutron; see also controller, vtn --> - <commons.net.version>3.7</commons.net.version> + <commons.net.version>3.7.2</commons.net.version> <!-- Used by neutron --> <eclipse.persistence.version>2.7.7</eclipse.persistence.version> <!-- Used by aaa --> @@ -136,7 +136,7 @@ <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.10.4</jackson.version> + <jackson.version>2.10.5</jackson.version> <!-- Used by snmp4sdn, yangtools --> <javassist.version>3.27.0-GA</javassist.version> @@ -154,19 +154,19 @@ <!-- Used everywhere --> <junit.version>4.13</junit.version> <!-- Used by coretutorials, sfc, snmp4sdn, sxp; see also affinity, toolkit --> - <logback.version>1.11.6</logback.version> + <logback.version>1.11.7</logback.version> <!-- Used by nic, sfc, sxp, tsdr --> <mockito.version>3.3.3</mockito.version> <!-- Used by bgpcep, netconf, ovsdb, sxp; see also opendove, toolkit --> - <netty.version>4.1.51.Final</netty.version> + <netty.version>4.1.56.Final</netty.version> <!-- Used by openflowjava, persistence, sfc, snmp4sdn, sxp; see also affinity, toolkit --> - <slf4j.version>1.7.29</slf4j.version> + <slf4j.version>1.7.28</slf4j.version> <!-- Used in integration/distribution; see also affinity, snmp4sdn, toolkit, tsdr, ttp --> <spring.version>4.3.25.RELEASE</spring.version> <!-- Extra support libraries used by SDN-C --> <jvnet.jaxb2.version>0.6.4</jvnet.jaxb2.version> - <antlr.version>4.8.1</antlr.version> + <antlr.version>4.8-1</antlr.version> <eelf.maven.plugin.version>1.0.0</eelf.maven.plugin.version> @@ -180,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.28.v20200408</jetty.version> + <jetty.version>9.4.31.v20200723</jetty.version> <skip.karaf.featureTest>true</skip.karaf.featureTest> <dependency-list.file>direct-dependencies.txt</dependency-list.file> </properties> @@ -587,21 +587,6 @@ </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> @@ -668,6 +653,7 @@ </configuration> </plugin> <plugin> + <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-checkstyle-plugin</artifactId> <version>${checkstyle.plugin.version}</version> <dependencies> @@ -679,6 +665,16 @@ </dependencies> <executions> <execution> + <phase>process-sources</phase> + <goals> + <goal>check</goal> + </goals> + <configuration> + <failOnViolation>false</failOnViolation> + <skip>true</skip> + </configuration> + </execution> + <execution> <id>check-license</id> <goals> <goal>check</goal> @@ -750,71 +746,8 @@ <!-- Plugins from oparent --> <plugin> + <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-checkstyle-plugin</artifactId> - <version>${checkstyle.plugin.version}</version> - <dependencies> - <dependency> - <groupId>org.onap.oparent</groupId> - <artifactId>checkstyle</artifactId> - <version>1.2.2</version> - </dependency> - </dependencies> - <executions> - <execution> - <!-- overwrite odl default to supress spotbugs code check execution --> - <goals> - <goal>check</goal> - </goals> - <phase>process-sources</phase> - <configuration> - <skip>true</skip> - <failOnViolation>false</failOnViolation> - </configuration> - </execution> - <execution> - <id>onap-license</id> - <goals> - <goal>check</goal> - </goals> - <phase>process-sources</phase> - <configuration> - <configLocation>onap-checkstyle/check-license.xml</configLocation> - <includeResources>false</includeResources> - <includeTestSourceDirectory>true</includeTestSourceDirectory> - <includeTestResources>false</includeTestResources> - <sourceDirectories> - <directory>${project.build.sourceDirectory}</directory> - </sourceDirectories> - <excludes> - </excludes> - <consoleOutput>true</consoleOutput> - <failOnViolation>false</failOnViolation> - </configuration> - </execution> - <execution> - <id>onap-java-style</id> - <goals> - <goal>check</goal> - </goals> - <phase>process-sources</phase> - <configuration> - <!-- Use Google Java Style Guide: https://github.com/checkstyle/checkstyle/blob/master/src/main/resources/google_checks.xml - with minor changes --> - <configLocation>onap-checkstyle/onap-java-style.xml</configLocation> - <!-- <sourceDirectory> is needed so that checkstyle ignores the generated sources directory --> - <sourceDirectories> - <directory>${project.build.sourceDirectory}/src/main/java</directory> - </sourceDirectories> - <includeResources>true</includeResources> - <includeTestSourceDirectory>true</includeTestSourceDirectory> - <includeTestResources>true</includeTestResources> - <excludes> - </excludes> - <consoleOutput>true</consoleOutput> - <failOnViolation>false</failOnViolation> - </configuration> - </execution> - </executions> </plugin> <plugin> <groupId>org.codehaus.mojo</groupId> diff --git a/odlparent/karaf4-parent/pom.xml b/odlparent/karaf4-parent/pom.xml index 7b93b0fd..90422c97 100644 --- a/odlparent/karaf4-parent/pom.xml +++ b/odlparent/karaf4-parent/pom.xml @@ -111,21 +111,21 @@ <sdnctl.slipluginutils.version>${ccsdk.sli.version}</sdnctl.slipluginutils.version> <!-- Support libraries used by OpenDaylight --> - <odl.controller.mdsal.version>1.12.1</odl.controller.mdsal.version> - <odl.mdsal.version>6.0.7</odl.mdsal.version> - <odl.mdsal.model.version>6.0.7</odl.mdsal.model.version> - <odl.netconf.restconf.version>1.12.1</odl.netconf.restconf.version> - <odl.netconf.netconf.version>1.9.1</odl.netconf.netconf.version> - <odl.netconf.sal.rest.docgen.version>1.12.1</odl.netconf.sal.rest.docgen.version> + <odl.controller.mdsal.version>1.12.3</odl.controller.mdsal.version> + <odl.mdsal.version>6.0.8</odl.mdsal.version> + <odl.mdsal.model.version>6.0.8</odl.mdsal.model.version> + <odl.netconf.restconf.version>1.12.3</odl.netconf.restconf.version> + <odl.netconf.netconf.version>1.9.3</odl.netconf.netconf.version> + <odl.netconf.sal.rest.docgen.version>1.12.3</odl.netconf.sal.rest.docgen.version> <!-- Used by aaa, vtn --> <commons.codec.version>1.15</commons.codec.version> <!-- Used by netconf, ovsdb --> - <commons.lang3.version>3.8.1</commons.lang3.version> + <commons.lang3.version>3.11</commons.lang3.version> <!-- Used by sfc, snmp4sdn; see also affinity, toolkit --> <commons.lang.version>2.6</commons.lang.version> <!-- Used by neutron; see also controller, vtn --> - <commons.net.version>3.7</commons.net.version> + <commons.net.version>3.7.2</commons.net.version> <!-- Used by neutron --> <eclipse.persistence.version>2.7.7</eclipse.persistence.version> <!-- Used by aaa --> @@ -136,7 +136,7 @@ <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.10.4</jackson.version> + <jackson.version>2.10.5</jackson.version> <!-- Used by snmp4sdn, yangtools --> <javassist.version>3.27.0-GA</javassist.version> @@ -154,19 +154,19 @@ <!-- Used everywhere --> <junit.version>4.13</junit.version> <!-- Used by coretutorials, sfc, snmp4sdn, sxp; see also affinity, toolkit --> - <logback.version>1.11.6</logback.version> + <logback.version>1.11.7</logback.version> <!-- Used by nic, sfc, sxp, tsdr --> <mockito.version>3.3.3</mockito.version> <!-- Used by bgpcep, netconf, ovsdb, sxp; see also opendove, toolkit --> - <netty.version>4.1.51.Final</netty.version> + <netty.version>4.1.56.Final</netty.version> <!-- Used by openflowjava, persistence, sfc, snmp4sdn, sxp; see also affinity, toolkit --> - <slf4j.version>1.7.29</slf4j.version> + <slf4j.version>1.7.28</slf4j.version> <!-- Used in integration/distribution; see also affinity, snmp4sdn, toolkit, tsdr, ttp --> <spring.version>4.3.25.RELEASE</spring.version> <!-- Extra support libraries used by SDN-C --> <jvnet.jaxb2.version>0.6.4</jvnet.jaxb2.version> - <antlr.version>4.8.1</antlr.version> + <antlr.version>4.8-1</antlr.version> <eelf.maven.plugin.version>1.0.0</eelf.maven.plugin.version> @@ -180,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.28.v20200408</jetty.version> + <jetty.version>9.4.31.v20200723</jetty.version> <skip.karaf.featureTest>true</skip.karaf.featureTest> <dependency-list.file>direct-dependencies.txt</dependency-list.file> </properties> @@ -587,21 +587,6 @@ </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> @@ -668,6 +653,7 @@ </configuration> </plugin> <plugin> + <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-checkstyle-plugin</artifactId> <version>${checkstyle.plugin.version}</version> <dependencies> @@ -679,6 +665,16 @@ </dependencies> <executions> <execution> + <phase>process-sources</phase> + <goals> + <goal>check</goal> + </goals> + <configuration> + <failOnViolation>false</failOnViolation> + <skip>true</skip> + </configuration> + </execution> + <execution> <id>check-license</id> <goals> <goal>check</goal> @@ -750,71 +746,8 @@ <!-- Plugins from oparent --> <plugin> + <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-checkstyle-plugin</artifactId> - <version>${checkstyle.plugin.version}</version> - <dependencies> - <dependency> - <groupId>org.onap.oparent</groupId> - <artifactId>checkstyle</artifactId> - <version>1.2.2</version> - </dependency> - </dependencies> - <executions> - <execution> - <!-- overwrite odl default to supress spotbugs code check execution --> - <goals> - <goal>check</goal> - </goals> - <phase>process-sources</phase> - <configuration> - <skip>true</skip> - <failOnViolation>false</failOnViolation> - </configuration> - </execution> - <execution> - <id>onap-license</id> - <goals> - <goal>check</goal> - </goals> - <phase>process-sources</phase> - <configuration> - <configLocation>onap-checkstyle/check-license.xml</configLocation> - <includeResources>false</includeResources> - <includeTestSourceDirectory>true</includeTestSourceDirectory> - <includeTestResources>false</includeTestResources> - <sourceDirectories> - <directory>${project.build.sourceDirectory}</directory> - </sourceDirectories> - <excludes> - </excludes> - <consoleOutput>true</consoleOutput> - <failOnViolation>false</failOnViolation> - </configuration> - </execution> - <execution> - <id>onap-java-style</id> - <goals> - <goal>check</goal> - </goals> - <phase>process-sources</phase> - <configuration> - <!-- Use Google Java Style Guide: https://github.com/checkstyle/checkstyle/blob/master/src/main/resources/google_checks.xml - with minor changes --> - <configLocation>onap-checkstyle/onap-java-style.xml</configLocation> - <!-- <sourceDirectory> is needed so that checkstyle ignores the generated sources directory --> - <sourceDirectories> - <directory>${project.build.sourceDirectory}/src/main/java</directory> - </sourceDirectories> - <includeResources>true</includeResources> - <includeTestSourceDirectory>true</includeTestSourceDirectory> - <includeTestResources>true</includeTestResources> - <excludes> - </excludes> - <consoleOutput>true</consoleOutput> - <failOnViolation>false</failOnViolation> - </configuration> - </execution> - </executions> </plugin> <plugin> <groupId>org.codehaus.mojo</groupId> diff --git a/odlparent/mdsal-it-parent/pom.xml b/odlparent/mdsal-it-parent/pom.xml index ea7872ef..32c3dc14 100644 --- a/odlparent/mdsal-it-parent/pom.xml +++ b/odlparent/mdsal-it-parent/pom.xml @@ -111,21 +111,21 @@ <sdnctl.slipluginutils.version>${ccsdk.sli.version}</sdnctl.slipluginutils.version> <!-- Support libraries used by OpenDaylight --> - <odl.controller.mdsal.version>1.12.1</odl.controller.mdsal.version> - <odl.mdsal.version>6.0.7</odl.mdsal.version> - <odl.mdsal.model.version>6.0.7</odl.mdsal.model.version> - <odl.netconf.restconf.version>1.12.1</odl.netconf.restconf.version> - <odl.netconf.netconf.version>1.9.1</odl.netconf.netconf.version> - <odl.netconf.sal.rest.docgen.version>1.12.1</odl.netconf.sal.rest.docgen.version> + <odl.controller.mdsal.version>1.12.3</odl.controller.mdsal.version> + <odl.mdsal.version>6.0.8</odl.mdsal.version> + <odl.mdsal.model.version>6.0.8</odl.mdsal.model.version> + <odl.netconf.restconf.version>1.12.3</odl.netconf.restconf.version> + <odl.netconf.netconf.version>1.9.3</odl.netconf.netconf.version> + <odl.netconf.sal.rest.docgen.version>1.12.3</odl.netconf.sal.rest.docgen.version> <!-- Used by aaa, vtn --> <commons.codec.version>1.15</commons.codec.version> <!-- Used by netconf, ovsdb --> - <commons.lang3.version>3.8.1</commons.lang3.version> + <commons.lang3.version>3.11</commons.lang3.version> <!-- Used by sfc, snmp4sdn; see also affinity, toolkit --> <commons.lang.version>2.6</commons.lang.version> <!-- Used by neutron; see also controller, vtn --> - <commons.net.version>3.7</commons.net.version> + <commons.net.version>3.7.2</commons.net.version> <!-- Used by neutron --> <eclipse.persistence.version>2.7.7</eclipse.persistence.version> <!-- Used by aaa --> @@ -136,7 +136,7 @@ <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.10.4</jackson.version> + <jackson.version>2.10.5</jackson.version> <!-- Used by snmp4sdn, yangtools --> <javassist.version>3.27.0-GA</javassist.version> @@ -154,19 +154,19 @@ <!-- Used everywhere --> <junit.version>4.13</junit.version> <!-- Used by coretutorials, sfc, snmp4sdn, sxp; see also affinity, toolkit --> - <logback.version>1.11.6</logback.version> + <logback.version>1.11.7</logback.version> <!-- Used by nic, sfc, sxp, tsdr --> <mockito.version>3.3.3</mockito.version> <!-- Used by bgpcep, netconf, ovsdb, sxp; see also opendove, toolkit --> - <netty.version>4.1.51.Final</netty.version> + <netty.version>4.1.56.Final</netty.version> <!-- Used by openflowjava, persistence, sfc, snmp4sdn, sxp; see also affinity, toolkit --> - <slf4j.version>1.7.29</slf4j.version> + <slf4j.version>1.7.28</slf4j.version> <!-- Used in integration/distribution; see also affinity, snmp4sdn, toolkit, tsdr, ttp --> <spring.version>4.3.25.RELEASE</spring.version> <!-- Extra support libraries used by SDN-C --> <jvnet.jaxb2.version>0.6.4</jvnet.jaxb2.version> - <antlr.version>4.8.1</antlr.version> + <antlr.version>4.8-1</antlr.version> <eelf.maven.plugin.version>1.0.0</eelf.maven.plugin.version> @@ -180,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.28.v20200408</jetty.version> + <jetty.version>9.4.31.v20200723</jetty.version> <skip.karaf.featureTest>true</skip.karaf.featureTest> <dependency-list.file>direct-dependencies.txt</dependency-list.file> </properties> @@ -587,21 +587,6 @@ </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> @@ -668,6 +653,7 @@ </configuration> </plugin> <plugin> + <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-checkstyle-plugin</artifactId> <version>${checkstyle.plugin.version}</version> <dependencies> @@ -679,6 +665,16 @@ </dependencies> <executions> <execution> + <phase>process-sources</phase> + <goals> + <goal>check</goal> + </goals> + <configuration> + <failOnViolation>false</failOnViolation> + <skip>true</skip> + </configuration> + </execution> + <execution> <id>check-license</id> <goals> <goal>check</goal> @@ -750,71 +746,8 @@ <!-- Plugins from oparent --> <plugin> + <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-checkstyle-plugin</artifactId> - <version>${checkstyle.plugin.version}</version> - <dependencies> - <dependency> - <groupId>org.onap.oparent</groupId> - <artifactId>checkstyle</artifactId> - <version>1.2.2</version> - </dependency> - </dependencies> - <executions> - <execution> - <!-- overwrite odl default to supress spotbugs code check execution --> - <goals> - <goal>check</goal> - </goals> - <phase>process-sources</phase> - <configuration> - <skip>true</skip> - <failOnViolation>false</failOnViolation> - </configuration> - </execution> - <execution> - <id>onap-license</id> - <goals> - <goal>check</goal> - </goals> - <phase>process-sources</phase> - <configuration> - <configLocation>onap-checkstyle/check-license.xml</configLocation> - <includeResources>false</includeResources> - <includeTestSourceDirectory>true</includeTestSourceDirectory> - <includeTestResources>false</includeTestResources> - <sourceDirectories> - <directory>${project.build.sourceDirectory}</directory> - </sourceDirectories> - <excludes> - </excludes> - <consoleOutput>true</consoleOutput> - <failOnViolation>false</failOnViolation> - </configuration> - </execution> - <execution> - <id>onap-java-style</id> - <goals> - <goal>check</goal> - </goals> - <phase>process-sources</phase> - <configuration> - <!-- Use Google Java Style Guide: https://github.com/checkstyle/checkstyle/blob/master/src/main/resources/google_checks.xml - with minor changes --> - <configLocation>onap-checkstyle/onap-java-style.xml</configLocation> - <!-- <sourceDirectory> is needed so that checkstyle ignores the generated sources directory --> - <sourceDirectories> - <directory>${project.build.sourceDirectory}/src/main/java</directory> - </sourceDirectories> - <includeResources>true</includeResources> - <includeTestSourceDirectory>true</includeTestSourceDirectory> - <includeTestResources>true</includeTestResources> - <excludes> - </excludes> - <consoleOutput>true</consoleOutput> - <failOnViolation>false</failOnViolation> - </configuration> - </execution> - </executions> </plugin> <plugin> <groupId>org.codehaus.mojo</groupId> diff --git a/odlparent/odlparent-lite/pom.xml b/odlparent/odlparent-lite/pom.xml index 5f8e5298..5dec9f8e 100644 --- a/odlparent/odlparent-lite/pom.xml +++ b/odlparent/odlparent-lite/pom.xml @@ -111,21 +111,21 @@ <sdnctl.slipluginutils.version>${ccsdk.sli.version}</sdnctl.slipluginutils.version> <!-- Support libraries used by OpenDaylight --> - <odl.controller.mdsal.version>1.12.1</odl.controller.mdsal.version> - <odl.mdsal.version>6.0.7</odl.mdsal.version> - <odl.mdsal.model.version>6.0.7</odl.mdsal.model.version> - <odl.netconf.restconf.version>1.12.1</odl.netconf.restconf.version> - <odl.netconf.netconf.version>1.9.1</odl.netconf.netconf.version> - <odl.netconf.sal.rest.docgen.version>1.12.1</odl.netconf.sal.rest.docgen.version> + <odl.controller.mdsal.version>1.12.3</odl.controller.mdsal.version> + <odl.mdsal.version>6.0.8</odl.mdsal.version> + <odl.mdsal.model.version>6.0.8</odl.mdsal.model.version> + <odl.netconf.restconf.version>1.12.3</odl.netconf.restconf.version> + <odl.netconf.netconf.version>1.9.3</odl.netconf.netconf.version> + <odl.netconf.sal.rest.docgen.version>1.12.3</odl.netconf.sal.rest.docgen.version> <!-- Used by aaa, vtn --> <commons.codec.version>1.15</commons.codec.version> <!-- Used by netconf, ovsdb --> - <commons.lang3.version>3.8.1</commons.lang3.version> + <commons.lang3.version>3.11</commons.lang3.version> <!-- Used by sfc, snmp4sdn; see also affinity, toolkit --> <commons.lang.version>2.6</commons.lang.version> <!-- Used by neutron; see also controller, vtn --> - <commons.net.version>3.7</commons.net.version> + <commons.net.version>3.7.2</commons.net.version> <!-- Used by neutron --> <eclipse.persistence.version>2.7.7</eclipse.persistence.version> <!-- Used by aaa --> @@ -136,7 +136,7 @@ <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.10.4</jackson.version> + <jackson.version>2.10.5</jackson.version> <!-- Used by snmp4sdn, yangtools --> <javassist.version>3.27.0-GA</javassist.version> @@ -154,19 +154,19 @@ <!-- Used everywhere --> <junit.version>4.13</junit.version> <!-- Used by coretutorials, sfc, snmp4sdn, sxp; see also affinity, toolkit --> - <logback.version>1.11.6</logback.version> + <logback.version>1.11.7</logback.version> <!-- Used by nic, sfc, sxp, tsdr --> <mockito.version>3.3.3</mockito.version> <!-- Used by bgpcep, netconf, ovsdb, sxp; see also opendove, toolkit --> - <netty.version>4.1.51.Final</netty.version> + <netty.version>4.1.56.Final</netty.version> <!-- Used by openflowjava, persistence, sfc, snmp4sdn, sxp; see also affinity, toolkit --> - <slf4j.version>1.7.29</slf4j.version> + <slf4j.version>1.7.28</slf4j.version> <!-- Used in integration/distribution; see also affinity, snmp4sdn, toolkit, tsdr, ttp --> <spring.version>4.3.25.RELEASE</spring.version> <!-- Extra support libraries used by SDN-C --> <jvnet.jaxb2.version>0.6.4</jvnet.jaxb2.version> - <antlr.version>4.8.1</antlr.version> + <antlr.version>4.8-1</antlr.version> <eelf.maven.plugin.version>1.0.0</eelf.maven.plugin.version> @@ -180,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.28.v20200408</jetty.version> + <jetty.version>9.4.31.v20200723</jetty.version> <skip.karaf.featureTest>true</skip.karaf.featureTest> <dependency-list.file>direct-dependencies.txt</dependency-list.file> </properties> @@ -587,21 +587,6 @@ </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> @@ -668,6 +653,7 @@ </configuration> </plugin> <plugin> + <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-checkstyle-plugin</artifactId> <version>${checkstyle.plugin.version}</version> <dependencies> @@ -679,6 +665,16 @@ </dependencies> <executions> <execution> + <phase>process-sources</phase> + <goals> + <goal>check</goal> + </goals> + <configuration> + <failOnViolation>false</failOnViolation> + <skip>true</skip> + </configuration> + </execution> + <execution> <id>check-license</id> <goals> <goal>check</goal> @@ -750,71 +746,8 @@ <!-- Plugins from oparent --> <plugin> + <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-checkstyle-plugin</artifactId> - <version>${checkstyle.plugin.version}</version> - <dependencies> - <dependency> - <groupId>org.onap.oparent</groupId> - <artifactId>checkstyle</artifactId> - <version>1.2.2</version> - </dependency> - </dependencies> - <executions> - <execution> - <!-- overwrite odl default to supress spotbugs code check execution --> - <goals> - <goal>check</goal> - </goals> - <phase>process-sources</phase> - <configuration> - <skip>true</skip> - <failOnViolation>false</failOnViolation> - </configuration> - </execution> - <execution> - <id>onap-license</id> - <goals> - <goal>check</goal> - </goals> - <phase>process-sources</phase> - <configuration> - <configLocation>onap-checkstyle/check-license.xml</configLocation> - <includeResources>false</includeResources> - <includeTestSourceDirectory>true</includeTestSourceDirectory> - <includeTestResources>false</includeTestResources> - <sourceDirectories> - <directory>${project.build.sourceDirectory}</directory> - </sourceDirectories> - <excludes> - </excludes> - <consoleOutput>true</consoleOutput> - <failOnViolation>false</failOnViolation> - </configuration> - </execution> - <execution> - <id>onap-java-style</id> - <goals> - <goal>check</goal> - </goals> - <phase>process-sources</phase> - <configuration> - <!-- Use Google Java Style Guide: https://github.com/checkstyle/checkstyle/blob/master/src/main/resources/google_checks.xml - with minor changes --> - <configLocation>onap-checkstyle/onap-java-style.xml</configLocation> - <!-- <sourceDirectory> is needed so that checkstyle ignores the generated sources directory --> - <sourceDirectories> - <directory>${project.build.sourceDirectory}/src/main/java</directory> - </sourceDirectories> - <includeResources>true</includeResources> - <includeTestSourceDirectory>true</includeTestSourceDirectory> - <includeTestResources>true</includeTestResources> - <excludes> - </excludes> - <consoleOutput>true</consoleOutput> - <failOnViolation>false</failOnViolation> - </configuration> - </execution> - </executions> </plugin> <plugin> <groupId>org.codehaus.mojo</groupId> diff --git a/odlparent/odlparent/pom.xml b/odlparent/odlparent/pom.xml index 597fd678..20ff8b8a 100644 --- a/odlparent/odlparent/pom.xml +++ b/odlparent/odlparent/pom.xml @@ -111,21 +111,21 @@ <sdnctl.slipluginutils.version>${ccsdk.sli.version}</sdnctl.slipluginutils.version> <!-- Support libraries used by OpenDaylight --> - <odl.controller.mdsal.version>1.12.1</odl.controller.mdsal.version> - <odl.mdsal.version>6.0.7</odl.mdsal.version> - <odl.mdsal.model.version>6.0.7</odl.mdsal.model.version> - <odl.netconf.restconf.version>1.12.1</odl.netconf.restconf.version> - <odl.netconf.netconf.version>1.9.1</odl.netconf.netconf.version> - <odl.netconf.sal.rest.docgen.version>1.12.1</odl.netconf.sal.rest.docgen.version> + <odl.controller.mdsal.version>1.12.3</odl.controller.mdsal.version> + <odl.mdsal.version>6.0.8</odl.mdsal.version> + <odl.mdsal.model.version>6.0.8</odl.mdsal.model.version> + <odl.netconf.restconf.version>1.12.3</odl.netconf.restconf.version> + <odl.netconf.netconf.version>1.9.3</odl.netconf.netconf.version> + <odl.netconf.sal.rest.docgen.version>1.12.3</odl.netconf.sal.rest.docgen.version> <!-- Used by aaa, vtn --> <commons.codec.version>1.15</commons.codec.version> <!-- Used by netconf, ovsdb --> - <commons.lang3.version>3.8.1</commons.lang3.version> + <commons.lang3.version>3.11</commons.lang3.version> <!-- Used by sfc, snmp4sdn; see also affinity, toolkit --> <commons.lang.version>2.6</commons.lang.version> <!-- Used by neutron; see also controller, vtn --> - <commons.net.version>3.7</commons.net.version> + <commons.net.version>3.7.2</commons.net.version> <!-- Used by neutron --> <eclipse.persistence.version>2.7.7</eclipse.persistence.version> <!-- Used by aaa --> @@ -136,7 +136,7 @@ <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.10.4</jackson.version> + <jackson.version>2.10.5</jackson.version> <!-- Used by snmp4sdn, yangtools --> <javassist.version>3.27.0-GA</javassist.version> @@ -154,19 +154,19 @@ <!-- Used everywhere --> <junit.version>4.13</junit.version> <!-- Used by coretutorials, sfc, snmp4sdn, sxp; see also affinity, toolkit --> - <logback.version>1.11.6</logback.version> + <logback.version>1.11.7</logback.version> <!-- Used by nic, sfc, sxp, tsdr --> <mockito.version>3.3.3</mockito.version> <!-- Used by bgpcep, netconf, ovsdb, sxp; see also opendove, toolkit --> - <netty.version>4.1.51.Final</netty.version> + <netty.version>4.1.56.Final</netty.version> <!-- Used by openflowjava, persistence, sfc, snmp4sdn, sxp; see also affinity, toolkit --> - <slf4j.version>1.7.29</slf4j.version> + <slf4j.version>1.7.28</slf4j.version> <!-- Used in integration/distribution; see also affinity, snmp4sdn, toolkit, tsdr, ttp --> <spring.version>4.3.25.RELEASE</spring.version> <!-- Extra support libraries used by SDN-C --> <jvnet.jaxb2.version>0.6.4</jvnet.jaxb2.version> - <antlr.version>4.8.1</antlr.version> + <antlr.version>4.8-1</antlr.version> <eelf.maven.plugin.version>1.0.0</eelf.maven.plugin.version> @@ -180,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.28.v20200408</jetty.version> + <jetty.version>9.4.31.v20200723</jetty.version> <skip.karaf.featureTest>true</skip.karaf.featureTest> <dependency-list.file>direct-dependencies.txt</dependency-list.file> </properties> @@ -587,21 +587,6 @@ </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> @@ -668,6 +653,7 @@ </configuration> </plugin> <plugin> + <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-checkstyle-plugin</artifactId> <version>${checkstyle.plugin.version}</version> <dependencies> @@ -679,6 +665,16 @@ </dependencies> <executions> <execution> + <phase>process-sources</phase> + <goals> + <goal>check</goal> + </goals> + <configuration> + <failOnViolation>false</failOnViolation> + <skip>true</skip> + </configuration> + </execution> + <execution> <id>check-license</id> <goals> <goal>check</goal> @@ -750,71 +746,8 @@ <!-- Plugins from oparent --> <plugin> + <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-checkstyle-plugin</artifactId> - <version>${checkstyle.plugin.version}</version> - <dependencies> - <dependency> - <groupId>org.onap.oparent</groupId> - <artifactId>checkstyle</artifactId> - <version>1.2.2</version> - </dependency> - </dependencies> - <executions> - <execution> - <!-- overwrite odl default to supress spotbugs code check execution --> - <goals> - <goal>check</goal> - </goals> - <phase>process-sources</phase> - <configuration> - <skip>true</skip> - <failOnViolation>false</failOnViolation> - </configuration> - </execution> - <execution> - <id>onap-license</id> - <goals> - <goal>check</goal> - </goals> - <phase>process-sources</phase> - <configuration> - <configLocation>onap-checkstyle/check-license.xml</configLocation> - <includeResources>false</includeResources> - <includeTestSourceDirectory>true</includeTestSourceDirectory> - <includeTestResources>false</includeTestResources> - <sourceDirectories> - <directory>${project.build.sourceDirectory}</directory> - </sourceDirectories> - <excludes> - </excludes> - <consoleOutput>true</consoleOutput> - <failOnViolation>false</failOnViolation> - </configuration> - </execution> - <execution> - <id>onap-java-style</id> - <goals> - <goal>check</goal> - </goals> - <phase>process-sources</phase> - <configuration> - <!-- Use Google Java Style Guide: https://github.com/checkstyle/checkstyle/blob/master/src/main/resources/google_checks.xml - with minor changes --> - <configLocation>onap-checkstyle/onap-java-style.xml</configLocation> - <!-- <sourceDirectory> is needed so that checkstyle ignores the generated sources directory --> - <sourceDirectories> - <directory>${project.build.sourceDirectory}/src/main/java</directory> - </sourceDirectories> - <includeResources>true</includeResources> - <includeTestSourceDirectory>true</includeTestSourceDirectory> - <includeTestResources>true</includeTestResources> - <excludes> - </excludes> - <consoleOutput>true</consoleOutput> - <failOnViolation>false</failOnViolation> - </configuration> - </execution> - </executions> </plugin> <plugin> <groupId>org.codehaus.mojo</groupId> diff --git a/odlparent/setup/src/main/resources/pom-template.xml b/odlparent/setup/src/main/resources/pom-template.xml index abf820c1..87854a70 100755 --- a/odlparent/setup/src/main/resources/pom-template.xml +++ b/odlparent/setup/src/main/resources/pom-template.xml @@ -111,21 +111,21 @@ <sdnctl.slipluginutils.version>\${ccsdk.sli.version}</sdnctl.slipluginutils.version> <!-- Support libraries used by OpenDaylight --> - <odl.controller.mdsal.version>1.12.1</odl.controller.mdsal.version> - <odl.mdsal.version>6.0.7</odl.mdsal.version> - <odl.mdsal.model.version>6.0.7</odl.mdsal.model.version> - <odl.netconf.restconf.version>1.12.1</odl.netconf.restconf.version> - <odl.netconf.netconf.version>1.9.1</odl.netconf.netconf.version> - <odl.netconf.sal.rest.docgen.version>1.12.1</odl.netconf.sal.rest.docgen.version> + <odl.controller.mdsal.version>1.12.3</odl.controller.mdsal.version> + <odl.mdsal.version>6.0.8</odl.mdsal.version> + <odl.mdsal.model.version>6.0.8</odl.mdsal.model.version> + <odl.netconf.restconf.version>1.12.3</odl.netconf.restconf.version> + <odl.netconf.netconf.version>1.9.3</odl.netconf.netconf.version> + <odl.netconf.sal.rest.docgen.version>1.12.3</odl.netconf.sal.rest.docgen.version> <!-- Used by aaa, vtn --> <commons.codec.version>1.15</commons.codec.version> <!-- Used by netconf, ovsdb --> - <commons.lang3.version>3.8.1</commons.lang3.version> + <commons.lang3.version>3.11</commons.lang3.version> <!-- Used by sfc, snmp4sdn; see also affinity, toolkit --> <commons.lang.version>2.6</commons.lang.version> <!-- Used by neutron; see also controller, vtn --> - <commons.net.version>3.7</commons.net.version> + <commons.net.version>3.7.2</commons.net.version> <!-- Used by neutron --> <eclipse.persistence.version>2.7.7</eclipse.persistence.version> <!-- Used by aaa --> @@ -136,7 +136,7 @@ <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.10.4</jackson.version> + <jackson.version>2.10.5</jackson.version> <!-- Used by snmp4sdn, yangtools --> <javassist.version>3.27.0-GA</javassist.version> @@ -154,19 +154,19 @@ <!-- Used everywhere --> <junit.version>4.13</junit.version> <!-- Used by coretutorials, sfc, snmp4sdn, sxp; see also affinity, toolkit --> - <logback.version>1.11.6</logback.version> + <logback.version>1.11.7</logback.version> <!-- Used by nic, sfc, sxp, tsdr --> <mockito.version>3.3.3</mockito.version> <!-- Used by bgpcep, netconf, ovsdb, sxp; see also opendove, toolkit --> - <netty.version>4.1.51.Final</netty.version> + <netty.version>4.1.56.Final</netty.version> <!-- Used by openflowjava, persistence, sfc, snmp4sdn, sxp; see also affinity, toolkit --> - <slf4j.version>1.7.29</slf4j.version> + <slf4j.version>1.7.28</slf4j.version> <!-- Used in integration/distribution; see also affinity, snmp4sdn, toolkit, tsdr, ttp --> <spring.version>4.3.25.RELEASE</spring.version> <!-- Extra support libraries used by SDN-C --> <jvnet.jaxb2.version>0.6.4</jvnet.jaxb2.version> - <antlr.version>4.8.1</antlr.version> + <antlr.version>4.8-1</antlr.version> <eelf.maven.plugin.version>1.0.0</eelf.maven.plugin.version> @@ -180,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.28.v20200408</jetty.version> + <jetty.version>9.4.31.v20200723</jetty.version> <skip.karaf.featureTest>true</skip.karaf.featureTest> <dependency-list.file>direct-dependencies.txt</dependency-list.file> </properties> @@ -587,21 +587,6 @@ </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> @@ -668,6 +653,7 @@ </configuration> </plugin> <plugin> + <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-checkstyle-plugin</artifactId> <version>${checkstyle.plugin.version}</version> <dependencies> @@ -679,6 +665,16 @@ </dependencies> <executions> <execution> + <phase>process-sources</phase> + <goals> + <goal>check</goal> + </goals> + <configuration> + <failOnViolation>false</failOnViolation> + <skip>true</skip> + </configuration> + </execution> + <execution> <id>check-license</id> <goals> <goal>check</goal> @@ -750,71 +746,8 @@ <!-- Plugins from oparent --> <plugin> + <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-checkstyle-plugin</artifactId> - <version>${checkstyle.plugin.version}</version> - <dependencies> - <dependency> - <groupId>org.onap.oparent</groupId> - <artifactId>checkstyle</artifactId> - <version>1.2.2</version> - </dependency> - </dependencies> - <executions> - <execution> - <!-- overwrite odl default to supress spotbugs code check execution --> - <goals> - <goal>check</goal> - </goals> - <phase>process-sources</phase> - <configuration> - <skip>true</skip> - <failOnViolation>false</failOnViolation> - </configuration> - </execution> - <execution> - <id>onap-license</id> - <goals> - <goal>check</goal> - </goals> - <phase>process-sources</phase> - <configuration> - <configLocation>onap-checkstyle/check-license.xml</configLocation> - <includeResources>false</includeResources> - <includeTestSourceDirectory>true</includeTestSourceDirectory> - <includeTestResources>false</includeTestResources> - <sourceDirectories> - <directory>\${project.build.sourceDirectory}</directory> - </sourceDirectories> - <excludes> - </excludes> - <consoleOutput>true</consoleOutput> - <failOnViolation>false</failOnViolation> - </configuration> - </execution> - <execution> - <id>onap-java-style</id> - <goals> - <goal>check</goal> - </goals> - <phase>process-sources</phase> - <configuration> - <!-- Use Google Java Style Guide: https://github.com/checkstyle/checkstyle/blob/master/src/main/resources/google_checks.xml - with minor changes --> - <configLocation>onap-checkstyle/onap-java-style.xml</configLocation> - <!-- <sourceDirectory> is needed so that checkstyle ignores the generated sources directory --> - <sourceDirectories> - <directory>\${project.build.sourceDirectory}/src/main/java</directory> - </sourceDirectories> - <includeResources>true</includeResources> - <includeTestSourceDirectory>true</includeTestSourceDirectory> - <includeTestResources>true</includeTestResources> - <excludes> - </excludes> - <consoleOutput>true</consoleOutput> - <failOnViolation>false</failOnViolation> - </configuration> - </execution> - </executions> </plugin> <plugin> <groupId>org.codehaus.mojo</groupId> diff --git a/odlparent/single-feature-parent/pom.xml b/odlparent/single-feature-parent/pom.xml index 018d0255..73784493 100644 --- a/odlparent/single-feature-parent/pom.xml +++ b/odlparent/single-feature-parent/pom.xml @@ -111,21 +111,21 @@ <sdnctl.slipluginutils.version>${ccsdk.sli.version}</sdnctl.slipluginutils.version> <!-- Support libraries used by OpenDaylight --> - <odl.controller.mdsal.version>1.12.1</odl.controller.mdsal.version> - <odl.mdsal.version>6.0.7</odl.mdsal.version> - <odl.mdsal.model.version>6.0.7</odl.mdsal.model.version> - <odl.netconf.restconf.version>1.12.1</odl.netconf.restconf.version> - <odl.netconf.netconf.version>1.9.1</odl.netconf.netconf.version> - <odl.netconf.sal.rest.docgen.version>1.12.1</odl.netconf.sal.rest.docgen.version> + <odl.controller.mdsal.version>1.12.3</odl.controller.mdsal.version> + <odl.mdsal.version>6.0.8</odl.mdsal.version> + <odl.mdsal.model.version>6.0.8</odl.mdsal.model.version> + <odl.netconf.restconf.version>1.12.3</odl.netconf.restconf.version> + <odl.netconf.netconf.version>1.9.3</odl.netconf.netconf.version> + <odl.netconf.sal.rest.docgen.version>1.12.3</odl.netconf.sal.rest.docgen.version> <!-- Used by aaa, vtn --> <commons.codec.version>1.15</commons.codec.version> <!-- Used by netconf, ovsdb --> - <commons.lang3.version>3.8.1</commons.lang3.version> + <commons.lang3.version>3.11</commons.lang3.version> <!-- Used by sfc, snmp4sdn; see also affinity, toolkit --> <commons.lang.version>2.6</commons.lang.version> <!-- Used by neutron; see also controller, vtn --> - <commons.net.version>3.7</commons.net.version> + <commons.net.version>3.7.2</commons.net.version> <!-- Used by neutron --> <eclipse.persistence.version>2.7.7</eclipse.persistence.version> <!-- Used by aaa --> @@ -136,7 +136,7 @@ <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.10.4</jackson.version> + <jackson.version>2.10.5</jackson.version> <!-- Used by snmp4sdn, yangtools --> <javassist.version>3.27.0-GA</javassist.version> @@ -154,19 +154,19 @@ <!-- Used everywhere --> <junit.version>4.13</junit.version> <!-- Used by coretutorials, sfc, snmp4sdn, sxp; see also affinity, toolkit --> - <logback.version>1.11.6</logback.version> + <logback.version>1.11.7</logback.version> <!-- Used by nic, sfc, sxp, tsdr --> <mockito.version>3.3.3</mockito.version> <!-- Used by bgpcep, netconf, ovsdb, sxp; see also opendove, toolkit --> - <netty.version>4.1.51.Final</netty.version> + <netty.version>4.1.56.Final</netty.version> <!-- Used by openflowjava, persistence, sfc, snmp4sdn, sxp; see also affinity, toolkit --> - <slf4j.version>1.7.29</slf4j.version> + <slf4j.version>1.7.28</slf4j.version> <!-- Used in integration/distribution; see also affinity, snmp4sdn, toolkit, tsdr, ttp --> <spring.version>4.3.25.RELEASE</spring.version> <!-- Extra support libraries used by SDN-C --> <jvnet.jaxb2.version>0.6.4</jvnet.jaxb2.version> - <antlr.version>4.8.1</antlr.version> + <antlr.version>4.8-1</antlr.version> <eelf.maven.plugin.version>1.0.0</eelf.maven.plugin.version> @@ -180,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.28.v20200408</jetty.version> + <jetty.version>9.4.31.v20200723</jetty.version> <skip.karaf.featureTest>true</skip.karaf.featureTest> <dependency-list.file>direct-dependencies.txt</dependency-list.file> </properties> @@ -587,21 +587,6 @@ </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> @@ -668,6 +653,7 @@ </configuration> </plugin> <plugin> + <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-checkstyle-plugin</artifactId> <version>${checkstyle.plugin.version}</version> <dependencies> @@ -679,6 +665,16 @@ </dependencies> <executions> <execution> + <phase>process-sources</phase> + <goals> + <goal>check</goal> + </goals> + <configuration> + <failOnViolation>false</failOnViolation> + <skip>true</skip> + </configuration> + </execution> + <execution> <id>check-license</id> <goals> <goal>check</goal> @@ -750,71 +746,8 @@ <!-- Plugins from oparent --> <plugin> + <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-checkstyle-plugin</artifactId> - <version>${checkstyle.plugin.version}</version> - <dependencies> - <dependency> - <groupId>org.onap.oparent</groupId> - <artifactId>checkstyle</artifactId> - <version>1.2.2</version> - </dependency> - </dependencies> - <executions> - <execution> - <!-- overwrite odl default to supress spotbugs code check execution --> - <goals> - <goal>check</goal> - </goals> - <phase>process-sources</phase> - <configuration> - <skip>true</skip> - <failOnViolation>false</failOnViolation> - </configuration> - </execution> - <execution> - <id>onap-license</id> - <goals> - <goal>check</goal> - </goals> - <phase>process-sources</phase> - <configuration> - <configLocation>onap-checkstyle/check-license.xml</configLocation> - <includeResources>false</includeResources> - <includeTestSourceDirectory>true</includeTestSourceDirectory> - <includeTestResources>false</includeTestResources> - <sourceDirectories> - <directory>${project.build.sourceDirectory}</directory> - </sourceDirectories> - <excludes> - </excludes> - <consoleOutput>true</consoleOutput> - <failOnViolation>false</failOnViolation> - </configuration> - </execution> - <execution> - <id>onap-java-style</id> - <goals> - <goal>check</goal> - </goals> - <phase>process-sources</phase> - <configuration> - <!-- Use Google Java Style Guide: https://github.com/checkstyle/checkstyle/blob/master/src/main/resources/google_checks.xml - with minor changes --> - <configLocation>onap-checkstyle/onap-java-style.xml</configLocation> - <!-- <sourceDirectory> is needed so that checkstyle ignores the generated sources directory --> - <sourceDirectories> - <directory>${project.build.sourceDirectory}/src/main/java</directory> - </sourceDirectories> - <includeResources>true</includeResources> - <includeTestSourceDirectory>true</includeTestSourceDirectory> - <includeTestResources>true</includeTestResources> - <excludes> - </excludes> - <consoleOutput>true</consoleOutput> - <failOnViolation>false</failOnViolation> - </configuration> - </execution> - </executions> </plugin> <plugin> <groupId>org.codehaus.mojo</groupId> |