Skip to content
This repository was archived by the owner on Aug 10, 2021. It is now read-only.

Commit 4e58833

Browse files
priitrpriitr
committed
Merge branch 'develop'
2 parents bd8ca30 + 5ac7755 commit 4e58833

File tree

2 files changed

+63
-87
lines changed

2 files changed

+63
-87
lines changed

‎pom.xml‎

Lines changed: 61 additions & 84 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,10 @@
66
<groupId>ee.ria.tara</groupId>
77
<artifactId>tara-server</artifactId>
88
<packaging>war</packaging>
9-
<version>1.4.4</version>
9+
<version>1.4.5</version>
1010

1111
<properties>
12-
<cas.version>5.3.7</cas.version>
13-
<spring.version>4.3.20.RELEASE</spring.version>
12+
<cas.version>5.3.9</cas.version>
1413
<springboot.version>1.5.18.RELEASE</springboot.version>
1514
<banklink.version>2.1.15</banklink.version>
1615
<!-- app.server could be -jetty, -undertow, -tomcat, or blank if you plan to provide appserver -->
@@ -98,6 +97,7 @@
9897
<artifactId>cas-server-webapp${app.server}</artifactId>
9998
<excludes>
10099
<exclude>WEB-INF/classes/user-details.properties</exclude>
100+
<exclude>WEB-INF/lib/jackson-*</exclude>
101101
</excludes>
102102
</overlay>
103103
</overlays>
@@ -132,13 +132,26 @@
132132
<finalName>cas</finalName>
133133
</build>
134134

135+
<dependencyManagement>
136+
<dependencies>
137+
<!-- Override a dependency by including it BEFORE the BOM -->
138+
<dependency>
139+
<groupId>com.fasterxml.jackson.core</groupId>
140+
<artifactId>jackson-databind</artifactId>
141+
<version>2.9.8</version>
142+
</dependency>
143+
144+
<dependency>
145+
<groupId>org.apereo.cas</groupId>
146+
<artifactId>cas-server-support-bom</artifactId>
147+
<version>${cas.version}</version>
148+
<type>pom</type>
149+
<scope>import</scope>
150+
</dependency>
151+
</dependencies>
152+
</dependencyManagement>
153+
135154
<dependencies>
136-
<dependency>
137-
<groupId>javax.servlet</groupId>
138-
<artifactId>javax.servlet-api</artifactId>
139-
<version>3.0.1</version>
140-
<scope>provided</scope>
141-
</dependency>
142155
<dependency>
143156
<groupId>org.apereo.cas</groupId>
144157
<artifactId>cas-server-webapp${app.server}</artifactId>
@@ -149,78 +162,95 @@
149162
<dependency>
150163
<groupId>org.apereo.cas</groupId>
151164
<artifactId>cas-server-webapp-config</artifactId>
152-
<version>${cas.version}</version>
153165
<scope>provided</scope>
154166
</dependency>
155-
156167
<dependency>
157168
<groupId>org.apereo.cas</groupId>
158169
<artifactId>cas-server-core</artifactId>
159-
<version>${cas.version}</version>
160170
<scope>provided</scope>
161171
</dependency>
162172
<dependency>
163173
<groupId>org.apereo.cas</groupId>
164174
<artifactId>cas-server-core-web-api</artifactId>
165-
<version>${cas.version}</version>
166175
<scope>provided</scope>
167176
</dependency>
168177
<dependency>
169178
<groupId>org.apereo.cas</groupId>
170179
<artifactId>cas-server-core-webflow-api</artifactId>
171-
<version>${cas.version}</version>
172180
<scope>provided</scope>
173181
</dependency>
174182
<dependency>
175183
<groupId>org.apereo.cas</groupId>
176184
<artifactId>cas-server-core-util-api</artifactId>
177-
<version>${cas.version}</version>
178185
<scope>provided</scope>
179186
</dependency>
180187
<dependency>
181188
<groupId>org.apereo.cas</groupId>
182189
<artifactId>cas-server-core-api-audit</artifactId>
183-
<version>${cas.version}</version>
184190
<scope>provided</scope>
185191
</dependency>
186192
<dependency>
187193
<groupId>org.apereo.cas</groupId>
188194
<artifactId>cas-server-core-services-api</artifactId>
189-
<version>${cas.version}</version>
190195
<scope>provided</scope>
191196
</dependency>
192197
<dependency>
193198
<groupId>org.apereo.cas</groupId>
194199
<artifactId>cas-server-core-authentication</artifactId>
195-
<version>${cas.version}</version>
196200
<scope>provided</scope>
197201
</dependency>
198202
<dependency>
199203
<groupId>org.apereo.cas</groupId>
200204
<artifactId>cas-server-core-authentication-api</artifactId>
201-
<version>${cas.version}</version>
202205
<scope>provided</scope>
203206
</dependency>
204207
<dependency>
205208
<groupId>org.apereo.cas</groupId>
206209
<artifactId>cas-server-core-api-configuration-model</artifactId>
207-
<version>${cas.version}</version>
208210
<scope>provided</scope>
209211
</dependency>
210212
<dependency>
211213
<groupId>org.apereo.cas</groupId>
212214
<artifactId>cas-server-core-tickets-api</artifactId>
213-
<version>${cas.version}</version>
214215
<scope>provided</scope>
215216
</dependency>
216217
<dependency>
217218
<groupId>org.apereo.cas</groupId>
218219
<artifactId>cas-server-core-cookie-api</artifactId>
219-
<version>${cas.version}</version>
220+
<scope>provided</scope>
221+
</dependency>
222+
<dependency>
223+
<groupId>org.aspectj</groupId>
224+
<artifactId>aspectjrt</artifactId>
225+
<scope>provided</scope>
226+
</dependency>
227+
<dependency>
228+
<groupId>org.jasig.cas.client</groupId>
229+
<artifactId>cas-client-core</artifactId>
230+
<scope>provided</scope>
231+
</dependency>
232+
<dependency>
233+
<groupId>org.pac4j</groupId>
234+
<artifactId>pac4j-core</artifactId>
235+
<scope>provided</scope>
236+
</dependency>
237+
<dependency>
238+
<groupId>org.pac4j</groupId>
239+
<artifactId>spring-webmvc-pac4j</artifactId>
240+
<scope>provided</scope>
241+
</dependency>
242+
<dependency>
243+
<groupId>org.pac4j</groupId>
244+
<artifactId>pac4j-cas</artifactId>
245+
<scope>provided</scope>
246+
</dependency>
247+
<dependency>
248+
<groupId>com.github.ben-manes.caffeine</groupId>
249+
<artifactId>caffeine</artifactId>
220250
<scope>provided</scope>
221251
</dependency>
222252

223-
<!-- oidc support -->
253+
<!-- cas oidc support -->
224254
<dependency>
225255
<groupId>org.apereo.cas</groupId>
226256
<artifactId>cas-server-support-oidc</artifactId>
@@ -229,12 +259,10 @@
229259
<dependency>
230260
<groupId>org.apereo.cas</groupId>
231261
<artifactId>cas-server-support-oidc-core</artifactId>
232-
<version>${cas.version}</version>
233262
</dependency>
234263
<dependency>
235264
<groupId>org.apereo.cas</groupId>
236265
<artifactId>cas-server-support-oidc-services</artifactId>
237-
<version>${cas.version}</version>
238266
</dependency>
239267
<dependency>
240268
<groupId>org.apereo.cas</groupId>
@@ -244,38 +272,29 @@
244272
<dependency>
245273
<groupId>org.apereo.cas</groupId>
246274
<artifactId>cas-server-support-oauth-api</artifactId>
247-
<version>${cas.version}</version>
248275
</dependency>
249276
<dependency>
250277
<groupId>org.apereo.cas</groupId>
251278
<artifactId>cas-server-support-oauth-services</artifactId>
252-
<version>${cas.version}</version>
253279
</dependency>
254280
<dependency>
255281
<groupId>org.apereo.cas</groupId>
256282
<artifactId>cas-server-support-oauth-core</artifactId>
257-
<version>${cas.version}</version>
258283
</dependency>
259284

260-
<!-- service storage support -->
285+
<!-- cas service storage support -->
261286
<dependency>
262287
<groupId>org.apereo.cas</groupId>
263288
<artifactId>cas-server-support-jpa-service-registry</artifactId>
264289
<version>${cas.version}</version>
265290
</dependency>
266-
<dependency>
267-
<groupId>com.zaxxer</groupId>
268-
<artifactId>HikariCP</artifactId>
269-
<version>2.7.1</version>
270-
<scope>provided</scope>
271-
</dependency>
272291
<dependency>
273292
<groupId>org.postgresql</groupId>
274293
<artifactId>postgresql</artifactId>
275-
<version>42.2.2</version>
294+
<version>42.2.5</version>
276295
</dependency>
277296

278-
<!-- cluster support -->
297+
<!-- cas cluster support -->
279298
<dependency>
280299
<groupId>org.apereo.cas</groupId>
281300
<artifactId>cas-server-webapp-session-hazelcast</artifactId>
@@ -287,51 +306,7 @@
287306
<version>${cas.version}</version>
288307
</dependency>
289308

290-
291-
292-
293-
<dependency>
294-
<groupId>org.springframework</groupId>
295-
<artifactId>spring-aspects</artifactId>
296-
<version>${spring.version}</version>
297-
</dependency>
298-
<dependency>
299-
<groupId>org.jasig.cas.client</groupId>
300-
<artifactId>cas-client-core</artifactId>
301-
<version>3.5.0</version>
302-
<scope>provided</scope>
303-
</dependency>
304-
<dependency>
305-
<groupId>org.pac4j</groupId>
306-
<artifactId>pac4j-core</artifactId>
307-
<version>3.3.0</version>
308-
<scope>provided</scope>
309-
</dependency>
310-
<dependency>
311-
<groupId>org.pac4j</groupId>
312-
<artifactId>spring-webmvc-pac4j</artifactId>
313-
<version>3.0.0</version>
314-
<scope>provided</scope>
315-
</dependency>
316-
<dependency>
317-
<groupId>org.pac4j</groupId>
318-
<artifactId>pac4j-cas</artifactId>
319-
<version>3.0.1</version>
320-
<scope>provided</scope>
321-
</dependency>
322-
<dependency>
323-
<groupId>com.github.ben-manes.caffeine</groupId>
324-
<artifactId>caffeine</artifactId>
325-
<version>2.6.2</version>
326-
<scope>provided</scope>
327-
</dependency>
328-
329-
<dependency>
330-
<groupId>org.cryptacular</groupId>
331-
<artifactId>cryptacular</artifactId>
332-
<version>1.2.0</version>
333-
<scope>provided</scope>
334-
</dependency>
309+
<!-- banklinks -->
335310
<dependency>
336311
<groupId>com.nortal.banklink</groupId>
337312
<artifactId>banklink-core</artifactId>
@@ -347,6 +322,8 @@
347322
<artifactId>banklink-link</artifactId>
348323
<version>${banklink.version}</version>
349324
</dependency>
325+
326+
<!-- mobileid -->
350327
<dependency>
351328
<groupId>com.codeborne</groupId>
352329
<artifactId>mobileid</artifactId>
@@ -355,15 +332,15 @@
355332
<dependency>
356333
<groupId>org.bouncycastle</groupId>
357334
<artifactId>bcprov-jdk15on</artifactId>
358-
<version>1.56</version>
359335
<scope>provided</scope>
360336
</dependency>
361337
<dependency>
362338
<groupId>org.bouncycastle</groupId>
363339
<artifactId>bcpkix-jdk15on</artifactId>
364-
<version>1.56</version>
365340
<scope>provided</scope>
366341
</dependency>
342+
343+
<!-- smartid -->
367344
<dependency>
368345
<groupId>ee.sk.smartid</groupId>
369346
<artifactId>smart-id-java-client</artifactId>

‎src/test/java/ee/ria/sso/statistics/StatisticsRecordMatcher.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
import java.time.LocalDateTime;
99

10-
public class StatisticsRecordMatcher extends ArgumentMatcher<StatisticsRecord> {
10+
public class StatisticsRecordMatcher implements ArgumentMatcher<StatisticsRecord> {
1111

1212
private final Matcher<LocalDateTime> timeMatcher;
1313
private final Matcher<String> clientIdMatcher;
@@ -31,7 +31,7 @@ public StatisticsRecordMatcher(Matcher<LocalDateTime> timeMatcher,
3131
}
3232

3333
@Override
34-
public boolean matches(Object actual) {
34+
public boolean matches(StatisticsRecord actual) {
3535
if (!StatisticsRecord.class.isInstance(actual))
3636
return false;
3737

@@ -43,5 +43,4 @@ public boolean matches(Object actual) {
4343
errorDescriptionMatcher.matches(ReflectionTestUtils.getField(statisticsRecord, "error")) &&
4444
bankMatcher.matches(ReflectionTestUtils.getField(statisticsRecord, "bank"));
4545
}
46-
4746
}

0 commit comments

Comments
 (0)