Update SpringBoot when approved version has Log4J 2.17.1 or higher

-Updated cps-dependencies/pom.xml SpringBoot to v2.6.4
-Updated cps-parent/pom.xml springboot maven to v2.6.4
-Updated spring cloud dependencies to 2021.0.1

Issue-ID: CPS-958
Change-Id: I37aca89edf6da83501414b4f202d3bb88464c801
Signed-off-by: JosephKeenan <joseph.keenan@est.tech>

diff --git a/cps-dependencies/pom.xml b/cps-dependencies/pom.xml
index 0f33e03..1de07c3 100755 (executable)
--- a/cps-dependencies/pom.xml
+++ b/cps-dependencies/pom.xml
@@ -66,14 +66,14 @@
             <dependency>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-dependencies</artifactId>
             <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>
             <dependency>
                 <groupId>org.springframework.cloud</groupId>
                 <artifactId>spring-cloud-dependencies</artifactId>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
             <dependency>
                 <groupId>org.springframework.cloud</groupId>
                 <artifactId>spring-cloud-dependencies</artifactId>

-                <version>2020.0.2</version>
+                <version>2021.0.1</version>

                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>


@@ -180,16 +180,6 @@
                 <version>0.18.0</version>
                 <scope>test</scope>
             </dependency>
                 <version>0.18.0</version>
                 <scope>test</scope>
             </dependency>

-            <dependency>
-                <groupId>org.apache.logging.log4j</groupId>
-                <artifactId>log4j-api</artifactId>
-                <version>2.17.2</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.logging.log4j</groupId>
-                <artifactId>log4j-to-slf4j</artifactId>
-                <version>2.17.2</version>
-            </dependency>

             <dependency>
                 <groupId>org.mapstruct</groupId>
                 <artifactId>mapstruct</artifactId>
             <dependency>
                 <groupId>org.mapstruct</groupId>
                 <artifactId>mapstruct</artifactId>

diff --git a/cps-parent/pom.xml b/cps-parent/pom.xml
index 7726957..b76c63c 100755 (executable)
--- a/cps-parent/pom.xml
+++ b/cps-parent/pom.xml
@@ -115,7 +115,7 @@
                 <plugin>
                     <groupId>org.springframework.boot</groupId>
                     <artifactId>spring-boot-maven-plugin</artifactId>
                 <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>
                     <executions>
                         <execution>
                             <goals>