From 828b4f53c837a77b860dc3df20a8e65b1330eaa8 Mon Sep 17 00:00:00 2001 From: devplant Date: Thu, 20 Apr 2023 16:14:28 +0300 Subject: [PATCH] RED-5694 - Upgrade spring-boot to 3.0 - add -DknownExploitedEnabled=false - import StorageAutoConfiguration to Application --- bamboo-specs/src/main/resources/scripts/sonar-java.sh | 3 ++- .../java/com/iqser/red/service/ocr/v1/server/Application.java | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/bamboo-specs/src/main/resources/scripts/sonar-java.sh b/bamboo-specs/src/main/resources/scripts/sonar-java.sh index b7ade4d..a959a52 100755 --- a/bamboo-specs/src/main/resources/scripts/sonar-java.sh +++ b/bamboo-specs/src/main/resources/scripts/sonar-java.sh @@ -12,7 +12,8 @@ mvn -f ${bamboo_build_working_directory}/$SERVICE_NAME-v1/pom.xml \ echo "dependency-check:aggregate" mvn --no-transfer-progress \ -f ${bamboo_build_working_directory}/$SERVICE_NAME-v1/pom.xml \ - org.owasp:dependency-check-maven:aggregate + org.owasp:dependency-check-maven:aggregate \ + -DknownExploitedEnabled=false if [[ -z "${bamboo_repository_pr_key}" ]] then diff --git a/ocr-service-v1/ocr-service-server-v1/src/main/java/com/iqser/red/service/ocr/v1/server/Application.java b/ocr-service-v1/ocr-service-server-v1/src/main/java/com/iqser/red/service/ocr/v1/server/Application.java index bfa6c70..18b1f9e 100644 --- a/ocr-service-v1/ocr-service-server-v1/src/main/java/com/iqser/red/service/ocr/v1/server/Application.java +++ b/ocr-service-v1/ocr-service-server-v1/src/main/java/com/iqser/red/service/ocr/v1/server/Application.java @@ -17,6 +17,7 @@ import com.iqser.red.service.ocr.v1.server.multitenancy.AsyncConfig; import com.iqser.red.service.ocr.v1.server.multitenancy.MultiTenancyMessagingConfiguration; import com.iqser.red.service.ocr.v1.server.multitenancy.MultiTenancyWebConfiguration; import com.iqser.red.service.ocr.v1.server.settings.OcrServiceSettings; +import com.iqser.red.storage.commons.StorageAutoConfiguration; import io.micrometer.core.aop.TimedAspect; import io.micrometer.core.instrument.MeterRegistry; @@ -24,7 +25,7 @@ import io.micrometer.core.instrument.MeterRegistry; @EnableAsync @EnableConfigurationProperties(OcrServiceSettings.class) @SpringBootApplication(exclude = {SecurityAutoConfiguration.class, ManagementWebSecurityAutoConfiguration.class}) -@Import({MultiTenancyWebConfiguration.class, AsyncConfig.class, MessagingConfiguration.class, MultiTenancyMessagingConfiguration.class}) +@Import({MultiTenancyWebConfiguration.class, AsyncConfig.class, MessagingConfiguration.class, MultiTenancyMessagingConfiguration.class, StorageAutoConfiguration.class}) @EnableFeignClients(basePackageClasses = FileStatusProcessingUpdateClient.class) public class Application {