Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[APPS-3035] fix for spring version update #174

Merged
merged 11 commits into from
Oct 4, 2024
6 changes: 6 additions & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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)
Expand Down
2 changes: 0 additions & 2 deletions extension-inspector-test/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down