diff --git a/.github/settings.yml b/.github/settings.yml new file mode 100644 index 0000000..9267e7d --- /dev/null +++ b/.github/settings.yml @@ -0,0 +1,2 @@ +# These settings are synced to GitHub by https://probot.github.io/apps/settings/ +_extends: .github diff --git a/.github/workflows/basic-linters.yml b/.github/workflows/basic-linters.yml index 60b10c5..6114f14 100644 --- a/.github/workflows/basic-linters.yml +++ b/.github/workflows/basic-linters.yml @@ -3,12 +3,7 @@ name: Vality basic linters on: pull_request: branches: - - master - - main - push: - branches: - - master - - main + - "*" jobs: lint: diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a654702..dbb1a95 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -7,4 +7,4 @@ on: jobs: build: - uses: valitydev/java-workflow/.github/workflows/maven-service-build.yml@v1 + uses: valitydev/java-workflow/.github/workflows/maven-service-build.yml@v3 diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 9162503..0cd5834 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -1,13 +1,14 @@ -name: Deploy Docker Image +name: Maven Deploy Artifact on: push: branches: - 'master' + - 'main' jobs: build-and-deploy: - uses: valitydev/java-workflow/.github/workflows/maven-service-deploy.yml@v1 + uses: valitydev/java-workflow/.github/workflows/maven-service-deploy.yml@v3 with: ignore-coverage: true secrets: diff --git a/pom.xml b/pom.xml index a0d1dbc..1b82a51 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ dev.vality service-parent-pom - 1.0.16 + 3.0.9 fraudbusters-api @@ -33,10 +33,7 @@ dev.vality.woody woody-thrift - - - dev.vality - shared-resources + 2.0.9 dev.vality @@ -88,8 +85,8 @@ - javax.servlet - javax.servlet-api + jakarta.servlet + jakarta.servlet-api org.projectlombok @@ -104,6 +101,11 @@ io.micrometer micrometer-registry-prometheus + + javax.validation + validation-api + 2.0.1.Final +