Merge pull request #174 from Alfresco/feature/APPS-3035-spring-vulner…

…ability

[APPS-3035] fix for spring version update

.github/workflows/build.yml

@@ -33,6 +33,12 @@ jobs:
       !contains(github.event.head_commit.message, '[skip tests]') &&
       !contains(github.event.head_commit.message, '[force]')
     steps:
+      - name: Set up Java
+        uses: actions/setup-java@v4
+        with:
+          distribution: adopt
+          java-version: 17
+
       - uses: Alfresco/[email protected]
         with:
           fail-on-new-issues: "false"

extension-inspector-analyser/src/main/java/org/alfresco/extension_inspector/analyser/service/ConfigService.java

@@ -20,11 +20,11 @@
 import static java.util.Collections.unmodifiableMap;
 import static org.alfresco.extension_inspector.model.Resource.Type.FILE;
 
-import javax.annotation.PostConstruct;
 import java.util.EnumMap;
 import java.util.Map;
 import java.util.Set;
 
+import jakarta.annotation.PostConstruct;
 import org.alfresco.extension_inspector.inventory.service.InventoryService;
 import org.alfresco.extension_inspector.model.InventoryReport;
 import org.alfresco.extension_inspector.model.Resource;

extension-inspector-analyser/src/main/java/org/alfresco/extension_inspector/analyser/store/WarInventoryReportStore.java

@@ -29,8 +29,8 @@
 import java.util.SortedSet;
 import java.util.TreeSet;
 
-import javax.annotation.PostConstruct;
 
+import jakarta.annotation.PostConstruct;
 import org.alfresco.extension_inspector.analyser.parser.InventoryParser;
 import org.alfresco.extension_inspector.model.InventoryReport;
 import org.apache.maven.artifact.versioning.ComparableVersion;

extension-inspector-packaging/src/main/java/org.alfresco.extension_inspector/Application.java

@@ -35,6 +35,7 @@
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.SerializationFeature;
+import org.springframework.context.annotation.Lazy;
 
 @SpringBootApplication
 public class Application implements ApplicationRunner, ExitCodeGenerator
@@ -46,6 +47,7 @@ public class Application implements ApplicationRunner, ExitCodeGenerator
     @Autowired
     private InventoryCommandRunner inventoryCommandRunner;
     @Autowired
+    @Lazy
     private AnalyserCommandRunner analyserCommandRunner;
 
     public static void main(String[] args)

extension-inspector-test/pom.xml

@@ -30,13 +30,11 @@
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-beans</artifactId>
-            <version>5.2.21.RELEASE</version>
         </dependency>
 
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-context</artifactId>
-            <version>5.2.4.RELEASE</version>
         </dependency>
 
         <dependency>

pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.5.15</version>
+        <version>3.3.4</version>
         <relativePath /> <!-- lookup parent from repository -->
     </parent>