From 930d8da958c43f9c33b41926143ad06858b5aa68 Mon Sep 17 00:00:00 2001 From: "Singal, Kapil (ks220y)" Date: Tue, 8 Jun 2021 12:00:17 -0400 Subject: [PATCH] Updating parent poms as per ODL Aluminum 0.13.3 (SR3) Issue-ID: CCSDK-3329 Signed-off-by: Singal, Kapil (ks220y) Change-Id: If9ac73ec5f0ad8a2bd0b09ed4a17731cb357d900 --- dependencies-bom/pom.xml | 28 +- dependencies-odl-bom/pom.xml | 35 +- installed-odl-bom/pom.xml | 441 +++++++++------------ odlparent/binding-parent/pom.xml | 119 ++---- odlparent/bundle-parent/pom.xml | 119 ++---- odlparent/feature-repo-parent/pom.xml | 119 ++---- odlparent/karaf4-parent/pom.xml | 119 ++---- odlparent/mdsal-it-parent/pom.xml | 119 ++---- odlparent/odlparent-lite/pom.xml | 119 ++---- odlparent/odlparent/pom.xml | 119 ++---- .../setup/src/main/resources/pom-template.xml | 119 ++---- odlparent/single-feature-parent/pom.xml | 119 ++---- oparent/pom.xml | 6 +- .../src/main/resources/pom-template.xml | 2 + springboot/springboot1/pom.xml | 2 + springboot/springboot2/pom.xml | 2 + standalone/pom.xml | 9 +- 17 files changed, 481 insertions(+), 1115 deletions(-) diff --git a/dependencies-bom/pom.xml b/dependencies-bom/pom.xml index bc84c2f6..0c4a79e3 100644 --- a/dependencies-bom/pom.xml +++ b/dependencies-bom/pom.xml @@ -44,6 +44,7 @@ com.fasterxml.jackson jackson-bom + 2.11.4 pom import @@ -120,10 +121,16 @@ javaee-api 7.0 + + + com.google.code.findbugs + annotations + 3.0.1 + javax.annotation javax.annotation-api - 1.3 + 1.3.1 true @@ -134,7 +141,14 @@ javax.ws.rs javax.ws.rs-api - 2.1 + 2.1.1 + + + + com.sun.xml.ws + jaxws-ri + 2.3.4 + pom javax.xml.bind @@ -156,7 +170,7 @@ org.antlr antlr4-runtime - 4.7.2 + 4.8-1 org.apache.commons @@ -166,12 +180,12 @@ org.apache.commons commons-lang3 - 3.8.1 + 3.11 org.apache.commons commons-text - 1.6 + 1.9 org.apache.derby @@ -227,6 +241,7 @@ org.glassfish.jersey jersey-bom + 2.29.1 pom import @@ -244,11 +259,13 @@ org.json json + 20201115 org.jsoup jsoup + 1.12.1 @@ -286,6 +303,7 @@ org.slf4j slf4j-api + 1.7.30 diff --git a/dependencies-odl-bom/pom.xml b/dependencies-odl-bom/pom.xml index 0cede3da..703f58c8 100644 --- a/dependencies-odl-bom/pom.xml +++ b/dependencies-odl-bom/pom.xml @@ -44,40 +44,40 @@ org.opendaylight.bgpcep bgp-artifacts - 0.14.1 + 0.14.3 pom import org.opendaylight.controller controller-artifacts - 2.0.6 + 2.0.7 pom import org.opendaylight.mdsal mdsal-artifacts - 6.0.7 + 6.0.8 pom import org.opendaylight.netconf netconf-artifacts - 1.9.1 + 1.9.3 pom import org.opendaylight.controller sal-binding-broker-impl - 1.12.1 + 1.12.3 org.opendaylight.controller sal-binding-broker-impl - 1.12.1 + 1.12.3 test-jar tests test @@ -98,16 +98,31 @@ elasticsearch-rest-client 6.4.3 + org.onap.dmaap.messagerouter.dmaapclient dmaapClient - 1.1.12 + 1.1.5 + com.google.code.findbugs annotations 3.0.1 + + + javax.xml.bind + jaxb-api + 2.3.1 + + + + com.sun.xml.ws + jaxws-ri + 2.3.4 + pom + org.glassfish.jersey jersey-bom @@ -120,6 +135,12 @@ commons-cli 1.3.1 + + + com.google.guava + listenablefuture + 9999.0-empty-to-avoid-conflict-with-guava + diff --git a/installed-odl-bom/pom.xml b/installed-odl-bom/pom.xml index a622e820..39ba6212 100644 --- a/installed-odl-bom/pom.xml +++ b/installed-odl-bom/pom.xml @@ -40,16 +40,6 @@ reflectasm 1.11.8 - - com.fasterxml - classmate - 1.3.4 - - - com.fasterxml - classmate - 1.5.1 - com.fasterxml.jackson.core jackson-annotations @@ -90,6 +80,11 @@ woodstox-core 6.2.3 + + com.fasterxml + classmate + 1.5.1 + com.github.mifmif generex @@ -120,11 +115,6 @@ json-simple 1.1.1 - - com.h2database - h2 - 1.4.199 - com.h2database h2 @@ -360,11 +350,6 @@ javax.annotation-api 1.3.1 - - javax.annotation - javax.annotation-api - 1.3 - javax.el javax.el-api @@ -650,11 +635,6 @@ org.apache.aries.jpa.support 2.7.2 - - org.apache.aries - org.apache.aries.util - 1.1.3 - org.apache.aries.proxy org.apache.aries.proxy @@ -680,11 +660,6 @@ org.apache.aries.subsystem.core 2.0.10 - - org.apache.aries.transaction - org.apache.aries.transaction.blueprint - 1.1.1 - org.apache.aries.transaction org.apache.aries.transaction.blueprint @@ -696,14 +671,14 @@ 1.3.3 - org.apache.commons - commons-collections4 - 4.3 + org.apache.aries + org.apache.aries.util + 1.1.3 org.apache.commons - commons-dbcp2 - 2.1.1 + commons-collections4 + 4.3 org.apache.commons @@ -715,16 +690,6 @@ commons-lang3 3.11 - - org.apache.commons - commons-pool2 - 2.6.0 - - - org.apache.commons - commons-pool2 - 2.6.2 - org.apache.commons commons-pool2 @@ -787,12 +752,12 @@ org.apache.derby - derby + derbyclient 10.14.2.0 org.apache.derby - derbyclient + derby 10.14.2.0 @@ -1120,11 +1085,6 @@ org.apache.karaf.management.server 4.2.10 - - org.apache.karaf - manual - 4.2.10 - org.apache.karaf.maven org.apache.karaf.maven.core @@ -1135,16 +1095,6 @@ org.apache.karaf.obr.core 4.2.10 - - org.apache.karaf - org.apache.karaf.client - 4.2.10 - - - org.apache.karaf - org.apache.karaf.event - 4.2.10 - org.apache.karaf.package org.apache.karaf.package.core @@ -1171,23 +1121,23 @@ 4.2.10 - org.apache.karaf.service - org.apache.karaf.service.core + org.apache.karaf.services + org.apache.karaf.services.coordinator 4.2.10 - org.apache.karaf.service - org.apache.karaf.service.guard + org.apache.karaf.services + org.apache.karaf.services.eventadmin 4.2.10 - org.apache.karaf.services - org.apache.karaf.services.coordinator + org.apache.karaf.service + org.apache.karaf.service.core 4.2.10 - org.apache.karaf.services - org.apache.karaf.services.eventadmin + org.apache.karaf.service + org.apache.karaf.service.guard 4.2.10 @@ -1230,11 +1180,6 @@ org.apache.karaf.tools.utils 4.2.10 - - org.apache.karaf.web - org.apache.karaf.web.core - 4.2.10 - org.apache.karaf.webconsole org.apache.karaf.webconsole.console @@ -1260,11 +1205,31 @@ org.apache.karaf.webconsole.instance 4.2.10 + + org.apache.karaf.web + org.apache.karaf.web.core + 4.2.10 + org.apache.karaf.wrapper org.apache.karaf.wrapper.core 4.2.10 + + org.apache.karaf + manual + 4.2.10 + + + org.apache.karaf + org.apache.karaf.client + 4.2.10 + + + org.apache.karaf + org.apache.karaf.event + 4.2.10 + org.apache.myfaces.core myfaces-api @@ -1400,11 +1365,6 @@ sshd-netty 2.3.0 - - org.apache.sshd - sshd-osgi - 2.3.0 - org.apache.sshd sshd-osgi @@ -1430,11 +1390,6 @@ xbean-asm7-shaded 4.12 - - org.apache.xbean - xbean-bundleutils - 4.12 - org.apache.xbean xbean-bundleutils @@ -1525,6 +1480,46 @@ http2-server 9.4.31.v20200723 + + org.eclipse.jetty.osgi + jetty-osgi-alpn + 9.4.31.v20200723 + + + org.eclipse.jetty.websocket + javax-websocket-client-impl + 9.4.31.v20200723 + + + org.eclipse.jetty.websocket + javax-websocket-server-impl + 9.4.31.v20200723 + + + org.eclipse.jetty.websocket + websocket-api + 9.4.31.v20200723 + + + org.eclipse.jetty.websocket + websocket-client + 9.4.31.v20200723 + + + org.eclipse.jetty.websocket + websocket-common + 9.4.31.v20200723 + + + org.eclipse.jetty.websocket + websocket-server + 9.4.31.v20200723 + + + org.eclipse.jetty.websocket + websocket-servlet + 9.4.31.v20200723 + org.eclipse.jetty jetty-alpn-server @@ -1602,12 +1597,12 @@ org.eclipse.jetty - jetty-servlet + jetty-servlets 9.4.31.v20200723 org.eclipse.jetty - jetty-servlets + jetty-servlet 9.4.31.v20200723 @@ -1630,51 +1625,6 @@ jetty-xml 9.4.31.v20200723 - - org.eclipse.jetty.osgi - jetty-osgi-alpn - 9.4.31.v20200723 - - - org.eclipse.jetty.websocket - javax-websocket-client-impl - 9.4.31.v20200723 - - - org.eclipse.jetty.websocket - javax-websocket-server-impl - 9.4.31.v20200723 - - - org.eclipse.jetty.websocket - websocket-api - 9.4.31.v20200723 - - - org.eclipse.jetty.websocket - websocket-client - 9.4.31.v20200723 - - - org.eclipse.jetty.websocket - websocket-common - 9.4.31.v20200723 - - - org.eclipse.jetty.websocket - websocket-server - 9.4.31.v20200723 - - - org.eclipse.jetty.websocket - websocket-servlet - 9.4.31.v20200723 - - - org.eclipse.persistence - javax.persistence - 2.1.0 - org.eclipse.persistence javax.persistence @@ -1750,11 +1700,6 @@ osgi-resource-locator 1.0.1 - - org.glassfish - jakarta.el - 3.0.3 - org.glassfish.jersey.containers jersey-container-servlet-core @@ -1795,11 +1740,21 @@ jersey-media-sse 2.27 + + org.glassfish + jakarta.el + 3.0.3 + org.hibernate.common hibernate-commons-annotations 5.1.0.Final + + org.hibernate.validator + hibernate-validator + 6.1.5.Final + org.hibernate hibernate-core @@ -1815,11 +1770,6 @@ hibernate-osgi 5.4.17.Final - - org.hibernate.validator - hibernate-validator - 6.1.5.Final - org.hsqldb hsqldb @@ -1830,11 +1780,6 @@ moneta 1.1 - - org.javassist - javassist - 3.24.0-GA - org.javassist javassist @@ -1845,11 +1790,6 @@ jboss-classfilewriter 1.1.2.Final - - org.jboss - jandex - 2.1.3.Final - org.jboss.logging jboss-logging @@ -1880,6 +1820,11 @@ xnio-nio 3.3.8.Final + + org.jboss + jandex + 2.1.3.Final + org.jline jline-builtins @@ -1941,9 +1886,24 @@ 2.6 - org.opendaylight.aaa - aaa-authn-api - 0.12.1 + org.opendaylight.aaa.web + servlet-api + 0.12.3 + + + org.opendaylight.aaa.web + servlet-jersey2 + 0.12.3 + + + org.opendaylight.aaa.web + web-api + 0.12.3 + + + org.opendaylight.aaa.web + web-osgi-impl + 0.12.3 org.opendaylight.aaa @@ -1993,32 +1953,32 @@ org.opendaylight.aaa aaa-shiro - 0.12.1 + 0.12.3 - org.opendaylight.aaa - aaa-shiro - 0.12.3 + org.opendaylight.controller.model + model-inventory + 2.0.7 - org.opendaylight.aaa.web - servlet-api - 0.12.3 + org.opendaylight.controller.model + model-topology + 2.0.7 - org.opendaylight.aaa.web - servlet-jersey2 - 0.12.3 + org.opendaylight.controller.samples + sample-toaster-consumer + 2.0.7 - org.opendaylight.aaa.web - web-api - 0.12.3 + org.opendaylight.controller.samples + sample-toaster-provider + 2.0.7 - org.opendaylight.aaa.web - web-osgi-impl - 0.12.3 + org.opendaylight.controller.samples + sample-toaster + 2.0.7 org.opendaylight.controller @@ -2060,16 +2020,6 @@ messagebus-util 2.0.7 - - org.opendaylight.controller.model - model-inventory - 2.0.7 - - - org.opendaylight.controller.model - model-topology - 2.0.7 - org.opendaylight.controller netty-event-executor-config @@ -2130,21 +2080,6 @@ sal-remoterpc-connector 2.0.7 - - org.opendaylight.controller.samples - sample-toaster-consumer - 2.0.7 - - - org.opendaylight.controller.samples - sample-toaster-provider - 2.0.7 - - - org.opendaylight.controller.samples - sample-toaster - 2.0.7 - org.opendaylight.controller threadpool-config-api @@ -2405,6 +2340,56 @@ rfc8542 6.0.8 + + org.opendaylight.mdsal.model + general-entity + 6.0.8 + + + org.opendaylight.mdsal.model + ietf-ted + 2013.10.21.18.8 + + + org.opendaylight.mdsal.model + ietf-topology-isis + 2013.10.21.18.8 + + + org.opendaylight.mdsal.model + ietf-topology-l3-unicast-igp + 2013.10.21.18.8 + + + org.opendaylight.mdsal.model + ietf-topology-ospf + 2013.10.21.18.8 + + + org.opendaylight.mdsal.model + ietf-topology + 2013.10.21.18.8 + + + org.opendaylight.mdsal.model + ietf-type-util + 6.0.8 + + + org.opendaylight.mdsal.model + odl-uint24 + 6.0.8 + + + org.opendaylight.mdsal.model + opendaylight-l2-types + 2013.08.27.18.8 + + + org.opendaylight.mdsal.model + yang-ext + 2013.09.07.18.8 + org.opendaylight.mdsal mdsal-binding-api @@ -2575,56 +2560,6 @@ mdsal-uint24-netty 6.0.8 - - org.opendaylight.mdsal.model - general-entity - 6.0.8 - - - org.opendaylight.mdsal.model - ietf-ted - 2013.10.21.18.8 - - - org.opendaylight.mdsal.model - ietf-topology-isis - 2013.10.21.18.8 - - - org.opendaylight.mdsal.model - ietf-topology-l3-unicast-igp - 2013.10.21.18.8 - - - org.opendaylight.mdsal.model - ietf-topology-ospf - 2013.10.21.18.8 - - - org.opendaylight.mdsal.model - ietf-topology - 2013.10.21.18.8 - - - org.opendaylight.mdsal.model - ietf-type-util - 6.0.8 - - - org.opendaylight.mdsal.model - odl-uint24 - 6.0.8 - - - org.opendaylight.mdsal.model - opendaylight-l2-types - 2013.08.27.18.8 - - - org.opendaylight.mdsal.model - yang-ext - 2013.09.07.18.8 - org.opendaylight.mdsal yang-binding @@ -3152,12 +3087,12 @@ org.ops4j.pax.jdbc - pax-jdbc-derby + pax-jdbc-derbyclient 1.4.4 org.ops4j.pax.jdbc - pax-jdbc-derbyclient + pax-jdbc-derby 1.4.4 @@ -3230,11 +3165,6 @@ pax-jdbc-teradata 1.4.4 - - org.ops4j.pax.jdbc - pax-jdbc - 1.3.4 - org.ops4j.pax.jdbc pax-jdbc @@ -3475,11 +3405,6 @@ asm-util 8.0.1 - - org.ow2.asm - asm - 5.2 - org.ow2.asm asm 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 @@ ${ccsdk.sli.version} - 1.12.1 - 6.0.7 - 6.0.7 - 1.12.1 - 1.9.1 - 1.12.1 + 1.12.3 + 6.0.8 + 6.0.8 + 1.12.3 + 1.9.3 + 1.12.3 1.15 - 3.8.1 + 3.11 2.6 - 3.7 + 3.7.2 2.7.7 @@ -136,7 +136,7 @@ 28.2-jre - 2.10.4 + 2.10.5 3.27.0-GA @@ -154,19 +154,19 @@ 4.13 - 1.11.6 + 1.11.7 3.3.3 - 4.1.51.Final + 4.1.56.Final - 1.7.29 + 1.7.28 4.3.25.RELEASE 0.6.4 - 4.8.1 + 4.8-1 1.0.0 @@ -180,7 +180,7 @@ 2.4.0 6.14.3 9.0.30 - 9.4.28.v20200408 + 9.4.31.v20200723 true direct-dependencies.txt @@ -586,21 +586,6 @@ false - - maven-checkstyle-plugin - - - process-sources - - check - - - false - false - - - - com.github.spotbugs spotbugs-maven-plugin @@ -668,6 +653,7 @@ + org.apache.maven.plugins maven-checkstyle-plugin ${checkstyle.plugin.version} @@ -678,6 +664,16 @@ + + process-sources + + check + + + false + true + + check-license @@ -750,71 +746,8 @@ + org.apache.maven.plugins maven-checkstyle-plugin - ${checkstyle.plugin.version} - - - org.onap.oparent - checkstyle - 1.2.2 - - - - - - - check - - process-sources - - true - false - - - - onap-license - - check - - process-sources - - onap-checkstyle/check-license.xml - false - true - false - - ${project.build.sourceDirectory} - - - - true - false - - - - onap-java-style - - check - - process-sources - - - onap-checkstyle/onap-java-style.xml - - - ${project.build.sourceDirectory}/src/main/java - - true - true - true - - - true - false - - - org.codehaus.mojo 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 @@ ${ccsdk.sli.version} - 1.12.1 - 6.0.7 - 6.0.7 - 1.12.1 - 1.9.1 - 1.12.1 + 1.12.3 + 6.0.8 + 6.0.8 + 1.12.3 + 1.9.3 + 1.12.3 1.15 - 3.8.1 + 3.11 2.6 - 3.7 + 3.7.2 2.7.7 @@ -136,7 +136,7 @@ 28.2-jre - 2.10.4 + 2.10.5 3.27.0-GA @@ -154,19 +154,19 @@ 4.13 - 1.11.6 + 1.11.7 3.3.3 - 4.1.51.Final + 4.1.56.Final - 1.7.29 + 1.7.28 4.3.25.RELEASE 0.6.4 - 4.8.1 + 4.8-1 1.0.0 @@ -180,7 +180,7 @@ 2.4.0 6.14.3 9.0.30 - 9.4.28.v20200408 + 9.4.31.v20200723 true direct-dependencies.txt @@ -586,21 +586,6 @@ false - - maven-checkstyle-plugin - - - process-sources - - check - - - false - false - - - - com.github.spotbugs spotbugs-maven-plugin @@ -668,6 +653,7 @@ + org.apache.maven.plugins maven-checkstyle-plugin ${checkstyle.plugin.version} @@ -678,6 +664,16 @@ + + process-sources + + check + + + false + true + + check-license @@ -750,71 +746,8 @@ + org.apache.maven.plugins maven-checkstyle-plugin - ${checkstyle.plugin.version} - - - org.onap.oparent - checkstyle - 1.2.2 - - - - - - - check - - process-sources - - true - false - - - - onap-license - - check - - process-sources - - onap-checkstyle/check-license.xml - false - true - false - - ${project.build.sourceDirectory} - - - - true - false - - - - onap-java-style - - check - - process-sources - - - onap-checkstyle/onap-java-style.xml - - - ${project.build.sourceDirectory}/src/main/java - - true - true - true - - - true - false - - - org.codehaus.mojo 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 @@ ${ccsdk.sli.version} - 1.12.1 - 6.0.7 - 6.0.7 - 1.12.1 - 1.9.1 - 1.12.1 + 1.12.3 + 6.0.8 + 6.0.8 + 1.12.3 + 1.9.3 + 1.12.3 1.15 - 3.8.1 + 3.11 2.6 - 3.7 + 3.7.2 2.7.7 @@ -136,7 +136,7 @@ 28.2-jre - 2.10.4 + 2.10.5 3.27.0-GA @@ -154,19 +154,19 @@ 4.13 - 1.11.6 + 1.11.7 3.3.3 - 4.1.51.Final + 4.1.56.Final - 1.7.29 + 1.7.28 4.3.25.RELEASE 0.6.4 - 4.8.1 + 4.8-1 1.0.0 @@ -180,7 +180,7 @@ 2.4.0 6.14.3 9.0.30 - 9.4.28.v20200408 + 9.4.31.v20200723 true direct-dependencies.txt @@ -586,21 +586,6 @@ false - - maven-checkstyle-plugin - - - process-sources - - check - - - false - false - - - - com.github.spotbugs spotbugs-maven-plugin @@ -668,6 +653,7 @@ + org.apache.maven.plugins maven-checkstyle-plugin ${checkstyle.plugin.version} @@ -678,6 +664,16 @@ + + process-sources + + check + + + false + true + + check-license @@ -750,71 +746,8 @@ + org.apache.maven.plugins maven-checkstyle-plugin - ${checkstyle.plugin.version} - - - org.onap.oparent - checkstyle - 1.2.2 - - - - - - - check - - process-sources - - true - false - - - - onap-license - - check - - process-sources - - onap-checkstyle/check-license.xml - false - true - false - - ${project.build.sourceDirectory} - - - - true - false - - - - onap-java-style - - check - - process-sources - - - onap-checkstyle/onap-java-style.xml - - - ${project.build.sourceDirectory}/src/main/java - - true - true - true - - - true - false - - - org.codehaus.mojo 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 @@ ${ccsdk.sli.version} - 1.12.1 - 6.0.7 - 6.0.7 - 1.12.1 - 1.9.1 - 1.12.1 + 1.12.3 + 6.0.8 + 6.0.8 + 1.12.3 + 1.9.3 + 1.12.3 1.15 - 3.8.1 + 3.11 2.6 - 3.7 + 3.7.2 2.7.7 @@ -136,7 +136,7 @@ 28.2-jre - 2.10.4 + 2.10.5 3.27.0-GA @@ -154,19 +154,19 @@ 4.13 - 1.11.6 + 1.11.7 3.3.3 - 4.1.51.Final + 4.1.56.Final - 1.7.29 + 1.7.28 4.3.25.RELEASE 0.6.4 - 4.8.1 + 4.8-1 1.0.0 @@ -180,7 +180,7 @@ 2.4.0 6.14.3 9.0.30 - 9.4.28.v20200408 + 9.4.31.v20200723 true direct-dependencies.txt @@ -586,21 +586,6 @@ false - - maven-checkstyle-plugin - - - process-sources - - check - - - false - false - - - - com.github.spotbugs spotbugs-maven-plugin @@ -668,6 +653,7 @@ + org.apache.maven.plugins maven-checkstyle-plugin ${checkstyle.plugin.version} @@ -678,6 +664,16 @@ + + process-sources + + check + + + false + true + + check-license @@ -750,71 +746,8 @@ + org.apache.maven.plugins maven-checkstyle-plugin - ${checkstyle.plugin.version} - - - org.onap.oparent - checkstyle - 1.2.2 - - - - - - - check - - process-sources - - true - false - - - - onap-license - - check - - process-sources - - onap-checkstyle/check-license.xml - false - true - false - - ${project.build.sourceDirectory} - - - - true - false - - - - onap-java-style - - check - - process-sources - - - onap-checkstyle/onap-java-style.xml - - - ${project.build.sourceDirectory}/src/main/java - - true - true - true - - - true - false - - - org.codehaus.mojo 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 @@ ${ccsdk.sli.version} - 1.12.1 - 6.0.7 - 6.0.7 - 1.12.1 - 1.9.1 - 1.12.1 + 1.12.3 + 6.0.8 + 6.0.8 + 1.12.3 + 1.9.3 + 1.12.3 1.15 - 3.8.1 + 3.11 2.6 - 3.7 + 3.7.2 2.7.7 @@ -136,7 +136,7 @@ 28.2-jre - 2.10.4 + 2.10.5 3.27.0-GA @@ -154,19 +154,19 @@ 4.13 - 1.11.6 + 1.11.7 3.3.3 - 4.1.51.Final + 4.1.56.Final - 1.7.29 + 1.7.28 4.3.25.RELEASE 0.6.4 - 4.8.1 + 4.8-1 1.0.0 @@ -180,7 +180,7 @@ 2.4.0 6.14.3 9.0.30 - 9.4.28.v20200408 + 9.4.31.v20200723 true direct-dependencies.txt @@ -586,21 +586,6 @@ false - - maven-checkstyle-plugin - - - process-sources - - check - - - false - false - - - - com.github.spotbugs spotbugs-maven-plugin @@ -668,6 +653,7 @@ + org.apache.maven.plugins maven-checkstyle-plugin ${checkstyle.plugin.version} @@ -678,6 +664,16 @@ + + process-sources + + check + + + false + true + + check-license @@ -750,71 +746,8 @@ + org.apache.maven.plugins maven-checkstyle-plugin - ${checkstyle.plugin.version} - - - org.onap.oparent - checkstyle - 1.2.2 - - - - - - - check - - process-sources - - true - false - - - - onap-license - - check - - process-sources - - onap-checkstyle/check-license.xml - false - true - false - - ${project.build.sourceDirectory} - - - - true - false - - - - onap-java-style - - check - - process-sources - - - onap-checkstyle/onap-java-style.xml - - - ${project.build.sourceDirectory}/src/main/java - - true - true - true - - - true - false - - - org.codehaus.mojo 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 @@ ${ccsdk.sli.version} - 1.12.1 - 6.0.7 - 6.0.7 - 1.12.1 - 1.9.1 - 1.12.1 + 1.12.3 + 6.0.8 + 6.0.8 + 1.12.3 + 1.9.3 + 1.12.3 1.15 - 3.8.1 + 3.11 2.6 - 3.7 + 3.7.2 2.7.7 @@ -136,7 +136,7 @@ 28.2-jre - 2.10.4 + 2.10.5 3.27.0-GA @@ -154,19 +154,19 @@ 4.13 - 1.11.6 + 1.11.7 3.3.3 - 4.1.51.Final + 4.1.56.Final - 1.7.29 + 1.7.28 4.3.25.RELEASE 0.6.4 - 4.8.1 + 4.8-1 1.0.0 @@ -180,7 +180,7 @@ 2.4.0 6.14.3 9.0.30 - 9.4.28.v20200408 + 9.4.31.v20200723 true direct-dependencies.txt @@ -586,21 +586,6 @@ false - - maven-checkstyle-plugin - - - process-sources - - check - - - false - false - - - - com.github.spotbugs spotbugs-maven-plugin @@ -668,6 +653,7 @@ + org.apache.maven.plugins maven-checkstyle-plugin ${checkstyle.plugin.version} @@ -678,6 +664,16 @@ + + process-sources + + check + + + false + true + + check-license @@ -750,71 +746,8 @@ + org.apache.maven.plugins maven-checkstyle-plugin - ${checkstyle.plugin.version} - - - org.onap.oparent - checkstyle - 1.2.2 - - - - - - - check - - process-sources - - true - false - - - - onap-license - - check - - process-sources - - onap-checkstyle/check-license.xml - false - true - false - - ${project.build.sourceDirectory} - - - - true - false - - - - onap-java-style - - check - - process-sources - - - onap-checkstyle/onap-java-style.xml - - - ${project.build.sourceDirectory}/src/main/java - - true - true - true - - - true - false - - - org.codehaus.mojo 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 @@ ${ccsdk.sli.version} - 1.12.1 - 6.0.7 - 6.0.7 - 1.12.1 - 1.9.1 - 1.12.1 + 1.12.3 + 6.0.8 + 6.0.8 + 1.12.3 + 1.9.3 + 1.12.3 1.15 - 3.8.1 + 3.11 2.6 - 3.7 + 3.7.2 2.7.7 @@ -136,7 +136,7 @@ 28.2-jre - 2.10.4 + 2.10.5 3.27.0-GA @@ -154,19 +154,19 @@ 4.13 - 1.11.6 + 1.11.7 3.3.3 - 4.1.51.Final + 4.1.56.Final - 1.7.29 + 1.7.28 4.3.25.RELEASE 0.6.4 - 4.8.1 + 4.8-1 1.0.0 @@ -180,7 +180,7 @@ 2.4.0 6.14.3 9.0.30 - 9.4.28.v20200408 + 9.4.31.v20200723 true direct-dependencies.txt @@ -586,21 +586,6 @@ false - - maven-checkstyle-plugin - - - process-sources - - check - - - false - false - - - - com.github.spotbugs spotbugs-maven-plugin @@ -668,6 +653,7 @@ + org.apache.maven.plugins maven-checkstyle-plugin ${checkstyle.plugin.version} @@ -678,6 +664,16 @@ + + process-sources + + check + + + false + true + + check-license @@ -750,71 +746,8 @@ + org.apache.maven.plugins maven-checkstyle-plugin - ${checkstyle.plugin.version} - - - org.onap.oparent - checkstyle - 1.2.2 - - - - - - - check - - process-sources - - true - false - - - - onap-license - - check - - process-sources - - onap-checkstyle/check-license.xml - false - true - false - - ${project.build.sourceDirectory} - - - - true - false - - - - onap-java-style - - check - - process-sources - - - onap-checkstyle/onap-java-style.xml - - - ${project.build.sourceDirectory}/src/main/java - - true - true - true - - - true - false - - - org.codehaus.mojo 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 @@ \${ccsdk.sli.version} - 1.12.1 - 6.0.7 - 6.0.7 - 1.12.1 - 1.9.1 - 1.12.1 + 1.12.3 + 6.0.8 + 6.0.8 + 1.12.3 + 1.9.3 + 1.12.3 1.15 - 3.8.1 + 3.11 2.6 - 3.7 + 3.7.2 2.7.7 @@ -136,7 +136,7 @@ 28.2-jre - 2.10.4 + 2.10.5 3.27.0-GA @@ -154,19 +154,19 @@ 4.13 - 1.11.6 + 1.11.7 3.3.3 - 4.1.51.Final + 4.1.56.Final - 1.7.29 + 1.7.28 4.3.25.RELEASE 0.6.4 - 4.8.1 + 4.8-1 1.0.0 @@ -180,7 +180,7 @@ 2.4.0 6.14.3 9.0.30 - 9.4.28.v20200408 + 9.4.31.v20200723 true direct-dependencies.txt @@ -586,21 +586,6 @@ false - - maven-checkstyle-plugin - - - process-sources - - check - - - false - false - - - - com.github.spotbugs spotbugs-maven-plugin @@ -668,6 +653,7 @@ + org.apache.maven.plugins maven-checkstyle-plugin ${checkstyle.plugin.version} @@ -678,6 +664,16 @@ + + process-sources + + check + + + false + true + + check-license @@ -750,71 +746,8 @@ + org.apache.maven.plugins maven-checkstyle-plugin - ${checkstyle.plugin.version} - - - org.onap.oparent - checkstyle - 1.2.2 - - - - - - - check - - process-sources - - true - false - - - - onap-license - - check - - process-sources - - onap-checkstyle/check-license.xml - false - true - false - - \${project.build.sourceDirectory} - - - - true - false - - - - onap-java-style - - check - - process-sources - - - onap-checkstyle/onap-java-style.xml - - - \${project.build.sourceDirectory}/src/main/java - - true - true - true - - - true - false - - - org.codehaus.mojo 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 @@ ${ccsdk.sli.version} - 1.12.1 - 6.0.7 - 6.0.7 - 1.12.1 - 1.9.1 - 1.12.1 + 1.12.3 + 6.0.8 + 6.0.8 + 1.12.3 + 1.9.3 + 1.12.3 1.15 - 3.8.1 + 3.11 2.6 - 3.7 + 3.7.2 2.7.7 @@ -136,7 +136,7 @@ 28.2-jre - 2.10.4 + 2.10.5 3.27.0-GA @@ -154,19 +154,19 @@ 4.13 - 1.11.6 + 1.11.7 3.3.3 - 4.1.51.Final + 4.1.56.Final - 1.7.29 + 1.7.28 4.3.25.RELEASE 0.6.4 - 4.8.1 + 4.8-1 1.0.0 @@ -180,7 +180,7 @@ 2.4.0 6.14.3 9.0.30 - 9.4.28.v20200408 + 9.4.31.v20200723 true direct-dependencies.txt @@ -586,21 +586,6 @@ false - - maven-checkstyle-plugin - - - process-sources - - check - - - false - false - - - - com.github.spotbugs spotbugs-maven-plugin @@ -668,6 +653,7 @@ + org.apache.maven.plugins maven-checkstyle-plugin ${checkstyle.plugin.version} @@ -678,6 +664,16 @@ + + process-sources + + check + + + false + true + + check-license @@ -750,71 +746,8 @@ + org.apache.maven.plugins maven-checkstyle-plugin - ${checkstyle.plugin.version} - - - org.onap.oparent - checkstyle - 1.2.2 - - - - - - - check - - process-sources - - true - false - - - - onap-license - - check - - process-sources - - onap-checkstyle/check-license.xml - false - true - false - - ${project.build.sourceDirectory} - - - - true - false - - - - onap-java-style - - check - - process-sources - - - onap-checkstyle/onap-java-style.xml - - - ${project.build.sourceDirectory}/src/main/java - - true - true - true - - - true - false - - - org.codehaus.mojo diff --git a/oparent/pom.xml b/oparent/pom.xml index a5acdcdd..b4fc8650 100755 --- a/oparent/pom.xml +++ b/oparent/pom.xml @@ -67,10 +67,10 @@ ${ccsdk.sli.version} 1.1.6-SNAPSHOT - 2.1.1 - 2.10.0 + 2.4.4 + 2.10.5 2.0 - + 1.1.5 1.4.1 1.6.5 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 6bfaa9cf..c7ae7d88 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 @@ + org.apache.maven.plugins maven-checkstyle-plugin 2.17 @@ -612,6 +613,7 @@ maven-deploy-plugin + org.apache.maven.plugins maven-checkstyle-plugin diff --git a/springboot/springboot1/pom.xml b/springboot/springboot1/pom.xml index bf1dcbfe..8852feda 100644 --- a/springboot/springboot1/pom.xml +++ b/springboot/springboot1/pom.xml @@ -335,6 +335,7 @@ + org.apache.maven.plugins maven-checkstyle-plugin 2.17 @@ -612,6 +613,7 @@ maven-deploy-plugin + org.apache.maven.plugins maven-checkstyle-plugin diff --git a/springboot/springboot2/pom.xml b/springboot/springboot2/pom.xml index 9620486a..bb84b79e 100644 --- a/springboot/springboot2/pom.xml +++ b/springboot/springboot2/pom.xml @@ -335,6 +335,7 @@ + org.apache.maven.plugins maven-checkstyle-plugin 2.17 @@ -612,6 +613,7 @@ maven-deploy-plugin + org.apache.maven.plugins maven-checkstyle-plugin diff --git a/standalone/pom.xml b/standalone/pom.xml index f4e479bb..10b0b8ac 100755 --- a/standalone/pom.xml +++ b/standalone/pom.xml @@ -55,16 +55,15 @@ 2.5.0 true - 2.1.1 - 2.10.0 + 2.4.4 + 2.10.5 2.0 - + 1.1.5 1.4.1 1.6.5 direct-dependencies.txt - @@ -89,7 +88,7 @@ org.slf4j slf4j-api - 1.7.21 + 1.7.28 org.apache.logging.log4j -- 2.16.6