From f74e764f2f61dff0103f1ffbc4309376abb15356 Mon Sep 17 00:00:00 2001
From: lazara <layellet@gmail.com>
Date: Thu, 28 Apr 2022 13:57:01 +0300
Subject: [PATCH] defect #1777009: [GitLab] should update Spring in order to
 fix Critical Zero-Day vulnerability: CVE-2022-22965 Spring4Shell

---
 pom.xml | 28 ++++++++++++++++------------
 1 file changed, 16 insertions(+), 12 deletions(-)

diff --git a/pom.xml b/pom.xml
index 603bb98..c1a5cd6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -48,7 +48,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.6.6</version>
+        <version>2.6.7</version>
     </parent>
 
     <scm>
@@ -159,7 +159,7 @@
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-log4j2</artifactId>
-            <version>2.6.6</version>
+<!--            <version>2.6.6</version>-->
             <exclusions>
                 <exclusion>
                     <groupId>org.apache.logging.log4j</groupId>
@@ -289,6 +289,20 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <configuration>
+                    <archive>
+                        <manifest>
+                            <mainClass>com.microfocus.octane.gitlab.app.Application</mainClass>
+                            <addDefaultImplementationEntries>
+                                true
+                            </addDefaultImplementationEntries>
+                        </manifest>
+                    </archive>
+                </configuration>
+            </plugin>
             <plugin>
                 <artifactId>maven-jar-plugin</artifactId>
                 <groupId>org.apache.maven.plugins</groupId>
@@ -307,16 +321,6 @@
                         </configuration>
                     </execution>
                 </executions>
-                <configuration>
-                    <archive>
-                        <manifest>
-                            <mainClass>com.microfocus.octane.gitlab.app.Application</mainClass>
-                            <addDefaultImplementationEntries>
-                                true
-                            </addDefaultImplementationEntries>
-                        </manifest>
-                    </archive>
-                </configuration>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>