diff options
| -rw-r--r-- | aai-traversal/pom.xml | 26 | ||||
| -rw-r--r-- | aai-traversal/src/test/java/org/onap/aai/it/multitenancy/MultiTenancyIT.java | 2 | ||||
| -rw-r--r-- | aai-traversal/src/test/java/org/onap/aai/rest/DslConsumerTest.java | 74 | ||||
| -rw-r--r-- | aai-traversal/src/test/resources/application-onap-test.properties | 2 | ||||
| -rw-r--r-- | aai-traversal/src/test/resources/application-test.properties | 6 | ||||
| -rw-r--r-- | aai-traversal/src/test/resources/schema-ingest.properties | 2 | ||||
| -rw-r--r-- | pom.xml | 6 | ||||
| -rw-r--r-- | version.properties | 2 |
8 files changed, 48 insertions, 72 deletions
diff --git a/aai-traversal/pom.xml b/aai-traversal/pom.xml index ea889ea..96337d5 100644 --- a/aai-traversal/pom.xml +++ b/aai-traversal/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>org.onap.aai.traversal</groupId> <artifactId>traversal</artifactId> - <version>1.14.6-SNAPSHOT</version> + <version>1.14.7-SNAPSHOT</version> </parent> <groupId>org.onap.aai.traversal</groupId> <artifactId>aai-traversal</artifactId> @@ -91,7 +91,6 @@ <schema.uri.base.path>/aai</schema.uri.base.path> <!-- versions --> - <spring.boot.version>2.4.13</spring.boot.version> <janusgraph.version>0.6.4</janusgraph.version> <gremlin.version>3.5.8</gremlin.version> @@ -298,23 +297,12 @@ <artifactId>spring-boot-starter-actuator</artifactId> </dependency> <dependency> - <groupId>org.springframework.boot</groupId> - <artifactId>spring-boot-starter-hateoas</artifactId> - </dependency> - <dependency> - <groupId>io.micrometer</groupId> - <artifactId>micrometer-core</artifactId> - <version>${micrometer.version}</version> - </dependency> - <dependency> <groupId>io.micrometer</groupId> <artifactId>micrometer-registry-prometheus</artifactId> - <version>${micrometer.version}</version> </dependency> <dependency> <groupId>io.micrometer</groupId> <artifactId>micrometer-jersey2</artifactId> - <version>${micrometer.version}</version> </dependency> <dependency> <groupId>javax.jms</groupId> @@ -464,14 +452,6 @@ <artifactId>jackson-dataformat-xml</artifactId> </dependency> <dependency> - <groupId>org.json</groupId> - <artifactId>json</artifactId> - </dependency> - <dependency> - <groupId>org.freemarker</groupId> - <artifactId>freemarker</artifactId> - </dependency> - <dependency> <groupId>org.eclipse.persistence</groupId> <artifactId>eclipselink</artifactId> </dependency> @@ -665,10 +645,6 @@ <artifactId>gremlin-groovy</artifactId> </dependency> <dependency> - <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-utils</artifactId> - </dependency> - <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-security</artifactId> </dependency> diff --git a/aai-traversal/src/test/java/org/onap/aai/it/multitenancy/MultiTenancyIT.java b/aai-traversal/src/test/java/org/onap/aai/it/multitenancy/MultiTenancyIT.java index 38490f8..18e7a52 100644 --- a/aai-traversal/src/test/java/org/onap/aai/it/multitenancy/MultiTenancyIT.java +++ b/aai-traversal/src/test/java/org/onap/aai/it/multitenancy/MultiTenancyIT.java @@ -102,7 +102,7 @@ public class MultiTenancyIT extends AbstractSpringRestTest { @Test public void testDslQueryWithDataOwner() throws Exception { baseUrl = "http://localhost:" + randomPort; - String endpoint = baseUrl + "/aai/v23/dsl?format=console"; + String endpoint = baseUrl + "/aai/v29/dsl?format=console"; List<Object> queryResults = null; ResponseEntity responseEntity = null; diff --git a/aai-traversal/src/test/java/org/onap/aai/rest/DslConsumerTest.java b/aai-traversal/src/test/java/org/onap/aai/rest/DslConsumerTest.java index ed4a6e6..9c38fd0 100644 --- a/aai-traversal/src/test/java/org/onap/aai/rest/DslConsumerTest.java +++ b/aai-traversal/src/test/java/org/onap/aai/rest/DslConsumerTest.java @@ -299,7 +299,7 @@ public class DslConsumerTest extends AbstractSpringRestTest { @Test public void testDslQueryV2Aggregate() throws Exception { - String endpoint = "/aai/v17/dsl?format=aggregate"; + String endpoint = "/aai/v29/dsl?format=aggregate"; Map<String, String> dslQueryMap = new HashMap<>(); dslQueryMap.put("dsl-query", "pserver*('hostname','test-pserver-dsl')"); String payload = PayloadUtil.getTemplatePayload("dsl-query.json", dslQueryMap); @@ -309,7 +309,7 @@ public class DslConsumerTest extends AbstractSpringRestTest { ResponseEntity<String> responseEntity = restTemplate.exchange(baseUrl + endpoint, HttpMethod.PUT, httpEntity, String.class); - assertNotNull("Response from /aai/v17/dsl is not null", responseEntity); + assertNotNull("Response from /aai/v29/dsl is not null", responseEntity); assertEquals("Expected the response to be 200", HttpStatus.OK, responseEntity.getStatusCode()); } @@ -388,7 +388,7 @@ public class DslConsumerTest extends AbstractSpringRestTest { dslQueryMap.put("dsl-query", "pserver{'hostname', 'ptnii-equip-name', 'in-maint'}('hostname','test-pserver-dsl')"); String payload = PayloadUtil.getTemplatePayload("dsl-query.json", dslQueryMap); - String endpoint = "/aai/v16/dsl?format=simple&depth=0&nodesOnly=true&as-tree=true"; + String endpoint = "/aai/v29/dsl?format=simple&depth=0&nodesOnly=true&as-tree=true"; // Add header with V2 to use the {} feature as a part of dsl query headers.add("X-DslApiVersion", "V2"); @@ -415,7 +415,7 @@ public class DslConsumerTest extends AbstractSpringRestTest { dslQueryMap.put("dsl-query", "pserver{'hostname', 'ptnii-equip-name', 'in-maint'}('hostname','test-pserver-dsl')"); String payload = PayloadUtil.getTemplatePayload("dsl-query.json", dslQueryMap); - String endpoint = "/aai/v16/dsl?format=simple&depth=0&nodesOnly=true"; + String endpoint = "/aai/v29/dsl?format=simple&depth=0&nodesOnly=true"; // Add header with V2 to use the {} feature as a part of dsl query headers.add("X-DslApiVersion", "V2"); @@ -443,7 +443,7 @@ public class DslConsumerTest extends AbstractSpringRestTest { dslQueryMap.put("dsl-query", "pserver{'hostname', 'ptnii-equip-name', 'in-maint'}('hostname','test-pserver-dsl')"); String payload = PayloadUtil.getTemplatePayload("dsl-query.json", dslQueryMap); - String endpoint = "/aai/v16/dsl?format=resource&depth=0&nodesOnly=true&as-tree=true"; + String endpoint = "/aai/v29/dsl?format=resource&depth=0&nodesOnly=true&as-tree=true"; // Add header with V2 to use the {} feature as a part of dsl query headers.add("X-DslApiVersion", "V2"); @@ -470,7 +470,7 @@ public class DslConsumerTest extends AbstractSpringRestTest { dslQueryMap.put("dsl-query", "pserver{'hostname', 'ptnii-equip-name', 'in-maint'}('hostname','test-pserver-dsl')"); String payload = PayloadUtil.getTemplatePayload("dsl-query.json", dslQueryMap); - String endpoint = "/aai/v16/dsl?format=resource&depth=0&nodesOnly=true"; + String endpoint = "/aai/v29/dsl?format=resource&depth=0&nodesOnly=true"; // Add header with V2 to use the {} feature as a part of dsl query headers.add("X-DslApiVersion", "V2"); @@ -498,7 +498,7 @@ public class DslConsumerTest extends AbstractSpringRestTest { "pserver{'hostname', 'ptnii-equip-name', 'in-maint'}('hostname','test-pserver-dsl')"); String payload = PayloadUtil.getTemplatePayload("dsl-query.json", dslQueryMap); String endpoint = - "/aai/v16/dsl?format=resource_and_url&depth=0&nodesOnly=true&as-tree=true"; + "/aai/v29/dsl?format=resource_and_url&depth=0&nodesOnly=true&as-tree=true"; // Add header with V2 to use the {} feature as a part of dsl query headers.add("X-DslApiVersion", "V2"); @@ -525,7 +525,7 @@ public class DslConsumerTest extends AbstractSpringRestTest { dslQueryMap.put("dsl-query", "pserver{'hostname', 'ptnii-equip-name', 'in-maint'}('hostname','test-pserver-dsl')"); String payload = PayloadUtil.getTemplatePayload("dsl-query.json", dslQueryMap); - String endpoint = "/aai/v16/dsl?format=resource_and_url&depth=0&nodesOnly=true"; + String endpoint = "/aai/v29/dsl?format=resource_and_url&depth=0&nodesOnly=true"; // Add header with V2 to use the {} feature as a part of dsl query headers.add("X-DslApiVersion", "V2"); @@ -552,7 +552,7 @@ public class DslConsumerTest extends AbstractSpringRestTest { dslQueryMap.put("dsl-query", "pserver{'hostname'}('hostname','test-pserver-dsl') > complex"); String payload = PayloadUtil.getTemplatePayload("dsl-query.json", dslQueryMap); - String endpoint = "/aai/v16/dsl?format=aggregate"; + String endpoint = "/aai/v29/dsl?format=aggregate"; // Add header with V2 to use the {} feature as a part of dsl query headers.add("X-DslApiVersion", "V2"); @@ -565,7 +565,7 @@ public class DslConsumerTest extends AbstractSpringRestTest { JsonArray resultsArray = results.get("results").getAsJsonArray(); JsonObject resultsValue = resultsArray.get(0).getAsJsonObject(); assertNull( - resultsValue.get("/aai/v16/cloud-infrastructure/complexes/complex/test-complex-dsl")); // assert + resultsValue.get("/aai/v29/cloud-infrastructure/complexes/complex/test-complex-dsl")); // assert // complex // is // not @@ -576,7 +576,7 @@ public class DslConsumerTest extends AbstractSpringRestTest { // not // selected JsonObject properties = - resultsValue.get("/aai/v16/cloud-infrastructure/pservers/pserver/test-pserver-dsl") + resultsValue.get("/aai/v29/cloud-infrastructure/pservers/pserver/test-pserver-dsl") .getAsJsonObject().get("properties").getAsJsonObject(); assertEquals(1, properties.size()); assertThat(properties.get("hostname").toString(), is("\"test-pserver-dsl\"")); // assert @@ -595,7 +595,7 @@ public class DslConsumerTest extends AbstractSpringRestTest { dslQueryMap.put("dsl-query", "pserver{'hostname'}('hostname','test-pserver-dsl') > complex*"); String payload = PayloadUtil.getTemplatePayload("dsl-query.json", dslQueryMap); - String endpoint = "/aai/v16/dsl?format=aggregate"; + String endpoint = "/aai/v29/dsl?format=aggregate"; // Add header with V2 to use the {} feature as a part of dsl query headers.add("X-DslApiVersion", "V2"); @@ -608,14 +608,14 @@ public class DslConsumerTest extends AbstractSpringRestTest { JsonArray resultsArray = results.get("results").getAsJsonArray(); JsonArray resultsValue = resultsArray.get(0).getAsJsonArray(); assertNotNull(resultsValue.get(1).getAsJsonObject() - .get("/aai/v16/cloud-infrastructure/complexes/complex/test-complex-dsl")); // assert + .get("/aai/v29/cloud-infrastructure/complexes/complex/test-complex-dsl")); // assert // complex is // returned // since it // is // selected JsonObject properties = resultsValue.get(0).getAsJsonObject() - .get("/aai/v16/cloud-infrastructure/pservers/pserver/test-pserver-dsl") + .get("/aai/v29/cloud-infrastructure/pservers/pserver/test-pserver-dsl") .getAsJsonObject().get("properties").getAsJsonObject(); assertEquals(1, properties.size()); assertThat(properties.get("hostname").toString(), is("\"test-pserver-dsl\"")); // verify @@ -628,7 +628,7 @@ public class DslConsumerTest extends AbstractSpringRestTest { assertNull(properties.get("in-maint")); // assert that in-maint is not returned in the // properties list JsonObject complexProperties = resultsValue.get(1).getAsJsonObject() - .get("/aai/v16/cloud-infrastructure/complexes/complex/test-complex-dsl") + .get("/aai/v29/cloud-infrastructure/complexes/complex/test-complex-dsl") .getAsJsonObject().get("properties").getAsJsonObject(); assertEquals(2, complexProperties.size()); // internal properties like source-of-truth, // node-type and aai-uri are not returned. @@ -640,7 +640,7 @@ public class DslConsumerTest extends AbstractSpringRestTest { Map<String, String> dslQueryMap = new HashMap<>(); dslQueryMap.put("dsl-query", "pserver*('hostname','test-pserver-dsl')"); String payload = PayloadUtil.getTemplatePayload("dsl-query.json", dslQueryMap); - String endpoint = "/aai/v16/dsl?format=aggregate"; + String endpoint = "/aai/v29/dsl?format=aggregate"; // Add header with V2 to use the {} feature as a part of dsl query headers.add("X-DslApiVersion", "V2"); @@ -652,7 +652,7 @@ public class DslConsumerTest extends AbstractSpringRestTest { JsonObject results = JsonParser.parseString(responseString).getAsJsonObject(); JsonArray resultsArray = results.get("results").getAsJsonArray(); JsonObject properties = resultsArray.get(0).getAsJsonObject() - .get("/aai/v16/cloud-infrastructure/pservers/pserver/test-pserver-dsl") + .get("/aai/v29/cloud-infrastructure/pservers/pserver/test-pserver-dsl") .getAsJsonObject().get("properties").getAsJsonObject(); assertEquals(2, properties.size()); assertThat(properties.get("hostname").toString(), is("\"test-pserver-dsl\"")); // verify @@ -673,7 +673,7 @@ public class DslConsumerTest extends AbstractSpringRestTest { dslQueryMap.put("dsl-query", "pserver*('hostname','test-pserver-dsl')(> complex)(> cloud-region)"); String payload = PayloadUtil.getTemplatePayload("dsl-query.json", dslQueryMap); - String endpoint = "/aai/v18/dsl?format=aggregate"; + String endpoint = "/aai/v29/dsl?format=aggregate"; // Add header with V2 to use the {} feature as a part of dsl query headers.add("X-DslApiVersion", "V2"); @@ -688,10 +688,10 @@ public class DslConsumerTest extends AbstractSpringRestTest { // test-pserver-dsl-03 since it does not have an edge // to cloud-region assertEquals(null, resultsArray.get(0).getAsJsonObject() - .get("/aai/v18/cloud-infrastructure/pservers/pserver/test-pserver-dsl-03")); // not + .get("/aai/v29/cloud-infrastructure/pservers/pserver/test-pserver-dsl-03")); // not // returned assertNotNull(resultsArray.get(0).getAsJsonObject() - .get("/aai/v18/cloud-infrastructure/pservers/pserver/test-pserver-dsl")); + .get("/aai/v29/cloud-infrastructure/pservers/pserver/test-pserver-dsl")); headers.remove("X-DslApiVersion"); } @@ -700,7 +700,7 @@ public class DslConsumerTest extends AbstractSpringRestTest { Map<String, String> dslQueryMap = new HashMap<>(); dslQueryMap.put("dsl-query", "pserver*('hostname')!(> complex)!(> cloud-region)"); String payload = PayloadUtil.getTemplatePayload("dsl-query.json", dslQueryMap); - String endpoint = "/aai/v18/dsl?format=aggregate"; + String endpoint = "/aai/v29/dsl?format=aggregate"; // Add header with V2 to use the {} feature as a part of dsl query headers.add("X-DslApiVersion", "V2"); @@ -713,10 +713,10 @@ public class DslConsumerTest extends AbstractSpringRestTest { JsonArray resultsArray = results.get("results").getAsJsonArray(); assertEquals(1, resultsArray.size()); // Returns only test-pserver-dsl-02 assertEquals(null, resultsArray.get(0).getAsJsonObject() - .get("/aai/v18/cloud-infrastructure/pservers/pserver/test-pserver-dsl")); // not + .get("/aai/v29/cloud-infrastructure/pservers/pserver/test-pserver-dsl")); // not // returned assertNotNull(resultsArray.get(0).getAsJsonObject() - .get("/aai/v18/cloud-infrastructure/pservers/pserver/test-pserver-dsl-02")); + .get("/aai/v29/cloud-infrastructure/pservers/pserver/test-pserver-dsl-02")); headers.remove("X-DslApiVersion"); } @@ -726,7 +726,7 @@ public class DslConsumerTest extends AbstractSpringRestTest { dslQueryMap.put("dsl-query", "pserver*('number-of-cpus','test')"); String payload = PayloadUtil.getTemplatePayload("dsl-query.json", dslQueryMap); - String endpoint = "/aai/v16/dsl?format=simple"; + String endpoint = "/aai/v29/dsl?format=simple"; httpEntity = new HttpEntity<String>(payload, headers); ResponseEntity<String> responseEntity = @@ -744,7 +744,7 @@ public class DslConsumerTest extends AbstractSpringRestTest { dslQueryMap.put("dsl-query", "[complex*('source-of-truth', 'JUNIT'), complex*('aai-uri', '/cloud-infrastructure/complexes/complex/test-complex-dsl')]"); String payload = PayloadUtil.getTemplatePayload("dsl-query.json", dslQueryMap); - String endpoint = "/aai/v16/dsl?format=resource"; + String endpoint = "/aai/v29/dsl?format=resource"; httpEntity = new HttpEntity<String>(payload, headers); ResponseEntity<String> responseEntity = @@ -766,7 +766,7 @@ public class DslConsumerTest extends AbstractSpringRestTest { dslQueryMap.put("dsl-query", "[pserver*('hostname','test-pserver-dsl'), complex*('physical-location-id', 'test-complex-dsl')]"); String payload = PayloadUtil.getTemplatePayload("dsl-query.json", dslQueryMap); - String endpoint = "/aai/v16/dsl?format=resource"; + String endpoint = "/aai/v29/dsl?format=resource"; httpEntity = new HttpEntity<String>(payload, headers); ResponseEntity<String> responseEntity = @@ -797,7 +797,7 @@ public class DslConsumerTest extends AbstractSpringRestTest { dslQueryMap.put("dsl-query", "[pserver*('hostname','test-pserver-dsl-02'), pserver*('hostname','test-pserver-dsl')>complex*, pnf('pnf-name','pnf-name-noResults')>lag-interface>l-interface] > complex*"); String payload = PayloadUtil.getTemplatePayload("dsl-query.json", dslQueryMap); - String endpoint = "/aai/v16/dsl?format=resource"; + String endpoint = "/aai/v29/dsl?format=resource"; httpEntity = new HttpEntity<String>(payload, headers); ResponseEntity<String> responseEntity = @@ -835,7 +835,7 @@ public class DslConsumerTest extends AbstractSpringRestTest { dslQueryMap.put("dsl-query", "[pnf*('pnf-name','test-pnf-name-01'),pserver(>cloud-region*('cloud-owner','test-cloud-owner-01'))]"); String payload = PayloadUtil.getTemplatePayload("dsl-query.json", dslQueryMap); - String endpoint = "/aai/v16/dsl?format=resource"; + String endpoint = "/aai/v29/dsl?format=resource"; httpEntity = new HttpEntity<String>(payload, headers); ResponseEntity<String> responseEntity = @@ -862,7 +862,7 @@ public class DslConsumerTest extends AbstractSpringRestTest { public void testDslQuery_IsAgnosticWithBooleanPropertyAsString_ReturnSuccessfulResponse() throws Exception { Map<String, String> dslQueryMap = new HashMap<>(); - String endpoint = "/aai/v19/dsl?format=resource&nodesOnly=true"; + String endpoint = "/aai/v29/dsl?format=resource&nodesOnly=true"; // With expected boolean value "false" as a boolean value (no quotes) dslQueryMap.put("dsl-query", @@ -896,7 +896,7 @@ public class DslConsumerTest extends AbstractSpringRestTest { public void testDslQuery_IsAgnosticWithWrongBooleanPropertyAsString_ReturnSuccessfulResponse() throws Exception { Map<String, String> dslQueryMap = new HashMap<>(); - String endpoint = "/aai/v19/dsl?format=resource&nodesOnly=true"; + String endpoint = "/aai/v29/dsl?format=resource&nodesOnly=true"; // all string values not boolean related default to false dslQueryMap.put("dsl-query", @@ -915,7 +915,7 @@ public class DslConsumerTest extends AbstractSpringRestTest { public void testDslQuery_IsAgnosticWithBooleanPropertyAsInteger0_ReturnSuccessfulResponse() throws Exception { Map<String, String> dslQueryMap = new HashMap<>(); - String endpoint = "/aai/v19/dsl?format=resource&nodesOnly=true"; + String endpoint = "/aai/v29/dsl?format=resource&nodesOnly=true"; // 0 is false, should return value dslQueryMap.put("dsl-query", @@ -934,7 +934,7 @@ public class DslConsumerTest extends AbstractSpringRestTest { public void testDslQuery_IsAgnosticWithBooleanPropertyAsInteger1_ReturnSuccessfulResponse() throws Exception { Map<String, String> dslQueryMap = new HashMap<>(); - String endpoint = "/aai/v19/dsl?format=resource&nodesOnly=true"; + String endpoint = "/aai/v29/dsl?format=resource&nodesOnly=true"; // 0 is false, should return value dslQueryMap.put("dsl-query", @@ -954,7 +954,7 @@ public class DslConsumerTest extends AbstractSpringRestTest { public void testDslQuery_IsAgnosticWithBooleanPropertyAsTrue_ReturnSuccessfulResponse() throws Exception { Map<String, String> dslQueryMap = new HashMap<>(); - String endpoint = "/aai/v19/dsl?format=resource&nodesOnly=true"; + String endpoint = "/aai/v29/dsl?format=resource&nodesOnly=true"; // 0 is false, should return value dslQueryMap.put("dsl-query", @@ -974,7 +974,7 @@ public class DslConsumerTest extends AbstractSpringRestTest { public void testDslQuery_IsAgnosticWithBooleanPropertyAsTrueString_ReturnSuccessfulResponse() throws Exception { Map<String, String> dslQueryMap = new HashMap<>(); - String endpoint = "/aai/v19/dsl?format=resource&nodesOnly=true"; + String endpoint = "/aai/v29/dsl?format=resource&nodesOnly=true"; // 0 is false, should return value dslQueryMap.put("dsl-query", @@ -994,7 +994,7 @@ public class DslConsumerTest extends AbstractSpringRestTest { public void testDslQuery_IsAgnosticWithIntegerPropertyAsString_ReturnSuccessfulResponse() throws Exception { Map<String, String> dslQueryMap = new HashMap<>(); - String endpoint = "/aai/v19/dsl?format=resource&nodesOnly=true"; + String endpoint = "/aai/v29/dsl?format=resource&nodesOnly=true"; // With expected boolean value "false" as a boolean value (no quotes) dslQueryMap.put("dsl-query", @@ -1028,7 +1028,7 @@ public class DslConsumerTest extends AbstractSpringRestTest { public void testDslQuery_IsAgnosticWithLongPropertyAsString_ReturnSuccessfulResponse() throws Exception { Map<String, String> dslQueryMap = new HashMap<>(); - String endpoint = "/aai/v19/dsl?format=resource&nodesOnly=true"; + String endpoint = "/aai/v29/dsl?format=resource&nodesOnly=true"; // With expected boolean value "false" as a boolean value (no quotes) dslQueryMap.put("dsl-query", @@ -1061,7 +1061,7 @@ public class DslConsumerTest extends AbstractSpringRestTest { public void testDslQuery_IsAgnosticWithPrimitivePropertiesInList_ReturnSuccessfulResponse() throws Exception { Map<String, String> dslQueryMap = new HashMap<>(); - String endpoint = "/aai/v19/dsl?format=resource&nodesOnly=true"; + String endpoint = "/aai/v29/dsl?format=resource&nodesOnly=true"; // With expected boolean value "false" as a boolean value (no quotes) dslQueryMap.put("dsl-query", diff --git a/aai-traversal/src/test/resources/application-onap-test.properties b/aai-traversal/src/test/resources/application-onap-test.properties index 5340d17..862e7e2 100644 --- a/aai-traversal/src/test/resources/application-onap-test.properties +++ b/aai-traversal/src/test/resources/application-onap-test.properties @@ -57,7 +57,7 @@ schema.ingest.file=${server.local.startpath}/application-test.properties # Schema Version Related Attributes schema.uri.base.path=/aai # Lists all of the versions in the schema -schema.version.list=v10,v11,v12,v13,v14,v15,v16,v17,v18,v19,v20,v21,v22,v23,v24,v25,v26,v27,v28,v29 +schema.version.list=v10,v11,v12,v13,v14,v29 # Specifies from which version should the depth parameter to default to zero schema.version.depth.start=v10 # Specifies from which version should the related link be displayed in response payload diff --git a/aai-traversal/src/test/resources/application-test.properties b/aai-traversal/src/test/resources/application-test.properties index d4e0378..b4a9352 100644 --- a/aai-traversal/src/test/resources/application-test.properties +++ b/aai-traversal/src/test/resources/application-test.properties @@ -37,7 +37,7 @@ server.local.startpath=src/main/resources server.basic.auth.location=${server.local.startpath}/etc/auth/realm.properties server.port=8446 -security.require-ssl=false +security.require-ssl=false server.ssl.enabled=false #server.ssl.enabled-protocols=TLSv1.1,TLSv1.2 #server.ssl.key-store=${server.local.startpath}/etc/auth/aai_keystore @@ -66,7 +66,7 @@ schema.ingest.file=${server.local.startpath}/application-test.properties # Schema Version Related Attributes schema.uri.base.path=/aai # Lists all of the versions in the schema -schema.version.list=v10,v11,v12,v13,v14,v15,v16,v17,v18,v19,v20,v21,v22,v23,v24,v25,v26,v27,v28,v29 +schema.version.list=v10,v11,v12,v13,v14v27,v28,v29 # Specifies from which version should the depth parameter to default to zero schema.version.depth.start=v10 # Specifies from which version should the related link be displayed in response payload @@ -88,4 +88,4 @@ management.server.port=0 management.endpoints.enabled-by-default=true management.endpoints.web.exposure.include=info, health, prometheus management.metrics.web.server.request.autotime.enabled=false -scrape.uri.metrics=true
\ No newline at end of file +scrape.uri.metrics=true diff --git a/aai-traversal/src/test/resources/schema-ingest.properties b/aai-traversal/src/test/resources/schema-ingest.properties index eeec1ac..6e3a8b9 100644 --- a/aai-traversal/src/test/resources/schema-ingest.properties +++ b/aai-traversal/src/test/resources/schema-ingest.properties @@ -2,7 +2,7 @@ schema.configuration.location=N/A schema.nodes.location=src/main/resources/etc/oxm/ schema.edges.location=src/main/resources/etc/dbedgerules/ -schema.version.list=v10,v11,v12,v13,v14,v15,v16,v17,v18,v19,v20,v21,v22,v23,v24,v25,v26,v27,v28,v29 +schema.version.list=v10,v11,v12,v13,v14,v29 schema.version.depth.start=v10 schema.version.related.link.start=v10 schema.version.app.root.start=v11 @@ -26,11 +26,11 @@ <parent> <groupId>org.onap.aai.aai-common</groupId> <artifactId>aai-parent</artifactId> - <version>1.14.5</version> + <version>1.14.6</version> </parent> <groupId>org.onap.aai.traversal</groupId> <artifactId>traversal</artifactId> - <version>1.14.6-SNAPSHOT</version> + <version>1.14.7-SNAPSHOT</version> <name>aai-traversal</name> <packaging>pom</packaging> <modules> @@ -41,7 +41,7 @@ Nexus Proxy Properties and Snapshot Locations Ideally this can be overwritten at runtime per internal environment specific values at runtime --> - <aai.common.version>1.14.5</aai.common.version> + <aai.common.version>1.14.6</aai.common.version> <nexusproxy>https://nexus.onap.org</nexusproxy> <site.path>/content/sites/site/org/onap/aai/traversal/${project.artifactId}/${project.version}</site.path> <release.path>/content/repositories/releases/</release.path> diff --git a/version.properties b/version.properties index cae43c2..e8f490e 100644 --- a/version.properties +++ b/version.properties @@ -5,7 +5,7 @@ major_version=1 minor_version=14 -patch_version=6 +patch_version=7 base_version=${major_version}.${minor_version}.${patch_version} |