diff options
author | 2023-08-10 16:58:48 +0100 | |
---|---|---|
committer | 2023-08-14 10:01:07 +0100 | |
commit | c1794ff92134dab997a11b608d2fc5073a7c8b94 (patch) | |
tree | 4e2526d55b41c9b991011392bab807d8bd890f4b /model/src | |
parent | 48a6922f4ce17846ee9f6cd74253ed6be740a29b (diff) |
Java 17 Upgrade
Updated dependencies to latest versions
Made Java 17 changes
Moved all version numbers to main apex pom
Issue-ID: POLICY-4675
Change-Id: Ia0c17f17ef1e536bbfddd5f488ed9510a557842f
Signed-off-by: saul.gill <saul.gill@est.tech>
Diffstat (limited to 'model/src')
2 files changed, 6 insertions, 6 deletions
diff --git a/model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/ApexModelReaderTest.java b/model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/ApexModelReaderTest.java index 1152771ea..ae14702ef 100644 --- a/model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/ApexModelReaderTest.java +++ b/model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/ApexModelReaderTest.java @@ -1,7 +1,7 @@ /* * ============LICENSE_START======================================================= * Copyright (C) 2016-2018 Ericsson. All rights reserved. - * Modifications Copyright (C) 2020,2022 Nordix Foundation + * Modifications Copyright (C) 2020,2022-2023 Nordix Foundation * Modifications Copyright (C) 2021 AT&T Intellectual Property. All rights reserved. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); @@ -36,7 +36,7 @@ import java.io.FileReader; import java.io.IOException; import org.junit.Test; import org.junit.runner.RunWith; -import org.mockito.runners.MockitoJUnitRunner; +import org.mockito.junit.MockitoJUnitRunner; import org.onap.policy.apex.model.basicmodel.concepts.ApexException; import org.onap.policy.apex.model.basicmodel.concepts.AxModel; diff --git a/model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/ApexModelWriterTest.java b/model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/ApexModelWriterTest.java index 063855976..3d59652b7 100644 --- a/model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/ApexModelWriterTest.java +++ b/model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/ApexModelWriterTest.java @@ -1,7 +1,7 @@ /* * ============LICENSE_START======================================================= * Copyright (C) 2016-2018 Ericsson. All rights reserved. - * Modifications Copyright (C) 2020,2022 Nordix Foundation + * Modifications Copyright (C) 2020,2022-2023 Nordix Foundation * Modifications Copyright (C) 2021 AT&T Intellectual Property. All rights reserved. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); @@ -28,12 +28,12 @@ import static org.junit.Assert.assertTrue; import java.io.ByteArrayOutputStream; import java.io.IOException; import org.junit.Test; -import org.junit.runner.RunWith; -import org.mockito.runners.MockitoJUnitRunner; +import org.junit.jupiter.api.extension.ExtendWith; +import org.mockito.junit.jupiter.MockitoExtension; import org.onap.policy.apex.model.basicmodel.concepts.ApexException; import org.onap.policy.apex.model.basicmodel.concepts.AxModel; -@RunWith(MockitoJUnitRunner.class) +@ExtendWith(MockitoExtension.class) public class ApexModelWriterTest { @Test public void testModelWriter() throws IOException, ApexException { |