From dfe98bd779a03efc8f176d1c8946c769417f5a60 Mon Sep 17 00:00:00 2001 From: vasraz Date: Wed, 5 Jul 2023 22:22:43 +0100 Subject: [PATCH] Update outdated/vulnerable dependencies Signed-off-by: Vasyl Razinkov Change-Id: Ib809c636cd4505589901d1f5b95bedba1fc0a1f5 Issue-ID: SDC-4560 --- asdctool/pom.xml | 30 ++++++++++-- catalog-be/pom.xml | 42 ++++++++++++---- catalog-dao/pom.xml | 21 ++++++-- catalog-fe/pom.xml | 32 ++++++++++--- catalog-model/pom.xml | 13 +++-- common-app-api/pom.xml | 4 +- common-app-logging/pom.xml | 4 +- .../onap-configuration-management-api/pom.xml | 4 +- integration-tests/pom.xml | 45 +++++++++++++++-- onboarding/pom.xml | 11 ++--- .../action-library-rest-services/pom.xml | 8 ++-- .../application-config-rest-services/pom.xml | 4 +- .../externaltesting-rest-services/pom.xml | 8 ++-- .../healthcheck-rest-services/pom.xml | 4 +- .../item-rest/item-rest-services/pom.xml | 4 +- .../openecomp-sdc-rest-webapp/metrics-rest/pom.xml | 4 +- .../notifications-fe/pom.xml | 10 ++-- .../onboarding-rest-war/pom.xml | 2 +- .../openecomp-sdc-common-rest/pom.xml | 4 +- .../togglz-rest/togglz-rest-services/pom.xml | 4 +- .../unique-type-rest-services/pom.xml | 4 +- .../validation-rest-services/pom.xml | 8 ++-- .../vendor-license-rest-services/pom.xml | 4 +- .../vendor-software-products-rest-services/pom.xml | 8 ++-- .../vnf-repository-rest-services/pom.xml | 4 +- .../backend/openecomp-sdc-security-util/pom.xml | 2 +- openecomp-be/lib/openecomp-common-lib/pom.xml | 4 +- .../openecomp-item-permissions-core/pom.xml | 4 +- .../openecomp-sdc-action-api/pom.xml | 4 +- .../openecomp-sdc-externaltesting-impl/pom.xml | 6 +-- .../openecomp-sdc-logging-api/pom.xml | 4 +- .../openecomp-sdc-notification-worker/pom.xml | 16 +++++-- .../openecomp-sdc-validation-impl/pom.xml | 3 +- pom.xml | 56 +++++++++++----------- utils/webseal-simulator/pom.xml | 8 ++-- 35 files changed, 260 insertions(+), 133 deletions(-) diff --git a/asdctool/pom.xml b/asdctool/pom.xml index 92e9342e08..b98a077605 100644 --- a/asdctool/pom.xml +++ b/asdctool/pom.xml @@ -167,6 +167,18 @@ javax.servlet javax.servlet-api + + org.onap.aaf.authz + aaf-cadi-aaf + + + org.onap.aaf.authz + aaf-cadi-client + + + org.onap.aaf.authz + aaf-cadi-core + @@ -286,9 +298,9 @@ - org.codehaus.groovy + org.apache.groovy groovy - compile + ${groovy.version} @@ -361,6 +373,12 @@ json-simple ${json-simple.version} compile + + + junit + junit + + @@ -393,6 +411,10 @@ org.apache.cassandra cassandra-all + + javax.validation + validation-api + @@ -437,8 +459,8 @@ - org.apache.httpcomponents - httpclient + org.apache.httpcomponents.client5 + httpclient5 ${httpclient.version} compile diff --git a/catalog-be/pom.xml b/catalog-be/pom.xml index 414422cd59..ee8c1d3618 100644 --- a/catalog-be/pom.xml +++ b/catalog-be/pom.xml @@ -164,8 +164,8 @@ - javax.ws.rs - javax.ws.rs-api + jakarta.ws.rs + jakarta.ws.rs-api ${ws.rs.version} @@ -366,8 +366,8 @@ - org.apache.httpcomponents - httpclient + org.apache.httpcomponents.client5 + httpclient5 ${httpclient.version} compile @@ -610,7 +610,12 @@ json-simple ${json-simple.version} compile - + + + junit + junit + + @@ -752,6 +757,18 @@ javax.servlet javax.servlet-api + + org.onap.aaf.authz + aaf-cadi-aaf + + + org.onap.aaf.authz + aaf-cadi-client + + + org.onap.aaf.authz + aaf-cadi-core + @@ -821,6 +838,10 @@ org.apache.httpcomponents httpclient-cache + + javax.ws.rs + javax.ws.rs-api + @@ -877,6 +898,12 @@ ${jersey-bom.version} pom test + + + junit + junit + + @@ -982,12 +1009,11 @@ com.google.code.bean-matchers bean-matchers - 0.11 + ${bean-matchers.version} test - - org.codehaus.groovy + org.apache.groovy groovy ${groovy.version} diff --git a/catalog-dao/pom.xml b/catalog-dao/pom.xml index 1d6164fea8..63c978d1f1 100644 --- a/catalog-dao/pom.xml +++ b/catalog-dao/pom.xml @@ -203,6 +203,12 @@ Modifications copyright (c) 2018 Nokia json-simple ${json-simple.version} provided + + + junit + junit + + @@ -235,8 +241,8 @@ Modifications copyright (c) 2018 Nokia - org.apache.httpcomponents - httpclient + org.apache.httpcomponents.client5 + httpclient5 ${httpclient.version} provided @@ -397,6 +403,10 @@ Modifications copyright (c) 2018 Nokia org.hibernate hibernate-validator + + javax.validation + validation-api + @@ -479,6 +489,10 @@ Modifications copyright (c) 2018 Nokia net.java.dev.jna jna + + junit + junit + @@ -531,8 +545,9 @@ Modifications copyright (c) 2018 Nokia - org.codehaus.groovy + org.apache.groovy groovy + ${groovy.version} org.togglz diff --git a/catalog-fe/pom.xml b/catalog-fe/pom.xml index 5f533956ca..51cd6da03f 100644 --- a/catalog-fe/pom.xml +++ b/catalog-fe/pom.xml @@ -77,9 +77,9 @@ - org.codehaus.groovy + org.apache.groovy groovy - compile + ${groovy.version} @@ -189,8 +189,8 @@ - org.apache.httpcomponents - httpclient + org.apache.httpcomponents.client5 + httpclient5 ${httpclient.version} @@ -210,7 +210,7 @@ org.apache.httpcomponents httpmime - ${httpclient.version} + ${httpmime.version} org.apache.httpcomponents @@ -366,6 +366,18 @@ javax.servlet javax.servlet-api + + org.onap.aaf.authz + aaf-cadi-aaf + + + org.onap.aaf.authz + aaf-cadi-client + + + org.onap.aaf.authz + aaf-cadi-core + @@ -389,6 +401,12 @@ ${jersey-bom.version} pom test + + + junit + junit + + @@ -423,8 +441,8 @@ ${jetty.version} - javax.ws.rs - javax.ws.rs-api + jakarta.ws.rs + jakarta.ws.rs-api ${ws.rs.version} compile diff --git a/catalog-model/pom.xml b/catalog-model/pom.xml index 96793babea..b6a1e17b0e 100644 --- a/catalog-model/pom.xml +++ b/catalog-model/pom.xml @@ -110,7 +110,7 @@ com.google.code.bean-matchers bean-matchers - ${bean-matcher.version} + ${bean-matchers.version} test @@ -297,6 +297,10 @@ org.apache.cassandra cassandra-all + + javax.validation + validation-api + @@ -309,8 +313,8 @@ - org.apache.httpcomponents - httpclient + org.apache.httpcomponents.client5 + httpclient5 ${httpclient.version} provided @@ -466,8 +470,9 @@ - org.codehaus.groovy + org.apache.groovy groovy + ${groovy.version} diff --git a/common-app-api/pom.xml b/common-app-api/pom.xml index 9d05d7cd93..876fd66530 100644 --- a/common-app-api/pom.xml +++ b/common-app-api/pom.xml @@ -134,8 +134,8 @@ - org.apache.httpcomponents - httpclient + org.apache.httpcomponents.client5 + httpclient5 ${httpclient.version} provided diff --git a/common-app-logging/pom.xml b/common-app-logging/pom.xml index 246490a6c8..93b76d983c 100644 --- a/common-app-logging/pom.xml +++ b/common-app-logging/pom.xml @@ -14,8 +14,8 @@ - javax.ws.rs - javax.ws.rs-api + jakarta.ws.rs + jakarta.ws.rs-api ${ws.rs.version} provided diff --git a/common/onap-common-configuration-management/onap-configuration-management-api/pom.xml b/common/onap-common-configuration-management/onap-configuration-management-api/pom.xml index 44226fc617..970963a455 100644 --- a/common/onap-common-configuration-management/onap-configuration-management-api/pom.xml +++ b/common/onap-common-configuration-management/onap-configuration-management-api/pom.xml @@ -14,8 +14,8 @@ - org.apache.httpcomponents - httpclient + org.apache.httpcomponents.client5 + httpclient5 ${httpclient.version} diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml index 0db0050987..03d407ed8b 100644 --- a/integration-tests/pom.xml +++ b/integration-tests/pom.xml @@ -228,8 +228,8 @@ limitations under the License. test - org.apache.httpcomponents - httpclient + org.apache.httpcomponents.client5 + httpclient5 ${httpclient.version} test @@ -281,11 +281,22 @@ limitations under the License. + + com.squareup.okhttp3 + okhttp + ${okhttp.version} + org.seleniumhq.selenium selenium-java test ${selenium.version} + + + com.squareup.okhttp3 + okhttp + + org.seleniumhq.selenium @@ -297,6 +308,10 @@ limitations under the License. javax.servlet javax.servlet-api + + com.squareup.okhttp3 + okhttp + @@ -304,6 +319,12 @@ limitations under the License. selenium-firefox-driver ${selenium.version} test + + + com.squareup.okhttp3 + okhttp + + @@ -322,6 +343,10 @@ limitations under the License. org.slf4j jcl-over-slf4j + + org.bouncycastle + bcprov-jdk15on + @@ -376,6 +401,18 @@ limitations under the License. javax.servlet javax.servlet-api + + org.onap.aaf.authz + aaf-cadi-aaf + + + org.onap.aaf.authz + aaf-cadi-client + + + org.onap.aaf.authz + aaf-cadi-core + @@ -653,8 +690,8 @@ limitations under the License. docker-maven-plugin - org.apache.httpcomponents - httpclient + org.apache.httpcomponents.client5 + httpclient5 ${httpclient.version} diff --git a/onboarding/pom.xml b/onboarding/pom.xml index e9fdc9ad5c..644471f717 100644 --- a/onboarding/pom.xml +++ b/onboarding/pom.xml @@ -55,7 +55,6 @@ 2.1 ${lang3.version} 3.8.0 - 1.5.8 ${httpclient.version} ${httpcore.version} 4.1.2 @@ -169,9 +168,9 @@ ${slf4j.version} - org.codehaus.groovy - groovy-all-minimal - ${groovy.minimal.version} + org.apache.groovy + groovy + ${groovy.version} org.codehaus.janino @@ -263,8 +262,8 @@ ${datastax.cassandra.version} - javax.ws.rs - javax.ws.rs-api + jakarta.ws.rs + jakarta.ws.rs-api ${ws.rs.version} diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/action-library-rest/action-library-rest-services/pom.xml b/openecomp-be/api/openecomp-sdc-rest-webapp/action-library-rest/action-library-rest-services/pom.xml index 2d9b96cc2e..bb9b5911b6 100644 --- a/openecomp-be/api/openecomp-sdc-rest-webapp/action-library-rest/action-library-rest-services/pom.xml +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/action-library-rest/action-library-rest-services/pom.xml @@ -79,8 +79,8 @@ - org.apache.httpcomponents - httpclient + org.apache.httpcomponents.client5 + httpclient5 ${http.client.version} @@ -96,8 +96,8 @@ - javax.ws.rs - javax.ws.rs-api + jakarta.ws.rs + jakarta.ws.rs-api ${ws.rs.version} diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/application-config-rest/application-config-rest-services/pom.xml b/openecomp-be/api/openecomp-sdc-rest-webapp/application-config-rest/application-config-rest-services/pom.xml index 32855e344f..ded32b5646 100644 --- a/openecomp-be/api/openecomp-sdc-rest-webapp/application-config-rest/application-config-rest-services/pom.xml +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/application-config-rest/application-config-rest-services/pom.xml @@ -20,8 +20,8 @@ ${swagger.version} - javax.ws.rs - javax.ws.rs-api + jakarta.ws.rs + jakarta.ws.rs-api ${ws.rs.version} diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/externaltesting-rest/externaltesting-rest-services/pom.xml b/openecomp-be/api/openecomp-sdc-rest-webapp/externaltesting-rest/externaltesting-rest-services/pom.xml index 6ce05d350c..49fabc2b68 100644 --- a/openecomp-be/api/openecomp-sdc-rest-webapp/externaltesting-rest/externaltesting-rest-services/pom.xml +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/externaltesting-rest/externaltesting-rest-services/pom.xml @@ -83,8 +83,8 @@ - org.apache.httpcomponents - httpclient + org.apache.httpcomponents.client5 + httpclient5 ${http.client.version} @@ -100,8 +100,8 @@ provided - javax.ws.rs - javax.ws.rs-api + jakarta.ws.rs + jakarta.ws.rs-api ${ws.rs.version} diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/healthcheck-rest/healthcheck-rest-services/pom.xml b/openecomp-be/api/openecomp-sdc-rest-webapp/healthcheck-rest/healthcheck-rest-services/pom.xml index 2c63381f23..9116527e65 100644 --- a/openecomp-be/api/openecomp-sdc-rest-webapp/healthcheck-rest/healthcheck-rest-services/pom.xml +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/healthcheck-rest/healthcheck-rest-services/pom.xml @@ -15,8 +15,8 @@ - javax.ws.rs - javax.ws.rs-api + jakarta.ws.rs + jakarta.ws.rs-api ${ws.rs.version} diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/item-rest/item-rest-services/pom.xml b/openecomp-be/api/openecomp-sdc-rest-webapp/item-rest/item-rest-services/pom.xml index ad0241ab1b..85f0117dd1 100644 --- a/openecomp-be/api/openecomp-sdc-rest-webapp/item-rest/item-rest-services/pom.xml +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/item-rest/item-rest-services/pom.xml @@ -29,8 +29,8 @@ ${project.version} - org.apache.httpcomponents - httpclient + org.apache.httpcomponents.client5 + httpclient5 ${http.client.version} diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/metrics-rest/pom.xml b/openecomp-be/api/openecomp-sdc-rest-webapp/metrics-rest/pom.xml index 74b97e4a5b..3a22487eb8 100644 --- a/openecomp-be/api/openecomp-sdc-rest-webapp/metrics-rest/pom.xml +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/metrics-rest/pom.xml @@ -34,8 +34,8 @@ - javax.ws.rs - javax.ws.rs-api + jakarta.ws.rs + jakarta.ws.rs-api ${ws.rs.version} diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/notifications-fe/pom.xml b/openecomp-be/api/openecomp-sdc-rest-webapp/notifications-fe/pom.xml index 2b037b37c4..4b3f8c3348 100644 --- a/openecomp-be/api/openecomp-sdc-rest-webapp/notifications-fe/pom.xml +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/notifications-fe/pom.xml @@ -68,12 +68,12 @@ ${hibernate.validator.version} - javax.ws.rs - javax.ws.rs-api + jakarta.ws.rs + jakarta.ws.rs-api ${ws.rs.version} - org.codehaus.groovy + org.apache.groovy groovy ${groovy.version} @@ -169,8 +169,8 @@ ${aspectj.version} - org.apache.httpcomponents - httpclient + org.apache.httpcomponents.client5 + httpclient5 ${http.client.version} diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/onboarding-rest-war/pom.xml b/openecomp-be/api/openecomp-sdc-rest-webapp/onboarding-rest-war/pom.xml index 0a9a8fa952..d8f471abfb 100644 --- a/openecomp-be/api/openecomp-sdc-rest-webapp/onboarding-rest-war/pom.xml +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/onboarding-rest-war/pom.xml @@ -144,7 +144,7 @@ ${project.version} - org.codehaus.groovy + org.apache.groovy groovy ${groovy.version} diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/openecomp-sdc-common-rest/pom.xml b/openecomp-be/api/openecomp-sdc-rest-webapp/openecomp-sdc-common-rest/pom.xml index 88428ea41b..175f8264a2 100644 --- a/openecomp-be/api/openecomp-sdc-rest-webapp/openecomp-sdc-common-rest/pom.xml +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/openecomp-sdc-common-rest/pom.xml @@ -58,8 +58,8 @@ ${project.version} - javax.ws.rs - javax.ws.rs-api + jakarta.ws.rs + jakarta.ws.rs-api ${ws.rs.version} diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/togglz-rest/togglz-rest-services/pom.xml b/openecomp-be/api/openecomp-sdc-rest-webapp/togglz-rest/togglz-rest-services/pom.xml index f5ffdb986d..4c05d6cba3 100644 --- a/openecomp-be/api/openecomp-sdc-rest-webapp/togglz-rest/togglz-rest-services/pom.xml +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/togglz-rest/togglz-rest-services/pom.xml @@ -15,8 +15,8 @@ - javax.ws.rs - javax.ws.rs-api + jakarta.ws.rs + jakarta.ws.rs-api ${ws.rs.version} diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/unique-type-rest/unique-type-rest-services/pom.xml b/openecomp-be/api/openecomp-sdc-rest-webapp/unique-type-rest/unique-type-rest-services/pom.xml index e5abc81ac2..5a2825597b 100644 --- a/openecomp-be/api/openecomp-sdc-rest-webapp/unique-type-rest/unique-type-rest-services/pom.xml +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/unique-type-rest/unique-type-rest-services/pom.xml @@ -37,8 +37,8 @@ ${javax.inject.version} - javax.ws.rs - javax.ws.rs-api + jakarta.ws.rs + jakarta.ws.rs-api ${ws.rs.version} diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/validation-rest/validation-rest-services/pom.xml b/openecomp-be/api/openecomp-sdc-rest-webapp/validation-rest/validation-rest-services/pom.xml index 0c12187763..1f29b0a1b5 100644 --- a/openecomp-be/api/openecomp-sdc-rest-webapp/validation-rest/validation-rest-services/pom.xml +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/validation-rest/validation-rest-services/pom.xml @@ -83,8 +83,8 @@ - org.apache.httpcomponents - httpclient + org.apache.httpcomponents.client5 + httpclient5 ${http.client.version} @@ -100,8 +100,8 @@ provided - javax.ws.rs - javax.ws.rs-api + jakarta.ws.rs + jakarta.ws.rs-api ${ws.rs.version} diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-services/pom.xml b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-services/pom.xml index 8d6a8ddc53..f1cc8149f1 100644 --- a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-services/pom.xml +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-services/pom.xml @@ -62,8 +62,8 @@ - org.apache.httpcomponents - httpclient + org.apache.httpcomponents.client5 + httpclient5 ${http.client.version} diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vendor-software-products-rest-services/pom.xml b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vendor-software-products-rest-services/pom.xml index 7bef384649..b913819064 100644 --- a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vendor-software-products-rest-services/pom.xml +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vendor-software-products-rest-services/pom.xml @@ -79,8 +79,8 @@ - org.apache.httpcomponents - httpclient + org.apache.httpcomponents.client5 + httpclient5 ${http.client.version} @@ -103,8 +103,8 @@ provided - javax.ws.rs - javax.ws.rs-api + jakarta.ws.rs + jakarta.ws.rs-api ${ws.rs.version} diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vnf-repository-rest-services/pom.xml b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vnf-repository-rest-services/pom.xml index b2f5bf2486..8efecd0626 100644 --- a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vnf-repository-rest-services/pom.xml +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vnf-repository-rest-services/pom.xml @@ -31,8 +31,8 @@ - javax.ws.rs - javax.ws.rs-api + jakarta.ws.rs + jakarta.ws.rs-api provided diff --git a/openecomp-be/backend/openecomp-sdc-security-util/pom.xml b/openecomp-be/backend/openecomp-sdc-security-util/pom.xml index ad7c3e4d50..d2365b11ea 100644 --- a/openecomp-be/backend/openecomp-sdc-security-util/pom.xml +++ b/openecomp-be/backend/openecomp-sdc-security-util/pom.xml @@ -16,7 +16,7 @@ org.slf4j slf4j-api - 1.7.25 + ${slf4j-api.version} diff --git a/openecomp-be/lib/openecomp-common-lib/pom.xml b/openecomp-be/lib/openecomp-common-lib/pom.xml index 1e72c5cf6e..bce24ee30f 100644 --- a/openecomp-be/lib/openecomp-common-lib/pom.xml +++ b/openecomp-be/lib/openecomp-common-lib/pom.xml @@ -41,8 +41,8 @@ ${javax.inject.version} - javax.ws.rs - javax.ws.rs-api + jakarta.ws.rs + jakarta.ws.rs-api provided diff --git a/openecomp-be/lib/openecomp-item-permissions-lib/openecomp-item-permissions-core/pom.xml b/openecomp-be/lib/openecomp-item-permissions-lib/openecomp-item-permissions-core/pom.xml index 049878e01b..c613b3b2d4 100644 --- a/openecomp-be/lib/openecomp-item-permissions-lib/openecomp-item-permissions-core/pom.xml +++ b/openecomp-be/lib/openecomp-item-permissions-lib/openecomp-item-permissions-core/pom.xml @@ -31,8 +31,8 @@ - javax.ws.rs - javax.ws.rs-api + jakarta.ws.rs + jakarta.ws.rs-api provided diff --git a/openecomp-be/lib/openecomp-sdc-action-lib/openecomp-sdc-action-api/pom.xml b/openecomp-be/lib/openecomp-sdc-action-lib/openecomp-sdc-action-api/pom.xml index c77694b9ea..6d8f7b65e6 100644 --- a/openecomp-be/lib/openecomp-sdc-action-lib/openecomp-sdc-action-api/pom.xml +++ b/openecomp-be/lib/openecomp-sdc-action-lib/openecomp-sdc-action-api/pom.xml @@ -40,8 +40,8 @@ jackson-annotations - javax.ws.rs - javax.ws.rs-api + jakarta.ws.rs + jakarta.ws.rs-api provided diff --git a/openecomp-be/lib/openecomp-sdc-externaltesting-lib/openecomp-sdc-externaltesting-impl/pom.xml b/openecomp-be/lib/openecomp-sdc-externaltesting-lib/openecomp-sdc-externaltesting-impl/pom.xml index edfca3a78c..dc92a3e5ac 100644 --- a/openecomp-be/lib/openecomp-sdc-externaltesting-lib/openecomp-sdc-externaltesting-impl/pom.xml +++ b/openecomp-be/lib/openecomp-sdc-externaltesting-lib/openecomp-sdc-externaltesting-impl/pom.xml @@ -114,9 +114,9 @@ - org.codehaus.groovy - groovy-all-minimal - ${groovy.minimal.version} + org.apache.groovy + groovy + ${groovy.version} test diff --git a/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-api/pom.xml b/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-api/pom.xml index e1331b4fe3..082bb4a601 100644 --- a/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-api/pom.xml +++ b/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-api/pom.xml @@ -15,8 +15,8 @@ - javax.ws.rs - javax.ws.rs-api + jakarta.ws.rs + jakarta.ws.rs-api ${ws.rs.version} provided diff --git a/openecomp-be/lib/openecomp-sdc-notification-lib/openecomp-sdc-notification-worker/pom.xml b/openecomp-be/lib/openecomp-sdc-notification-lib/openecomp-sdc-notification-worker/pom.xml index c61250d5b7..59ef77b737 100644 --- a/openecomp-be/lib/openecomp-sdc-notification-lib/openecomp-sdc-notification-worker/pom.xml +++ b/openecomp-be/lib/openecomp-sdc-notification-lib/openecomp-sdc-notification-worker/pom.xml @@ -65,11 +65,17 @@ com.googlecode.json-simple json-simple - 1.1 + ${json-simple.version} + + + junit + junit + + - org.apache.httpcomponents - httpclient + org.apache.httpcomponents.client5 + httpclient5 ${http.client.version} provided @@ -86,8 +92,8 @@ provided - javax.ws.rs - javax.ws.rs-api + jakarta.ws.rs + jakarta.ws.rs-api provided diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/pom.xml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/pom.xml index 685dbef4d6..2eb7eef106 100644 --- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/pom.xml +++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/pom.xml @@ -107,8 +107,7 @@ org.apache.httpcomponents httpmime - ${httpclient.version} - compile + ${httpmime.version} org.apache.httpcomponents diff --git a/pom.xml b/pom.xml index 867056121e..23d8261888 100644 --- a/pom.xml +++ b/pom.xml @@ -43,9 +43,8 @@ Modifications copyright (c) 2018-2019 Nokia ${project.version} - 0.11 - 3.10 - 30.1-jre + 3.12.0 + 32.1.1-jre 0.3.3 5.3.27 3.6.0 @@ -60,34 +59,34 @@ Modifications copyright (c) 2018-2019 Nokia 2.26.3 3.4.0 4.3.1.0 - 2.1.8 + 2.1.21 1.18.24 1.9.4 - 2.8.0 + 2.13.0 2.8.0 1.6.1 1.10.0 2.3.1 0.10.3 - 3.0.7 + 4.0.13 2.1.7 3.0.0 - 6.1.6.Final + 6.2.5.Final 20220320 4.3 - 2.1.1 + 2.1.6 2.0.1.Final - 9.4.49.v20220914 + 9.4.51.v20230217 ${jetty.version} - 3.4.4 + 3.6.1 2.4.0.0 2.1.3 - 18.0.0 + 21.1.1 2.14.2 @@ -99,25 +98,25 @@ Modifications copyright (c) 2018-2019 Nokia 1.33 4.9 - 4.5.13 + 4.5.14 + 5.2.1 4.4.15 - 1.1 + 1.1.1 - 1.2.15 - + 1.2.15 - 1.2.10 - 1.7.25 + 1.2.12 + 1.7.36 1.15 1.2 - 3.0.6 + 3.1.9 - 0.20.1 - 1.9.7 + 0.21.1 + 1.9.19 ${aspectj.version} 0.13.2 @@ -126,7 +125,7 @@ Modifications copyright (c) 2018-2019 Nokia 1.6.4 - 2.8.9 + 2.10.1 1.1 @@ -140,7 +139,7 @@ Modifications copyright (c) 2018-2019 Nokia 3.16.0 7.7.0 7.10.1 - 0.11 + 0.14 2.2 1.3 2.22.2 @@ -185,10 +184,10 @@ Modifications copyright (c) 2018-2019 Nokia true false - 1.69 + 1.70 - 1.41 + 1.43 onap docker docker @@ -196,8 +195,8 @@ Modifications copyright (c) 2018-2019 Nokia 1.8.4 - 8.3.4 - 4.9.3 + 8.5.4 + 4.11.0 1.15.3 @@ -265,7 +264,7 @@ Modifications copyright (c) 2018-2019 Nokia ${lang3.version} - org.codehaus.groovy + org.apache.groovy groovy ${groovy.version} @@ -500,7 +499,7 @@ Modifications copyright (c) 2018-2019 Nokia io.fabric8 docker-maven-plugin - 0.38.0 + 0.43.0 org.apache.maven.plugins @@ -878,6 +877,7 @@ Modifications copyright (c) 2018-2019 Nokia true true true + true true true diff --git a/utils/webseal-simulator/pom.xml b/utils/webseal-simulator/pom.xml index 8ddaab1d59..9068814456 100644 --- a/utils/webseal-simulator/pom.xml +++ b/utils/webseal-simulator/pom.xml @@ -77,8 +77,8 @@ - org.apache.httpcomponents - httpclient + org.apache.httpcomponents.client5 + httpclient5 ${httpclient.version} @@ -100,8 +100,8 @@ commons-logging - commons-logging-api - 1.0.4 + commons-logging + ${commons-logging} -- 2.16.6