Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions .github/workflows/frontend-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,19 +6,19 @@ on:

jobs:
configured:
uses: valitydev/action-frontend/.github/workflows/configured.yml@v0.1
uses: valitydev/action-frontend/.github/workflows/configured.yml@v1.0
publish:
name: Publish
runs-on: ubuntu-latest
needs: configured
if: needs.configured.outputs.exists == 'true'
steps:
- uses: actions/checkout@v3
- uses: valitydev/action-frontend/setup@v0.1
- uses: valitydev/action-setup-thrift@v1.0.1
- uses: actions/checkout@v4
- uses: valitydev/action-frontend/setup@v1
- uses: valitydev/action-setup-thrift@v1.0.2
- run: npm i # protocols don't always update the package-lock.json, so installing from package.json
- name: Build
run: npm run codegen
- uses: valitydev/action-frontend/publish@v0.1
- uses: valitydev/action-frontend/publish@v1
with:
npm-token: ${{ secrets.NPM_TOKEN }}
2 changes: 1 addition & 1 deletion .github/workflows/java-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:

jobs:
deploy:
uses: valitydev/java-workflow/.github/workflows/maven-thrift-deploy.yml@v1
uses: valitydev/java-workflow/.github/workflows/maven-thrift-deploy.yml@v3
secrets:
server-username: ${{ secrets.OSSRH_USERNAME }}
server-password: ${{ secrets.OSSRH_TOKEN }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/java-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ on:

jobs:
build:
uses: valitydev/java-workflow/.github/workflows/maven-thrift-build.yml@v1
uses: valitydev/java-workflow/.github/workflows/maven-thrift-build.yml@v3
16 changes: 8 additions & 8 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>dev.vality</groupId>
<artifactId>library-parent-pom</artifactId>
<version>1.0.2</version>
<version>2.0.3</version>
</parent>

<artifactId>limiter-proto</artifactId>
Expand Down Expand Up @@ -49,18 +49,18 @@
<dependency>
<groupId>dev.vality.woody</groupId>
<artifactId>woody-thrift</artifactId>
<version>1.0.4</version>
<version>2.0.9</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
<version>1.3.2</version>
<groupId>jakarta.annotation</groupId>
<artifactId>jakarta.annotation-api</artifactId>
<version>3.0.0</version>
</dependency>
<dependency>
<groupId>dev.vality</groupId>
<artifactId>damsel</artifactId>
<version>1.593-698c7d2</version>
<version>1.654-ab44b9d</version>
<scope>provided</scope>
</dependency>
</dependencies>
Expand All @@ -84,7 +84,7 @@
<artifactId>thrift-maven-plugin</artifactId>
<version>0.10.0</version>
<configuration>
<generator>java:fullcamel</generator>
<generator>java:fullcamel,jakarta_annotations</generator>
<thriftSourceRoot>${project.basedir}/proto</thriftSourceRoot>
<thriftExecutable>${path_to_thrift}</thriftExecutable>
</configuration>
Expand All @@ -101,7 +101,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>3.2.4</version>
<version>3.6.0</version>
<executions>
<execution>
<phase>package</phase>
Expand Down
1 change: 0 additions & 1 deletion proto/limiter_config.thrift
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,6 @@ union LimitScopeType {
1: LimitScopeEmptyDetails party
2: LimitScopeEmptyDetails shop
3: LimitScopeEmptyDetails wallet
4: LimitScopeEmptyDetails identity

/**
* Scope over data which uniquely identifies payment tool used in a payment.
Expand Down
2 changes: 1 addition & 1 deletion rebar.lock
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[{<<"damsel">>,
{git,"https://github.com/valitydev/damsel.git",
{ref,"500c0a2aab6dc90db0c0b7ea4cd9757fd86368d0"}},
{ref,"ab44b9db25a76a2c50545fd884e4cdf3d3e3b628"}},
0}].
Loading