Update resources to use v21

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

diff --git a/aai-resources/pom.xml b/aai-resources/pom.xml
index 7f13dd1..603c1b1 100644 (file)
--- a/aai-resources/pom.xml
+++ b/aai-resources/pom.xml
@@ -70,8 +70,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>v20</schema.version.api.default>
-        <schema.version.list>v10,v11,v12,v13,v14,v15,v16,v17,v18,v19,v20</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>
         <!-- <schema.translator.list>config</schema.translator.list> -->
         <schema.ingest.file>${project.basedir}/src/main/resources/application.properties</schema.ingest.file>
@@ -186,7 +186,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</schema.version.list>
+                <schema.version.list>v10,v11,v12,v13,v14,v15,v16,v17,v18,v19,v20,v21</schema.version.list>
                 <schema.ingest.file>${project.basedir}/src/main/resources/application.properties</schema.ingest.file>
             </properties>
         </profile>
@@ -738,6 +738,7 @@
                                         <artifactId>aai-schema</artifactId>
                                         <outputDirectory>${project.basedir}/src/main/resources/schema/</outputDirectory>
                                         <includes>**/oxm/**/*.xml</includes>
+                                        <version>${aai.schema.service.version}</version>
                                     </artifactItem>
                                 </artifactItems>
                                 <!-- other configurations here -->
@@ -756,6 +757,7 @@
                                         <artifactId>aai-schema</artifactId>
                                         <outputDirectory>${project.basedir}/src/main/resources/schema/</outputDirectory>
                                         <includes>**/dbedgerules/**/*.json</includes>
+                                        <version>${aai.schema.service.version}</version>
                                     </artifactItem>
                                 </artifactItems>
                                 <!-- other configurations here -->

diff --git a/aai-resources/src/main/resources/application.properties b/aai-resources/src/main/resources/application.properties
index 86bc0d5..6852607 100644 (file)
--- a/aai-resources/src/main/resources/application.properties
+++ b/aai-resources/src/main/resources/application.properties
@@ -62,7 +62,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
@@ -75,7 +75,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=schema-service

diff --git a/pom.xml b/pom.xml
index ca38d92..c12bf88 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -49,7 +49,7 @@
         <!-- GMaven plugin uses this property to figure out the name of the docker tag -->
         <aai.project.version>${project.version}</aai.project.version>
         <aai.common.version>1.7.0</aai.common.version>
-        <aai.schema.service.version>1.7.3</aai.schema.service.version>
+        <aai.schema.service.version>1.7.8</aai.schema.service.version>
     </properties>
     <build>
         <pluginManagement>