valitydev/wb-list-manager
14
0
Fork 0
mirror of https://github.com/valitydev/wb-list-manager.git synced 2024-11-06 09:45:18 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #3 from valitydev/ft/fix-metrics

Browse Source 
update actions and deps
This commit is contained in:
Gregory 2022-01-19 14:21:02 +03:00 committed by GitHub
commit 2c3796e71c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 12 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
.github/workflows/build.yml vendored
View File

@ -14,13 +14,6 @@ jobs:
- name: Checkout GitHub Action Repo - name: Checkout GitHub Action Repo
uses: actions/checkout@v2 uses: actions/checkout@v2
with:
repository: valitydev/action-jdk-build
ref: v1.0.18
path: .github/actions/action-jdk-build
- name: Run Build Java - name: Run Build Java
uses: ./.github/actions/action-jdk-build uses: valitydev/action-jdk-build@v0.0.7
with:
github-pat: '${{ secrets.GH_PACKAGES_RO_PAT }}'
github-user: 'strug'

13
pom.xml
View File

@ -6,7 +6,7 @@
<parent> <parent>
<groupId>dev.vality</groupId> <groupId>dev.vality</groupId>
<artifactId>service-parent-pom</artifactId> <artifactId>service-parent-pom</artifactId>
<version>1.0.1</version> <version>1.0.2</version>
</parent> </parent>
<artifactId>wb-list-manager</artifactId> <artifactId>wb-list-manager</artifactId>
@ -54,19 +54,22 @@
<artifactId>spring-boot-starter-actuator</artifactId> <artifactId>spring-boot-starter-actuator</artifactId>
</dependency> </dependency>
<!-- RBK --> <!-- RBK&ValityDev-->
<dependency> <dependency>
<groupId>com.rbkmoney</groupId> <groupId>com.rbkmoney</groupId>
<artifactId>shared-resources</artifactId> <artifactId>shared-resources</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.rbkmoney.woody</groupId> <groupId>dev.vality.woody</groupId>
<artifactId>woody-thrift</artifactId> <artifactId>woody-thrift</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.rbkmoney</groupId> <groupId>com.rbkmoney</groupId>
<artifactId>spring-boot-starter-metrics-statsd</artifactId> <artifactId>custom-metrics-spring-boot-starter</artifactId>
<version>1.1.3</version> </dependency>
<dependency>
<groupId>com.rbkmoney</groupId>
<artifactId>custom-actuator-endpoints</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>dev.vality</groupId> <groupId>dev.vality</groupId>

2
src/main/java/com/rbkmoney/wb/list/manager/resource/WbListServlet.java
View File

@ -1,7 +1,7 @@
package com.rbkmoney.wb.list.manager.resource; package com.rbkmoney.wb.list.manager.resource;
import com.rbkmoney.woody.thrift.impl.http.THServiceBuilder;
import dev.vality.damsel.wb_list.WbListServiceSrv; import dev.vality.damsel.wb_list.WbListServiceSrv;
import dev.vality.woody.thrift.impl.http.THServiceBuilder;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import javax.servlet.*; import javax.servlet.*;

4
src/test/java/com/rbkmoney/wb/list/manager/WbListManagerApplicationTest.java
View File

@ -3,14 +3,14 @@ package com.rbkmoney.wb.list.manager;
import com.rbkmoney.wb.list.manager.extension.AwaitilityExtension; import com.rbkmoney.wb.list.manager.extension.AwaitilityExtension;
import com.rbkmoney.wb.list.manager.extension.RiakTestcontainerExtension; import com.rbkmoney.wb.list.manager.extension.RiakTestcontainerExtension;
import com.rbkmoney.wb.list.manager.utils.ChangeCommandWrapper; import com.rbkmoney.wb.list.manager.utils.ChangeCommandWrapper;
import com.rbkmoney.woody.api.flow.error.WRuntimeException;
import com.rbkmoney.woody.thrift.impl.http.THClientBuilder;
import dev.vality.damsel.wb_list.*; import dev.vality.damsel.wb_list.*;
import dev.vality.testcontainers.annotations.kafka.KafkaTestcontainer; import dev.vality.testcontainers.annotations.kafka.KafkaTestcontainer;
import dev.vality.testcontainers.annotations.kafka.config.KafkaConsumer; import dev.vality.testcontainers.annotations.kafka.config.KafkaConsumer;
import dev.vality.testcontainers.annotations.kafka.config.KafkaConsumerConfig; import dev.vality.testcontainers.annotations.kafka.config.KafkaConsumerConfig;
import dev.vality.testcontainers.annotations.kafka.config.KafkaProducer; import dev.vality.testcontainers.annotations.kafka.config.KafkaProducer;
import dev.vality.testcontainers.annotations.kafka.config.KafkaProducerConfig; import dev.vality.testcontainers.annotations.kafka.config.KafkaProducerConfig;
import dev.vality.woody.api.flow.error.WRuntimeException;
import dev.vality.woody.thrift.impl.http.THClientBuilder;
import org.apache.thrift.TBase; import org.apache.thrift.TBase;
import org.apache.thrift.TException; import org.apache.thrift.TException;
import org.awaitility.Awaitility; import org.awaitility.Awaitility;