diff options
author | Kai <lukai@chinamobile.com> | 2021-03-29 11:48:10 +0800 |
---|---|---|
committer | Remigiusz Janeczek <remigiusz.janeczek@nokia.com> | 2021-05-12 17:11:08 +0200 |
commit | 9bb841d5faa995c2170057f93cd65303fba7979c (patch) | |
tree | b3fe5deaa60844546984d74adb82b9217a6f4705 /dcae-analytics/pom.xml | |
parent | 6302edb304f69068b108a69001d69bc6213b6a6a (diff) |
Fix mongodb errors on application startup1.3.0-tca-gen2
Revert Dockerfile refactor due to permissions issues
Issue-ID: DCAEGEN2-2747
Issue-ID: DCAEGEN2-2590
Signed-off-by: Kai Lu <lukai@chinamobile.com>
Change-Id: I84075575cc75090876416cb13e0ac197a8e0f6e3
Signed-off-by: Remigiusz Janeczek <remigiusz.janeczek@nokia.com>
Diffstat (limited to 'dcae-analytics/pom.xml')
-rw-r--r-- | dcae-analytics/pom.xml | 110 |
1 files changed, 14 insertions, 96 deletions
diff --git a/dcae-analytics/pom.xml b/dcae-analytics/pom.xml index 4f8fc42..d3d924f 100644 --- a/dcae-analytics/pom.xml +++ b/dcae-analytics/pom.xml @@ -3,6 +3,7 @@ ~ ================================================================================ ~ Copyright (c) 2018-2020 AT&T Intellectual Property. All rights reserved. ~ Copyright (c) 2021 Samsung Electronics. All rights reserved. + ~ Copyright (c) 2021 China Mobile Property. All rights reserved. ~ ================================================================================ ~ Licensed under the Apache License, Version 2.0 (the "License"); ~ you may not use this file except in compliance with the License. @@ -56,9 +57,8 @@ <!-- DEPENDENCIES VERSION --> <eelf.logger.version>1.0.1-SNAPSHOT</eelf.logger.version> - <spring.boot.version>2.0.9.RELEASE</spring.boot.version> + <spring.boot.version>2.4.4</spring.boot.version> <spring.cloud.version>Finchley.RC2</spring.cloud.version> - <spring.version>5.0.11.RELEASE</spring.version> <commons.text.version>1.4</commons.text.version> <springfox-swagger2.version>3.0.0</springfox-swagger2.version> <findbugs.jsr305.version>3.0.2</findbugs.jsr305.version> @@ -109,9 +109,7 @@ <snapshots.path>content/repositories/snapshots/</snapshots.path> <releases.path>content/repositories/releases/</releases.path> <docker.repository>nexus3.onap.org:10003</docker.repository> - <jackson.version>2.11.0</jackson.version> - <undertow.version>2.2.2.Final</undertow.version> - <spring-webflux.version>5.2.7.RELEASE</spring-webflux.version> + <spring-swagger-ui.version>2.10.5</spring-swagger-ui.version> <!-- SONAR EXCLUSIONS --> <!-- EXCLUDE TEST COVERAGE ON @@ -184,11 +182,12 @@ <groupId>io.springfox</groupId> <artifactId>springfox-swagger2</artifactId> <version>${springfox-swagger2.version}</version> - </dependency> - <dependency> - <groupId>io.springfox</groupId> - <artifactId>springfox-swagger-ui</artifactId> - <version>${springfox-swagger2.version}</version> + <exclusions> + <exclusion> + <groupId>org.springframework.plugin</groupId> + <artifactId>spring-plugin-core</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.springframework.plugin</groupId> @@ -196,9 +195,9 @@ <version>2.0.0.RELEASE</version> </dependency> <dependency> - <groupId>org.springframework.plugin</groupId> - <artifactId>spring-plugin-metadata</artifactId> - <version>2.0.0.RELEASE</version> + <groupId>io.springfox</groupId> + <artifactId>springfox-swagger-ui</artifactId> + <version>${spring-swagger-ui.version}</version> </dependency> <!-- FIND BUGS --> @@ -270,40 +269,6 @@ <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-dependencies</artifactId> <version>${spring.boot.version}</version> - <exclusions> - <exclusion> - <groupId>org.springframework</groupId> - <artifactId>spring-web</artifactId> - </exclusion> - <exclusion> - <groupId>org.springframework.boot</groupId> - <artifactId>spring-boot-starter-test</artifactId> - </exclusion> - <exclusion> - <groupId>org.mockito</groupId> - <artifactId>mockito-core</artifactId> - </exclusion> - <exclusion> - <groupId>io.undertow</groupId> - <artifactId>undertow-core</artifactId> - </exclusion> - <exclusion> - <groupId>org.springframework</groupId> - <artifactId>spring-webflux</artifactId> - </exclusion> - <exclusion> - <groupId>com.fasterxml.jackson.core</groupId> - <artifactId>jackson-databind</artifactId> - </exclusion> - <exclusion> - <groupId>com.fasterxml.jackson.core</groupId> - <artifactId>jackson-core</artifactId> - </exclusion> - <exclusion> - <groupId>com.fasterxml.jackson.dataformat</groupId> - <artifactId>jackson-dataformat-smile</artifactId> - </exclusion> - </exclusions> <type>pom</type> <scope>import</scope> </dependency> @@ -315,46 +280,6 @@ <type>pom</type> <scope>import</scope> </dependency> - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-webflux</artifactId> - <version>${spring-webflux.version}</version> - </dependency> - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-web</artifactId> - <version>${spring.version}</version> - </dependency> - <dependency> - <groupId>org.springframework.boot</groupId> - <artifactId>spring-boot-starter-test</artifactId> - <version>2.2.0.RELEASE</version> - </dependency> - <dependency> - <groupId>org.mockito</groupId> - <artifactId>mockito-core</artifactId> - <version>2.23.4</version> - </dependency> - <dependency> - <groupId>io.undertow</groupId> - <artifactId>undertow-core</artifactId> - <version>${undertow.version}</version> - </dependency> - <dependency> - <groupId>com.fasterxml.jackson.core</groupId> - <artifactId>jackson-databind</artifactId> - <version>${jackson.version}</version> - </dependency> - <dependency> - <groupId>com.fasterxml.jackson.core</groupId> - <artifactId>jackson-core</artifactId> - <version>${jackson.version}</version> - </dependency> - <dependency> - <groupId>com.fasterxml.jackson.dataformat</groupId> - <artifactId>jackson-dataformat-smile</artifactId> - <version>${jackson.version}</version> - </dependency> </dependencies> </dependencyManagement> @@ -445,8 +370,7 @@ <version>${maven-surefire-plugin.version}</version> <configuration> <skipTests>${skip.unit.tests}</skipTests> - <argLine>-Xmx2048m -Djava.awt.headless=true - -XX:+UseConcMarkSweepGC + <argLine>-Xmx2048m -Djava.awt.headless=true -XX:+UseConcMarkSweepGC -XX:OnOutOfMemoryError="kill -9 %p" -XX:+HeapDumpOnOutOfMemoryError ${surefireArgLine} </argLine> <redirectTestOutputToFile>${surefire.redirectTestOutputToFile}</redirectTestOutputToFile> @@ -553,7 +477,7 @@ <id>validate</id> <phase>validate</phase> <configuration> - <skip>true</skip> + <skip>true</skip> <configLocation>${checkstyle.file.name}</configLocation> <suppressionsLocation>${checkstyle.suppression.file.name}</suppressionsLocation> <encoding>UTF-8</encoding> @@ -686,12 +610,6 @@ </execution> </executions> </plugin> - - <!-- DOCKER PLUGIN --> - <!-- <plugin> <groupId>com.spotify</groupId> <artifactId>docker-maven-plugin</artifactId> - <version>${docker-maven-version}</version> <configuration> <repository>${docker.repository}/onap/${project.groupId}.${project.artifactId}</repository> - <tag>${project.version}</tag> </configuration> </plugin> --> - </plugins> </pluginManagement> |