diff options
| -rw-r--r-- | catalog-be/pom.xml | 9 | ||||
| -rw-r--r-- | common-app-api/pom.xml | 16 | ||||
| -rw-r--r-- | common-be-tests-utils/pom.xml | 13 | ||||
| -rw-r--r-- | common-be/pom.xml | 13 | ||||
| -rw-r--r-- | pom.xml | 8 |
5 files changed, 57 insertions, 2 deletions
diff --git a/catalog-be/pom.xml b/catalog-be/pom.xml index 11873926ee..58c2f240eb 100644 --- a/catalog-be/pom.xml +++ b/catalog-be/pom.xml @@ -288,8 +288,17 @@ <groupId>org.hibernate</groupId> <artifactId>hibernate-validator</artifactId> </exclusion> + <exclusion> + <groupId>org.glassfish</groupId> + <artifactId>jakarta.el</artifactId> + </exclusion> </exclusions> </dependency> + <dependency> + <groupId>org.glassfish</groupId> + <artifactId>jakarta.el</artifactId> + <version>${jakarta.el.version}</version> + </dependency> <!-- http client --> <dependency> diff --git a/common-app-api/pom.xml b/common-app-api/pom.xml index d51fb570a0..7905404f82 100644 --- a/common-app-api/pom.xml +++ b/common-app-api/pom.xml @@ -17,6 +17,12 @@ <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter</artifactId> <version>${spring.boot.version}</version> + <exclusions> + <exclusion> + <groupId>org.yaml</groupId> + <artifactId>snakeyaml</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.onap.sdc.sdc-be-common</groupId> @@ -55,9 +61,19 @@ <groupId>org.onap.portal.sdk</groupId> <artifactId>epsdk-fw</artifactId> </exclusion> + <exclusion> + <groupId>org.glassfish</groupId> + <artifactId>jakarta.el</artifactId> + </exclusion> </exclusions> </dependency> <dependency> + <groupId>org.glassfish</groupId> + <artifactId>jakarta.el</artifactId> + <version>${jakarta.el.version}</version> + </dependency> + + <dependency> <groupId>commons-io</groupId> <artifactId>commons-io</artifactId> <version>${commons.io.version}</version> diff --git a/common-be-tests-utils/pom.xml b/common-be-tests-utils/pom.xml index 4d0cfb413e..b2b04be736 100644 --- a/common-be-tests-utils/pom.xml +++ b/common-be-tests-utils/pom.xml @@ -22,7 +22,18 @@ <dependency> <groupId>io.minio</groupId> <artifactId>minio</artifactId> - <version>8.3.4</version> + <version>${minio.version}</version> + <exclusions> + <exclusion> + <groupId>com.squareup.okhttp3</groupId> + <artifactId>okhttp</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>com.squareup.okhttp3</groupId> + <artifactId>okhttp</artifactId> + <version>${okhttp.version}</version> </dependency> <!-- Common of SD&C --> diff --git a/common-be/pom.xml b/common-be/pom.xml index 3f8a97599f..02a3a3ad44 100644 --- a/common-be/pom.xml +++ b/common-be/pom.xml @@ -22,7 +22,18 @@ <dependency> <groupId>io.minio</groupId> <artifactId>minio</artifactId> - <version>8.3.4</version> + <version>${minio.version}</version> + <exclusions> + <exclusion> + <groupId>com.squareup.okhttp3</groupId> + <artifactId>okhttp</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>com.squareup.okhttp3</groupId> + <artifactId>okhttp</artifactId> + <version>${okhttp.version}</version> </dependency> <!-- Common of SD&C --> @@ -49,7 +49,12 @@ Modifications copyright (c) 2018-2019 Nokia <janusgraph.version>0.3.3</janusgraph.version> <spring.version>5.3.18</spring.version> <spring.boot.version>2.2.13.RELEASE</spring.boot.version> + + <!-- update to 2.36 bring error--> + <!-- java.lang.NoClassDefFoundError: com/fasterxml/jackson/databind/AnnotationIntrospector$XmlExtensions--> <jersey-bom.version>2.34</jersey-bom.version> + <jakarta.el.version>3.0.4</jakarta.el.version> + <netty.version>4.1.77.Final</netty.version> <servlet-api.version>4.0.1</servlet-api.version> <wire-mock.version>2.26.3</wire-mock.version> @@ -192,6 +197,9 @@ 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> + <verbose>false</verbose> </properties> |