ft/TECH-285 (#34)

* TECH-285: bump dependencies

* TECH-285: bump dependencies

* TECH-285: bump workflow

Author: Gretchen-z

.github/workflows/build.yml

@@ -7,4 +7,4 @@ on:
 
 jobs:
   build:
-    uses: valitydev/java-workflow/.github/workflows/maven-service-build.yml@v2
+    uses: valitydev/java-workflow/.github/workflows/maven-service-build.yml@v3

.github/workflows/deploy.yml

@@ -8,7 +8,7 @@ on:
 
 jobs:
   build-and-deploy:
-    uses: valitydev/java-workflow/.github/workflows/maven-service-deploy.yml@v2
+    uses: valitydev/java-workflow/.github/workflows/maven-service-deploy.yml@v3
     secrets:
       github-token: ${{ secrets.GITHUB_TOKEN }}
       mm-webhook-url: ${{ secrets.MATTERMOST_WEBHOOK_URL }}

pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>dev.vality</groupId>
 		<artifactId>service-parent-pom</artifactId>
-		<version>2.1.5</version>
+		<version>3.1.1</version>
 	</parent>
 
 	<artifactId>mayday</artifactId>
@@ -19,7 +19,7 @@
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-		<java.version>17</java.version>
+		<java.version>21</java.version>
 		<server.port>8022</server.port>
 		<management.port>8023</management.port>
 		<exposed.ports>${management.port} ${server.port}</exposed.ports>
@@ -30,7 +30,7 @@
 			<dependency>
 				<groupId>org.springframework.cloud</groupId>
 				<artifactId>spring-cloud-dependencies</artifactId>
-				<version>2022.0.3</version>
+				<version>2025.1.1</version>
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>
@@ -101,11 +101,12 @@
 		<dependency>
 			<groupId>commons-io</groupId>
 			<artifactId>commons-io</artifactId>
-			<version>2.11.0</version>
+			<version>2.21.0</version>
 		</dependency>
 		<dependency>
-			<groupId>javax.servlet</groupId>
-			<artifactId>javax.servlet-api</artifactId>
+			<groupId>jakarta.servlet</groupId>
+			<artifactId>jakarta.servlet-api</artifactId>
+<!--			<scope>provided</scope>-->
 		</dependency>
 		<dependency>
 			<groupId>io.fabric8</groupId>
@@ -125,7 +126,7 @@
 		<dependency>
 			<groupId>dev.vality</groupId>
 			<artifactId>testcontainers-annotations</artifactId>
-			<version>2.0.2</version>
+			<version>4.1.3</version>
 			<scope>test</scope>
 		</dependency>
 

src/main/java/dev/vality/alerting/mayday/alertmanager/config/properties/AlertmanagerWebhookProperties.java

@@ -6,7 +6,7 @@
 import org.springframework.context.annotation.Configuration;
 import org.springframework.validation.annotation.Validated;
 
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 
 @Configuration
 @ConfigurationProperties(prefix = "alertmanager.webhook")

src/main/java/dev/vality/alerting/mayday/alertmanager/config/properties/TelegramBotReceiverProperties.java

@@ -7,7 +7,7 @@
 import org.springframework.core.io.Resource;
 import org.springframework.validation.annotation.Validated;
 
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 
 @Configuration
 @ConfigurationProperties(prefix = "alertmanager.receiver.telegram-bot")

src/main/java/dev/vality/alerting/mayday/alertmanager/controller/WebhookController.java

@@ -19,7 +19,7 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 import java.util.stream.Collectors;
 
 @Slf4j

src/main/java/dev/vality/alerting/mayday/alerttemplate/config/AlertConfigurationsConfig.java

@@ -9,9 +9,9 @@
 import org.springframework.core.io.Resource;
 import org.springframework.core.io.support.ResourcePatternResolver;
 
-import javax.validation.ConstraintViolation;
-import javax.validation.ConstraintViolationException;
-import javax.validation.Validator;
+import jakarta.validation.ConstraintViolation;
+import jakarta.validation.ConstraintViolationException;
+import jakarta.validation.Validator;
 import java.io.IOException;
 import java.util.Arrays;
 import java.util.Map;

src/main/java/dev/vality/alerting/mayday/alerttemplate/model/alerttemplate/AlertTemplate.java

@@ -3,7 +3,7 @@
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;
 
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 import java.util.List;
 
 @Data

src/main/java/dev/vality/alerting/mayday/thrift/servlet/AlertingServlet.java

@@ -5,8 +5,8 @@
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
 
-import javax.servlet.*;
-import javax.servlet.annotation.WebServlet;
+import jakarta.servlet.*;
+import jakarta.servlet.annotation.WebServlet;
 import java.io.IOException;
 
 @WebServlet("/mayday")

src/test/java/dev/vality/alerting/mayday/integration/AlertingIntegrationTest.java

@@ -15,14 +15,14 @@
 import dev.vality.alerting.mayday.testutil.DawayObjectUtil;
 import dev.vality.alerting.mayday.testutil.K8sObjectUtil;
 import dev.vality.alerting.mayday.testutil.ThriftObjectUtil;
-import dev.vality.testcontainers.annotations.DefaultSpringBootTest;
 import org.apache.thrift.TException;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.mockito.MockitoAnnotations;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.mock.mockito.MockBean;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
 
 import java.util.List;
 import java.util.Optional;
@@ -32,7 +32,7 @@
 import static org.junit.jupiter.api.Assertions.*;
 import static org.mockito.Mockito.*;
 
-@DefaultSpringBootTest
+@SpringBootTest
 public class AlertingIntegrationTest {
 
     @Autowired
@@ -42,11 +42,11 @@ public class AlertingIntegrationTest {
     @Autowired
     private AlertmanagerService alertmanagerService;
 
-    @MockBean
+    @MockitoBean
     private PrometheusClient prometheusClient;
-    @MockBean
+    @MockitoBean
     private AlertmanagerClient alertmanagerClient;
-    @MockBean
+    @MockitoBean
     private DawayDao dawayDao;
 
     private AutoCloseable mocks;