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>

2 files changed, 11 insertions, 1 deletions

diff --git a/aai-schema-abstraction/pom.xml b/aai-schema-abstraction/pom.xml
index 324d033c..91879d32 100644
--- a/aai-schema-abstraction/pom.xml
+++ b/aai-schema-abstraction/pom.xml
@@ -58,6 +58,16 @@
       <groupId>com.att.eelf</groupId>
       <artifactId>eelf-core</artifactId>
       <version>1.0.1-oss</version>
+      <exclusions>
+        <exclusion>
+          <groupId>org.powermock</groupId>
+          <artifactId>powermock-module-junit4</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.powermock</groupId>
+          <artifactId>powermock-api-mockito</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.onap.aai.logging-service</groupId>
diff --git a/aai-schema-abstraction/src/test/java/org/onap/aai/schemaif/oxm/OxmSchemaProviderTest.java b/aai-schema-abstraction/src/test/java/org/onap/aai/schemaif/oxm/OxmSchemaProviderTest.java
index 21ba985b..222be0e9 100644
--- a/aai-schema-abstraction/src/test/java/org/onap/aai/schemaif/oxm/OxmSchemaProviderTest.java
+++ b/aai-schema-abstraction/src/test/java/org/onap/aai/schemaif/oxm/OxmSchemaProviderTest.java
@@ -29,7 +29,7 @@ import java.util.Set;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 import org.onap.aai.schemaif.SchemaProviderException;
 import org.onap.aai.schemaif.definitions.EdgeSchema;
 import org.onap.aai.schemaif.definitions.PropertySchema;