Update resources to use v21

Issue-ID: AAI-3128
Change-Id: I66dfa71b4148024ea22b90b727a41e370af87ccd
Signed-off-by: Maharajh, Robby (rx2202) <rx2202@us.att.com>

diff --git a/pom.xml b/pom.xml
index b0c0823..6f746ca 100755 (executable)
--- a/pom.xml
+++ b/pom.xml
@@ -55,8 +55,8 @@
         <!-- 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.version>1.7.3</aai.schema.version>
-           <aai.common.version>1.7.0</aai.common.version>
+        <aai.schema.service.version>1.7.9</aai.schema.service.version>
+        <aai.common.version>1.7.0</aai.common.version>
         <aai.build.directory>${project.build.directory}/${project.artifactId}-${project.version}-build/
         </aai.build.directory>
         <aai.docker.namespace>onap</aai.docker.namespace>
@@ -98,8 +98,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>v19</schema.version.api.default>
-        <schema.version.list>v10,v11,v12,v13,v14,v15,v16,v17,v18,v19</schema.version.list>
+        <schema.version.api.default>v21</schema.version.api.default>
+        <schema.version.list>v10,v11,v12,v13,v14,v15,v16,v17,v18,v19,v20,v21</schema.version.list>
         <schema.uri.base.path>/aai</schema.uri.base.path>
         <!-- End of Default ONAP Schema Properties -->
     </properties>
@@ -147,7 +147,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</schema.version.list>
+                <schema.version.list>v10,v11,v12,v13,v14,v15,v16,v17,v18,v19,v20,v21</schema.version.list>
             </properties>
         </profile>
         <!-- End of ONAP Profile -->
@@ -662,7 +662,7 @@
                                     <artifactItem>
                                         <groupId>org.onap.aai.schema-service</groupId>
                                         <artifactId>aai-schema</artifactId>
-                                        <version>${aai.schema.version}</version>
+                                        <version>${aai.schema.service.version}</version>
                                         <outputDirectory>${project.basedir}/src/main/resources/schema/</outputDirectory>
                                         <includes>**/oxm/**/*.xml</includes>
                                     </artifactItem>
@@ -681,7 +681,7 @@
                                     <artifactItem>
                                         <groupId>org.onap.aai.schema-service</groupId>
                                         <artifactId>aai-schema</artifactId>
-                                        <version>${aai.schema.version}</version>
+                                        <version>${aai.schema.service.version}</version>
                                         <outputDirectory>${project.basedir}/src/main/resources/schema/</outputDirectory>
                                         <includes>**/dbedgerules/**/*.json</includes>
                                     </artifactItem>

diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index ba59da9..c7210c2 100644 (file)
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -49,7 +49,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
+schema.version.list=v10,v11,v12,v13,v14,v15,v16,v17,v18,v19,v20,v21
 # 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
@@ -62,7 +62,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=v19
+schema.version.api.default=v21
 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 7642399..b5ad7e5 100644 (file)
--- a/src/test/resources/application-test.properties
+++ b/src/test/resources/application-test.properties
@@ -50,7 +50,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
+schema.version.list=v10,v11,v12,v13,v14,v15,v16,v17,v18,v19,v20,v21
 # 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
@@ -63,7 +63,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=v17
+schema.version.api.default=v21
 schema.translator.list=config
 #schema.service.client=no-auth
 schema.service.base.url=http://localhost:8452/aai/schema-service/v1/