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.

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

Ft/td 921 bump to SB3, JDK21 #57

Merged
merged 3 commits into from
Jun 13, 2024
Merged

Ft/td 921 bump to SB3, JDK21 #57

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
44a373a
move to Spring Boot 2 and Jdk 21
Gretchen-z Jun 10, 2024
a17f990
change kafka error handler and bump libs
Gretchen-z Jun 11, 2024
c4571e1
exclusion commons-logging lib
Gretchen-z Jun 13, 2024
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.0.11
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 @@ -12,7 +12,7 @@ env:

jobs:
deploy:
uses: valitydev/java-workflow/.github/workflows/maven-service-deploy.yml@v1
uses: valitydev/java-workflow/.github/workflows/maven-service-deploy.yml@v3
secrets:
github-token: ${{ secrets.GITHUB_TOKEN }}
mm-webhook-url: ${{ secrets.MATTERMOST_WEBHOOK_URL }}
52 changes: 44 additions & 8 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>dev.vality</groupId>
<artifactId>service-parent-pom</artifactId>
<version>2.1.8</version>
<version>3.0.0</version>
</parent>

<artifactId>magista</artifactId>
Expand All @@ -32,6 +32,7 @@
<db.user>postgres</db.user>
<db.password>postgres</db.password>
<db.schema>mst</db.schema>
<shared-resources.version>3.0.0</shared-resources.version>
</properties>

<dependencies>
Expand Down Expand Up @@ -73,11 +74,6 @@
<artifactId>lombok</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.flywaydb</groupId>
<artifactId>flyway-core</artifactId>
Expand Down Expand Up @@ -116,28 +112,52 @@
<dependency>
<groupId>software.amazon.msk</groupId>
<artifactId>aws-msk-iam-auth</artifactId>
<exclusions>
<exclusion>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</exclusion>
</exclusions>
</dependency>

<!-- dev.vality libs-->
<dependency>
<groupId>dev.vality</groupId>
<artifactId>damsel</artifactId>
<version>1.611-958e5f0</version>
<exclusions>
<exclusion>
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>dev.vality</groupId>
<artifactId>payout-manager-proto</artifactId>
<version>1.39-b079679</version>
<exclusions>
<exclusion>
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>dev.vality</groupId>
<artifactId>magista-proto</artifactId>
<version>1.51-28d11b9</version>
<exclusions>
<exclusion>
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>dev.vality.woody</groupId>
<artifactId>woody-thrift</artifactId>
<version>1.0.5</version>
<version>2.0.1</version>
</dependency>
<dependency>
<groupId>dev.vality</groupId>
Expand All @@ -151,6 +171,16 @@
<dependency>
<groupId>dev.vality.geck</groupId>
<artifactId>serializer</artifactId>
<exclusions>
<exclusion>
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
</exclusion>
<exclusion>
<groupId>javax.inject</groupId>
<artifactId>javax.inject</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>dev.vality</groupId>
Expand All @@ -160,6 +190,12 @@
<groupId>dev.vality</groupId>
<artifactId>machinegun-proto</artifactId>
<version>1.41-96f7f11</version>
<exclusions>
<exclusion>
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
</exclusion>
</exclusions>
</dependency>

<!--Test libs-->
Expand All @@ -176,7 +212,7 @@
<dependency>
<groupId>dev.vality</groupId>
<artifactId>testcontainers-annotations</artifactId>
<version>1.4.3</version>
<version>2.0.3</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/dev/vality/magista/config/KafkaConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
import org.springframework.kafka.config.ConcurrentKafkaListenerContainerFactory;
import org.springframework.kafka.core.DefaultKafkaConsumerFactory;
import org.springframework.kafka.listener.ContainerProperties;
import org.springframework.kafka.listener.SeekToCurrentBatchErrorHandler;
import org.springframework.kafka.listener.DefaultErrorHandler;

import java.util.Map;

Expand Down Expand Up @@ -95,7 +95,7 @@ private <T> void configureContainerFactory(
maxPollRecords,
kafkaProperties);
containerFactory.setConsumerFactory(consumerFactory);
containerFactory.setBatchErrorHandler(new SeekToCurrentBatchErrorHandler());
containerFactory.setCommonErrorHandler(new DefaultErrorHandler());
containerFactory.setBatchListener(true);
containerFactory.getContainerProperties().setAckMode(ContainerProperties.AckMode.MANUAL);
}
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/dev/vality/magista/config/properties/TokenGenProperties.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
package dev.vality.magista.config.properties;

import jakarta.validation.constraints.NotEmpty;
import lombok.Getter;
import lombok.Setter;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.stereotype.Component;
import org.springframework.validation.annotation.Validated;

import javax.validation.constraints.NotEmpty;

@Getter
@Setter
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/dev/vality/magista/endpoint/MerchantStatisticsServlet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@

import dev.vality.magista.MerchantStatisticsServiceSrv;
import dev.vality.woody.thrift.impl.http.THServiceBuilder;
import jakarta.servlet.*;
import jakarta.servlet.annotation.WebServlet;
import org.springframework.beans.factory.annotation.Autowired;

import javax.servlet.*;
import javax.servlet.annotation.WebServlet;
import java.io.IOException;

@WebServlet("/v3/stat")
Expand Down
Loading