From: Fiete Ostkamp Date: Thu, 11 Jan 2024 10:36:27 +0000 (+0100) Subject: Update spring boot to 2.4 X-Git-Tag: 1.13.1~2 X-Git-Url: https://gerrit.onap.org/r/gitweb?p=aai%2Faai-common.git;a=commitdiff_plain;h=6ecaa012a9712c5579e80ed9096f4e89c1285bf7 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 --- diff --git a/aai-aaf-auth/pom.xml b/aai-aaf-auth/pom.xml index ef7d9568..18b58046 100644 --- a/aai-aaf-auth/pom.xml +++ b/aai-aaf-auth/pom.xml @@ -38,6 +38,10 @@ org.springframework spring-context + + org.springframework.boot + spring-boot-starter-web + org.springframework.boot spring-boot-starter-web @@ -56,5 +60,22 @@ commons-io commons-io + + junit + junit + test + + + + org.junit.vintage + junit-vintage-engine + test + + + org.hamcrest + hamcrest-core + + + diff --git a/aai-core/pom.xml b/aai-core/pom.xml index 4281629e..d210f4e0 100644 --- a/aai-core/pom.xml +++ b/aai-core/pom.xml @@ -38,7 +38,7 @@ limitations under the License. 0.50 3.2.2 2.5.15 - 2.4.0 + 3.4.0 https://wiki.onap.org/ v15 @@ -341,11 +341,6 @@ limitations under the License. spring-boot-test test - - org.powermock - powermock-module-javaagent - test - org.skyscreamer jsonassert diff --git a/aai-core/src/test/java/org/onap/aai/introspection/sideeffect/DataCopyTest.java b/aai-core/src/test/java/org/onap/aai/introspection/sideeffect/DataCopyTest.java index e83d3bd3..779139e7 100644 --- a/aai-core/src/test/java/org/onap/aai/introspection/sideeffect/DataCopyTest.java +++ b/aai-core/src/test/java/org/onap/aai/introspection/sideeffect/DataCopyTest.java @@ -123,7 +123,7 @@ public class DataCopyTest extends AAISetup { @Before public void initMock() { loader = loaderFactory.createLoaderForVersion(introspectorFactoryType, schemaVersions.getDefaultVersion()); - MockitoAnnotations.initMocks(this); + MockitoAnnotations.openMocks(this); dbEngine = new JanusGraphDBEngine(queryStyle, loader); } diff --git a/aai-core/src/test/java/org/onap/aai/introspection/sideeffect/DataLinkTest.java b/aai-core/src/test/java/org/onap/aai/introspection/sideeffect/DataLinkTest.java index 440d2797..2a68e53d 100644 --- a/aai-core/src/test/java/org/onap/aai/introspection/sideeffect/DataLinkTest.java +++ b/aai-core/src/test/java/org/onap/aai/introspection/sideeffect/DataLinkTest.java @@ -169,7 +169,7 @@ public class DataLinkTest extends DataLinkSetup { @Before public void initMock() { loader = loaderFactory.createLoaderForVersion(introspectorFactoryType, schemaVersions.getDefaultVersion()); - MockitoAnnotations.initMocks(this); + MockitoAnnotations.openMocks(this); dbEngine = new JanusGraphDBEngine(queryStyle, loader); } diff --git a/aai-core/src/test/java/org/onap/aai/introspection/sideeffect/OwnerCheckTest.java b/aai-core/src/test/java/org/onap/aai/introspection/sideeffect/OwnerCheckTest.java index a349f85e..7ca4e047 100644 --- a/aai-core/src/test/java/org/onap/aai/introspection/sideeffect/OwnerCheckTest.java +++ b/aai-core/src/test/java/org/onap/aai/introspection/sideeffect/OwnerCheckTest.java @@ -109,7 +109,7 @@ public class OwnerCheckTest extends AAISetup { @Before public void initMock() { loader = loaderFactory.createLoaderForVersion(introspectorFactoryType, schemaVersions.getDefaultVersion()); - MockitoAnnotations.initMocks(this); + MockitoAnnotations.openMocks(this); dbEngine = new JanusGraphDBEngine(queryStyle, loader); } diff --git a/aai-core/src/test/java/org/onap/aai/introspection/sideeffect/PrivateEdgeTest.java b/aai-core/src/test/java/org/onap/aai/introspection/sideeffect/PrivateEdgeTest.java index edace19d..d99b14e8 100644 --- a/aai-core/src/test/java/org/onap/aai/introspection/sideeffect/PrivateEdgeTest.java +++ b/aai-core/src/test/java/org/onap/aai/introspection/sideeffect/PrivateEdgeTest.java @@ -121,7 +121,7 @@ public class PrivateEdgeTest extends AAISetup { public void initMock() { Loader loader = loaderFactory.createLoaderForVersion(introspectorFactoryType, schemaVersions.getDefaultVersion()); - MockitoAnnotations.initMocks(this); + MockitoAnnotations.openMocks(this); dbEngine = new JanusGraphDBEngine(queryStyle, loader); } diff --git a/aai-core/src/test/java/org/onap/aai/serialization/queryformats/AggregateFormatTest.java b/aai-core/src/test/java/org/onap/aai/serialization/queryformats/AggregateFormatTest.java index 2b80fb14..f7a7fde1 100644 --- a/aai-core/src/test/java/org/onap/aai/serialization/queryformats/AggregateFormatTest.java +++ b/aai-core/src/test/java/org/onap/aai/serialization/queryformats/AggregateFormatTest.java @@ -77,7 +77,7 @@ public class AggregateFormatTest extends AAISetup { version = schemaVersions.getDefaultVersion(); - MockitoAnnotations.initMocks(this); + MockitoAnnotations.openMocks(this); graph = TinkerGraph.open(); diff --git a/aai-core/src/test/java/org/onap/aai/serialization/queryformats/CountQuerySupportTest.java b/aai-core/src/test/java/org/onap/aai/serialization/queryformats/CountQuerySupportTest.java index daf7d474..5c6ca4b5 100644 --- a/aai-core/src/test/java/org/onap/aai/serialization/queryformats/CountQuerySupportTest.java +++ b/aai-core/src/test/java/org/onap/aai/serialization/queryformats/CountQuerySupportTest.java @@ -80,7 +80,7 @@ public class CountQuerySupportTest extends AAISetup { public void setUp() throws Exception { version = schemaVersions.getDefaultVersion(); - MockitoAnnotations.initMocks(this); + MockitoAnnotations.openMocks(this); graph = TinkerGraph.open(); diff --git a/aai-core/src/test/java/org/onap/aai/serialization/queryformats/MultiFormatTest.java b/aai-core/src/test/java/org/onap/aai/serialization/queryformats/MultiFormatTest.java index 09a1d1b4..58fc0146 100644 --- a/aai-core/src/test/java/org/onap/aai/serialization/queryformats/MultiFormatTest.java +++ b/aai-core/src/test/java/org/onap/aai/serialization/queryformats/MultiFormatTest.java @@ -94,7 +94,7 @@ public class MultiFormatTest extends AAISetup { public void setUp() throws Exception { version = schemaVersions.getAppRootVersion(); - MockitoAnnotations.initMocks(this); + MockitoAnnotations.openMocks(this); graph = TinkerGraph.open(); diff --git a/aai-core/src/test/java/org/onap/aai/serialization/queryformats/PathedURLTest.java b/aai-core/src/test/java/org/onap/aai/serialization/queryformats/PathedURLTest.java index b38b20a8..6ed42539 100644 --- a/aai-core/src/test/java/org/onap/aai/serialization/queryformats/PathedURLTest.java +++ b/aai-core/src/test/java/org/onap/aai/serialization/queryformats/PathedURLTest.java @@ -80,7 +80,7 @@ public class PathedURLTest extends AAISetup { version = schemaVersions.getDefaultVersion(); - MockitoAnnotations.initMocks(this); + MockitoAnnotations.openMocks(this); graph = TinkerGraph.open(); diff --git a/aai-core/src/test/java/org/onap/aai/serialization/queryformats/RawFormatTest.java b/aai-core/src/test/java/org/onap/aai/serialization/queryformats/RawFormatTest.java index 232e80b3..217ccd4f 100644 --- a/aai-core/src/test/java/org/onap/aai/serialization/queryformats/RawFormatTest.java +++ b/aai-core/src/test/java/org/onap/aai/serialization/queryformats/RawFormatTest.java @@ -77,7 +77,7 @@ public class RawFormatTest extends AAISetup { version = schemaVersions.getDefaultVersion(); - MockitoAnnotations.initMocks(this); + MockitoAnnotations.openMocks(this); graph = TinkerGraph.open(); diff --git a/aai-core/src/test/java/org/onap/aai/serialization/queryformats/ResourceFormatTest.java b/aai-core/src/test/java/org/onap/aai/serialization/queryformats/ResourceFormatTest.java index e26c56e2..587d943f 100644 --- a/aai-core/src/test/java/org/onap/aai/serialization/queryformats/ResourceFormatTest.java +++ b/aai-core/src/test/java/org/onap/aai/serialization/queryformats/ResourceFormatTest.java @@ -72,7 +72,7 @@ public class ResourceFormatTest extends AAISetup { @Before public void setUp() throws Exception { - MockitoAnnotations.initMocks(this); + MockitoAnnotations.openMocks(this); graph = TinkerGraph.open(); diff --git a/aai-core/src/test/java/org/onap/aai/serialization/queryformats/ResourceWithSoTTest.java b/aai-core/src/test/java/org/onap/aai/serialization/queryformats/ResourceWithSoTTest.java index 2bb3971d..ac08ae2c 100644 --- a/aai-core/src/test/java/org/onap/aai/serialization/queryformats/ResourceWithSoTTest.java +++ b/aai-core/src/test/java/org/onap/aai/serialization/queryformats/ResourceWithSoTTest.java @@ -73,7 +73,7 @@ public class ResourceWithSoTTest extends AAISetup { public void setUp() throws Exception { version = schemaVersions.getDefaultVersion(); - MockitoAnnotations.initMocks(this); + MockitoAnnotations.openMocks(this); graph = TinkerGraph.open(); diff --git a/aai-core/src/test/java/org/onap/aai/serialization/queryformats/SimpleFormatTest.java b/aai-core/src/test/java/org/onap/aai/serialization/queryformats/SimpleFormatTest.java index 7634d22a..bfe41e1b 100644 --- a/aai-core/src/test/java/org/onap/aai/serialization/queryformats/SimpleFormatTest.java +++ b/aai-core/src/test/java/org/onap/aai/serialization/queryformats/SimpleFormatTest.java @@ -80,7 +80,7 @@ public class SimpleFormatTest extends AAISetup { @Before public void setUp() throws Exception { - MockitoAnnotations.initMocks(this); + MockitoAnnotations.openMocks(this); graph = TinkerGraph.open(); diff --git a/aai-core/src/test/java/org/onap/aai/serialization/queryformats/utils/QueryParamInjectorTest.java b/aai-core/src/test/java/org/onap/aai/serialization/queryformats/utils/QueryParamInjectorTest.java index 0ac12165..9b0639f1 100644 --- a/aai-core/src/test/java/org/onap/aai/serialization/queryformats/utils/QueryParamInjectorTest.java +++ b/aai-core/src/test/java/org/onap/aai/serialization/queryformats/utils/QueryParamInjectorTest.java @@ -47,7 +47,7 @@ public class QueryParamInjectorTest { @Test public void test() throws AAIException { - MockitoAnnotations.initMocks(this); + MockitoAnnotations.openMocks(this); QueryParamInjector injector = QueryParamInjector.getInstance(); MultivaluedMap params = new MultivaluedHashMap<>(); diff --git a/aai-core/src/test/java/org/onap/aai/serialization/queryformats/utils/UrlBuilderTest.java b/aai-core/src/test/java/org/onap/aai/serialization/queryformats/utils/UrlBuilderTest.java index 63671447..4174207f 100644 --- a/aai-core/src/test/java/org/onap/aai/serialization/queryformats/utils/UrlBuilderTest.java +++ b/aai-core/src/test/java/org/onap/aai/serialization/queryformats/utils/UrlBuilderTest.java @@ -52,7 +52,7 @@ public class UrlBuilderTest extends AAISetup { @Before public void before() throws UnsupportedEncodingException, URISyntaxException { - MockitoAnnotations.initMocks(this); + MockitoAnnotations.openMocks(this); when(serializer.getURIForVertex(any(Vertex.class))).thenReturn(new URI(uri)); when(v.id()).thenReturn(vId); } 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 @@ org.onap.logging-analytics logging-slf4j + + + org.powermock + powermock-module-junit4 + + javax.servlet @@ -88,11 +94,6 @@ slf4j-api provided - - junit - junit - test - org.mockito mockito-core @@ -140,6 +141,23 @@ spring-boot-starter-test test + + junit + junit + test + + + + org.junit.vintage + junit-vintage-engine + test + + + org.hamcrest + hamcrest-core + + + - 2.3.12.RELEASE - 5.2.12.RELEASE + 2.4.13 + 5.3.13 5.2.25.RELEASE ${spring.version} 2.2.0 @@ -104,12 +104,11 @@ limitations under the License. 1.2.7 1.7.25 2.17.1 - 1.10.19 - 1.10.19 + 3.4.0 + 3.4.0 4.1.63.Final 4.1.63.Final 3.1 - 1.6.6 3.1.1 0.9.10 1.29 @@ -134,7 +133,6 @@ limitations under the License. 1.0.8.RELEASE 1.1.1 - 2.0.4 1.9.1 1.5.1 @@ -178,7 +176,7 @@ limitations under the License. org.springframework spring-jms - ${spring.jms.version} + 5.3.31 @@ -375,33 +373,6 @@ limitations under the License. ${mockito.core.version} test - - org.powermock - powermock-module-junit4 - ${powermock.version} - - - - org.powermock - powermock-module-junit4-rule-agent - ${powermock.version} - - - - org.powermock - powermock-api-mockito2 - ${powermock.api.mockito2.version} - - - org.powermock - powermock-core - ${powermock.api.mockito2.version} - - - org.powermock - powermock-module-javaagent - ${powermock.version} - com.beust jcommander 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 @@ com.att.eelf eelf-core 1.0.1-oss + + + org.powermock + powermock-module-junit4 + + + org.powermock + powermock-api-mockito + + org.onap.aai.logging-service 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; diff --git a/aai-schema-ingest/pom.xml b/aai-schema-ingest/pom.xml index ad2f9fcc..7193ebd9 100644 --- a/aai-schema-ingest/pom.xml +++ b/aai-schema-ingest/pom.xml @@ -138,9 +138,21 @@ limitations under the License. junit test + + + org.junit.vintage + junit-vintage-engine + test + + + org.hamcrest + hamcrest-core + + + org.mockito - mockito-all + mockito-core test diff --git a/aai-utils/pom.xml b/aai-utils/pom.xml index 677c8061..a2ca8ca8 100644 --- a/aai-utils/pom.xml +++ b/aai-utils/pom.xml @@ -43,6 +43,16 @@ com.att.eelf eelf-core 1.0.1-oss + + + org.powermock + powermock-module-junit4 + + + org.powermock + powermock-api-mockito + + org.apache.httpcomponents