Skip to content

Commit bf81ab2

Browse files
echerniakecherniak
authored
Bump (#86)
* Revert "Auth via tokenkeeper (#73)" This reverts commit 520a524. * Bump deps + remove payout * Replace vortigon with dominant * Bump gh actions * Bump deps + cleanup * Update deprecated properties * upd swag
1 parent d7ca3b5 commit bf81ab2

67 files changed

Lines changed: 929 additions & 1527 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/build.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@ on:
77

88
jobs:
99
build:
10-
uses: valitydev/java-workflow/.github/workflows/maven-service-build.yml@v1
10+
uses: valitydev/java-workflow/.github/workflows/maven-service-build.yml@v3

‎.github/workflows/deploy.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ env:
1212

1313
jobs:
1414
deploy:
15-
uses: valitydev/java-workflow/.github/workflows/maven-service-deploy.yml@v1
15+
uses: valitydev/java-workflow/.github/workflows/maven-service-deploy.yml@v3
1616
secrets:
1717
github-token: ${{ secrets.GITHUB_TOKEN }}
1818
mm-webhook-url: ${{ secrets.MATTERMOST_WEBHOOK_URL }}

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ buildNumber.properties
2828
.idea/dictionaries
2929
.idea/vcs.xml
3030
.idea/jsLibraryMappings.xml
31+
.vscode/
3132

3233
# Sensitive or high-churn files:
3334
.idea/dataSources.ids

‎package-lock.json‎

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎pom.xml‎

Lines changed: 49 additions & 87 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@
66
<parent>
77
<groupId>dev.vality</groupId>
88
<artifactId>service-parent-pom</artifactId>
9-
<version>1.0.19</version>
9+
<version>3.1.1</version>
1010
</parent>
1111

1212
<artifactId>anapi-v2</artifactId>
13-
<version>1.0.4</version>
13+
<version>2.0.0</version>
1414
<packaging>jar</packaging>
1515

1616
<name>anapi-v2</name>
@@ -19,52 +19,36 @@
1919
<properties>
2020
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
2121
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
22-
<java.version>15</java.version>
22+
<java.version>21</java.version>
2323
<server.port>8022</server.port>
2424
<management.port>8023</management.port>
2525
<exposed.ports>${server.port} ${management.port}</exposed.ports>
2626
<dockerfile.registry>${env.REGISTRY}</dockerfile.registry>
27-
<springfox-version>2.10.5</springfox-version>
28-
<servlet-api-version>2.5</servlet-api-version>
29-
<jackson-version>2.12.5</jackson-version>
30-
<spring-version>2.5.3</spring-version>
31-
<javax-annotation-api-version>1.3.2</javax-annotation-api-version>
32-
<jaxb-version>2.3.1</jaxb-version>
33-
<woody.version>1.0.4</woody.version>
27+
<jjwt-version>0.12.6</jjwt-version>
3428
</properties>
3529

3630
<dependencies>
3731

3832
<!--vality-->
3933
<dependency>
4034
<groupId>dev.vality</groupId>
41-
<artifactId>swag-anapi-v2</artifactId>
42-
<version>1.81-8f1ba21-server</version>
35+
<artifactId>swag-anapi-v2-server</artifactId>
36+
<version>1.101-adc5097</version>
4337
</dependency>
4438
<dependency>
4539
<groupId>dev.vality</groupId>
4640
<artifactId>bouncer-proto</artifactId>
47-
<version>1.51-23d1761</version>
41+
<version>1.57-31866c3</version>
4842
</dependency>
4943
<dependency>
5044
<groupId>dev.vality</groupId>
5145
<artifactId>org-management-proto</artifactId>
52-
<version>1.12-1a0110a</version>
53-
</dependency>
54-
<dependency>
55-
<groupId>dev.vality</groupId>
56-
<artifactId>payout-manager-proto</artifactId>
57-
<version>1.38-635dc24</version>
46+
<version>1.17-04de2f4</version>
5847
</dependency>
5948
<dependency>
6049
<groupId>dev.vality</groupId>
6150
<artifactId>magista-proto</artifactId>
62-
<version>1.44-5352f74</version>
63-
</dependency>
64-
<dependency>
65-
<groupId>dev.vality</groupId>
66-
<artifactId>party-shop-proto</artifactId>
67-
<version>1.19-72faaf6</version>
51+
<version>1.55-bbdee33</version>
6852
</dependency>
6953
<dependency>
7054
<groupId>dev.vality</groupId>
@@ -83,19 +67,25 @@
8367
<dependency>
8468
<groupId>dev.vality</groupId>
8569
<artifactId>damsel</artifactId>
86-
<version>1.614-3df747f</version>
87-
</dependency>
88-
<dependency>
89-
<groupId>dev.vality</groupId>
90-
<artifactId>token-keeper-proto</artifactId>
91-
<version>1.32-8b8bb43</version>
9270
</dependency>
9371

9472
<!--spring-->
73+
<dependency>
74+
<groupId>org.springframework.boot</groupId>
75+
<artifactId>spring-boot-starter-security</artifactId>
76+
</dependency>
9577
<dependency>
9678
<groupId>org.springframework.boot</groupId>
9779
<artifactId>spring-boot-starter-aop</artifactId>
9880
</dependency>
81+
<dependency>
82+
<groupId>org.springframework.security</groupId>
83+
<artifactId>spring-security-config</artifactId>
84+
</dependency>
85+
<dependency>
86+
<groupId>org.springframework.security</groupId>
87+
<artifactId>spring-security-web</artifactId>
88+
</dependency>
9989
<dependency>
10090
<groupId>org.springframework.boot</groupId>
10191
<artifactId>spring-boot-starter</artifactId>
@@ -123,59 +113,24 @@
123113
<artifactId>spring-boot-configuration-processor</artifactId>
124114
<optional>true</optional>
125115
</dependency>
126-
127-
<!--third party-->
128-
<dependency>
129-
<groupId>javax.servlet</groupId>
130-
<artifactId>javax.servlet-api</artifactId>
131-
</dependency>
132-
<dependency>
133-
<groupId>io.swagger</groupId>
134-
<artifactId>swagger-annotations</artifactId>
135-
<version>1.6.12</version>
136-
<scope>provided</scope>
137-
</dependency>
138116
<dependency>
139-
<groupId>io.springfox</groupId>
140-
<artifactId>springfox-swagger2</artifactId>
141-
<version>${springfox-version}</version>
117+
<groupId>org.springframework.boot</groupId>
118+
<artifactId>spring-boot-starter-oauth2-resource-server</artifactId>
142119
</dependency>
120+
121+
<!--third party-->
143122
<dependency>
144-
<groupId>io.springfox</groupId>
145-
<artifactId>springfox-swagger-ui</artifactId>
146-
<version>${springfox-version}</version>
123+
<groupId>jakarta.servlet</groupId>
124+
<artifactId>jakarta.servlet-api</artifactId>
147125
</dependency>
148126
<dependency>
149127
<groupId>org.projectlombok</groupId>
150128
<artifactId>lombok</artifactId>
151129
<scope>provided</scope>
152130
</dependency>
153131
<dependency>
154-
<groupId>javax.servlet</groupId>
155-
<artifactId>servlet-api</artifactId>
156-
<version>${servlet-api-version}</version>
157-
<scope>provided</scope>
158-
</dependency>
159-
<dependency>
160-
<groupId>javax.annotation</groupId>
161-
<artifactId>javax.annotation-api</artifactId>
162-
<version>${javax-annotation-api-version}</version>
163-
</dependency>
164-
<dependency>
165-
<groupId>javax.validation</groupId>
166-
<artifactId>validation-api</artifactId>
167-
<version>2.0.1.Final</version>
168-
<scope>provided</scope>
169-
</dependency>
170-
<dependency>
171-
<groupId>javax.xml.bind</groupId>
172-
<artifactId>jaxb-api</artifactId>
173-
<version>${jaxb-version}</version>
174-
</dependency>
175-
<dependency>
176-
<groupId>com.google.code.findbugs</groupId>
177-
<artifactId>jsr305</artifactId>
178-
<version>3.0.2</version>
132+
<groupId>jakarta.validation</groupId>
133+
<artifactId>jakarta.validation-api</artifactId>
179134
<scope>provided</scope>
180135
</dependency>
181136
<dependency>
@@ -184,11 +139,6 @@
184139
<version>0.2.6</version>
185140
<scope>provided</scope>
186141
</dependency>
187-
<dependency>
188-
<groupId>org.bouncycastle</groupId>
189-
<artifactId>bcprov-jdk15on</artifactId>
190-
<version>1.70</version>
191-
</dependency>
192142
<dependency>
193143
<groupId>io.micrometer</groupId>
194144
<artifactId>micrometer-core</artifactId>
@@ -206,20 +156,32 @@
206156
</dependency>
207157
<dependency>
208158
<groupId>io.jsonwebtoken</groupId>
209-
<artifactId>jjwt</artifactId>
210-
<version>0.9.1</version>
159+
<artifactId>jjwt-api</artifactId>
160+
<version>${jjwt-version}</version>
161+
<scope>test</scope>
162+
</dependency>
163+
<dependency>
164+
<groupId>io.jsonwebtoken</groupId>
165+
<artifactId>jjwt-impl</artifactId>
166+
<version>${jjwt-version}</version>
211167
<scope>test</scope>
212168
</dependency>
213169
<dependency>
214-
<groupId>com.github.tomakehurst</groupId>
215-
<artifactId>wiremock-jre8-standalone</artifactId>
216-
<version>2.35.1</version>
170+
<groupId>io.jsonwebtoken</groupId>
171+
<artifactId>jjwt-jackson</artifactId>
172+
<version>${jjwt-version}</version>
217173
<scope>test</scope>
218174
</dependency>
219175
<dependency>
220176
<groupId>org.springframework.cloud</groupId>
221177
<artifactId>spring-cloud-contract-wiremock</artifactId>
222-
<version>3.1.4</version>
178+
<version>4.3.0</version>
179+
<scope>test</scope>
180+
</dependency>
181+
<dependency>
182+
<groupId>org.bouncycastle</groupId>
183+
<artifactId>bcpkix-jdk18on</artifactId>
184+
<version>1.79</version>
223185
<scope>test</scope>
224186
</dependency>
225187
</dependencies>
@@ -256,12 +218,12 @@
256218
<plugin>
257219
<groupId>org.apache.maven.plugins</groupId>
258220
<artifactId>maven-remote-resources-plugin</artifactId>
259-
<version>3.1.0</version>
221+
<version>3.3.0</version>
260222
<dependencies>
261223
<dependency>
262224
<groupId>org.apache.maven.shared</groupId>
263225
<artifactId>maven-filtering</artifactId>
264-
<version>3.3.1</version>
226+
<version>3.4.0</version>
265227
</dependency>
266228
</dependencies>
267229
<configuration>

0 commit comments

Comments
 (0)