diff options
| author |   Fiete Ostkamp <Fiete.Ostkamp@telekom.de> | 2024-01-11 11:36:27 +0100 |
|---|---|---|
| committer | Fiete Ostkamp <Fiete.Ostkamp@telekom.de> | 2024-01-11 14:54:54 +0100 |
| commit | 6ecaa012a9712c5579e80ed9096f4e89c1285bf7 (patch) | |
| tree | b507713c0d5df9480be9248e720848fe8cdd8bf7 /aai-els-onap-logging | |
| parent | 64ba3c1816fc85d24ca2de935a5263608fd7b23f (diff) | |
Update spring boot to 2.4
- update spring boot from 2.3 to 2.4
- remove compile-time dependency on powermock introduced by eelf-core
- remove dependencyManagement declarations for powermock since it's not used anymore
Issue-ID: AAI-3725
Change-Id: I05a35e0cee80b27123f28bb8eeb8ed885c83a173
Signed-off-by: Fiete Ostkamp <Fiete.Ostkamp@telekom.de>
Diffstat (limited to 'aai-els-onap-logging')
| -rw-r--r-- | aai-els-onap-logging/pom.xml | 28 |
1 files changed, 23 insertions, 5 deletions
diff --git a/aai-els-onap-logging/pom.xml b/aai-els-onap-logging/pom.xml index 0fb44189..3ca0cc76 100644 --- a/aai-els-onap-logging/pom.xml +++ b/aai-els-onap-logging/pom.xml @@ -72,6 +72,12 @@ <dependency> <groupId>org.onap.logging-analytics</groupId> <artifactId>logging-slf4j</artifactId> + <exclusions> + <exclusion> + <groupId>org.powermock</groupId> + <artifactId>powermock-module-junit4</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>javax.servlet</groupId> @@ -89,11 +95,6 @@ <scope>provided</scope> </dependency> <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <scope>test</scope> - </dependency> - <dependency> <groupId>org.mockito</groupId> <artifactId>mockito-core</artifactId> <version>3.12.4</version> @@ -140,6 +141,23 @@ <artifactId>spring-boot-starter-test</artifactId> <scope>test</scope> </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <scope>test</scope> + </dependency> + <!-- TODO: Migrate tests to junit 5 and remove this dependency --> + <dependency> + <groupId>org.junit.vintage</groupId> + <artifactId>junit-vintage-engine</artifactId> + <scope>test</scope> + <exclusions> + <exclusion> + <groupId>org.hamcrest</groupId> + <artifactId>hamcrest-core</artifactId> + </exclusion> + </exclusions> + </dependency> </dependencies> <!-- <build> |