Skip to content

ft/TECH-285 #34

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.

Sign up for GitHub

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

Merged
Gretchen-z merged 3 commits into from
Mar 13, 2026
Merged

ft/TECH-285 #34

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1e95465
TECH-285: bump dependencies
Gretchen-z Mar 13, 2026
e2e82d9
TECH-285: bump dependencies
Gretchen-z Mar 13, 2026
48bd16e
TECH-285: bump workflow
Gretchen-z Mar 13, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion .github/workflows/deploy.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
15 changes: 8 additions & 7 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand All @@ -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>
Expand Down Expand Up @@ -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>
Expand All @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion .../vality/alerting/mayday/alertmanager/config/properties/AlertmanagerWebhookProperties.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
2 changes: 1 addition & 1 deletion .../vality/alerting/mayday/alertmanager/config/properties/TelegramBotReceiverProperties.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/dev/vality/alerting/mayday/alertmanager/controller/WebhookController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/dev/vality/alerting/mayday/alerttemplate/config/AlertConfigurationsConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...main/java/dev/vality/alerting/mayday/alerttemplate/model/alerttemplate/AlertTemplate.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/dev/vality/alerting/mayday/thrift/servlet/AlertingServlet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
12 changes: 6 additions & 6 deletions src/test/java/dev/vality/alerting/mayday/integration/AlertingIntegrationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -32,7 +32,7 @@
import static org.junit.jupiter.api.Assertions.*;
import static org.mockito.Mockito.*;

@DefaultSpringBootTest
@SpringBootTest
public class AlertingIntegrationTest {

@Autowired
Expand All @@ -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;
Expand Down
10 changes: 5 additions & 5 deletions src/test/java/dev/vality/alerting/mayday/unit/TemplateHelperTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@
import dev.vality.alerting.mayday.alerttemplate.service.helper.TemplateHelper;
import dev.vality.alerting.mayday.testutil.DawayObjectUtil;
import dev.vality.alerting.mayday.testutil.ThriftObjectUtil;
import dev.vality.testcontainers.annotations.DefaultSpringBootTest;
import org.apache.thrift.TException;
import org.junit.jupiter.api.Test;
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;
Expand All @@ -24,7 +24,7 @@
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.mockito.Mockito.when;

@DefaultSpringBootTest
@SpringBootTest
public class TemplateHelperTest {

@Autowired
Expand All @@ -39,9 +39,9 @@ public class TemplateHelperTest {
@Autowired
private TemplateService templateService;

@MockBean
@MockitoBean
private AlertmanagerClient alertmanagerClient;
@MockBean
@MockitoBean
private DawayDao dawayDao;


Expand Down
Loading