diff options
| author |   Singal, Kapil (ks220y) <ks220y@att.com> | 2021-06-08 12:00:17 -0400 |
|---|---|---|
| committer | Singal, Kapil (ks220y) <ks220y@att.com> | 2021-06-08 14:43:34 -0400 |
| commit | b2db3c41156f0855daafa8afe29f0aca43cc225d (patch) | |
| tree | 9173fa6cbe5731d5150f01ee4b482ff5aee71601 | |
| parent | b473d3c5a0287f093b893f88fe262b62925438ec (diff) | |
Updating parent poms as per Silicon onap-karaf:0.14.0 package
Issue-ID: CCSDK-3329
Signed-off-by: Singal, Kapil (ks220y) <ks220y@att.com>
Change-Id: If9ac73ec5f0ad8a2bd0b09ed4a17731cb357d900
| -rw-r--r-- | dependencies-bom/pom.xml | 26 | ||||
| -rw-r--r-- | dependencies-odl-bom/pom.xml | 23 | ||||
| -rw-r--r-- | installed-odl-bom/pom.xml | 2 | ||||
| -rw-r--r-- | odlparent/binding-parent/pom.xml | 111 | ||||
| -rw-r--r-- | odlparent/bundle-parent/pom.xml | 111 | ||||
| -rw-r--r-- | odlparent/feature-repo-parent/pom.xml | 111 | ||||
| -rw-r--r-- | odlparent/karaf4-parent/pom.xml | 111 | ||||
| -rw-r--r-- | odlparent/mdsal-it-parent/pom.xml | 111 | ||||
| -rw-r--r-- | odlparent/odlparent-lite/pom.xml | 111 | ||||
| -rw-r--r-- | odlparent/odlparent/pom.xml | 111 | ||||
| -rwxr-xr-x | odlparent/setup/src/main/resources/pom-template.xml | 111 | ||||
| -rw-r--r-- | odlparent/single-feature-parent/pom.xml | 111 | ||||
| -rwxr-xr-x | oparent/pom.xml | 6 | ||||
| -rw-r--r-- | springboot/spring-boot-setup/src/main/resources/pom-template.xml | 2 | ||||
| -rw-r--r-- | springboot/springboot1/pom.xml | 2 | ||||
| -rw-r--r-- | springboot/springboot2/pom.xml | 2 | ||||
| -rwxr-xr-x | standalone/pom.xml | 9 |
17 files changed, 256 insertions, 815 deletions
diff --git a/dependencies-bom/pom.xml b/dependencies-bom/pom.xml index fac96450..71595844 100644 --- a/dependencies-bom/pom.xml +++ b/dependencies-bom/pom.xml @@ -44,6 +44,7 @@ <dependency> <groupId>com.fasterxml.jackson</groupId> <artifactId>jackson-bom</artifactId> + <!-- ODL Aluminum has 2.10.5 --> <version>2.11.4</version> <type>pom</type> <scope>import</scope> @@ -120,10 +121,16 @@ <artifactId>javaee-api</artifactId> <version>7.0</version> </dependency> + <!-- Below provides javax.annotations --> + <dependency> + <groupId>com.google.code.findbugs</groupId> + <artifactId>annotations</artifactId> + <version>3.0.1</version> + </dependency> <dependency> <groupId>javax.annotation</groupId> <artifactId>javax.annotation-api</artifactId> - <version>1.3</version> + <version>1.3.1</version> <optional>true</optional> </dependency> <dependency> @@ -134,7 +141,14 @@ <dependency> <groupId>javax.ws.rs</groupId> <artifactId>javax.ws.rs-api</artifactId> - <version>2.1</version> + <version>2.1.1</version> + </dependency> + <!-- Below provides javax.jws --> + <dependency> + <groupId>com.sun.xml.ws</groupId> + <artifactId>jaxws-ri</artifactId> + <version>2.3.4</version> + <type>pom</type> </dependency> <dependency> <groupId>javax.xml.bind</groupId> @@ -166,12 +180,12 @@ <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-lang3</artifactId> - <version>3.8.1</version> + <version>3.11</version> </dependency> <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-text</artifactId> - <version>1.6</version> + <version>1.9</version> </dependency> <dependency> <groupId>org.apache.derby</groupId> @@ -227,6 +241,7 @@ <dependency> <groupId>org.glassfish.jersey</groupId> <artifactId>jersey-bom</artifactId> + <!-- ODL has 2.27 --> <version>2.29.1</version> <type>pom</type> <scope>import</scope> @@ -244,11 +259,13 @@ <dependency> <groupId>org.json</groupId> <artifactId>json</artifactId> + <!-- ODL has 20131018 --> <version>20201115</version> </dependency> <dependency> <groupId>org.jsoup</groupId> <artifactId>jsoup</artifactId> + <!-- ODL has 1.8.3 --> <version>1.12.1</version> </dependency> <dependency> @@ -286,6 +303,7 @@ <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> + <!-- ODL has 1.7.28 --> <version>1.7.30</version> </dependency> <dependency> diff --git a/dependencies-odl-bom/pom.xml b/dependencies-odl-bom/pom.xml index 27076a60..060345ab 100644 --- a/dependencies-odl-bom/pom.xml +++ b/dependencies-odl-bom/pom.xml @@ -98,16 +98,31 @@ <artifactId>elasticsearch-rest-client</artifactId> <version>6.4.3</version> </dependency> + <!-- Using dmaapClient 1.1.5 as SLI needs java package as com.att.nsa.mr and dmaapClient 1.1.12 has org.onap.dmaap.mr --> <dependency> <groupId>org.onap.dmaap.messagerouter.dmaapclient</groupId> <artifactId>dmaapClient</artifactId> - <version>1.1.12</version> + <version>1.1.5</version> </dependency> + <!-- Below provides javax.annotations --> <dependency> <groupId>com.google.code.findbugs</groupId> <artifactId>annotations</artifactId> <version>3.0.1</version> </dependency> + <!-- Below provides javax.xml.bind and javax.xml.bind.annotations --> + <dependency> + <groupId>javax.xml.bind</groupId> + <artifactId>jaxb-api</artifactId> + <version>2.3.1</version> + </dependency> + <!-- Below provides javax.jws --> + <dependency> + <groupId>com.sun.xml.ws</groupId> + <artifactId>jaxws-ri</artifactId> + <version>2.3.4</version> + <type>pom</type> + </dependency> <dependency> <groupId>org.glassfish.jersey</groupId> <artifactId>jersey-bom</artifactId> @@ -125,6 +140,12 @@ <artifactId>org.osgi.compendium</artifactId> <version>5.0.0</version> </dependency> + <!-- Below is required by com.google.guava : guava : jar : 28.2-jre --> + <dependency> + <groupId>com.google.guava</groupId> + <artifactId>listenablefuture</artifactId> + <version>9999.0-empty-to-avoid-conflict-with-guava</version> + </dependency> </dependencies> </dependencyManagement> diff --git a/installed-odl-bom/pom.xml b/installed-odl-bom/pom.xml index b0eba0de..58681e86 100644 --- a/installed-odl-bom/pom.xml +++ b/installed-odl-bom/pom.xml @@ -3427,7 +3427,7 @@ </dependency> </dependencies> </dependencyManagement> - + <build> <plugins> <plugin> diff --git a/odlparent/binding-parent/pom.xml b/odlparent/binding-parent/pom.xml index 1ac5f71b..a11e81a4 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.13.0</odl.controller.mdsal.version> + <odl.controller.mdsal.version>1.13.1</odl.controller.mdsal.version> <odl.mdsal.version>7.0.6</odl.mdsal.version> <odl.mdsal.model.version>7.0.6</odl.mdsal.model.version> - <odl.netconf.restconf.version>1.13.0</odl.netconf.restconf.version> + <odl.netconf.restconf.version>1.13.1</odl.netconf.restconf.version> <odl.netconf.netconf.version>1.13.1</odl.netconf.netconf.version> - <odl.netconf.sal.rest.docgen.version>1.13.0</odl.netconf.sal.rest.docgen.version> + <odl.netconf.sal.rest.docgen.version>1.13.1</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.8</commons.net.version> + <commons.net.version>3.8.0</commons.net.version> <!-- Used by neutron --> <eclipse.persistence.version>2.7.7</eclipse.persistence.version> <!-- Used by aaa --> @@ -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.59.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> @@ -772,71 +768,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 5ca12e84..eaa63c95 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.13.0</odl.controller.mdsal.version> + <odl.controller.mdsal.version>1.13.1</odl.controller.mdsal.version> <odl.mdsal.version>7.0.6</odl.mdsal.version> <odl.mdsal.model.version>7.0.6</odl.mdsal.model.version> - <odl.netconf.restconf.version>1.13.0</odl.netconf.restconf.version> + <odl.netconf.restconf.version>1.13.1</odl.netconf.restconf.version> <odl.netconf.netconf.version>1.13.1</odl.netconf.netconf.version> - <odl.netconf.sal.rest.docgen.version>1.13.0</odl.netconf.sal.rest.docgen.version> + <odl.netconf.sal.rest.docgen.version>1.13.1</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.8</commons.net.version> + <commons.net.version>3.8.0</commons.net.version> <!-- Used by neutron --> <eclipse.persistence.version>2.7.7</eclipse.persistence.version> <!-- Used by aaa --> @@ -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.59.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> @@ -772,71 +768,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 fa56a6a7..0663f9e9 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.13.0</odl.controller.mdsal.version> + <odl.controller.mdsal.version>1.13.1</odl.controller.mdsal.version> <odl.mdsal.version>7.0.6</odl.mdsal.version> <odl.mdsal.model.version>7.0.6</odl.mdsal.model.version> - <odl.netconf.restconf.version>1.13.0</odl.netconf.restconf.version> + <odl.netconf.restconf.version>1.13.1</odl.netconf.restconf.version> <odl.netconf.netconf.version>1.13.1</odl.netconf.netconf.version> - <odl.netconf.sal.rest.docgen.version>1.13.0</odl.netconf.sal.rest.docgen.version> + <odl.netconf.sal.rest.docgen.version>1.13.1</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.8</commons.net.version> + <commons.net.version>3.8.0</commons.net.version> <!-- Used by neutron --> <eclipse.persistence.version>2.7.7</eclipse.persistence.version> <!-- Used by aaa --> @@ -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.59.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> @@ -772,71 +768,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 bc136043..9f8945cb 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.13.0</odl.controller.mdsal.version> + <odl.controller.mdsal.version>1.13.1</odl.controller.mdsal.version> <odl.mdsal.version>7.0.6</odl.mdsal.version> <odl.mdsal.model.version>7.0.6</odl.mdsal.model.version> - <odl.netconf.restconf.version>1.13.0</odl.netconf.restconf.version> + <odl.netconf.restconf.version>1.13.1</odl.netconf.restconf.version> <odl.netconf.netconf.version>1.13.1</odl.netconf.netconf.version> - <odl.netconf.sal.rest.docgen.version>1.13.0</odl.netconf.sal.rest.docgen.version> + <odl.netconf.sal.rest.docgen.version>1.13.1</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.8</commons.net.version> + <commons.net.version>3.8.0</commons.net.version> <!-- Used by neutron --> <eclipse.persistence.version>2.7.7</eclipse.persistence.version> <!-- Used by aaa --> @@ -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.59.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> @@ -772,71 +768,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 43d3f30e..1bc99418 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.13.0</odl.controller.mdsal.version> + <odl.controller.mdsal.version>1.13.1</odl.controller.mdsal.version> <odl.mdsal.version>7.0.6</odl.mdsal.version> <odl.mdsal.model.version>7.0.6</odl.mdsal.model.version> - <odl.netconf.restconf.version>1.13.0</odl.netconf.restconf.version> + <odl.netconf.restconf.version>1.13.1</odl.netconf.restconf.version> <odl.netconf.netconf.version>1.13.1</odl.netconf.netconf.version> - <odl.netconf.sal.rest.docgen.version>1.13.0</odl.netconf.sal.rest.docgen.version> + <odl.netconf.sal.rest.docgen.version>1.13.1</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.8</commons.net.version> + <commons.net.version>3.8.0</commons.net.version> <!-- Used by neutron --> <eclipse.persistence.version>2.7.7</eclipse.persistence.version> <!-- Used by aaa --> @@ -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.59.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> @@ -772,71 +768,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 46ddaf9e..059b6fdb 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.13.0</odl.controller.mdsal.version> + <odl.controller.mdsal.version>1.13.1</odl.controller.mdsal.version> <odl.mdsal.version>7.0.6</odl.mdsal.version> <odl.mdsal.model.version>7.0.6</odl.mdsal.model.version> - <odl.netconf.restconf.version>1.13.0</odl.netconf.restconf.version> + <odl.netconf.restconf.version>1.13.1</odl.netconf.restconf.version> <odl.netconf.netconf.version>1.13.1</odl.netconf.netconf.version> - <odl.netconf.sal.rest.docgen.version>1.13.0</odl.netconf.sal.rest.docgen.version> + <odl.netconf.sal.rest.docgen.version>1.13.1</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.8</commons.net.version> + <commons.net.version>3.8.0</commons.net.version> <!-- Used by neutron --> <eclipse.persistence.version>2.7.7</eclipse.persistence.version> <!-- Used by aaa --> @@ -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.59.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> @@ -772,71 +768,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 949942a3..5383be0a 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.13.0</odl.controller.mdsal.version> + <odl.controller.mdsal.version>1.13.1</odl.controller.mdsal.version> <odl.mdsal.version>7.0.6</odl.mdsal.version> <odl.mdsal.model.version>7.0.6</odl.mdsal.model.version> - <odl.netconf.restconf.version>1.13.0</odl.netconf.restconf.version> + <odl.netconf.restconf.version>1.13.1</odl.netconf.restconf.version> <odl.netconf.netconf.version>1.13.1</odl.netconf.netconf.version> - <odl.netconf.sal.rest.docgen.version>1.13.0</odl.netconf.sal.rest.docgen.version> + <odl.netconf.sal.rest.docgen.version>1.13.1</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.8</commons.net.version> + <commons.net.version>3.8.0</commons.net.version> <!-- Used by neutron --> <eclipse.persistence.version>2.7.7</eclipse.persistence.version> <!-- Used by aaa --> @@ -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.59.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> @@ -772,71 +768,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 e5eeb722..9d1690dd 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.13.0</odl.controller.mdsal.version> + <odl.controller.mdsal.version>1.13.1</odl.controller.mdsal.version> <odl.mdsal.version>7.0.6</odl.mdsal.version> <odl.mdsal.model.version>7.0.6</odl.mdsal.model.version> - <odl.netconf.restconf.version>1.13.0</odl.netconf.restconf.version> + <odl.netconf.restconf.version>1.13.1</odl.netconf.restconf.version> <odl.netconf.netconf.version>1.13.1</odl.netconf.netconf.version> - <odl.netconf.sal.rest.docgen.version>1.13.0</odl.netconf.sal.rest.docgen.version> + <odl.netconf.sal.rest.docgen.version>1.13.1</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.8</commons.net.version> + <commons.net.version>3.8.0</commons.net.version> <!-- Used by neutron --> <eclipse.persistence.version>2.7.7</eclipse.persistence.version> <!-- Used by aaa --> @@ -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.59.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> @@ -772,71 +768,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 455783dd..f13c79ed 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.13.0</odl.controller.mdsal.version> + <odl.controller.mdsal.version>1.13.1</odl.controller.mdsal.version> <odl.mdsal.version>7.0.6</odl.mdsal.version> <odl.mdsal.model.version>7.0.6</odl.mdsal.model.version> - <odl.netconf.restconf.version>1.13.0</odl.netconf.restconf.version> + <odl.netconf.restconf.version>1.13.1</odl.netconf.restconf.version> <odl.netconf.netconf.version>1.13.1</odl.netconf.netconf.version> - <odl.netconf.sal.rest.docgen.version>1.13.0</odl.netconf.sal.rest.docgen.version> + <odl.netconf.sal.rest.docgen.version>1.13.1</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.8</commons.net.version> + <commons.net.version>3.8.0</commons.net.version> <!-- Used by neutron --> <eclipse.persistence.version>2.7.7</eclipse.persistence.version> <!-- Used by aaa --> @@ -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.59.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> @@ -772,71 +768,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/oparent/pom.xml b/oparent/pom.xml index 7b0f9795..98d5ad0d 100755 --- a/oparent/pom.xml +++ b/oparent/pom.xml @@ -67,10 +67,10 @@ <ccsdk.sli.plugins.version>${ccsdk.sli.version}</ccsdk.sli.plugins.version> <ccsdk.distribution.version>1.1.1-SNAPSHOT</ccsdk.distribution.version> - <mariadb.connector.version>2.1.1</mariadb.connector.version> - <fasterxml.jackson.version>2.10.0</fasterxml.jackson.version> + <mariadb.connector.version>2.4.4</mariadb.connector.version> + <fasterxml.jackson.version>2.10.5</fasterxml.jackson.version> <velocity.version>2.0</velocity.version> - + <!-- Using dmaapClient 1.1.5 as SLI needs java package as com.att.nsa.mr and dmaapClient 1.1.12 has org.onap.dmaap.mr --> <dmaap.listener.version>1.1.5</dmaap.listener.version> <sdc.client.version>1.4.1</sdc.client.version> <sdc.tosca.version>1.6.5</sdc.tosca.version> diff --git a/springboot/spring-boot-setup/src/main/resources/pom-template.xml b/springboot/spring-boot-setup/src/main/resources/pom-template.xml index 3c0373bc..903aee08 100644 --- a/springboot/spring-boot-setup/src/main/resources/pom-template.xml +++ b/springboot/spring-boot-setup/src/main/resources/pom-template.xml @@ -335,6 +335,7 @@ </executions> </plugin> <plugin> + <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-checkstyle-plugin</artifactId> <version>2.17</version> <dependencies> @@ -612,6 +613,7 @@ <artifactId>maven-deploy-plugin</artifactId> </plugin> <plugin> + <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-checkstyle-plugin</artifactId> </plugin> <plugin> diff --git a/springboot/springboot1/pom.xml b/springboot/springboot1/pom.xml index d3ad2bce..d8c3ce76 100644 --- a/springboot/springboot1/pom.xml +++ b/springboot/springboot1/pom.xml @@ -335,6 +335,7 @@ </executions> </plugin> <plugin> + <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-checkstyle-plugin</artifactId> <version>2.17</version> <dependencies> @@ -612,6 +613,7 @@ <artifactId>maven-deploy-plugin</artifactId> </plugin> <plugin> + <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-checkstyle-plugin</artifactId> </plugin> <plugin> diff --git a/springboot/springboot2/pom.xml b/springboot/springboot2/pom.xml index eb6e5e5a..3179f97b 100644 --- a/springboot/springboot2/pom.xml +++ b/springboot/springboot2/pom.xml @@ -335,6 +335,7 @@ </executions> </plugin> <plugin> + <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-checkstyle-plugin</artifactId> <version>2.17</version> <dependencies> @@ -612,6 +613,7 @@ <artifactId>maven-deploy-plugin</artifactId> </plugin> <plugin> + <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-checkstyle-plugin</artifactId> </plugin> <plugin> diff --git a/standalone/pom.xml b/standalone/pom.xml index 93d581bc..753f87b1 100755 --- a/standalone/pom.xml +++ b/standalone/pom.xml @@ -55,16 +55,15 @@ <bundle.plugin.version>2.5.0</bundle.plugin.version> <checkstyle.skip>true</checkstyle.skip> - <mariadb.connector.version>2.1.1</mariadb.connector.version> - <fasterxml.jackson.version>2.10.0</fasterxml.jackson.version> + <mariadb.connector.version>2.4.4</mariadb.connector.version> + <fasterxml.jackson.version>2.10.5</fasterxml.jackson.version> <velocity.version>2.0</velocity.version> - + <!-- Using dmaapClient 1.1.5 as SLI needs java package as com.att.nsa.mr and dmaapClient 1.1.12 has org.onap.dmaap.mr --> <dmaap.listener.version>1.1.5</dmaap.listener.version> <sdc.client.version>1.4.1</sdc.client.version> <sdc.tosca.version>1.6.5</sdc.tosca.version> <dependency-list.file>direct-dependencies.txt</dependency-list.file> - </properties> <dependencyManagement> @@ -89,7 +88,7 @@ <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> - <version>1.7.21</version> + <version>1.7.28</version> </dependency> <dependency> <groupId>org.apache.logging.log4j</groupId> |