bump java 21, SB3 (#37)

* bump java 21, SB3

* bump workflow

* fix workflow

* revert properties

---------

Co-authored-by: ggmaleva <ggmaleva@yandex.ru>
This commit is contained in:
Gregory 2024-07-18 13:40:13 +03:00 committed by GitHub
parent b62a20935d
commit 323b91d30b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 20 additions and 20 deletions

View File

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

View File

@ -8,7 +8,7 @@ on:
jobs:
deploy:
uses: valitydev/java-workflow/.github/workflows/maven-library-deploy.yml@v1
uses: valitydev/java-workflow/.github/workflows/maven-library-deploy.yml@v3
secrets:
server-username: ${{ secrets.OSSRH_USERNAME }}
server-password: ${{ secrets.OSSRH_TOKEN }}

24
pom.xml
View File

@ -11,7 +11,7 @@
</parent>
<artifactId>adapter-bank-payout-spring-boot-starter</artifactId>
<version>1.0.4</version>
<version>2.0.0</version>
<packaging>jar</packaging>
<name>Adapter-bank-payout-spring-boot-starter</name>
@ -39,16 +39,16 @@
</scm>
<properties>
<damsel.version>1.597-bfedcb9</damsel.version>
<spring-boot.version>2.7.12</spring-boot.version>
<damsel.version>1.611-958e5f0</damsel.version>
<spring-boot.version>3.2.3</spring-boot.version>
</properties>
<dependencies>
<!--third party-->
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<version>4.0.1</version>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
<version>6.1.0</version>
<scope>provided</scope>
</dependency>
<dependency>
@ -60,13 +60,13 @@
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>1.18.28</version>
<version>1.18.30</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.validation</groupId>
<artifactId>validation-api</artifactId>
<version>2.0.1.Final</version>
<groupId>jakarta.validation</groupId>
<artifactId>jakarta.validation-api</artifactId>
<version>3.1.0</version>
<scope>provided</scope>
</dependency>
@ -114,12 +114,12 @@
<dependency>
<groupId>dev.vality</groupId>
<artifactId>adapter-common-lib</artifactId>
<version>1.2.10</version>
<version>1.2.13</version>
</dependency>
<dependency>
<groupId>dev.vality.woody</groupId>
<artifactId>woody-thrift</artifactId>
<version>1.0.5</version>
<version>2.0.0</version>
<scope>provided</scope>
</dependency>
<dependency>

View File

@ -6,7 +6,7 @@ import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.context.annotation.Configuration;
import org.springframework.validation.annotation.Validated;
import javax.validation.constraints.NotEmpty;
import jakarta.validation.constraints.NotEmpty;
@Getter
@Setter

View File

@ -6,7 +6,7 @@ import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.context.annotation.Configuration;
import org.springframework.validation.annotation.Validated;
import javax.validation.constraints.NotNull;
import jakarta.validation.constraints.NotNull;
@Configuration
@ConfigurationProperties("time.config")

View File

@ -22,7 +22,7 @@ import java.util.HashMap;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertTrue;
public class IntentServiceImplTest {
class IntentServiceImplTest {
private static final String ERROR_MAPPING_FILE_PATH = "src/test/resources/fixture/errors.json";
private static final String ERROR_MAPPING_PATTERN = "'%s' - '%s'";
@ -35,7 +35,7 @@ public class IntentServiceImplTest {
}
@Test
public void getSleepIntentSuccess() {
void getSleepIntentSuccess() {
ExitStateModel exitStateModel = new ExitStateModel();
EntryStateModel entryStateModel = new EntryStateModel();
entryStateModel.setOptions(new HashMap<>());
@ -50,7 +50,7 @@ public class IntentServiceImplTest {
}
@Test
public void getSleepIntentFailure() {
void getSleepIntentFailure() {
ExitStateModel exitStateModel = new ExitStateModel();
AdapterState adapterState = new AdapterState();
PollingInfo pollingInfo = new PollingInfo();
@ -62,7 +62,7 @@ public class IntentServiceImplTest {
}
@Test
public void getSleepException() {
void getSleepException() {
ExitStateModel exitStateModel = new ExitStateModel();
AdapterState adapterState = new AdapterState();
adapterState.setPollingInfo(new PollingInfo());