diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f5da36e..4bf9db8 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -14,13 +14,6 @@ jobs: - name: Checkout GitHub Action Repo uses: actions/checkout@v2 - with: - repository: valitydev/action-jdk-build - ref: v1.0.18 - path: .github/actions/action-jdk-build - name: Run Build Java - uses: ./.github/actions/action-jdk-build - with: - github-pat: '${{ secrets.GH_PACKAGES_RO_PAT }}' - github-user: 'strug' \ No newline at end of file + uses: valitydev/action-jdk-build@v0.0.7 \ No newline at end of file diff --git a/pom.xml b/pom.xml index 063c0d4..32d55cd 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ dev.vality service-parent-pom - 1.0.1 + 1.0.2 wb-list-manager @@ -54,19 +54,22 @@ spring-boot-starter-actuator - + com.rbkmoney shared-resources - com.rbkmoney.woody + dev.vality.woody woody-thrift com.rbkmoney - spring-boot-starter-metrics-statsd - 1.1.3 + custom-metrics-spring-boot-starter + + + com.rbkmoney + custom-actuator-endpoints dev.vality diff --git a/src/main/java/com/rbkmoney/wb/list/manager/resource/WbListServlet.java b/src/main/java/com/rbkmoney/wb/list/manager/resource/WbListServlet.java index 358ecad..108588b 100644 --- a/src/main/java/com/rbkmoney/wb/list/manager/resource/WbListServlet.java +++ b/src/main/java/com/rbkmoney/wb/list/manager/resource/WbListServlet.java @@ -1,7 +1,7 @@ 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.woody.thrift.impl.http.THServiceBuilder; import lombok.RequiredArgsConstructor; import javax.servlet.*; diff --git a/src/test/java/com/rbkmoney/wb/list/manager/WbListManagerApplicationTest.java b/src/test/java/com/rbkmoney/wb/list/manager/WbListManagerApplicationTest.java index 19a7bea..fe3131c 100644 --- a/src/test/java/com/rbkmoney/wb/list/manager/WbListManagerApplicationTest.java +++ b/src/test/java/com/rbkmoney/wb/list/manager/WbListManagerApplicationTest.java @@ -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.RiakTestcontainerExtension; 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.testcontainers.annotations.kafka.KafkaTestcontainer; import dev.vality.testcontainers.annotations.kafka.config.KafkaConsumer; import dev.vality.testcontainers.annotations.kafka.config.KafkaConsumerConfig; import dev.vality.testcontainers.annotations.kafka.config.KafkaProducer; 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.TException; import org.awaitility.Awaitility;