summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorvasraz <vasyl.razinkov@est.tech>2023-07-05 22:22:43 +0100
committerMichael Morris <michael.morris@est.tech>2023-07-10 13:55:11 +0000
commitdfe98bd779a03efc8f176d1c8946c769417f5a60 (patch)
tree3c25f9a8047175c964e1acf243d8a5c03a30306b
parentb76217740231c916fce669613e20fb70c7320a2e (diff)
Update outdated/vulnerable dependencies
Signed-off-by: Vasyl Razinkov <vasyl.razinkov@est.tech> Change-Id: Ib809c636cd4505589901d1f5b95bedba1fc0a1f5 Issue-ID: SDC-4560
-rw-r--r--asdctool/pom.xml30
-rw-r--r--catalog-be/pom.xml42
-rw-r--r--catalog-dao/pom.xml21
-rw-r--r--catalog-fe/pom.xml32
-rw-r--r--catalog-model/pom.xml13
-rw-r--r--common-app-api/pom.xml4
-rw-r--r--common-app-logging/pom.xml4
-rw-r--r--common/onap-common-configuration-management/onap-configuration-management-api/pom.xml4
-rw-r--r--integration-tests/pom.xml45
-rw-r--r--onboarding/pom.xml11
-rw-r--r--openecomp-be/api/openecomp-sdc-rest-webapp/action-library-rest/action-library-rest-services/pom.xml8
-rw-r--r--openecomp-be/api/openecomp-sdc-rest-webapp/application-config-rest/application-config-rest-services/pom.xml4
-rw-r--r--openecomp-be/api/openecomp-sdc-rest-webapp/externaltesting-rest/externaltesting-rest-services/pom.xml8
-rw-r--r--openecomp-be/api/openecomp-sdc-rest-webapp/healthcheck-rest/healthcheck-rest-services/pom.xml4
-rw-r--r--openecomp-be/api/openecomp-sdc-rest-webapp/item-rest/item-rest-services/pom.xml4
-rw-r--r--openecomp-be/api/openecomp-sdc-rest-webapp/metrics-rest/pom.xml4
-rw-r--r--openecomp-be/api/openecomp-sdc-rest-webapp/notifications-fe/pom.xml10
-rw-r--r--openecomp-be/api/openecomp-sdc-rest-webapp/onboarding-rest-war/pom.xml2
-rw-r--r--openecomp-be/api/openecomp-sdc-rest-webapp/openecomp-sdc-common-rest/pom.xml4
-rw-r--r--openecomp-be/api/openecomp-sdc-rest-webapp/togglz-rest/togglz-rest-services/pom.xml4
-rw-r--r--openecomp-be/api/openecomp-sdc-rest-webapp/unique-type-rest/unique-type-rest-services/pom.xml4
-rw-r--r--openecomp-be/api/openecomp-sdc-rest-webapp/validation-rest/validation-rest-services/pom.xml8
-rw-r--r--openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-services/pom.xml4
-rw-r--r--openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vendor-software-products-rest-services/pom.xml8
-rw-r--r--openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vnf-repository-rest-services/pom.xml4
-rw-r--r--openecomp-be/backend/openecomp-sdc-security-util/pom.xml2
-rw-r--r--openecomp-be/lib/openecomp-common-lib/pom.xml4
-rw-r--r--openecomp-be/lib/openecomp-item-permissions-lib/openecomp-item-permissions-core/pom.xml4
-rw-r--r--openecomp-be/lib/openecomp-sdc-action-lib/openecomp-sdc-action-api/pom.xml4
-rw-r--r--openecomp-be/lib/openecomp-sdc-externaltesting-lib/openecomp-sdc-externaltesting-impl/pom.xml6
-rw-r--r--openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-api/pom.xml4
-rw-r--r--openecomp-be/lib/openecomp-sdc-notification-lib/openecomp-sdc-notification-worker/pom.xml16
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/pom.xml3
-rw-r--r--pom.xml56
-rw-r--r--utils/webseal-simulator/pom.xml8
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 @@
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.onap.aaf.authz</groupId>
+ <artifactId>aaf-cadi-aaf</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.onap.aaf.authz</groupId>
+ <artifactId>aaf-cadi-client</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.onap.aaf.authz</groupId>
+ <artifactId>aaf-cadi-core</artifactId>
+ </exclusion>
</exclusions>
</dependency>
@@ -286,9 +298,9 @@
<!-- groovy -->
<dependency>
- <groupId>org.codehaus.groovy</groupId>
+ <groupId>org.apache.groovy</groupId>
<artifactId>groovy</artifactId>
- <scope>compile</scope>
+ <version>${groovy.version}</version>
</dependency>
<dependency>
@@ -361,6 +373,12 @@
<artifactId>json-simple</artifactId>
<version>${json-simple.version}</version>
<scope>compile</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
@@ -393,6 +411,10 @@
<groupId>org.apache.cassandra</groupId>
<artifactId>cassandra-all</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>javax.validation</groupId>
+ <artifactId>validation-api</artifactId>
+ </exclusion>
</exclusions>
</dependency>
@@ -437,8 +459,8 @@
</dependency>
<dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpclient</artifactId>
+ <groupId>org.apache.httpcomponents.client5</groupId>
+ <artifactId>httpclient5</artifactId>
<version>${httpclient.version}</version>
<scope>compile</scope>
<exclusions>
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 @@
</dependency>
<dependency>
- <groupId>javax.ws.rs</groupId>
- <artifactId>javax.ws.rs-api</artifactId>
+ <groupId>jakarta.ws.rs</groupId>
+ <artifactId>jakarta.ws.rs-api</artifactId>
<version>${ws.rs.version}</version>
</dependency>
@@ -366,8 +366,8 @@
<!-- http client -->
<dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpclient</artifactId>
+ <groupId>org.apache.httpcomponents.client5</groupId>
+ <artifactId>httpclient5</artifactId>
<version>${httpclient.version}</version>
<scope>compile</scope>
<exclusions>
@@ -610,7 +610,12 @@
<artifactId>json-simple</artifactId>
<version>${json-simple.version}</version>
<scope>compile</scope>
-
+ <exclusions>
+ <exclusion>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<!-- functional java -->
@@ -752,6 +757,18 @@
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.onap.aaf.authz</groupId>
+ <artifactId>aaf-cadi-aaf</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.onap.aaf.authz</groupId>
+ <artifactId>aaf-cadi-client</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.onap.aaf.authz</groupId>
+ <artifactId>aaf-cadi-core</artifactId>
+ </exclusion>
</exclusions>
</dependency>
@@ -821,6 +838,10 @@
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient-cache</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>javax.ws.rs</groupId>
+ <artifactId>javax.ws.rs-api</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -877,6 +898,12 @@
<version>${jersey-bom.version}</version>
<type>pom</type>
<scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
@@ -982,12 +1009,11 @@
<dependency>
<groupId>com.google.code.bean-matchers</groupId>
<artifactId>bean-matchers</artifactId>
- <version>0.11</version>
+ <version>${bean-matchers.version}</version>
<scope>test</scope>
</dependency>
-
<dependency>
- <groupId>org.codehaus.groovy</groupId>
+ <groupId>org.apache.groovy</groupId>
<artifactId>groovy</artifactId>
<version>${groovy.version}</version>
</dependency>
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
<artifactId>json-simple</artifactId>
<version>${json-simple.version}</version>
<scope>provided</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
@@ -235,8 +241,8 @@ Modifications copyright (c) 2018 Nokia
<!-- http client -->
<dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpclient</artifactId>
+ <groupId>org.apache.httpcomponents.client5</groupId>
+ <artifactId>httpclient5</artifactId>
<version>${httpclient.version}</version>
<scope>provided</scope>
<exclusions>
@@ -397,6 +403,10 @@ Modifications copyright (c) 2018 Nokia
<groupId>org.hibernate</groupId>
<artifactId>hibernate-validator</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>javax.validation</groupId>
+ <artifactId>validation-api</artifactId>
+ </exclusion>
</exclusions>
</dependency>
@@ -479,6 +489,10 @@ Modifications copyright (c) 2018 Nokia
<groupId>net.java.dev.jna</groupId>
<artifactId>jna</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -531,8 +545,9 @@ Modifications copyright (c) 2018 Nokia
</dependency>
<dependency>
- <groupId>org.codehaus.groovy</groupId>
+ <groupId>org.apache.groovy</groupId>
<artifactId>groovy</artifactId>
+ <version>${groovy.version}</version>
</dependency>
<dependency>
<groupId>org.togglz</groupId>
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 @@
</dependency>
<dependency>
- <groupId>org.codehaus.groovy</groupId>
+ <groupId>org.apache.groovy</groupId>
<artifactId>groovy</artifactId>
- <scope>compile</scope>
+ <version>${groovy.version}</version>
</dependency>
<dependency>
@@ -189,8 +189,8 @@
<!-- http client -->
<dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpclient</artifactId>
+ <groupId>org.apache.httpcomponents.client5</groupId>
+ <artifactId>httpclient5</artifactId>
<version>${httpclient.version}</version>
<exclusions>
<exclusion>
@@ -210,7 +210,7 @@
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpmime</artifactId>
- <version>${httpclient.version}</version>
+ <version>${httpmime.version}</version>
<exclusions>
<exclusion>
<groupId>org.apache.httpcomponents</groupId>
@@ -366,6 +366,18 @@
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.onap.aaf.authz</groupId>
+ <artifactId>aaf-cadi-aaf</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.onap.aaf.authz</groupId>
+ <artifactId>aaf-cadi-client</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.onap.aaf.authz</groupId>
+ <artifactId>aaf-cadi-core</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<!-- System metrics -->
@@ -389,6 +401,12 @@
<version>${jersey-bom.version}</version>
<type>pom</type>
<scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
@@ -423,8 +441,8 @@
<version>${jetty.version}</version>
</dependency>
<dependency>
- <groupId>javax.ws.rs</groupId>
- <artifactId>javax.ws.rs-api</artifactId>
+ <groupId>jakarta.ws.rs</groupId>
+ <artifactId>jakarta.ws.rs-api</artifactId>
<version>${ws.rs.version}</version>
<scope>compile</scope>
</dependency>
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 @@
<dependency>
<groupId>com.google.code.bean-matchers</groupId>
<artifactId>bean-matchers</artifactId>
- <version>${bean-matcher.version}</version>
+ <version>${bean-matchers.version}</version>
<scope>test</scope>
</dependency>
@@ -297,6 +297,10 @@
<groupId>org.apache.cassandra</groupId>
<artifactId>cassandra-all</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>javax.validation</groupId>
+ <artifactId>validation-api</artifactId>
+ </exclusion>
</exclusions>
</dependency>
@@ -309,8 +313,8 @@
<!-- http client -->
<dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpclient</artifactId>
+ <groupId>org.apache.httpcomponents.client5</groupId>
+ <artifactId>httpclient5</artifactId>
<version>${httpclient.version}</version>
<scope>provided</scope>
<exclusions>
@@ -466,8 +470,9 @@
</dependency>
<dependency>
- <groupId>org.codehaus.groovy</groupId>
+ <groupId>org.apache.groovy</groupId>
<artifactId>groovy</artifactId>
+ <version>${groovy.version}</version>
</dependency>
<dependency>
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 @@
<!-- http client -->
<dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpclient</artifactId>
+ <groupId>org.apache.httpcomponents.client5</groupId>
+ <artifactId>httpclient5</artifactId>
<version>${httpclient.version}</version>
<scope>provided</scope>
<exclusions>
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 @@
<dependencies>
<dependency>
- <groupId>javax.ws.rs</groupId>
- <artifactId>javax.ws.rs-api</artifactId>
+ <groupId>jakarta.ws.rs</groupId>
+ <artifactId>jakarta.ws.rs-api</artifactId>
<version>${ws.rs.version}</version>
<scope>provided</scope>
</dependency>
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 @@
</parent>
<dependencies>
<dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpclient</artifactId>
+ <groupId>org.apache.httpcomponents.client5</groupId>
+ <artifactId>httpclient5</artifactId>
<version>${httpclient.version}</version>
<exclusions>
<exclusion>
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.
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpclient</artifactId>
+ <groupId>org.apache.httpcomponents.client5</groupId>
+ <artifactId>httpclient5</artifactId>
<version>${httpclient.version}</version>
<scope>test</scope>
<exclusions>
@@ -282,10 +282,21 @@ limitations under the License.
<!--FOR the Frontend -->
<dependency>
+ <groupId>com.squareup.okhttp3</groupId>
+ <artifactId>okhttp</artifactId>
+ <version>${okhttp.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.seleniumhq.selenium</groupId>
<artifactId>selenium-java</artifactId>
<scope>test</scope>
<version>${selenium.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>com.squareup.okhttp3</groupId>
+ <artifactId>okhttp</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.seleniumhq.selenium</groupId>
@@ -297,6 +308,10 @@ limitations under the License.
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>com.squareup.okhttp3</groupId>
+ <artifactId>okhttp</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -304,6 +319,12 @@ limitations under the License.
<artifactId>selenium-firefox-driver</artifactId>
<version>${selenium.version}</version>
<scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>com.squareup.okhttp3</groupId>
+ <artifactId>okhttp</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
@@ -322,6 +343,10 @@ limitations under the License.
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.bouncycastle</groupId>
+ <artifactId>bcprov-jdk15on</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -376,6 +401,18 @@ limitations under the License.
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.onap.aaf.authz</groupId>
+ <artifactId>aaf-cadi-aaf</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.onap.aaf.authz</groupId>
+ <artifactId>aaf-cadi-client</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.onap.aaf.authz</groupId>
+ <artifactId>aaf-cadi-core</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -653,8 +690,8 @@ limitations under the License.
<artifactId>docker-maven-plugin</artifactId>
<dependencies>
<dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpclient</artifactId>
+ <groupId>org.apache.httpcomponents.client5</groupId>
+ <artifactId>httpclient5</artifactId>
<version>${httpclient.version}</version>
</dependency>
</dependencies>
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 @@
<commons.digester.version>2.1</commons.digester.version>
<commons.lang3.version>${lang3.version}</commons.lang3.version>
<datastax.cassandra.version>3.8.0</datastax.cassandra.version>
- <groovy.minimal.version>1.5.8</groovy.minimal.version>
<http.client.version>${httpclient.version}</http.client.version>
<http.core.version>${httpcore.version}</http.core.version>
<httpasyncclient.version>4.1.2</httpasyncclient.version>
@@ -169,9 +168,9 @@
<version>${slf4j.version}</version>
</dependency>
<dependency>
- <groupId>org.codehaus.groovy</groupId>
- <artifactId>groovy-all-minimal</artifactId>
- <version>${groovy.minimal.version}</version>
+ <groupId>org.apache.groovy</groupId>
+ <artifactId>groovy</artifactId>
+ <version>${groovy.version}</version>
</dependency>
<dependency>
<groupId>org.codehaus.janino</groupId>
@@ -263,8 +262,8 @@
<version>${datastax.cassandra.version}</version>
</dependency>
<dependency>
- <groupId>javax.ws.rs</groupId>
- <artifactId>javax.ws.rs-api</artifactId>
+ <groupId>jakarta.ws.rs</groupId>
+ <artifactId>jakarta.ws.rs-api</artifactId>
<version>${ws.rs.version}</version>
</dependency>
<dependency>
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 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpclient</artifactId>
+ <groupId>org.apache.httpcomponents.client5</groupId>
+ <artifactId>httpclient5</artifactId>
<version>${http.client.version}</version>
<exclusions>
<exclusion>
@@ -96,8 +96,8 @@
</dependency>
<dependency>
- <groupId>javax.ws.rs</groupId>
- <artifactId>javax.ws.rs-api</artifactId>
+ <groupId>jakarta.ws.rs</groupId>
+ <artifactId>jakarta.ws.rs-api</artifactId>
<version>${ws.rs.version}</version>
</dependency>
<dependency>
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 @@
<version>${swagger.version}</version>
</dependency>
<dependency>
- <groupId>javax.ws.rs</groupId>
- <artifactId>javax.ws.rs-api</artifactId>
+ <groupId>jakarta.ws.rs</groupId>
+ <artifactId>jakarta.ws.rs-api</artifactId>
<version>${ws.rs.version}</version>
</dependency>
<dependency>
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 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpclient</artifactId>
+ <groupId>org.apache.httpcomponents.client5</groupId>
+ <artifactId>httpclient5</artifactId>
<version>${http.client.version}</version>
<exclusions>
<exclusion>
@@ -100,8 +100,8 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.ws.rs</groupId>
- <artifactId>javax.ws.rs-api</artifactId>
+ <groupId>jakarta.ws.rs</groupId>
+ <artifactId>jakarta.ws.rs-api</artifactId>
<version>${ws.rs.version}</version>
</dependency>
<dependency>
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 @@
<dependencies>
<dependency>
- <groupId>javax.ws.rs</groupId>
- <artifactId>javax.ws.rs-api</artifactId>
+ <groupId>jakarta.ws.rs</groupId>
+ <artifactId>jakarta.ws.rs-api</artifactId>
<version>${ws.rs.version}</version>
</dependency>
<dependency>
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 @@
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpclient</artifactId>
+ <groupId>org.apache.httpcomponents.client5</groupId>
+ <artifactId>httpclient5</artifactId>
<version>${http.client.version}</version>
<exclusions>
<exclusion>
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 @@
<dependencies>
<dependency>
- <groupId>javax.ws.rs</groupId>
- <artifactId>javax.ws.rs-api</artifactId>
+ <groupId>jakarta.ws.rs</groupId>
+ <artifactId>jakarta.ws.rs-api</artifactId>
<version>${ws.rs.version}</version>
</dependency>
<dependency>
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 @@
<version>${hibernate.validator.version}</version>
</dependency>
<dependency>
- <groupId>javax.ws.rs</groupId>
- <artifactId>javax.ws.rs-api</artifactId>
+ <groupId>jakarta.ws.rs</groupId>
+ <artifactId>jakarta.ws.rs-api</artifactId>
<version>${ws.rs.version}</version>
</dependency>
<dependency>
- <groupId>org.codehaus.groovy</groupId>
+ <groupId>org.apache.groovy</groupId>
<artifactId>groovy</artifactId>
<version>${groovy.version}</version>
</dependency>
@@ -169,8 +169,8 @@
<version>${aspectj.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpclient</artifactId>
+ <groupId>org.apache.httpcomponents.client5</groupId>
+ <artifactId>httpclient5</artifactId>
<version>${http.client.version}</version>
<exclusions>
<exclusion>
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 @@
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.codehaus.groovy</groupId>
+ <groupId>org.apache.groovy</groupId>
<artifactId>groovy</artifactId>
<version>${groovy.version}</version>
</dependency>
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 @@
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>javax.ws.rs</groupId>
- <artifactId>javax.ws.rs-api</artifactId>
+ <groupId>jakarta.ws.rs</groupId>
+ <artifactId>jakarta.ws.rs-api</artifactId>
<version>${ws.rs.version}</version>
</dependency>
<!-- Swagger -->
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 @@
<dependency>
- <groupId>javax.ws.rs</groupId>
- <artifactId>javax.ws.rs-api</artifactId>
+ <groupId>jakarta.ws.rs</groupId>
+ <artifactId>jakarta.ws.rs-api</artifactId>
<version>${ws.rs.version}</version>
</dependency>
<dependency>
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 @@
<version>${javax.inject.version}</version>
</dependency>
<dependency>
- <groupId>javax.ws.rs</groupId>
- <artifactId>javax.ws.rs-api</artifactId>
+ <groupId>jakarta.ws.rs</groupId>
+ <artifactId>jakarta.ws.rs-api</artifactId>
<version>${ws.rs.version}</version>
</dependency>
<dependency>
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 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpclient</artifactId>
+ <groupId>org.apache.httpcomponents.client5</groupId>
+ <artifactId>httpclient5</artifactId>
<version>${http.client.version}</version>
<exclusions>
<exclusion>
@@ -100,8 +100,8 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.ws.rs</groupId>
- <artifactId>javax.ws.rs-api</artifactId>
+ <groupId>jakarta.ws.rs</groupId>
+ <artifactId>jakarta.ws.rs-api</artifactId>
<version>${ws.rs.version}</version>
</dependency>
<dependency>
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 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpclient</artifactId>
+ <groupId>org.apache.httpcomponents.client5</groupId>
+ <artifactId>httpclient5</artifactId>
<version>${http.client.version}</version>
<exclusions>
<exclusion>
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 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpclient</artifactId>
+ <groupId>org.apache.httpcomponents.client5</groupId>
+ <artifactId>httpclient5</artifactId>
<version>${http.client.version}</version>
<exclusions>
<exclusion>
@@ -103,8 +103,8 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.ws.rs</groupId>
- <artifactId>javax.ws.rs-api</artifactId>
+ <groupId>jakarta.ws.rs</groupId>
+ <artifactId>jakarta.ws.rs-api</artifactId>
<version>${ws.rs.version}</version>
</dependency>
<dependency>
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 @@
<dependencies>
<dependency>
- <groupId>javax.ws.rs</groupId>
- <artifactId>javax.ws.rs-api</artifactId>
+ <groupId>jakarta.ws.rs</groupId>
+ <artifactId>jakarta.ws.rs-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
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 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
- <version>1.7.25</version>
+ <version>${slf4j-api.version}</version>
</dependency>
<dependency>
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 @@
<version>${javax.inject.version}</version>
</dependency>
<dependency>
- <groupId>javax.ws.rs</groupId>
- <artifactId>javax.ws.rs-api</artifactId>
+ <groupId>jakarta.ws.rs</groupId>
+ <artifactId>jakarta.ws.rs-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
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 @@
<dependencies>
<dependency>
- <groupId>javax.ws.rs</groupId>
- <artifactId>javax.ws.rs-api</artifactId>
+ <groupId>jakarta.ws.rs</groupId>
+ <artifactId>jakarta.ws.rs-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
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 @@
<artifactId>jackson-annotations</artifactId>
</dependency>
<dependency>
- <groupId>javax.ws.rs</groupId>
- <artifactId>javax.ws.rs-api</artifactId>
+ <groupId>jakarta.ws.rs</groupId>
+ <artifactId>jakarta.ws.rs-api</artifactId>
<scope>provided</scope>
</dependency>
</dependencies>
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 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.codehaus.groovy</groupId>
- <artifactId>groovy-all-minimal</artifactId>
- <version>${groovy.minimal.version}</version>
+ <groupId>org.apache.groovy</groupId>
+ <artifactId>groovy</artifactId>
+ <version>${groovy.version}</version>
<scope>test</scope>
</dependency>
<dependency>
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 @@
<dependencies>
<dependency>
- <groupId>javax.ws.rs</groupId>
- <artifactId>javax.ws.rs-api</artifactId>
+ <groupId>jakarta.ws.rs</groupId>
+ <artifactId>jakarta.ws.rs-api</artifactId>
<version>${ws.rs.version}</version>
<scope>provided</scope>
</dependency>
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 @@
<dependency>
<groupId>com.googlecode.json-simple</groupId>
<artifactId>json-simple</artifactId>
- <version>1.1</version>
+ <version>${json-simple.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpclient</artifactId>
+ <groupId>org.apache.httpcomponents.client5</groupId>
+ <artifactId>httpclient5</artifactId>
<version>${http.client.version}</version>
<scope>provided</scope>
<exclusions>
@@ -86,8 +92,8 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.ws.rs</groupId>
- <artifactId>javax.ws.rs-api</artifactId>
+ <groupId>jakarta.ws.rs</groupId>
+ <artifactId>jakarta.ws.rs-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
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 @@
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpmime</artifactId>
- <version>${httpclient.version}</version>
- <scope>compile</scope>
+ <version>${httpmime.version}</version>
<exclusions>
<exclusion>
<groupId>org.apache.httpcomponents</groupId>
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
<tosca.datatype.version>${project.version}</tosca.datatype.version>
<!-- 3rd parties versions -->
- <bean-matcher.version>0.11</bean-matcher.version>
- <lang3.version>3.10</lang3.version>
- <guava.version>30.1-jre</guava.version>
+ <lang3.version>3.12.0</lang3.version>
+ <guava.version>32.1.1-jre</guava.version>
<janusgraph.version>0.3.3</janusgraph.version>
<spring.version>5.3.27</spring.version>
<mvn.assembly.version>3.6.0</mvn.assembly.version>
@@ -60,34 +59,34 @@ Modifications copyright (c) 2018-2019 Nokia
<wire-mock.version>2.26.3</wire-mock.version>
<ecomp.version>3.4.0</ecomp.version>
<cassandra.unit.version>4.3.1.0</cassandra.unit.version>
- <cadi.version>2.1.8</cadi.version>
+ <cadi.version>2.1.21</cadi.version>
<lombok.version>1.18.24</lombok.version>
<commons-beanutils>1.9.4</commons-beanutils>
- <commons.io.version>2.8.0</commons.io.version>
+ <commons.io.version>2.13.0</commons.io.version>
<commons-configuration>2.8.0</commons-configuration>
<onap.logging.version>1.6.1</onap.logging.version>
<apache-commons-text.version>1.10.0</apache-commons-text.version>
<jaxb-api.version>2.3.1</jaxb-api.version>
<io.vavr.version>0.10.3</io.vavr.version>
- <groovy.version>3.0.7</groovy.version>
+ <groovy.version>4.0.13</groovy.version>
<swagger-core-mvn-plugin.version>2.1.7</swagger-core-mvn-plugin.version>
<maven-antrun-plugin.version>3.0.0</maven-antrun-plugin.version>
- <hibernate.validator.version>6.1.6.Final</hibernate.validator.version>
+ <hibernate.validator.version>6.2.5.Final</hibernate.validator.version>
<org.json.version>20220320</org.json.version>
<commons.collections.version>4.3</commons.collections.version>
- <ws.rs.version>2.1.1</ws.rs.version>
+ <ws.rs.version>2.1.6</ws.rs.version>
<javax.validation.version>2.0.1.Final</javax.validation.version>
- <jetty.version>9.4.49.v20220914</jetty.version>
+ <jetty.version>9.4.51.v20230217</jetty.version>
<jetty-distribution.version>${jetty.version}</jetty-distribution.version>
- <cxf.version>3.4.4</cxf.version>
+ <cxf.version>3.6.1</cxf.version>
<org.owasp.esapi.version>2.4.0.0</org.owasp.esapi.version>
<org.dom4j.version>2.1.3</org.dom4j.version>
<!-- Keycloak authentication-->
- <keycloak.version>18.0.0</keycloak.version>
+ <keycloak.version>21.1.1</keycloak.version>
<!-- JSON and YAML Parsing -->
<jackson.version>2.14.2</jackson.version>
@@ -99,25 +98,25 @@ Modifications copyright (c) 2018-2019 Nokia
<!-- Yaml for properties -->
<snakeyaml.version>1.33</snakeyaml.version>
<functionaljava.version>4.9</functionaljava.version>
- <httpclient.version>4.5.13</httpclient.version>
+ <httpmime.version>4.5.14</httpmime.version>
+ <httpclient.version>5.2.1</httpclient.version>
<httpcore.version>4.4.15</httpcore.version>
- <json-simple.version>1.1</json-simple.version>
+ <json-simple.version>1.1.1</json-simple.version>
<!-- PM Dictionary validation -->
- <onap.vnfsdk.validation.pmdictionary.version>1.2.15
- </onap.vnfsdk.validation.pmdictionary.version>
+ <onap.vnfsdk.validation.pmdictionary.version>1.2.15</onap.vnfsdk.validation.pmdictionary.version>
<!-- Logging start -->
<!-- logback -->
- <logback.version>1.2.10</logback.version>
- <slf4j-api.version>1.7.25</slf4j-api.version>
+ <logback.version>1.2.12</logback.version>
+ <slf4j-api.version>1.7.36</slf4j-api.version>
<commons-codec>1.15</commons-codec>
<commons-logging>1.2</commons-logging>
- <janino.version>3.0.6</janino.version>
+ <janino.version>3.1.9</janino.version>
<!-- aspects -->
- <jcabi.version>0.20.1</jcabi.version>
- <aspectj.version>1.9.7</aspectj.version>
+ <jcabi.version>0.21.1</jcabi.version>
+ <aspectj.version>1.9.19</aspectj.version>
<aspectjrt.version>${aspectj.version}</aspectjrt.version>
<jcabi.maven.plugin.version>0.13.2</jcabi.maven.plugin.version>
@@ -126,7 +125,7 @@ Modifications copyright (c) 2018-2019 Nokia
<sigar.version>1.6.4</sigar.version>
<!--GSON-->
- <gson.version>2.8.9</gson.version>
+ <gson.version>2.10.1</gson.version>
<!--listen to file changes-->
<commons-jci-core.version>1.1</commons-jci-core.version>
@@ -140,7 +139,7 @@ Modifications copyright (c) 2018-2019 Nokia
<assertj.version>3.16.0</assertj.version>
<testng.version>7.7.0</testng.version>
<cucumber.version>7.10.1</cucumber.version>
- <bean-matchers.version>0.11</bean-matchers.version>
+ <bean-matchers.version>0.14</bean-matchers.version>
<hamcrest.version>2.2</hamcrest.version>
<hamcrest-all.version>1.3</hamcrest-all.version>
<maven-surefire-plugin.version>2.22.2</maven-surefire-plugin.version>
@@ -185,10 +184,10 @@ Modifications copyright (c) 2018-2019 Nokia
<surefire.reuseForks>true</surefire.reuseForks>
<surefire.skip.tests>false</surefire.skip.tests>
- <bouncycastle.version>1.69</bouncycastle.version>
+ <bouncycastle.version>1.70</bouncycastle.version>
<!--DOCKER-->
- <docker.api.version>1.41</docker.api.version>
+ <docker.api.version>1.43</docker.api.version>
<docker.namespace>onap</docker.namespace>
<docker.password>docker</docker.password>
<docker.username>docker</docker.username>
@@ -196,8 +195,8 @@ Modifications copyright (c) 2018-2019 Nokia
<micrometer.version>1.8.4</micrometer.version>
- <minio.version>8.3.4</minio.version>
- <okhttp.version>4.9.3</okhttp.version>
+ <minio.version>8.5.4</minio.version>
+ <okhttp.version>4.11.0</okhttp.version>
<jsoup.version>1.15.3</jsoup.version>
@@ -265,7 +264,7 @@ Modifications copyright (c) 2018-2019 Nokia
<version>${lang3.version}</version>
</dependency>
<dependency>
- <groupId>org.codehaus.groovy</groupId>
+ <groupId>org.apache.groovy</groupId>
<artifactId>groovy</artifactId>
<version>${groovy.version}</version>
</dependency>
@@ -500,7 +499,7 @@ Modifications copyright (c) 2018-2019 Nokia
<plugin>
<groupId>io.fabric8</groupId>
<artifactId>docker-maven-plugin</artifactId>
- <version>0.38.0</version>
+ <version>0.43.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -878,6 +877,7 @@ Modifications copyright (c) 2018-2019 Nokia
<skipYamlJsonValidator>true</skipYamlJsonValidator>
<checkstyle.skip>true</checkstyle.skip>
<jacoco.skip>true</jacoco.skip>
+
<docker.skip.run>true</docker.skip.run>
<maven.antrun.skip>true</maven.antrun.skip>
<swagger.skip>true</swagger.skip>
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 @@
</dependency>
<dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpclient</artifactId>
+ <groupId>org.apache.httpcomponents.client5</groupId>
+ <artifactId>httpclient5</artifactId>
<version>${httpclient.version}</version>
<exclusions>
<exclusion>
@@ -100,8 +100,8 @@
<dependency>
<groupId>commons-logging</groupId>
- <artifactId>commons-logging-api</artifactId>
- <version>1.0.4</version>
+ <artifactId>commons-logging</artifactId>
+ <version>${commons-logging}</version>
</dependency>
<dependency>