From b2db3c41156f0855daafa8afe29f0aca43cc225d Mon Sep 17 00:00:00 2001 From: "Singal, Kapil (ks220y)" Date: Tue, 8 Jun 2021 12:00:17 -0400 Subject: Updating parent poms as per Silicon onap-karaf:0.14.0 package Issue-ID: CCSDK-3329 Signed-off-by: Singal, Kapil (ks220y) Change-Id: If9ac73ec5f0ad8a2bd0b09ed4a17731cb357d900 --- dependencies-bom/pom.xml | 26 ++++- dependencies-odl-bom/pom.xml | 23 ++++- installed-odl-bom/pom.xml | 2 +- odlparent/binding-parent/pom.xml | 111 ++++----------------- odlparent/bundle-parent/pom.xml | 111 ++++----------------- odlparent/feature-repo-parent/pom.xml | 111 ++++----------------- odlparent/karaf4-parent/pom.xml | 111 ++++----------------- odlparent/mdsal-it-parent/pom.xml | 111 ++++----------------- odlparent/odlparent-lite/pom.xml | 111 ++++----------------- odlparent/odlparent/pom.xml | 111 ++++----------------- .../setup/src/main/resources/pom-template.xml | 111 ++++----------------- odlparent/single-feature-parent/pom.xml | 111 ++++----------------- 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, 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 @@ 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 @@ -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 27076a60..060345ab 100644 --- a/dependencies-odl-bom/pom.xml +++ b/dependencies-odl-bom/pom.xml @@ -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 @@ -125,6 +140,12 @@ org.osgi.compendium 5.0.0 + + + 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 b0eba0de..58681e86 100644 --- a/installed-odl-bom/pom.xml +++ b/installed-odl-bom/pom.xml @@ -3427,7 +3427,7 @@ - + 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 @@ ${ccsdk.sli.version} - 1.13.0 + 1.13.1 7.0.6 7.0.6 - 1.13.0 + 1.13.1 1.13.1 - 1.13.0 + 1.13.1 1.15 - 3.8.1 + 3.11 2.6 - 3.8 + 3.8.0 2.7.7 @@ -154,19 +154,19 @@ 4.13 - 1.11.6 + 1.11.7 3.3.3 - 4.1.51.Final + 4.1.59.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 @@ -772,71 +768,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 5ca12e84..eaa63c95 100644 --- a/odlparent/bundle-parent/pom.xml +++ b/odlparent/bundle-parent/pom.xml @@ -111,21 +111,21 @@ ${ccsdk.sli.version} - 1.13.0 + 1.13.1 7.0.6 7.0.6 - 1.13.0 + 1.13.1 1.13.1 - 1.13.0 + 1.13.1 1.15 - 3.8.1 + 3.11 2.6 - 3.8 + 3.8.0 2.7.7 @@ -154,19 +154,19 @@ 4.13 - 1.11.6 + 1.11.7 3.3.3 - 4.1.51.Final + 4.1.59.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 @@ -772,71 +768,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 fa56a6a7..0663f9e9 100644 --- a/odlparent/feature-repo-parent/pom.xml +++ b/odlparent/feature-repo-parent/pom.xml @@ -111,21 +111,21 @@ ${ccsdk.sli.version} - 1.13.0 + 1.13.1 7.0.6 7.0.6 - 1.13.0 + 1.13.1 1.13.1 - 1.13.0 + 1.13.1 1.15 - 3.8.1 + 3.11 2.6 - 3.8 + 3.8.0 2.7.7 @@ -154,19 +154,19 @@ 4.13 - 1.11.6 + 1.11.7 3.3.3 - 4.1.51.Final + 4.1.59.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 @@ -772,71 +768,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 bc136043..9f8945cb 100644 --- a/odlparent/karaf4-parent/pom.xml +++ b/odlparent/karaf4-parent/pom.xml @@ -111,21 +111,21 @@ ${ccsdk.sli.version} - 1.13.0 + 1.13.1 7.0.6 7.0.6 - 1.13.0 + 1.13.1 1.13.1 - 1.13.0 + 1.13.1 1.15 - 3.8.1 + 3.11 2.6 - 3.8 + 3.8.0 2.7.7 @@ -154,19 +154,19 @@ 4.13 - 1.11.6 + 1.11.7 3.3.3 - 4.1.51.Final + 4.1.59.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 @@ -772,71 +768,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 43d3f30e..1bc99418 100644 --- a/odlparent/mdsal-it-parent/pom.xml +++ b/odlparent/mdsal-it-parent/pom.xml @@ -111,21 +111,21 @@ ${ccsdk.sli.version} - 1.13.0 + 1.13.1 7.0.6 7.0.6 - 1.13.0 + 1.13.1 1.13.1 - 1.13.0 + 1.13.1 1.15 - 3.8.1 + 3.11 2.6 - 3.8 + 3.8.0 2.7.7 @@ -154,19 +154,19 @@ 4.13 - 1.11.6 + 1.11.7 3.3.3 - 4.1.51.Final + 4.1.59.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 @@ -772,71 +768,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 46ddaf9e..059b6fdb 100644 --- a/odlparent/odlparent-lite/pom.xml +++ b/odlparent/odlparent-lite/pom.xml @@ -111,21 +111,21 @@ ${ccsdk.sli.version} - 1.13.0 + 1.13.1 7.0.6 7.0.6 - 1.13.0 + 1.13.1 1.13.1 - 1.13.0 + 1.13.1 1.15 - 3.8.1 + 3.11 2.6 - 3.8 + 3.8.0 2.7.7 @@ -154,19 +154,19 @@ 4.13 - 1.11.6 + 1.11.7 3.3.3 - 4.1.51.Final + 4.1.59.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 @@ -772,71 +768,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 949942a3..5383be0a 100644 --- a/odlparent/odlparent/pom.xml +++ b/odlparent/odlparent/pom.xml @@ -111,21 +111,21 @@ ${ccsdk.sli.version} - 1.13.0 + 1.13.1 7.0.6 7.0.6 - 1.13.0 + 1.13.1 1.13.1 - 1.13.0 + 1.13.1 1.15 - 3.8.1 + 3.11 2.6 - 3.8 + 3.8.0 2.7.7 @@ -154,19 +154,19 @@ 4.13 - 1.11.6 + 1.11.7 3.3.3 - 4.1.51.Final + 4.1.59.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 @@ -772,71 +768,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 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 @@ \${ccsdk.sli.version} - 1.13.0 + 1.13.1 7.0.6 7.0.6 - 1.13.0 + 1.13.1 1.13.1 - 1.13.0 + 1.13.1 1.15 - 3.8.1 + 3.11 2.6 - 3.8 + 3.8.0 2.7.7 @@ -154,19 +154,19 @@ 4.13 - 1.11.6 + 1.11.7 3.3.3 - 4.1.51.Final + 4.1.59.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 @@ -772,71 +768,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 455783dd..f13c79ed 100644 --- a/odlparent/single-feature-parent/pom.xml +++ b/odlparent/single-feature-parent/pom.xml @@ -111,21 +111,21 @@ ${ccsdk.sli.version} - 1.13.0 + 1.13.1 7.0.6 7.0.6 - 1.13.0 + 1.13.1 1.13.1 - 1.13.0 + 1.13.1 1.15 - 3.8.1 + 3.11 2.6 - 3.8 + 3.8.0 2.7.7 @@ -154,19 +154,19 @@ 4.13 - 1.11.6 + 1.11.7 3.3.3 - 4.1.51.Final + 4.1.59.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 @@ -772,71 +768,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 7b0f9795..98d5ad0d 100755 --- a/oparent/pom.xml +++ b/oparent/pom.xml @@ -67,10 +67,10 @@ ${ccsdk.sli.version} 1.1.1-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 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 @@ + 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 d3ad2bce..d8c3ce76 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 eb6e5e5a..3179f97b 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 93d581bc..753f87b1 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 -- cgit 1.2.3-korg