From: vasraz Date: Mon, 6 Mar 2023 15:56:57 +0000 (+0000) Subject: Update vulnerable dependency - javax.servlet:javax.servlet-api X-Git-Tag: 1.12.3~17 X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F54%2F133554%2F4;p=sdc.git Update vulnerable dependency - javax.servlet:javax.servlet-api Signed-off-by: Vasyl Razinkov Change-Id: Iad407eb6c950e43e692830d595fdca680366e863 Issue-ID: SDC-4426 --- diff --git a/asdctool/pom.xml b/asdctool/pom.xml index 6b40219795..6e0bf5b8df 100644 --- a/asdctool/pom.xml +++ b/asdctool/pom.xml @@ -159,10 +159,13 @@ log4j log4j + + javax.servlet + javax.servlet-api + - org.eclipse.jetty @@ -174,6 +177,10 @@ org.eclipse.jetty jetty-http + + javax.servlet + javax.servlet-api + diff --git a/catalog-be/pom.xml b/catalog-be/pom.xml index 9e3e82fb9f..49fd3df111 100644 --- a/catalog-be/pom.xml +++ b/catalog-be/pom.xml @@ -116,6 +116,10 @@ org.eclipse.jetty jetty-http + + javax.servlet + javax.servlet-api + @@ -378,13 +382,6 @@ - - javax.servlet - javax.servlet-api - ${servlet-api.version} - provided - - org.eclipse.jgit org.eclipse.jgit @@ -733,6 +730,10 @@ log4j log4j + + javax.servlet + javax.servlet-api + @@ -813,6 +814,10 @@ javax.jms jms + + javax.servlet + javax.servlet-api + @@ -834,6 +839,10 @@ log4j log4j + + javax.servlet + javax.servlet-api + diff --git a/catalog-dao/pom.xml b/catalog-dao/pom.xml index 72f41b772c..08f16a6831 100644 --- a/catalog-dao/pom.xml +++ b/catalog-dao/pom.xml @@ -50,6 +50,10 @@ Modifications copyright (c) 2018 Nokia org.eclipse.jetty jetty-http + + javax.servlet + javax.servlet-api + diff --git a/catalog-fe/pom.xml b/catalog-fe/pom.xml index 5f821fc73a..c869f85d00 100644 --- a/catalog-fe/pom.xml +++ b/catalog-fe/pom.xml @@ -40,6 +40,10 @@ org.eclipse.jetty jetty-http + + javax.servlet + javax.servlet-api + @@ -214,13 +218,6 @@ - - javax.servlet - javax.servlet-api - ${servlet-api.version} - provided - - com.fasterxml.jackson.dataformat @@ -349,6 +346,10 @@ log4j log4j + + javax.servlet + javax.servlet-api + diff --git a/catalog-model/pom.xml b/catalog-model/pom.xml index 0d9e87a901..e0dcc069af 100644 --- a/catalog-model/pom.xml +++ b/catalog-model/pom.xml @@ -45,6 +45,10 @@ org.eclipse.jetty jetty-http + + javax.servlet + javax.servlet-api + diff --git a/common-app-api/pom.xml b/common-app-api/pom.xml index dc1cc633d5..7f137acbb2 100644 --- a/common-app-api/pom.xml +++ b/common-app-api/pom.xml @@ -105,12 +105,6 @@ provided - - javax.servlet - javax.servlet-api - ${servlet-api.version} - provided - org.hibernate.validator hibernate-validator @@ -394,6 +388,10 @@ org.eclipse.jetty jetty-http + + javax.servlet + javax.servlet-api + diff --git a/common-app-logging/pom.xml b/common-app-logging/pom.xml index 605adf6ed0..d01c470dac 100644 --- a/common-app-logging/pom.xml +++ b/common-app-logging/pom.xml @@ -13,12 +13,6 @@ - - javax.servlet - javax.servlet-api - ${servlet-api.version} - provided - javax.ws.rs javax.ws.rs-api @@ -122,4 +116,4 @@ - \ No newline at end of file + diff --git a/common-be-tests-utils/pom.xml b/common-be-tests-utils/pom.xml index ebc266dd4a..aa67b004f2 100644 --- a/common-be-tests-utils/pom.xml +++ b/common-be-tests-utils/pom.xml @@ -47,6 +47,10 @@ org.eclipse.jetty jetty-http + + javax.servlet + javax.servlet-api + diff --git a/common-be/pom.xml b/common-be/pom.xml index a4323671c1..0a57575916 100644 --- a/common-be/pom.xml +++ b/common-be/pom.xml @@ -51,6 +51,10 @@ org.eclipse.jetty jetty-http + + javax.servlet + javax.servlet-api + diff --git a/common/onap-common-configuration-management/onap-configuration-management-core/pom.xml b/common/onap-common-configuration-management/onap-configuration-management-core/pom.xml index b197faae0f..f5ee1169ce 100755 --- a/common/onap-common-configuration-management/onap-configuration-management-core/pom.xml +++ b/common/onap-common-configuration-management/onap-configuration-management-core/pom.xml @@ -101,11 +101,6 @@ onap-configuration-management-api ${project.version} - - javax.servlet - javax.servlet-api - provided - com.fasterxml.jackson.core jackson-annotations diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml index 7c9798fa8c..eea5c5afc7 100644 --- a/integration-tests/pom.xml +++ b/integration-tests/pom.xml @@ -291,6 +291,12 @@ limitations under the License. selenium-server ${selenium.version} test + + + javax.servlet + javax.servlet-api + + org.seleniumhq.selenium @@ -365,6 +371,10 @@ limitations under the License. org.owasp.esapi esapi + + javax.servlet + javax.servlet-api + diff --git a/onboarding/pom.xml b/onboarding/pom.xml index 204efd818b..78c5c6b771 100644 --- a/onboarding/pom.xml +++ b/onboarding/pom.xml @@ -80,7 +80,6 @@ 1.0.0 1.0.3 ${project.version} - ${servlet-api.version} @@ -197,8 +196,8 @@ ${aspectjrt.version} - javax.servlet - javax.servlet-api + jakarta.servlet + jakarta.servlet-api ${servlet-api.version} provided 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 b46a1367f5..5e84e5840c 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 @@ -132,12 +132,6 @@ ${jersey.multipart.version} provided - - javax.servlet - javax.servlet-api - ${servlet-api.version} - provided - com.sun.activation javax.activation 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 c2542ec22e..9c6630723a 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 @@ -162,11 +162,6 @@ openecomp-sdc-externaltesting-impl ${project.version} - - javax.servlet - javax.servlet-api - provided - com.sun.activation javax.activation 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 f8d53a1714..798f5f828e 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 @@ -23,12 +23,6 @@ openecomp-sdc-notification-websocket ${project.version} - - javax.servlet - javax.servlet-api - ${javax.servlet.version} - provided - com.fasterxml.jackson.jaxrs 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 a739cd2ff9..d5b543ad7b 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 @@ -100,12 +100,6 @@ metrics-rest ${project.version} - - javax.servlet - javax.servlet-api - ${servlet-api.version} - provided - com.fasterxml.jackson.jaxrs 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 4f53c43425..27007e3868 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 @@ -74,12 +74,6 @@ openecomp-session-lib ${project.version} - - javax.servlet - javax.servlet-api - ${javax.servlet.version} - provided - org.glassfish.jersey.core jersey-common diff --git a/openecomp-be/backend/openecomp-sdc-security-util/pom.xml b/openecomp-be/backend/openecomp-sdc-security-util/pom.xml index 3ae70dba20..53aeedc652 100644 --- a/openecomp-be/backend/openecomp-sdc-security-util/pom.xml +++ b/openecomp-be/backend/openecomp-sdc-security-util/pom.xml @@ -67,12 +67,6 @@ ${commons-codec} - - javax.servlet - javax.servlet-api - ${javax.servlet.version} - - diff --git a/openecomp-be/lib/openecomp-common-lib/pom.xml b/openecomp-be/lib/openecomp-common-lib/pom.xml index 5665dad0b6..fffee50fc0 100644 --- a/openecomp-be/lib/openecomp-common-lib/pom.xml +++ b/openecomp-be/lib/openecomp-common-lib/pom.xml @@ -35,12 +35,6 @@ openecomp-sdc-datatypes-lib ${project.version} - - javax.servlet - javax.servlet-api - ${servlet-api.version} - provided - javax.inject javax.inject diff --git a/openecomp-be/lib/openecomp-core-lib/openecomp-utilities-lib/pom.xml b/openecomp-be/lib/openecomp-core-lib/openecomp-utilities-lib/pom.xml index 409e669b47..f65f37d83e 100644 --- a/openecomp-be/lib/openecomp-core-lib/openecomp-utilities-lib/pom.xml +++ b/openecomp-be/lib/openecomp-core-lib/openecomp-utilities-lib/pom.xml @@ -113,6 +113,10 @@ org.eclipse.jetty jetty-http + + javax.servlet + javax.servlet-api + 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 3f3696e9ce..cbe2dec4ab 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 @@ -30,12 +30,6 @@ openecomp-item-permissions-core - - - javax.servlet - javax.servlet-api - provided - javax.ws.rs javax.ws.rs-api 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 5a95302f72..726127b224 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 @@ -20,12 +20,6 @@ ${ws.rs.version} provided - - javax.servlet - javax.servlet-api - ${servlet-api.version} - provided - org.projectlombok lombok diff --git a/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-spring/pom.xml b/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-spring/pom.xml index 33925e8856..beee2c01b5 100644 --- a/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-spring/pom.xml +++ b/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-spring/pom.xml @@ -34,11 +34,6 @@ openecomp-sdc-logging-api ${project.version} - - javax.servlet - javax.servlet-api - provided - org.springframework spring-webmvc diff --git a/pom.xml b/pom.xml index 0f8b970292..a211a0daac 100644 --- a/pom.xml +++ b/pom.xml @@ -56,7 +56,7 @@ Modifications copyright (c) 2018-2019 Nokia 3.0.4 4.1.77.Final - 4.0.1 + 4.0.4 2.26.3 3.4.0 4.3.1.0 @@ -79,7 +79,6 @@ Modifications copyright (c) 2018-2019 Nokia 4.3 2.1.1 2.0.1.Final - ${servlet-api.version} 9.4.49.v20220914 ${jetty.version} @@ -378,9 +377,10 @@ Modifications copyright (c) 2018-2019 Nokia + - javax.servlet - javax.servlet-api + jakarta.servlet + jakarta.servlet-api ${servlet-api.version} provided diff --git a/utils/webseal-simulator/pom.xml b/utils/webseal-simulator/pom.xml index 1ed09f67a3..d9790e4708 100644 --- a/utils/webseal-simulator/pom.xml +++ b/utils/webseal-simulator/pom.xml @@ -37,6 +37,10 @@ org.eclipse.jetty jetty-http + + javax.servlet + javax.servlet-api + @@ -63,11 +67,6 @@ - - javax.servlet - javax.servlet-api - ${javax.servlet.version} - org.apache.httpcomponents