Ft/bump 343o (#139)

* Update valitydev/action-setup-thrift action to v1.0.2

* Update dependency org.apache.maven.plugins:maven-shade-plugin to v3.6.0

* Update actions/checkout action to v4

* Update dependency dev.vality.woody:woody-thrift to v2

* Update dependency dev.vality:library-parent-pom to v2

* Update valitydev/action-frontend action to v1

* Update valitydev/java-workflow action to v3

* woody 2 migration

* woody 2 migration

---------

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
This commit is contained in:
Anatolii Karlov 2024-06-24 17:11:50 +07:00 committed by GitHub
parent 02e0ec0db6
commit 485612481e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 22 additions and 16 deletions

View File

@ -6,16 +6,16 @@ on:
jobs: jobs:
configured: configured:
uses: valitydev/action-frontend/.github/workflows/configured.yml@v0.1 uses: valitydev/action-frontend/.github/workflows/configured.yml@v1.0
check: check:
name: Check name: Check
runs-on: ubuntu-latest runs-on: ubuntu-latest
needs: configured needs: configured
if: needs.configured.outputs.exists == 'true' if: needs.configured.outputs.exists == 'true'
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v4
- uses: valitydev/action-frontend/setup@v1 - uses: valitydev/action-frontend/setup@v1
- uses: valitydev/action-setup-thrift@v1.0.1 - 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 - run: npm i # protocols don't always update the package-lock.json, so installing from package.json
- name: Codegen - name: Codegen
run: npm run codegen run: npm run codegen

View File

@ -6,16 +6,16 @@ on:
jobs: jobs:
configured: configured:
uses: valitydev/action-frontend/.github/workflows/configured.yml@v0.1 uses: valitydev/action-frontend/.github/workflows/configured.yml@v1.0
publish: publish:
name: Publish name: Publish
runs-on: ubuntu-latest runs-on: ubuntu-latest
needs: configured needs: configured
if: needs.configured.outputs.exists == 'true' if: needs.configured.outputs.exists == 'true'
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v4
- uses: valitydev/action-frontend/setup@v1 - uses: valitydev/action-frontend/setup@v1
- uses: valitydev/action-setup-thrift@v1.0.1 - 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 - run: npm i # protocols don't always update the package-lock.json, so installing from package.json
- name: Build - name: Build
run: npm run codegen run: npm run codegen

View File

@ -8,7 +8,7 @@ on:
jobs: jobs:
deploy: deploy:
uses: valitydev/java-workflow/.github/workflows/maven-thrift-deploy.yml@v1 uses: valitydev/java-workflow/.github/workflows/maven-thrift-deploy.yml@v3
secrets: secrets:
server-username: ${{ secrets.OSSRH_USERNAME }} server-username: ${{ secrets.OSSRH_USERNAME }}
server-password: ${{ secrets.OSSRH_TOKEN }} server-password: ${{ secrets.OSSRH_TOKEN }}

View File

@ -7,4 +7,4 @@ on:
jobs: jobs:
build: build:
uses: valitydev/java-workflow/.github/workflows/maven-thrift-build.yml@v1 uses: valitydev/java-workflow/.github/workflows/maven-thrift-build.yml@v3

22
pom.xml
View File

@ -7,7 +7,7 @@
<parent> <parent>
<groupId>dev.vality</groupId> <groupId>dev.vality</groupId>
<artifactId>library-parent-pom</artifactId> <artifactId>library-parent-pom</artifactId>
<version>1.0.2</version> <version>2.0.2</version>
</parent> </parent>
<artifactId>damsel</artifactId> <artifactId>damsel</artifactId>
@ -18,6 +18,13 @@
<description>Generates jar artifact containing compiled thrift classes based on generated thrift IDL files</description> <description>Generates jar artifact containing compiled thrift classes based on generated thrift IDL files</description>
<url>https://github.com/valitydev/damsel.git</url> <url>https://github.com/valitydev/damsel.git</url>
<licenses>
<license>
<name>The Apache Software License, Version 2.0</name>
<url>https://www.apache.org/licenses/LICENSE-2.0.txt</url>
</license>
</licenses>
<developers> <developers>
<developer> <developer>
<organization>Vality</organization> <organization>Vality</organization>
@ -40,13 +47,13 @@
<dependency> <dependency>
<groupId>dev.vality.woody</groupId> <groupId>dev.vality.woody</groupId>
<artifactId>woody-thrift</artifactId> <artifactId>woody-thrift</artifactId>
<version>1.0.4</version> <version>2.0.1</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>javax.annotation</groupId> <groupId>jakarta.annotation</groupId>
<artifactId>javax.annotation-api</artifactId> <artifactId>jakarta.annotation-api</artifactId>
<version>1.3.2</version> <version>3.0.0</version>
</dependency> </dependency>
</dependencies> </dependencies>
@ -68,7 +75,7 @@
<artifactId>thrift-maven-plugin</artifactId> <artifactId>thrift-maven-plugin</artifactId>
<version>0.10.0</version> <version>0.10.0</version>
<configuration> <configuration>
<generator>java:fullcamel</generator> <generator>java:fullcamel,jakarta_annotations</generator>
<thriftSourceRoot>${project.basedir}/proto</thriftSourceRoot> <thriftSourceRoot>${project.basedir}/proto</thriftSourceRoot>
<thriftExecutable>${path_to_thrift}</thriftExecutable> <thriftExecutable>${path_to_thrift}</thriftExecutable>
</configuration> </configuration>
@ -85,7 +92,7 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId> <artifactId>maven-shade-plugin</artifactId>
<version>3.2.4</version> <version>3.6.0</version>
<executions> <executions>
<execution> <execution>
<phase>package</phase> <phase>package</phase>
@ -107,5 +114,4 @@
</plugin> </plugin>
</plugins> </plugins>
</build> </build>
</project> </project>