summaryrefslogtreecommitdiffstats
path: root/integration
diff options
context:
space:
mode:
authorliamfallon <liam.fallon@est.tech>2023-01-31 09:21:40 +0000
committerliamfallon <liam.fallon@est.tech>2023-01-31 11:05:55 +0000
commit38f611322eaa05e9da82a370c959c5816eb17df7 (patch)
treee34e6aae312cddd63f8f3f449e567a19a1669751 /integration
parent128212521398b1f2cf1d51e2f0cfba4b76739424 (diff)
Upgrade and clean up dependencies
- Upgrade Hibernate - Upgrade Mockito - Upgrade Mockserver - Remove Powermock (no longer supported) and replace with spring-test ReflectionTestUtils - Upgrade Spring Framework - Add spring-security to allow authentication on unitests using MockMVC Minor clean-up - Replace deprecated authorization configuraiton on spring boot applications with SecurityFilterChain bean - Change @LocalPort include on tests to use test include rather than runtime include - Remove unused imports - Remove unused constants and variables - Add deprecation annotations where required Issue-ID: POLICY-4482 Change-Id: I5229379037ec773d31a1adc21d5533ca3e1fb93d Signed-off-by: liamfallon <liam.fallon@est.tech>
Diffstat (limited to 'integration')
-rw-r--r--integration/pom.xml46
1 files changed, 18 insertions, 28 deletions
diff --git a/integration/pom.xml b/integration/pom.xml
index cf6b6afb..d57e45ff 100644
--- a/integration/pom.xml
+++ b/integration/pom.xml
@@ -2,7 +2,7 @@
============LICENSE_START=======================================================
Copyright (C) 2018 Ericsson. All rights reserved.
Modifications Copyright (C) 2018-2023 AT&T. All rights reserved.
- Modifications Copyright (C) 2019-2022 Nordix Foundation.
+ Modifications Copyright (C) 2019-2023 Nordix Foundation.
Modifications Copyright (C) 2020-2022 Bell Canada.
================================================================================
Licensed under the Apache License, Version 2.0 (the "License");
@@ -60,8 +60,7 @@
<version.google-re2j>1.7</version.google-re2j>
<version.gson>2.10</version.gson>
<version.h2>2.1.214</version.h2>
- <version.hibernate.core>5.4.31.Final</version.hibernate.core>
- <!--version.hibernate.core>6.1.5.Final</version.hibernate.core-->
+ <version.hibernate.core>5.6.14.Final</version.hibernate.core>
<version.httpcore>4.4.16</version.httpcore>
<version.immutables>2.9.2</version.immutables>
<version.io.micrometer>1.10.2</version.io.micrometer>
@@ -88,25 +87,22 @@
<version.mariadb>3.1.0</version.mariadb>
<version.medeia>1.1.1</version.medeia>
<version.mockito-all>1.10.19</version.mockito-all>
- <version.mockito-core>3.7.7</version.mockito-core>
- <!--version.mockito-core>4.9.0</version.mockito-core-->
- <version.mockserver>5.14.0</version.mockserver>
+ <version.mockito-core>5.1.0</version.mockito-core>
+ <version.mockserver>5.15.0</version.mockserver>
<version.netty>4.1.85.Final</version.netty>
<version.nsa-cambria>1.2.1-oss</version.nsa-cambria>
<version.nsa-sa-client>1.3.0-oss</version.nsa-sa-client>
<version.openpojo>0.9.1</version.openpojo>
<version.plexus>3.5.0</version.plexus>
<version.postgresql>42.5.1</version.postgresql>
- <version.powermock>2.0.9</version.powermock>
<version.sdc>2.0.0</version.sdc>
<version.servlet>4.0.1</version.servlet>
<version.slf4j>1.7.30</version.slf4j>
<!--version.slf4j>2.0.5</version.slf4j-->
<version.snakeyaml>1.33</version.snakeyaml>
- <version.spring>5.3.22</version.spring>
- <!--version.spring>6.0.2</version.spring-->
+ <version.spring>5.3.25</version.spring>
+ <version.spring-security>5.8.1</version.spring-security>
<version.springboot>2.7.8</version.springboot>
- <!--version.springboot>3.0.0</version.springboot-->
<version.springdoc>1.6.13</version.springdoc>
<version.swagger.codegen.v3>3.0.36</version.swagger.codegen.v3>
<version.swagger.core.v3>2.2.7</version.swagger.core.v3>
@@ -713,24 +709,6 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.powermock</groupId>
- <artifactId>powermock-core</artifactId>
- <version>${version.powermock}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.powermock</groupId>
- <artifactId>powermock-api-mockito2</artifactId>
- <version>${version.powermock}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.powermock</groupId>
- <artifactId>powermock-module-junit4</artifactId>
- <version>${version.powermock}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>${version.mockito-core}</version>
@@ -835,6 +813,18 @@
<artifactId>spring-webflux</artifactId>
<version>${version.spring}</version>
</dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-test</artifactId>
+ <version>${version.spring}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.security</groupId>
+ <artifactId>spring-security-test</artifactId>
+ <version>${version.spring-security}</version>
+ <scope>test</scope>
+ </dependency>
<!-- Springboot -->
<dependency>
<groupId>org.springframework.boot</groupId>