From: Dan Timoney Date: Tue, 14 Jan 2020 02:49:19 +0000 (+0000) Subject: Merge "Update versions of dependencies" X-Git-Tag: 1.5.1~4 X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=9209a391b8e0d2257374bd2ebb02f3254f2f3dec;hp=-c;p=ccsdk%2Fparent.git Merge "Update versions of dependencies" --- 9209a391b8e0d2257374bd2ebb02f3254f2f3dec diff --combined odlparent/binding-parent/pom.xml index 5bb2dea4,353984be..8c1e434c --- a/odlparent/binding-parent/pom.xml +++ b/odlparent/binding-parent/pom.xml @@@ -52,7 -52,8 +52,7 @@@ 0.7.7.201606060606 3.2 jacoco - - target/code-coverage/jacoco-ut.exec,target/code-coverage/jacoco-it.exec + **/gen/**,**/generated-sources/**,**/yang-gen**,**/pax/** @@@ -90,10 -91,10 +90,10 @@@ java jacoco ${project.build.directory}/surefire-reports - true ${project.version} + 0.7.0-SNAPSHOT 0.7.0-SNAPSHOT 0.7.0-SNAPSHOT 0.7.0-SNAPSHOT @@@ -170,14 -171,14 +170,14 @@@ 1.0.0 - 4.4.10 - 4.5.6 + 4.4.12 + 4.5.10 10.14.2.0 1.0.0 - 1.17.1 - 2.1.1 - 2.2.3 - 6.11 + 1.21.1 + 2.4.4 + 2.4.0 + 6.14.3 9.0.27 9.4.12.v20180830 true diff --combined odlparent/bundle-parent/pom.xml index e8673c62,cc85f9ea..d1dc5738 --- a/odlparent/bundle-parent/pom.xml +++ b/odlparent/bundle-parent/pom.xml @@@ -52,7 -52,8 +52,7 @@@ 0.7.7.201606060606 3.2 jacoco - - target/code-coverage/jacoco-ut.exec,target/code-coverage/jacoco-it.exec + **/gen/**,**/generated-sources/**,**/yang-gen**,**/pax/** @@@ -90,10 -91,10 +90,10 @@@ java jacoco ${project.build.directory}/surefire-reports - true ${project.version} + 0.7.0-SNAPSHOT 0.7.0-SNAPSHOT 0.7.0-SNAPSHOT 0.7.0-SNAPSHOT @@@ -170,14 -171,14 +170,14 @@@ 1.0.0 - 4.4.10 - 4.5.6 + 4.4.12 + 4.5.10 10.14.2.0 1.0.0 - 1.17.1 - 2.1.1 - 2.2.3 - 6.11 + 1.21.1 + 2.4.4 + 2.4.0 + 6.14.3 9.0.27 9.4.12.v20180830 true diff --combined odlparent/feature-repo-parent/pom.xml index 0536d779,584888c9..1ce404e6 --- a/odlparent/feature-repo-parent/pom.xml +++ b/odlparent/feature-repo-parent/pom.xml @@@ -52,7 -52,8 +52,7 @@@ 0.7.7.201606060606 3.2 jacoco - - target/code-coverage/jacoco-ut.exec,target/code-coverage/jacoco-it.exec + **/gen/**,**/generated-sources/**,**/yang-gen**,**/pax/** @@@ -90,10 -91,10 +90,10 @@@ java jacoco ${project.build.directory}/surefire-reports - true ${project.version} + 0.7.0-SNAPSHOT 0.7.0-SNAPSHOT 0.7.0-SNAPSHOT 0.7.0-SNAPSHOT @@@ -170,14 -171,14 +170,14 @@@ 1.0.0 - 4.4.10 - 4.5.6 + 4.4.12 + 4.5.10 10.14.2.0 1.0.0 - 1.17.1 - 2.1.1 - 2.2.3 - 6.11 + 1.21.1 + 2.4.4 + 2.4.0 + 6.14.3 9.0.27 9.4.12.v20180830 true diff --combined odlparent/karaf4-parent/pom.xml index da23632d,45d652b0..164e3b12 --- a/odlparent/karaf4-parent/pom.xml +++ b/odlparent/karaf4-parent/pom.xml @@@ -52,7 -52,8 +52,7 @@@ 0.7.7.201606060606 3.2 jacoco - - target/code-coverage/jacoco-ut.exec,target/code-coverage/jacoco-it.exec + **/gen/**,**/generated-sources/**,**/yang-gen**,**/pax/** @@@ -90,10 -91,10 +90,10 @@@ java jacoco ${project.build.directory}/surefire-reports - true ${project.version} + 0.7.0-SNAPSHOT 0.7.0-SNAPSHOT 0.7.0-SNAPSHOT 0.7.0-SNAPSHOT @@@ -170,14 -171,14 +170,14 @@@ 1.0.0 - 4.4.10 - 4.5.6 + 4.4.12 + 4.5.10 10.14.2.0 1.0.0 - 1.17.1 - 2.1.1 - 2.2.3 - 6.11 + 1.21.1 + 2.4.4 + 2.4.0 + 6.14.3 9.0.27 9.4.12.v20180830 true diff --combined odlparent/mdsal-it-parent/pom.xml index 5b2d9277,48b9fb69..40420744 --- a/odlparent/mdsal-it-parent/pom.xml +++ b/odlparent/mdsal-it-parent/pom.xml @@@ -52,7 -52,8 +52,7 @@@ 0.7.7.201606060606 3.2 jacoco - - target/code-coverage/jacoco-ut.exec,target/code-coverage/jacoco-it.exec + **/gen/**,**/generated-sources/**,**/yang-gen**,**/pax/** @@@ -90,10 -91,10 +90,10 @@@ java jacoco ${project.build.directory}/surefire-reports - true ${project.version} + 0.7.0-SNAPSHOT 0.7.0-SNAPSHOT 0.7.0-SNAPSHOT 0.7.0-SNAPSHOT @@@ -170,14 -171,14 +170,14 @@@ 1.0.0 - 4.4.10 - 4.5.6 + 4.4.12 + 4.5.10 10.14.2.0 1.0.0 - 1.17.1 - 2.1.1 - 2.2.3 - 6.11 + 1.21.1 + 2.4.4 + 2.4.0 + 6.14.3 9.0.27 9.4.12.v20180830 true diff --combined odlparent/odlparent-lite/pom.xml index d907e309,5f7f0629..b3f9a87c --- a/odlparent/odlparent-lite/pom.xml +++ b/odlparent/odlparent-lite/pom.xml @@@ -52,7 -52,8 +52,7 @@@ 0.7.7.201606060606 3.2 jacoco - - target/code-coverage/jacoco-ut.exec,target/code-coverage/jacoco-it.exec + **/gen/**,**/generated-sources/**,**/yang-gen**,**/pax/** @@@ -90,10 -91,10 +90,10 @@@ java jacoco ${project.build.directory}/surefire-reports - true ${project.version} + 0.7.0-SNAPSHOT 0.7.0-SNAPSHOT 0.7.0-SNAPSHOT 0.7.0-SNAPSHOT @@@ -170,14 -171,14 +170,14 @@@ 1.0.0 - 4.4.10 - 4.5.6 + 4.4.12 + 4.5.10 10.14.2.0 1.0.0 - 1.17.1 - 2.1.1 - 2.2.3 - 6.11 + 1.21.1 + 2.4.4 + 2.4.0 + 6.14.3 9.0.27 9.4.12.v20180830 true diff --combined odlparent/odlparent/pom.xml index a727d778,fe3c9ba1..651874d8 --- a/odlparent/odlparent/pom.xml +++ b/odlparent/odlparent/pom.xml @@@ -52,7 -52,8 +52,7 @@@ 0.7.7.201606060606 3.2 jacoco - - target/code-coverage/jacoco-ut.exec,target/code-coverage/jacoco-it.exec + **/gen/**,**/generated-sources/**,**/yang-gen**,**/pax/** @@@ -90,10 -91,10 +90,10 @@@ java jacoco ${project.build.directory}/surefire-reports - true ${project.version} + 0.7.0-SNAPSHOT 0.7.0-SNAPSHOT 0.7.0-SNAPSHOT 0.7.0-SNAPSHOT @@@ -170,14 -171,14 +170,14 @@@ 1.0.0 - 4.4.10 - 4.5.6 + 4.4.12 + 4.5.10 10.14.2.0 1.0.0 - 1.17.1 - 2.1.1 - 2.2.3 - 6.11 + 1.21.1 + 2.4.4 + 2.4.0 + 6.14.3 9.0.27 9.4.12.v20180830 true diff --combined odlparent/setup/src/main/resources/pom-template.xml index 30b76494,8369bbd2..d663031b --- a/odlparent/setup/src/main/resources/pom-template.xml +++ b/odlparent/setup/src/main/resources/pom-template.xml @@@ -52,7 -52,8 +52,7 @@@ 0.7.7.201606060606 3.2 jacoco - - target/code-coverage/jacoco-ut.exec,target/code-coverage/jacoco-it.exec + **/gen/**,**/generated-sources/**,**/yang-gen**,**/pax/** @@@ -90,10 -91,10 +90,10 @@@ java jacoco \${project.build.directory}/surefire-reports - true \${project.version} + 0.7.0-SNAPSHOT 0.7.0-SNAPSHOT 0.7.0-SNAPSHOT 0.7.0-SNAPSHOT @@@ -170,14 -171,14 +170,14 @@@ 1.0.0 - 4.4.10 - 4.5.6 + 4.4.12 + 4.5.10 10.14.2.0 1.0.0 - 1.17.1 - 2.1.1 - 2.2.3 - 6.11 + 1.21.1 + 2.4.4 + 2.4.0 + 6.14.3 9.0.27 9.4.12.v20180830 true diff --combined odlparent/single-feature-parent/pom.xml index 0246a827,c2b69dde..809676c7 --- a/odlparent/single-feature-parent/pom.xml +++ b/odlparent/single-feature-parent/pom.xml @@@ -52,7 -52,8 +52,7 @@@ 0.7.7.201606060606 3.2 jacoco - - target/code-coverage/jacoco-ut.exec,target/code-coverage/jacoco-it.exec + **/gen/**,**/generated-sources/**,**/yang-gen**,**/pax/** @@@ -90,10 -91,10 +90,10 @@@ java jacoco ${project.build.directory}/surefire-reports - true ${project.version} + 0.7.0-SNAPSHOT 0.7.0-SNAPSHOT 0.7.0-SNAPSHOT 0.7.0-SNAPSHOT @@@ -170,14 -171,14 +170,14 @@@ 1.0.0 - 4.4.10 - 4.5.6 + 4.4.12 + 4.5.10 10.14.2.0 1.0.0 - 1.17.1 - 2.1.1 - 2.2.3 - 6.11 + 1.21.1 + 2.4.4 + 2.4.0 + 6.14.3 9.0.27 9.4.12.v20180830 true diff --combined springboot/springboot1/pom.xml index 10387b2f,7716922f..63c1c50f --- a/springboot/springboot1/pom.xml +++ b/springboot/springboot1/pom.xml @@@ -49,7 -49,8 +49,7 @@@ 0.7.7.201606060606 3.2 jacoco - - target/code-coverage/jacoco-ut.exec,target/code-coverage/jacoco-it.exec + **/gen/**,**/generated-sources/**,**/yang-gen**,**/pax/** @@@ -82,10 -83,10 +82,10 @@@ java jacoco ${project.build.directory}/surefire-reports - true ${project.version} + 0.7.0-SNAPSHOT 0.7.0-SNAPSHOT 0.7.0-SNAPSHOT 0.7.0-SNAPSHOT @@@ -97,7 -98,7 +97,7 @@@ ${ccsdk.sli.adaptors.version} ${ccsdk.sli.core.version} - 2.1.1 + 2.4.4 direct-dependencies.txt diff --combined springboot/springboot2/pom.xml index 2dd82600,1d353d02..c1034b94 --- a/springboot/springboot2/pom.xml +++ b/springboot/springboot2/pom.xml @@@ -48,7 -48,8 +48,7 @@@ 0.7.7.201606060606 3.2 jacoco - - target/code-coverage/jacoco-ut.exec,target/code-coverage/jacoco-it.exec + **/gen/**,**/generated-sources/**,**/yang-gen**,**/pax/** @@@ -81,10 -82,10 +81,10 @@@ java jacoco ${project.build.directory}/surefire-reports - true ${project.version} + 0.7.0-SNAPSHOT 0.7.0-SNAPSHOT 0.7.0-SNAPSHOT 0.7.0-SNAPSHOT @@@ -109,8 -110,8 +109,8 @@@ 0.5.0 1.9.3 - 4.4.10 - 4.5.6 + 4.4.12 + 4.5.10 10.14.2.0 1.0.0 1.25.0 @@@ -121,8 -122,8 +121,8 @@@ 1.3.8 4.12 1.2.3 - 2.1.1 - 2.2.3 + 2.4.4 + 2.4.0 1.7.25 6.11 9.0.27