update schema service version and upgrade to v31

- Updated schema service dependency version 1.13.3
- Applied v31 schema updates to AAI traversal

Issue-ID: AAI-4207
Change-Id: I970baa2e2eb12c6d3b487f806d892969e8adfc87
Signed-off-by: akshay.khairnar@t-systems.com <akshay.khairnar@t-systems.com>

diff --git a/aai-traversal/pom.xml b/aai-traversal/pom.xml
index 80a823b..11246ff 100644 (file)
--- a/aai-traversal/pom.xml
+++ b/aai-traversal/pom.xml
@@ -84,8 +84,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>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.version.api.default>v31</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,v31</schema.version.list>
                <schema.uri.base.path>/aai</schema.uri.base.path>
 
                <!-- versions -->
@@ -196,7 +196,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,v30</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,v31</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 7d624b5..55f2ddd 100644 (file)
--- a/aai-traversal/src/main/resources/application.properties
+++ b/aai-traversal/src/main/resources/application.properties
@@ -42,7 +42,7 @@ server.port=8446
 # Switch to one-way-ssl
 spring.profiles.active=production,one-way-ssl
 
-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=v10,v11,v12,v13,v14,v15,v16,v17,v18,v19,v20,v21,v22,v23,v24,v25,v26,v27,v28,v29,v30,v31
 # Specifies which component should the oxm be looking at
 schema.source.name=onap
 # End of Internal Specific Properties
@@ -83,7 +83,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=v30
+schema.version.api.default=v31
 
 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 05be0c7..ddff3e3 100644 (file)
--- a/aai-traversal/src/test/resources/application-onap-test.properties
+++ b/aai-traversal/src/test/resources/application-onap-test.properties
@@ -47,7 +47,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,v30
+schema.version.list=v10,v11,v12,v13,v14,v29,v30,v31
 # 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
@@ -60,5 +60,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=v30
+schema.version.api.default=v31
 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 0c4d701..81bb746 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,v30
+schema.version.list=v10,v11,v12,v13,v14v27,v28,v29,v30,v31
 # 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=v30
+schema.version.api.default=v31
 
 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 ecca6d0..fa6d1f5 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,v30
+schema.version.list=v10,v11,v12,v13,v14,v29,v30,v31
 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=v30
+schema.version.api.default=v31

diff --git a/pom.xml b/pom.xml
index 29be2d5..6ea6b90 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -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.13.1-SNAPSHOT</aai.schema.service.version>
+        <aai.schema.service.version>1.13.3-SNAPSHOT</aai.schema.service.version>
     </properties>
     <build>
         <pluginManagement>

diff --git a/version.properties b/version.properties
index 02346c5..7c25a91 100644 (file)
--- a/version.properties
+++ b/version.properties
@@ -5,7 +5,7 @@
 
 major_version=1
 minor_version=16
-patch_version=1
+patch_version=2
 
 base_version=${major_version}.${minor_version}.${patch_version}