From fc768c6cea75cc8aba3233780b9f31c73e787c99 Mon Sep 17 00:00:00 2001 From: vasraz Date: Fri, 14 Oct 2022 10:51:11 +0100 Subject: Align 'org.eclipse.jetty'-version (9.4.49.v20220914) Signed-off-by: Vasyl Razinkov Change-Id: If56735406d86bd42b57c2ccb1f23699c1685069b Issue-ID: SDC-4189 --- asdctool/pom.xml | 4 - .../etsi-nfv-nsd-csar-plugin/pom.xml | 10 +- catalog-be/pom.xml | 64 +- catalog-dao/pom.xml | 24 + catalog-fe/pom.xml | 38 +- catalog-model/pom.xml | 24 + common-app-api/pom.xml | 888 +++++++++++---------- common-be-tests-utils/pom.xml | 24 + common-be/pom.xml | 34 + integration-tests/pom.xml | 20 + .../item-rest/item-rest-services/pom.xml | 8 + .../openecomp-sdc-common-rest/pom.xml | 15 +- .../togglz-rest/togglz-rest-services/pom.xml | 8 + .../backend/openecomp-sdc-action-manager/pom.xml | 10 + .../openecomp-sdc-activity-log-manager/pom.xml | 10 + .../openecomp-sdc-healthcheck-manager/pom.xml | 10 + .../openecomp-sdc-validation-manager/pom.xml | 10 + .../pom.xml | 18 + openecomp-be/lib/openecomp-common-lib/pom.xml | 15 + .../openecomp-facade-api/pom.xml | 10 + .../openecomp-facade-core/pom.xml | 10 + .../openecomp-utilities-lib/pom.xml | 25 +- openecomp-be/lib/openecomp-heat-lib/pom.xml | 10 + .../openecomp-sdc-enrichment-core/pom.xml | 10 + .../openecomp-sdc-enrichment-impl/pom.xml | 10 + .../openecomp-sdc-externaltesting-impl/pom.xml | 10 + .../openecomp-sdc-model-impl/pom.xml | 10 + .../openecomp-sdc-notification-worker/pom.xml | 10 + .../openecomp-sdc-translator-core/pom.xml | 10 + .../openecomp-sdc-validation-core/pom.xml | 10 + .../openecomp-sdc-validation-impl/pom.xml | 10 + .../pom.xml | 8 + .../openecomp-tosca-converter-core/pom.xml | 10 +- openecomp-be/lib/openecomp-tosca-lib/pom.xml | 18 + openecomp-be/tools/swagger-ui/pom.xml | 8 + pom.xml | 6 +- utils/webseal-simulator/pom.xml | 29 + 37 files changed, 952 insertions(+), 496 deletions(-) diff --git a/asdctool/pom.xml b/asdctool/pom.xml index 4c099ae2d0..166ea15f6a 100644 --- a/asdctool/pom.xml +++ b/asdctool/pom.xml @@ -210,10 +210,6 @@ ${jetty.version} compile - - org.eclipse.jetty - jetty-server - org.eclipse.jetty jetty-security diff --git a/catalog-be-plugins/etsi-nfv-nsd-csar-plugin/pom.xml b/catalog-be-plugins/etsi-nfv-nsd-csar-plugin/pom.xml index 5295ed4ed8..3496a866bf 100644 --- a/catalog-be-plugins/etsi-nfv-nsd-csar-plugin/pom.xml +++ b/catalog-be-plugins/etsi-nfv-nsd-csar-plugin/pom.xml @@ -50,6 +50,14 @@ org.eclipse.jetty jetty-servlets + + org.eclipse.jetty + jetty-servlet + + + org.eclipse.jetty + jetty-server + org.springframework spring-core @@ -119,4 +127,4 @@ etsi-nfv-nsd-csar-plugin - \ No newline at end of file + diff --git a/catalog-be/pom.xml b/catalog-be/pom.xml index 02f055d039..7b060c9bfa 100644 --- a/catalog-be/pom.xml +++ b/catalog-be/pom.xml @@ -34,6 +34,12 @@ + + org.jsoup + jsoup + ${jsoup.version} + + com.fasterxml.jackson.core @@ -100,6 +106,30 @@ ${hibernate.validator.version} + + org.eclipse.jetty + jetty-server + ${jetty.version} + compile + + + org.eclipse.jetty + jetty-http + + + + + org.eclipse.jetty + jetty-servlet + ${jetty.version} + compile + + + org.eclipse.jetty + jetty-security + + + org.openecomp.sdc common-app-api @@ -148,6 +178,14 @@ org.springframework spring-core + + org.eclipse.jetty + jetty-server + + + org.eclipse.jetty + jetty-servlet + @@ -711,12 +749,6 @@ jetty-proxy ${jetty.version} compile - - - org.eclipse.jetty - jetty-http - - @@ -729,10 +761,6 @@ org.eclipse.jetty jetty-http - - org.eclipse.jetty - jetty-continuation - @@ -822,16 +850,6 @@ ${jersey-bom.version} pom test - - - org.eclipse.jetty - jetty-server - - - org.eclipse.jetty - jetty-continuation - - @@ -845,12 +863,6 @@ jetty-webapp ${jetty.version} test - - - org.eclipse.jetty - jetty-servlet - - diff --git a/catalog-dao/pom.xml b/catalog-dao/pom.xml index 1db8b1f007..4103086b44 100644 --- a/catalog-dao/pom.xml +++ b/catalog-dao/pom.xml @@ -40,6 +40,30 @@ Modifications copyright (c) 2018 Nokia + + org.eclipse.jetty + jetty-server + ${jetty.version} + compile + + + org.eclipse.jetty + jetty-http + + + + + org.eclipse.jetty + jetty-servlet + ${jetty.version} + compile + + + org.eclipse.jetty + jetty-security + + + org.openecomp.sdc common-app-api diff --git a/catalog-fe/pom.xml b/catalog-fe/pom.xml index 65b2f16be3..a9672101cf 100644 --- a/catalog-fe/pom.xml +++ b/catalog-fe/pom.xml @@ -30,6 +30,18 @@ onap-configuration-management-api ${project.version} + + org.eclipse.jetty + jetty-server + ${jetty.version} + compile + + + org.eclipse.jetty + jetty-http + + + org.openecomp.sdc common-app-api @@ -223,12 +235,6 @@ jetty-proxy ${jetty.version} compile - - - org.eclipse.jetty - jetty-http - - @@ -366,16 +372,6 @@ ${jersey-bom.version} pom test - - - org.eclipse.jetty - jetty-server - - - org.eclipse.jetty - jetty-continuation - - @@ -391,10 +387,6 @@ ${jetty.version} test - - org.eclipse.jetty - jetty-server - org.eclipse.jetty jetty-security @@ -407,12 +399,6 @@ jetty-webapp ${jetty.version} test - - - org.eclipse.jetty - jetty-servlet - - org.eclipse.jetty diff --git a/catalog-model/pom.xml b/catalog-model/pom.xml index 9903c39eb7..e92ae8b822 100644 --- a/catalog-model/pom.xml +++ b/catalog-model/pom.xml @@ -35,6 +35,30 @@ ${jackson.version} + + org.eclipse.jetty + jetty-server + ${jetty.version} + compile + + + org.eclipse.jetty + jetty-http + + + + + org.eclipse.jetty + jetty-servlet + ${jetty.version} + compile + + + org.eclipse.jetty + jetty-security + + + org.openecomp.sdc common-app-api diff --git a/common-app-api/pom.xml b/common-app-api/pom.xml index 12c6a89171..72aea4ed73 100644 --- a/common-app-api/pom.xml +++ b/common-app-api/pom.xml @@ -1,432 +1,460 @@ - - 4.0.0 - - common-app-api - - - org.openecomp.sdc - sdc-main - 1.12.0-SNAPSHOT - - - - - org.springframework.boot - spring-boot-starter - ${spring.boot.version} - - - org.yaml - snakeyaml - - - org.springframework - spring-core - - - - - org.onap.sdc.sdc-be-common - security-util-lib - ${security.util.lib.version} - - - org.springframework.boot - spring-boot-starter-logging - - - org.springframework.boot - spring-boot-starter - - - org.springframework - spring-context - - - commons-io - commons-io - - - org.owasp.esapi - esapi - - - org.hibernate.validator - hibernate-validator - - - org.springframework - spring-core - - - org.onap.portal.sdk - epsdk-fw - - - org.glassfish - jakarta.el - - - - - org.glassfish - jakarta.el - ${jakarta.el.version} - - - - commons-io - commons-io - ${commons.io.version} - - - org.springframework - spring-context - ${spring.version} - - - org.springframework - spring-expression - - - org.springframework - spring-core - - - - - - org.functionaljava - functionaljava - ${functionaljava.version} - provided - - - - javax.servlet - javax.servlet-api - ${servlet-api.version} - provided - - - - org.glassfish.jersey.containers - jersey-container-servlet - ${jersey-bom.version} - provided - - - - - org.yaml - snakeyaml - ${snakeyaml.version} - provided - - - - - org.apache.commons - commons-jci-core - ${commons-jci-core.version} - provided - - - commons-io - commons-io - - - - - - - com.google.code.gson - gson - ${gson.version} - provided - - - - - org.apache.httpcomponents - httpclient - ${httpclient.version} - provided - - - org.apache.httpcomponents - httpcore - - - - - - org.apache.httpcomponents - httpcore - ${httpcore.version} - provided - - - - commons-logging - commons-logging - ${commons-logging} - provided - - - - commons-codec - commons-codec - ${commons-codec} - provided - - - - org.glassfish.jersey.media - jersey-media-json-jackson - ${jersey-bom.version} - provided - - - com.fasterxml.jackson.core - jackson-annotations - - - - - - - com.jcabi - jcabi-aspects - ${jcabi.version} - provided - - - - org.aspectj - aspectjrt - ${aspectjrt.version} - provided - - - - org.apache.commons - commons-lang3 - ${lang3.version} - provided - - - - com.fasterxml.jackson.core - jackson-databind - ${jackson.version} - provided - - - com.fasterxml.jackson.core - jackson-core - - - - - - com.fasterxml.jackson.core - jackson-core - ${jackson.version} - provided - - - - ch.qos.logback - logback-classic - ${logback.version} - provided - - - - - org.projectlombok - lombok - ${lombok.version} - - - - com.google.guava - guava - ${guava.version} - provided - - - - org.fusesource - sigar - ${sigar.version} - provided - - - log4j - log4j - - - - - - org.hamcrest - hamcrest - ${hamcrest.version} - test - - - - org.hamcrest - hamcrest-library - ${hamcrest.version} - test - - - - org.junit.jupiter - junit-jupiter - ${junitJupiter.version} - test - - - - org.mockito - mockito-junit-jupiter - ${mockitoJupiter.version} - test - - - - com.google.code.bean-matchers - bean-matchers - ${bean-matchers.version} - test - - - - - org.jsoup - jsoup - 1.14.3 - - - - commons-validator - commons-validator - 1.6 - - - commons-collections - commons-collections - - - - - - org.apache.commons - commons-collections4 - ${commons.collections.version} - - - - org.codehaus.jettison - jettison - 1.3.3 - - - - de.ruedigermoeller - fst - 2.47 - compile - - - org.openecomp.sdc - common-app-logging - ${project.version} - compile - - - com.datastax.cassandra - cassandra-driver-mapping - ${cassandra.driver.version} - compile - - - com.github.jnr - jnr-posix - - - - - org.apache.commons - commons-text - ${apache-commons-text.version} - - - - - - - src/test/resources - - **/*.zip - - true - - - src/test/resources/zip - - **.zip - - false - zip - - - src/test/resources/zip-slip - - **.zip - - false - zip-slip - - - - - com.github.sylvainlaurent.maven - yaml-json-validator-maven-plugin - - - validate - validate - - validate - - - - - - src/main/resources/**/*.y*ml - src/test/resources/**/*.y*ml - - - - - src/main/resources/**/*.json - src/test/resources/**/*.json - - - - ${skipYamlJsonValidator} - - - - - - + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + + 4.0.0 + + common-app-api + + + org.openecomp.sdc + sdc-main + 1.12.0-SNAPSHOT + + + + + org.springframework.boot + spring-boot-starter + ${spring.boot.version} + + + org.yaml + snakeyaml + + + org.springframework + spring-core + + + + + org.onap.sdc.sdc-be-common + security-util-lib + ${security.util.lib.version} + + + org.springframework.boot + spring-boot-starter-logging + + + org.springframework.boot + spring-boot-starter + + + org.springframework + spring-context + + + commons-io + commons-io + + + org.owasp.esapi + esapi + + + org.hibernate.validator + hibernate-validator + + + org.springframework + spring-core + + + org.onap.portal.sdk + epsdk-fw + + + org.glassfish + jakarta.el + + + + + org.glassfish + jakarta.el + ${jakarta.el.version} + + + + commons-io + commons-io + ${commons.io.version} + + + org.springframework + spring-context + ${spring.version} + + + org.springframework + spring-expression + + + org.springframework + spring-core + + + + + + org.functionaljava + functionaljava + ${functionaljava.version} + provided + + + + javax.servlet + javax.servlet-api + ${servlet-api.version} + provided + + + org.hibernate.validator + hibernate-validator + ${hibernate.validator.version} + + + org.glassfish.jersey.containers + jersey-container-servlet + ${jersey-bom.version} + provided + + + + + org.yaml + snakeyaml + ${snakeyaml.version} + provided + + + + + org.apache.commons + commons-jci-core + ${commons-jci-core.version} + provided + + + commons-io + commons-io + + + + + + + com.google.code.gson + gson + ${gson.version} + provided + + + + + org.apache.httpcomponents + httpclient + ${httpclient.version} + provided + + + org.apache.httpcomponents + httpcore + + + + + + org.apache.httpcomponents + httpcore + ${httpcore.version} + provided + + + + commons-logging + commons-logging + ${commons-logging} + provided + + + + commons-codec + commons-codec + ${commons-codec} + provided + + + + org.glassfish.jersey.media + jersey-media-json-jackson + ${jersey-bom.version} + provided + + + com.fasterxml.jackson.core + jackson-annotations + + + + + + + com.jcabi + jcabi-aspects + ${jcabi.version} + provided + + + + org.aspectj + aspectjrt + ${aspectjrt.version} + provided + + + + org.apache.commons + commons-lang3 + ${lang3.version} + provided + + + + com.fasterxml.jackson.core + jackson-databind + ${jackson.version} + provided + + + com.fasterxml.jackson.core + jackson-core + + + + + + com.fasterxml.jackson.core + jackson-core + ${jackson.version} + provided + + + + ch.qos.logback + logback-classic + ${logback.version} + provided + + + + + org.projectlombok + lombok + ${lombok.version} + + + + com.google.guava + guava + ${guava.version} + provided + + + + org.fusesource + sigar + ${sigar.version} + provided + + + log4j + log4j + + + + + + org.hamcrest + hamcrest + ${hamcrest.version} + test + + + + org.hamcrest + hamcrest-library + ${hamcrest.version} + test + + + + org.junit.jupiter + junit-jupiter + ${junitJupiter.version} + test + + + + org.mockito + mockito-junit-jupiter + ${mockitoJupiter.version} + test + + + + com.google.code.bean-matchers + bean-matchers + ${bean-matchers.version} + test + + + + + org.jsoup + jsoup + ${jsoup.version} + + + + commons-validator + commons-validator + 1.6 + + + commons-collections + commons-collections + + + + + + org.apache.commons + commons-collections4 + ${commons.collections.version} + + + + org.codehaus.jettison + jettison + 1.3.3 + + + + de.ruedigermoeller + fst + 2.47 + compile + + + org.openecomp.sdc + common-app-logging + ${project.version} + compile + + + com.datastax.cassandra + cassandra-driver-mapping + ${cassandra.driver.version} + compile + + + com.github.jnr + jnr-posix + + + + + org.apache.commons + commons-text + ${apache-commons-text.version} + + + org.eclipse.jetty + jetty-servlet + ${jetty.version} + compile + + + org.eclipse.jetty + jetty-security + + + + + org.eclipse.jetty + jetty-server + ${jetty.version} + compile + + + org.eclipse.jetty + jetty-http + + + + + + + + + src/test/resources + + **/*.zip + + true + + + src/test/resources/zip + + **.zip + + false + zip + + + src/test/resources/zip-slip + + **.zip + + false + zip-slip + + + + + com.github.sylvainlaurent.maven + yaml-json-validator-maven-plugin + + + validate + validate + + validate + + + + + + src/main/resources/**/*.y*ml + src/test/resources/**/*.y*ml + + + + + src/main/resources/**/*.json + src/test/resources/**/*.json + + + + ${skipYamlJsonValidator} + + + + + + diff --git a/common-be-tests-utils/pom.xml b/common-be-tests-utils/pom.xml index 408cc3ae75..22d8ff799b 100644 --- a/common-be-tests-utils/pom.xml +++ b/common-be-tests-utils/pom.xml @@ -37,6 +37,30 @@ + + org.eclipse.jetty + jetty-server + ${jetty.version} + compile + + + org.eclipse.jetty + jetty-http + + + + + org.eclipse.jetty + jetty-servlet + ${jetty.version} + compile + + + org.eclipse.jetty + jetty-security + + + org.openecomp.sdc common-app-api diff --git a/common-be/pom.xml b/common-be/pom.xml index b05f87f92b..c8c79ded69 100644 --- a/common-be/pom.xml +++ b/common-be/pom.xml @@ -41,6 +41,30 @@ + + org.eclipse.jetty + jetty-server + ${jetty.version} + compile + + + org.eclipse.jetty + jetty-http + + + + + org.eclipse.jetty + jetty-servlet + ${jetty.version} + compile + + + org.eclipse.jetty + jetty-security + + + org.openecomp.sdc common-app-api @@ -229,6 +253,16 @@ common-be-tests-utils ${project.version} test + + + org.eclipse.jetty + jetty-server + + + org.eclipse.jetty + jetty-servlet + + diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml index d004de7abf..d3f64e47ee 100644 --- a/integration-tests/pom.xml +++ b/integration-tests/pom.xml @@ -95,12 +95,32 @@ limitations under the License. catalog-model ${project.version} test + + + org.eclipse.jetty + jetty-server + + + org.eclipse.jetty + jetty-servlet + + org.openecomp.sdc.be catalog-dao ${project.version} test + + + org.eclipse.jetty + jetty-server + + + org.eclipse.jetty + jetty-servlet + + org.openecomp.sdc 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 1a545ba01c..64f555250c 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 @@ -100,6 +100,14 @@ org.springframework spring-core + + org.eclipse.jetty + jetty-server + + + org.eclipse.jetty + jetty-servlet + 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 7ad3f30585..9a57d7c2a1 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 @@ -41,17 +41,22 @@ org.openecomp.sdc.core openecomp-utilities-lib ${project.version} + + + org.eclipse.jetty + jetty-server + + + org.eclipse.jetty + jetty-servlet + + org.openecomp.sdc.core openecomp-common-lib ${project.version} - - org.hibernate.validator - hibernate-validator - ${hibernate.validator.version} - javax.ws.rs javax.ws.rs-api 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 99197b99f8..634656ca54 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 @@ -76,6 +76,14 @@ org.springframework spring-core + + org.eclipse.jetty + jetty-server + + + org.eclipse.jetty + jetty-servlet + diff --git a/openecomp-be/backend/openecomp-sdc-action-manager/pom.xml b/openecomp-be/backend/openecomp-sdc-action-manager/pom.xml index 8ef760b61c..419dd8bad2 100644 --- a/openecomp-be/backend/openecomp-sdc-action-manager/pom.xml +++ b/openecomp-be/backend/openecomp-sdc-action-manager/pom.xml @@ -34,6 +34,16 @@ org.openecomp.sdc.core openecomp-utilities-lib ${project.version} + + + org.eclipse.jetty + jetty-server + + + org.eclipse.jetty + jetty-servlet + + org.openecomp.sdc diff --git a/openecomp-be/backend/openecomp-sdc-activity-log-manager/pom.xml b/openecomp-be/backend/openecomp-sdc-activity-log-manager/pom.xml index 2930d61202..3f5923b736 100644 --- a/openecomp-be/backend/openecomp-sdc-activity-log-manager/pom.xml +++ b/openecomp-be/backend/openecomp-sdc-activity-log-manager/pom.xml @@ -17,6 +17,16 @@ org.openecomp.sdc.core openecomp-utilities-lib ${project.version} + + + org.eclipse.jetty + jetty-server + + + org.eclipse.jetty + jetty-servlet + + diff --git a/openecomp-be/backend/openecomp-sdc-healthcheck-manager/pom.xml b/openecomp-be/backend/openecomp-sdc-healthcheck-manager/pom.xml index d1a23bbfde..7f3d75de5f 100644 --- a/openecomp-be/backend/openecomp-sdc-healthcheck-manager/pom.xml +++ b/openecomp-be/backend/openecomp-sdc-healthcheck-manager/pom.xml @@ -33,6 +33,16 @@ org.openecomp.sdc.core openecomp-utilities-lib ${project.version} + + + org.eclipse.jetty + jetty-server + + + org.eclipse.jetty + jetty-servlet + + diff --git a/openecomp-be/backend/openecomp-sdc-validation-manager/pom.xml b/openecomp-be/backend/openecomp-sdc-validation-manager/pom.xml index 4cb346fdfe..a9f3910428 100644 --- a/openecomp-be/backend/openecomp-sdc-validation-manager/pom.xml +++ b/openecomp-be/backend/openecomp-sdc-validation-manager/pom.xml @@ -33,6 +33,16 @@ org.openecomp.sdc.core openecomp-utilities-lib ${project.version} + + + org.eclipse.jetty + jetty-server + + + org.eclipse.jetty + jetty-servlet + + org.openecomp.sdc.core diff --git a/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/pom.xml b/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/pom.xml index 2a4d597df5..7b8935c771 100644 --- a/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/pom.xml +++ b/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/pom.xml @@ -47,6 +47,16 @@ org.openecomp.sdc.core openecomp-utilities-lib ${project.version} + + + org.eclipse.jetty + jetty-server + + + org.eclipse.jetty + jetty-servlet + + org.openecomp.sdc.core @@ -226,6 +236,14 @@ org.springframework spring-core + + org.eclipse.jetty + jetty-server + + + org.eclipse.jetty + jetty-servlet + diff --git a/openecomp-be/lib/openecomp-common-lib/pom.xml b/openecomp-be/lib/openecomp-common-lib/pom.xml index cb41e44001..f0b7c1f8a5 100644 --- a/openecomp-be/lib/openecomp-common-lib/pom.xml +++ b/openecomp-be/lib/openecomp-common-lib/pom.xml @@ -19,6 +19,16 @@ org.openecomp.sdc.core openecomp-utilities-lib ${project.version} + + + org.eclipse.jetty + jetty-server + + + org.eclipse.jetty + jetty-servlet + + org.openecomp.sdc @@ -83,6 +93,11 @@ org.projectlombok lombok + + org.hibernate.validator + hibernate-validator + ${hibernate.validator.version} + diff --git a/openecomp-be/lib/openecomp-core-lib/openecomp-facade-lib/openecomp-facade-api/pom.xml b/openecomp-be/lib/openecomp-core-lib/openecomp-facade-lib/openecomp-facade-api/pom.xml index 3bfa3da96d..b8c40636a9 100644 --- a/openecomp-be/lib/openecomp-core-lib/openecomp-facade-lib/openecomp-facade-api/pom.xml +++ b/openecomp-be/lib/openecomp-core-lib/openecomp-facade-lib/openecomp-facade-api/pom.xml @@ -16,6 +16,16 @@ org.openecomp.sdc.core openecomp-utilities-lib ${project.version} + + + org.eclipse.jetty + jetty-server + + + org.eclipse.jetty + jetty-servlet + + org.openecomp.sdc.core diff --git a/openecomp-be/lib/openecomp-core-lib/openecomp-facade-lib/openecomp-facade-core/pom.xml b/openecomp-be/lib/openecomp-core-lib/openecomp-facade-lib/openecomp-facade-core/pom.xml index 0acda8c033..e8b1316951 100644 --- a/openecomp-be/lib/openecomp-core-lib/openecomp-facade-lib/openecomp-facade-core/pom.xml +++ b/openecomp-be/lib/openecomp-core-lib/openecomp-facade-lib/openecomp-facade-core/pom.xml @@ -17,6 +17,16 @@ org.openecomp.sdc.core openecomp-utilities-lib ${project.version} + + + org.eclipse.jetty + jetty-server + + + org.eclipse.jetty + jetty-servlet + + org.openecomp.sdc.core 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 045c757dd2..4d7aac4b9b 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 @@ -22,7 +22,6 @@ openecomp-utilities-lib openecomp-utilities-lib - openecomp-core-lib org.openecomp.sdc.core @@ -104,6 +103,30 @@ openecomp-sdc-logging-api ${project.version} + + org.eclipse.jetty + jetty-server + ${jetty.version} + compile + + + org.eclipse.jetty + jetty-http + + + + + org.eclipse.jetty + jetty-servlet + ${jetty.version} + compile + + + org.eclipse.jetty + jetty-security + + + org.openecomp.sdc common-app-api diff --git a/openecomp-be/lib/openecomp-heat-lib/pom.xml b/openecomp-be/lib/openecomp-heat-lib/pom.xml index 83641487b7..91db22c367 100644 --- a/openecomp-be/lib/openecomp-heat-lib/pom.xml +++ b/openecomp-be/lib/openecomp-heat-lib/pom.xml @@ -50,6 +50,16 @@ org.openecomp.sdc.core openecomp-utilities-lib ${project.version} + + + org.eclipse.jetty + jetty-server + + + org.eclipse.jetty + jetty-servlet + + org.openecomp.sdc diff --git a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/pom.xml b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/pom.xml index e6ae0e5d1b..94bafc98fa 100644 --- a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/pom.xml +++ b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/pom.xml @@ -43,6 +43,16 @@ org.openecomp.sdc.core openecomp-utilities-lib ${project.version} + + + org.eclipse.jetty + jetty-server + + + org.eclipse.jetty + jetty-servlet + + org.openecomp.sdc diff --git a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/pom.xml b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/pom.xml index c0e0c0ed06..b3198c248a 100644 --- a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/pom.xml +++ b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/pom.xml @@ -43,6 +43,16 @@ org.openecomp.sdc.core openecomp-utilities-lib ${project.version} + + + org.eclipse.jetty + jetty-server + + + org.eclipse.jetty + jetty-servlet + + org.openecomp.sdc 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 7c8a518bdb..dcb6f465b2 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 @@ -50,6 +50,16 @@ org.openecomp.sdc.core openecomp-utilities-lib ${project.version} + + + org.eclipse.jetty + jetty-server + + + org.eclipse.jetty + jetty-servlet + + org.openecomp.sdc diff --git a/openecomp-be/lib/openecomp-sdc-model-lib/openecomp-sdc-model-impl/pom.xml b/openecomp-be/lib/openecomp-sdc-model-lib/openecomp-sdc-model-impl/pom.xml index 9524a05a2d..2d8393bedc 100644 --- a/openecomp-be/lib/openecomp-sdc-model-lib/openecomp-sdc-model-impl/pom.xml +++ b/openecomp-be/lib/openecomp-sdc-model-lib/openecomp-sdc-model-impl/pom.xml @@ -49,6 +49,16 @@ org.openecomp.sdc.core openecomp-utilities-lib ${project.version} + + + org.eclipse.jetty + jetty-server + + + org.eclipse.jetty + jetty-servlet + + org.openecomp.sdc.core 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 7f67ceb607..b4bff23b7a 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 @@ -22,6 +22,16 @@ org.openecomp.sdc.core openecomp-utilities-lib ${project.version} + + + org.eclipse.jetty + jetty-server + + + org.eclipse.jetty + jetty-servlet + + com.fasterxml.jackson.jaxrs diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/pom.xml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/pom.xml index 949e569fd1..2e95ba160a 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/pom.xml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/pom.xml @@ -44,6 +44,16 @@ org.openecomp.sdc.core openecomp-utilities-lib ${project.version} + + + org.eclipse.jetty + jetty-server + + + org.eclipse.jetty + jetty-servlet + + org.openecomp.sdc diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-core/pom.xml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-core/pom.xml index 0d5dbd4aca..1add6037a6 100644 --- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-core/pom.xml +++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-core/pom.xml @@ -46,6 +46,16 @@ org.openecomp.sdc.core openecomp-utilities-lib ${project.version} + + + org.eclipse.jetty + jetty-server + + + org.eclipse.jetty + jetty-servlet + + org.openecomp.sdc 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 e40474f31e..4b7965b963 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 @@ -51,6 +51,16 @@ org.openecomp.sdc.core openecomp-utilities-lib ${project.version} + + + org.eclipse.jetty + jetty-server + + + org.eclipse.jetty + jetty-servlet + + org.openecomp.sdc diff --git a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/pom.xml b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/pom.xml index db82eb7f99..e3310b9b1b 100644 --- a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/pom.xml +++ b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/pom.xml @@ -73,6 +73,14 @@ org.springframework spring-core + + org.eclipse.jetty + jetty-server + + + org.eclipse.jetty + jetty-servlet + diff --git a/openecomp-be/lib/openecomp-tosca-converter-lib/openecomp-tosca-converter-core/pom.xml b/openecomp-be/lib/openecomp-tosca-converter-lib/openecomp-tosca-converter-core/pom.xml index 7add400559..3fa657d9c7 100644 --- a/openecomp-be/lib/openecomp-tosca-converter-lib/openecomp-tosca-converter-core/pom.xml +++ b/openecomp-be/lib/openecomp-tosca-converter-lib/openecomp-tosca-converter-core/pom.xml @@ -24,6 +24,14 @@ org.springframework spring-core + + org.eclipse.jetty + jetty-server + + + org.eclipse.jetty + jetty-servlet + @@ -71,4 +79,4 @@ - \ No newline at end of file + diff --git a/openecomp-be/lib/openecomp-tosca-lib/pom.xml b/openecomp-be/lib/openecomp-tosca-lib/pom.xml index 580c766062..258ab97b4b 100644 --- a/openecomp-be/lib/openecomp-tosca-lib/pom.xml +++ b/openecomp-be/lib/openecomp-tosca-lib/pom.xml @@ -44,6 +44,16 @@ org.openecomp.sdc.core openecomp-utilities-lib ${project.version} + + + org.eclipse.jetty + jetty-server + + + org.eclipse.jetty + jetty-servlet + + org.openecomp.sdc @@ -109,6 +119,14 @@ org.springframework spring-core + + org.eclipse.jetty + jetty-server + + + org.eclipse.jetty + jetty-servlet + diff --git a/openecomp-be/tools/swagger-ui/pom.xml b/openecomp-be/tools/swagger-ui/pom.xml index 0b05df2b81..2de3f52adb 100644 --- a/openecomp-be/tools/swagger-ui/pom.xml +++ b/openecomp-be/tools/swagger-ui/pom.xml @@ -26,6 +26,14 @@ org.eclipse.jetty jetty-servlets + + org.eclipse.jetty + jetty-server + + + org.eclipse.jetty + jetty-servlet + org.springframework spring-core diff --git a/pom.xml b/pom.xml index c94982e011..e9983d1c8a 100644 --- a/pom.xml +++ b/pom.xml @@ -81,8 +81,8 @@ Modifications copyright (c) 2018-2019 Nokia 2.0.1.Final ${servlet-api.version} - 9.4.45.v20220203 - 9.4.45.v20220203 + 9.4.49.v20220914 + ${jetty.version} 3.4.4 2.4.0.0 @@ -200,6 +200,8 @@ Modifications copyright (c) 2018-2019 Nokia 8.3.4 4.9.3 + 1.15.3 + false diff --git a/utils/webseal-simulator/pom.xml b/utils/webseal-simulator/pom.xml index 8b2fa980a8..10a3b25d14 100644 --- a/utils/webseal-simulator/pom.xml +++ b/utils/webseal-simulator/pom.xml @@ -22,6 +22,35 @@ + + org.hibernate.validator + hibernate-validator + ${hibernate.validator.version} + + + org.eclipse.jetty + jetty-server + ${jetty.version} + compile + + + org.eclipse.jetty + jetty-http + + + + + org.eclipse.jetty + jetty-servlet + ${jetty.version} + compile + + + org.eclipse.jetty + jetty-security + + + org.openecomp.sdc common-app-api -- cgit 1.2.3-korg