update schema service version 1.13.3 and upgrade to v31

- Updated schema service dependency version 1.13.3
- Applied v31 schema updates to AAI graphadmin
- Bump up aai-graphadmin to 1.16.2

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

diff --git a/pom.xml b/pom.xml
index 036a968..72b506b 100755 (executable)
--- a/pom.xml
+++ b/pom.xml
@@ -30,7 +30,7 @@
     </parent>
     <groupId>org.onap.aai.graphadmin</groupId>
     <artifactId>aai-graphadmin</artifactId>
-    <version>1.16.1-SNAPSHOT</version>
+    <version>1.16.2-SNAPSHOT</version>
 
     <properties>
         <maven.compiler.release>17</maven.compiler.release>
@@ -55,7 +55,7 @@
         <!-- This value should be overwritten at runtime to wherever need to be pushed to -->
         <docker.push.registry>localhost:5000</docker.push.registry>
         <aai.docker.version>1.0.0</aai.docker.version>
-        <aai.schema.service.version>1.12.7</aai.schema.service.version>
+        <aai.schema.service.version>1.13.3-SNAPSHOT</aai.schema.service.version>
         <aai.common.version>1.16.1</aai.common.version>
         <aai.build.directory>${project.build.directory}/${project.artifactId}-${project.version}-build/
         </aai.build.directory>
@@ -93,8 +93,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>
         <!-- End of Default ONAP Schema Properties -->
 
@@ -155,7 +155,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/src/main/resources/application.properties b/src/main/resources/application.properties
index c94b6e4..f488c70 100644 (file)
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -46,7 +46,7 @@ schema.ingest.file=${server.local.startpath}/application.properties
 
 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,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 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
@@ -59,7 +59,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.client=no-auth
 schema.service.base.url=https://localhost:8452/aai/schema-service/v1/

diff --git a/src/test/resources/application-test.properties b/src/test/resources/application-test.properties
index 40a4156..25a941c 100644 (file)
--- a/src/test/resources/application-test.properties
+++ b/src/test/resources/application-test.properties
@@ -48,7 +48,7 @@ schema.ingest.file=${server.local.startpath}/application.properties
 
 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,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 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
@@ -61,7 +61,7 @@ schema.version.namespace.change.start=v11
 # 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.client=no-auth
 schema.service.base.url=http://localhost:8452/aai/schema-service/v1/

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}