[AAI] Update aai-schema version to 1.12.7 in ResourcesHEADmaster

- Bump aai-schema pom version to 1.12.7
- Update aai-schema default version to v30
- Increase version to 1.15.4-SNAPSHOT

Issue-ID: AAI-4075
Change-Id: I29df327fdb8e4c7b4b2745b55fc0494102f9127b
Signed-off-by: vani.kv <vani.kv@accenture.com>

3 files changed, 7 insertions, 7 deletions

diff --git a/aai-resources/src/test/java/org/onap/aai/it/performance/K6ReadTest.java b/aai-resources/src/test/java/org/onap/aai/it/performance/K6ReadTest.java
index f176ccc..6d7a393 100644
--- a/aai-resources/src/test/java/org/onap/aai/it/performance/K6ReadTest.java
+++ b/aai-resources/src/test/java/org/onap/aai/it/performance/K6ReadTest.java
@@ -89,7 +89,7 @@ public class K6ReadTest {
         .withAccessToHost(true)
         .withTestScript(MountableFile.forClasspathResource("k6/readWithoutRelations.js"))
         .withScriptVar("API_PORT", String.valueOf(port))
-        .withScriptVar("API_VERSION", "v29")
+        .withScriptVar("API_VERSION", "v30")
         .withScriptVar("DURATION_SECONDS", String.valueOf(testDuration))
         .withScriptVar("N_PSERVERS", String.valueOf(nPservers))
         .withCmdOptions("--quiet", "--no-usage-report");
@@ -130,7 +130,7 @@ public class K6ReadTest {
         .withAccessToHost(true)
         .withTestScript(MountableFile.forClasspathResource("k6/writeWithoutRelations.js"))
         .withScriptVar("API_PORT", String.valueOf(port))
-        .withScriptVar("API_VERSION", "v29")
+        .withScriptVar("API_VERSION", "v30")
         .withScriptVar("DURATION_SECONDS", String.valueOf(testDuration))
         .withScriptVar("N_PSERVERS", String.valueOf(nPservers))
         .withCmdOptions("--quiet", "--no-usage-report");
diff --git a/aai-resources/src/test/java/org/onap/aai/rest/ModelDistributionTest.java b/aai-resources/src/test/java/org/onap/aai/rest/ModelDistributionTest.java
index 1ba8652..a0a55e3 100644
--- a/aai-resources/src/test/java/org/onap/aai/rest/ModelDistributionTest.java
+++ b/aai-resources/src/test/java/org/onap/aai/rest/ModelDistributionTest.java
@@ -64,7 +64,7 @@ public class ModelDistributionTest {
     @Test
     @Order(1)
     public void thatModelsCanBeDistributed() throws Exception {
-        String uri = "/aai/v29/service-design-and-creation/models/model/d821d1aa-8a69-47a4-aa63-3dae1742c47c";
+        String uri = "/aai/v30/service-design-and-creation/models/model/d821d1aa-8a69-47a4-aa63-3dae1742c47c";
 
         webClient.get()
                 .uri(uri)
@@ -117,7 +117,7 @@ public class ModelDistributionTest {
         final String UPDATE_MODEL_FILE = "src/test/resources/payloads/models/model-version.xml";
         String modelInvariantId = "d821d1aa-8a69-47a4-aa63-3dae1742c47c";
         String modelVersionId = "8b713350-90fc-44b1-8c6e-a2b3973aa9d3";
-        String modelUri = "/aai/v29/service-design-and-creation/models/model/" + modelInvariantId;
+        String modelUri = "/aai/v30/service-design-and-creation/models/model/" + modelInvariantId;
         String modelVersionUri = modelUri + "/model-vers/model-ver/" + modelVersionId;
         webClient.get()
                 .uri(modelUri)
diff --git a/aai-resources/src/test/java/org/onap/aai/rest/resources/ResourcesControllerTest.java b/aai-resources/src/test/java/org/onap/aai/rest/resources/ResourcesControllerTest.java
index a724b51..da7c064 100644
--- a/aai-resources/src/test/java/org/onap/aai/rest/resources/ResourcesControllerTest.java
+++ b/aai-resources/src/test/java/org/onap/aai/rest/resources/ResourcesControllerTest.java
@@ -358,7 +358,7 @@ public class ResourcesControllerTest {
         assertEquals("Error writing output performing %1 on %2 (msg=%3) (ec=%4)", serviceException.getText());
         List<String> expected = List.of(
             "PUT",
-            "v29/cloud-infrastructure/pservers/pserver/hostname/related-to/fsdf",
+            "v30/cloud-infrastructure/pservers/pserver/hostname/related-to/fsdf",
             "Cannot write via this URL",
             "ERR.5.6.3010");
         assertIterableEquals(expected, serviceException.getVariables());
@@ -377,7 +377,7 @@ public class ResourcesControllerTest {
         serviceException = errorResponse.getRequestError().getServiceException();
         expected = List.of(
             "PUT",
-            "v29/cloud-infrastructure/pservers/pserver/hostname/related-to/fsdf/relationship-list/relationship",
+            "v30/cloud-infrastructure/pservers/pserver/hostname/related-to/fsdf/relationship-list/relationship",
             "Cannot write via this URL",
             "ERR.5.6.3010");
         assertIterableEquals(expected, serviceException.getVariables());
@@ -483,7 +483,7 @@ public class ResourcesControllerTest {
         assertEquals("Error parsing input performing %1 on %2 (msg=%3) (ec=%4)", policyException.getText());
         List<String> expected = List.of(
             "DELETE",
-            "v29/cloud-infrastructure/pservers/pserver/testData/relationship-list/relationship",
+            "v30/cloud-infrastructure/pservers/pserver/testData/relationship-list/relationship",
             "Error parsing input performing %1 on %2:You must supply a relationship",
             "ERR.5.1.3102");
         assertIterableEquals(expected, policyException.getVariables());