diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0ff11dc..92f0c6c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -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 diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 58af93b..3ccda4e 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -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 }} diff --git a/pom.xml b/pom.xml index cb761a7..0a8edca 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ adapter-bank-payout-spring-boot-starter - 1.0.4 + 2.0.0 jar Adapter-bank-payout-spring-boot-starter @@ -39,16 +39,16 @@ - 1.597-bfedcb9 - 2.7.12 + 1.611-958e5f0 + 3.2.3 - javax.servlet - javax.servlet-api - 4.0.1 + jakarta.servlet + jakarta.servlet-api + 6.1.0 provided @@ -60,13 +60,13 @@ org.projectlombok lombok - 1.18.28 + 1.18.30 provided - javax.validation - validation-api - 2.0.1.Final + jakarta.validation + jakarta.validation-api + 3.1.0 provided @@ -114,12 +114,12 @@ dev.vality adapter-common-lib - 1.2.10 + 1.2.13 dev.vality.woody woody-thrift - 1.0.5 + 2.0.0 provided diff --git a/src/main/java/dev/vality/adapter/bank/payout/spring/boot/starter/config/properties/AdapterProperties.java b/src/main/java/dev/vality/adapter/bank/payout/spring/boot/starter/config/properties/AdapterProperties.java index 16c8cbf..a8b3cae 100644 --- a/src/main/java/dev/vality/adapter/bank/payout/spring/boot/starter/config/properties/AdapterProperties.java +++ b/src/main/java/dev/vality/adapter/bank/payout/spring/boot/starter/config/properties/AdapterProperties.java @@ -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 diff --git a/src/main/java/dev/vality/adapter/bank/payout/spring/boot/starter/config/properties/TimerProperties.java b/src/main/java/dev/vality/adapter/bank/payout/spring/boot/starter/config/properties/TimerProperties.java index 91e152d..fb52a20 100644 --- a/src/main/java/dev/vality/adapter/bank/payout/spring/boot/starter/config/properties/TimerProperties.java +++ b/src/main/java/dev/vality/adapter/bank/payout/spring/boot/starter/config/properties/TimerProperties.java @@ -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") diff --git a/src/test/java/dev/vality/adapter/bank/payout/spring/boot/starter/service/IntentServiceImplTest.java b/src/test/java/dev/vality/adapter/bank/payout/spring/boot/starter/service/IntentServiceImplTest.java index 43b0ec3..c4ed6af 100644 --- a/src/test/java/dev/vality/adapter/bank/payout/spring/boot/starter/service/IntentServiceImplTest.java +++ b/src/test/java/dev/vality/adapter/bank/payout/spring/boot/starter/service/IntentServiceImplTest.java @@ -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());