summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJosephKeenan <joseph.keenan@est.tech>2022-03-23 15:12:53 +0000
committerJosephKeenan <joseph.keenan@est.tech>2022-03-25 11:11:08 +0000
commitbe383b488bf50af4fb58e567fa945229a84116af (patch)
tree089755c697b0daf77cf38867bee8938a2f20d24e
parent786eb8050017bfc4ebf5d8cddb7abca34a10e82b (diff)
Update SpringBoot when approved version has Log4J 2.17.1 or higher
-Updated cps-dependencies/pom.xml SpringBoot to v2.6.4 Issue-ID: CPS-958 Change-Id: Idac149e77eab1c273694672ee0282868e0e8589a Signed-off-by: JosephKeenan <joseph.keenan@est.tech>
-rw-r--r--pom.xml21
-rw-r--r--src/main/resources/application.yml9
2 files changed, 18 insertions, 12 deletions
diff --git a/pom.xml b/pom.xml
index b6e0f9a0..363a6e72 100644
--- a/pom.xml
+++ b/pom.xml
@@ -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: