diff options
| author |   Toine Siebelink <toine.siebelink@est.tech> | 2022-03-25 15:48:04 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2022-03-25 15:48:04 +0000 |
| commit | 24479731fea8a35fdd1c384bd96b0e21068081c9 (patch) | |
| tree | a62570f0bb79dc159c025ed38e8803edac36f3b9 | |
| parent | 145a14310d109d367da9c854217f6c71a82e49b4 (diff) | |
| parent | be383b488bf50af4fb58e567fa945229a84116af (diff) | |
Merge "Update SpringBoot when approved version has Log4J 2.17.1 or higher"
| -rw-r--r-- | pom.xml | 21 | ||||
| -rw-r--r-- | src/main/resources/application.yml | 9 |
2 files changed, 18 insertions, 12 deletions
@@ -52,7 +52,7 @@ <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-dependencies</artifactId> - <version>2.5.5</version> + <version>2.6.4</version> <type>pom</type> <scope>import</scope> </dependency> @@ -64,20 +64,17 @@ <scope>import</scope> </dependency> <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-api</artifactId> - <version>2.17.1</version> - </dependency> - <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-to-slf4j</artifactId> - <version>2.17.1</version> - </dependency> - <dependency> <groupId>com.google.code.gson</groupId> <artifactId>gson</artifactId> <version>2.8.9</version> </dependency> + <dependency> + <groupId>org.springframework.cloud</groupId> + <artifactId>spring-cloud-dependencies</artifactId> + <version>2021.0.1</version> + <type>pom</type> + <scope>import</scope> + </dependency> </dependencies> </dependencyManagement> <dependencies> @@ -251,7 +248,7 @@ <plugin> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-maven-plugin</artifactId> - <version>2.3.3.RELEASE</version> + <version>2.6.4</version> <executions> <execution> <goals> diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 67cd28ee..2d324c5b 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -34,6 +34,15 @@ security: username: ${DMI_USERNAME} password: ${DMI_PASSWORD} +# When updating to sprinboot 2.6.4 an exception would occur when starting the container +# "Failed to start bean 'documentationPluginsBootstrapper'. +# This is a known issue with springfox and springboot introduced in 2.6.x: +# https://github.com/springfox/springfox/issues/3462 +spring: + mvc: + pathmatch: + matching-strategy: ANT_PATH_MATCHER + # Actuator management: server: |