diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index a06b816..a654702 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -1,4 +1,4 @@
-name: Build Artifact
+name: Maven Build Artifact
on:
pull_request:
@@ -7,13 +7,4 @@ on:
jobs:
build:
- runs-on: ubuntu-20.04
- steps:
- - name: Checkout Repo
- uses: actions/checkout@v2
-
- - name: Checkout GitHub Action Repo
- uses: actions/checkout@v2
-
- - name: Run Build Java
- uses: valitydev/action-jdk-build@v0.0.7
+ uses: valitydev/java-workflow/.github/workflows/maven-service-build.yml@v1
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index a122f8d..cfeee39 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -1,4 +1,4 @@
-name: Deploy Docker Image
+name: Maven Deploy Artifact
on:
push:
@@ -6,34 +6,9 @@ on:
- 'master'
- 'main'
-env:
- REGISTRY: ghcr.io
- IMAGE_NAME: ${{ github.repository }}
-
jobs:
- build-and-deploy:
- runs-on: ubuntu-20.04
- steps:
- - name: Checkout Repo
- uses: actions/checkout@v2
-
- - name: Checkout GitHub Action JDK Build Repo
- uses: actions/checkout@v2
-
- - name: Checkout GitHub Action Deploy Docker Repo
- uses: actions/checkout@v2
- with:
- repository: valitydev/action-deploy-docker
- ref: v1.0.16
- path: .github/actions/action-deploy-docker
-
- - name: Run Build Java
- uses: valitydev/action-jdk-build@v0.0.7
-
- - name: Deploy image
- uses: ./.github/actions/action-deploy-docker
- with:
- registry-username: ${{ github.actor }}
- registry-access-token: ${{ secrets.GITHUB_TOKEN }}
- env:
- ECR_REGISTRY: ${{ steps.login-ecr.outputs.registry }}
+ deploy:
+ uses: valitydev/java-workflow/.github/workflows/maven-service-deploy.yml@v1
+ secrets:
+ github-token: ${{ secrets.GITHUB_TOKEN }}
+ mm-webhook-url: ${{ secrets.MATTERMOST_WEBHOOK_URL }}
diff --git a/pom.xml b/pom.xml
index e4c5d14..8dd74f3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,8 +21,6 @@
8022
8023
${server.port} ${management.port}
- c0612d6052ac049496b72a23a04acb142035f249
- dr2.rbkmoney.com
0.3.7
1.44-5dbd6d4
1.4.3
@@ -154,12 +152,12 @@
org.apache.maven.plugins
maven-remote-resources-plugin
- 1.6.0
+ 3.0.0
org.apache.maven.shared
maven-filtering
- 1.3
+ 3.3.1
@@ -177,24 +175,6 @@
-
-
- org.jacoco
- jacoco-maven-plugin
- 0.8.7
-
- ${sonar.jacoco.reportPath}
- true
-
-
-
- agent
-
- prepare-agent
-
-
-
-
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 8bd2e88..57375e5 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -1,20 +1,36 @@
+info:
+ version: '@project.version@'
+ stage: dev
+
server:
port: '@server.port@'
rest:
port: '@server.rest.port@'
endpoint: ch-manager
+
+spring:
+ application:
+ name: '@project.name@'
+ output:
+ ansi:
+ enabled: always
+ main:
+ allow-bean-definition-overriding: true
+ kafka:
+ bootstrap-servers: "localhost:29092"
+ streams:
+ application-id: wb-list
+ client-id: wb-list-client
+
management:
- security:
- flag: false
server:
port: '@management.port@'
metrics:
export:
- statsd:
- flavor: etsy
- enabled: false
prometheus:
enabled: false
+ tags:
+ application: wb-list-manager
endpoint:
health:
show-details: always
@@ -26,17 +42,7 @@ management:
web:
exposure:
include: health,info,prometheus
-spring:
- application:
- name: '@project.name@'
- output:
- ansi:
- enabled: always
- kafka:
- bootstrap-servers: "localhost:29092"
- streams:
- application-id: wb-list
- client-id: wb-list-client
+
riak-config:
address: localhost
port: 8087