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

- 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: Ibda1609c07f5472b795a70c55b94a1da765b84db
Signed-off-by: vani.kv <vani.kv@accenture.com>

diff --git a/aai-traversal/pom.xml b/aai-traversal/pom.xml
index 4c644e0..d432d63 100644 (file)
--- 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.15.3-SNAPSHOT</version>
+               <version>1.15.4-SNAPSHOT</version>
        </parent>
        <groupId>org.onap.aai.traversal</groupId>
        <artifactId>aai-traversal</artifactId>
@@ -86,8 +86,8 @@
                <schema.version.app.root.start>v11</schema.version.app.root.start>
                <schema.version.namespace.change.start>v12</schema.version.namespace.change.start>
                <schema.version.edge.label.start>v12</schema.version.edge.label.start>
-               <schema.version.api.default>v29</schema.version.api.default>
-               <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>
+               <schema.version.api.default>v30</schema.version.api.default>
+               <schema.version.list>v10,v11,v12,v13,v14,v15,v16,v17,v18,v19,v20,v21,v22,v23,v24,v25,v26,v27,v28,v29,v30</schema.version.list>
                <schema.uri.base.path>/aai</schema.uri.base.path>
 
                <!-- versions -->
@@ -202,7 +202,7 @@
                        <properties>
                                <schema.source.name>onap</schema.source.name>
                                <schema.version.namespace.change.start>v12</schema.version.namespace.change.start>
-                               <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>
+                               <schema.version.list>v10,v11,v12,v13,v14,v15,v16,v17,v18,v19,v20,v21,v22,v23,v24,v25,v26,v27,v28,v29,v30</schema.version.list>
                        </properties>
                </profile>
                <!-- End of ONAP Profile -->

diff --git a/aai-traversal/src/main/resources/application.properties b/aai-traversal/src/main/resources/application.properties
index 22c2ebe..0416af4 100644 (file)
--- a/aai-traversal/src/main/resources/application.properties
+++ b/aai-traversal/src/main/resources/application.properties
@@ -62,7 +62,7 @@ server.ssl.key-store-password=password(OBF:1vn21ugu1saj1v9i1v941sar1ugw1vo0)
 server.ssl.trust-store=${server.certs.location}${server.truststore.name}
 server.ssl.trust-store-password=password(OBF:1vn21ugu1saj1v9i1v941sar1ugw1vo0)
 
-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,v15,v16,v17,v18,v19,v20,v21,v22,v23,v24,v25,v26,v27,v28,v29,v30
 # Specifies which component should the oxm be looking at
 schema.source.name=onap
 # End of Internal Specific Properties
@@ -103,7 +103,7 @@ schema.version.namespace.change.start=v12
 # Specifies from which version should the client start seeing the edge label in payload
 schema.version.edge.label.start=v12
 # Specifies the version that the application should default to
-schema.version.api.default=v29
+schema.version.api.default=v30
 
 schema.translator.list=config
 schema.service.base.url=https://localhost:8452/aai/schema-service/v1/

diff --git a/aai-traversal/src/test/resources/application-onap-test.properties b/aai-traversal/src/test/resources/application-onap-test.properties
index 809b9c3..9241af4 100644 (file)
--- a/aai-traversal/src/test/resources/application-onap-test.properties
+++ b/aai-traversal/src/test/resources/application-onap-test.properties
@@ -54,7 +54,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,v29
+schema.version.list=v10,v11,v12,v13,v14,v29,v30
 # 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
@@ -67,5 +67,5 @@ schema.version.namespace.change.start=v12
 # Specifies from which version should the client start seeing the edge label in payload
 schema.version.edge.label.start=v12
 # Specifies the version that the application should default to
-schema.version.api.default=v29
+schema.version.api.default=v30
 schema.translator.list=config

diff --git a/aai-traversal/src/test/resources/application-test.properties b/aai-traversal/src/test/resources/application-test.properties
index f018cb6..3fc66a4 100644 (file)
--- a/aai-traversal/src/test/resources/application-test.properties
+++ b/aai-traversal/src/test/resources/application-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,v14v27,v28,v29
+schema.version.list=v10,v11,v12,v13,v14v27,v28,v29,v30
 # 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
@@ -70,7 +70,7 @@ schema.version.namespace.change.start=v12
 # Specifies from which version should the client start seeing the edge label in payload
 schema.version.edge.label.start=v12
 # Specifies the version that the application should default to
-schema.version.api.default=v29
+schema.version.api.default=v30
 
 schema.translator.list=config
 

diff --git a/aai-traversal/src/test/resources/schema-ingest.properties b/aai-traversal/src/test/resources/schema-ingest.properties
index 6e3a8b9..ecca6d0 100644 (file)
--- a/aai-traversal/src/test/resources/schema-ingest.properties
+++ b/aai-traversal/src/test/resources/schema-ingest.properties
@@ -2,9 +2,9 @@ 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,v29
+schema.version.list=v10,v11,v12,v13,v14,v29,v30
 schema.version.depth.start=v10
 schema.version.related.link.start=v10
 schema.version.app.root.start=v11
 schema.version.edge.label.start=v12
-schema.version.api.default=v29
+schema.version.api.default=v30

diff --git a/pom.xml b/pom.xml
index 62eb1e8..bf82c6f 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -30,7 +30,7 @@
     </parent>
     <groupId>org.onap.aai.traversal</groupId>
     <artifactId>traversal</artifactId>
-    <version>1.15.3-SNAPSHOT</version>
+    <version>1.15.4-SNAPSHOT</version>
     <name>aai-traversal</name>
     <packaging>pom</packaging>
     <modules>
@@ -50,7 +50,7 @@
         <staging.path>/content/repositories/staging/</staging.path>
         <!-- GMaven plugin uses this property to figure out the name of the docker tag -->
         <aai.project.version>${project.version}</aai.project.version>
-        <aai.schema.service.version>1.12.6</aai.schema.service.version>
+        <aai.schema.service.version>1.12.7</aai.schema.service.version>
     </properties>
     <build>
         <pluginManagement>

diff --git a/version.properties b/version.properties
index 08fc17c..6129e4a 100644 (file)
--- a/version.properties
+++ b/version.properties
@@ -5,7 +5,7 @@
 
 major_version=1
 minor_version=15
-patch_version=3
+patch_version=4
 
 base_version=${major_version}.${minor_version}.${patch_version}