[AAI] Update resources to use the new v26 schema and upversion to 1.9.4

Issue-ID: AAI-3435
Signed-off-by: wr148d <wr148d@att.com>
Change-Id: Ic631a118869421f388ceb1405eaf9ba1c172d3b1

diff --git a/aai-resources/pom.xml b/aai-resources/pom.xml
index 48102ae..d3537ac 100644 (file)
--- a/aai-resources/pom.xml
+++ b/aai-resources/pom.xml
@@ -28,7 +28,7 @@
     <parent>
         <groupId>org.onap.aai.resources</groupId>
         <artifactId>resources</artifactId>
-        <version>1.9.3-SNAPSHOT</version>
+        <version>1.9.4-SNAPSHOT</version>
     </parent>
     <properties>
         <java.version>1.8</java.version>
@@ -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>v24</schema.version.api.default>
-        <schema.version.list>v10,v11,v12,v13,v14,v15,v16,v17,v18,v19,v20,v21,v22,v23,v24</schema.version.list>
+        <schema.version.api.default>v26</schema.version.api.default>
+        <schema.version.list>v10,v11,v12,v13,v14,v15,v16,v17,v18,v19,v20,v21,v22,v23,v24,v25,v26</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>
@@ -194,7 +194,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</schema.version.list>
+                <schema.version.list>v10,v11,v12,v13,v14,v15,v16,v17,v18,v19,v20,v21,v22,v23,v24,v25,v26</schema.version.list>
                 <schema.ingest.file>${project.basedir}/src/main/resources/application.properties</schema.ingest.file>
             </properties>
         </profile>

diff --git a/aai-resources/src/main/resources/application.properties b/aai-resources/src/main/resources/application.properties
index 60807ec..31169cd 100644 (file)
--- a/aai-resources/src/main/resources/application.properties
+++ b/aai-resources/src/main/resources/application.properties
@@ -63,7 +63,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
+schema.version.list=v10,v11,v12,v13,v14,v15,v16,v17,v18,v19,v20,v21,v22,v23,v24,v25,v26
 # 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
@@ -76,7 +76,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=v24
+schema.version.api.default=v26
 
 
 #schema.translator.list=schema-service

diff --git a/aai-resources/src/test/resources/it/application-keycloak-test.properties b/aai-resources/src/test/resources/it/application-keycloak-test.properties
index 2800c13..8529254 100644 (file)
--- a/aai-resources/src/test/resources/it/application-keycloak-test.properties
+++ b/aai-resources/src/test/resources/it/application-keycloak-test.properties
@@ -14,4 +14,4 @@ keycloak.bearer-only=true
 
 multi.tenancy.enabled=true
 spring.profiles.active=production,keycloak
-schema.version.list=v10,v11,v12,v13,v14,v15,v23
+schema.version.list=v10,v11,v12,v13,v14,v15,v23,v24,v25,v26

diff --git a/pom.xml b/pom.xml
index 2eec04d..d68a6bb 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -30,7 +30,7 @@
     </parent>
     <groupId>org.onap.aai.resources</groupId>
     <artifactId>resources</artifactId>
-    <version>1.9.3-SNAPSHOT</version>
+    <version>1.9.4-SNAPSHOT</version>
     <name>aai-resources</name>
     <packaging>pom</packaging>
     <modules>
@@ -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.9.2</aai.common.version>
-        <aai.schema.service.version>1.9.2</aai.schema.service.version>
+        <aai.schema.service.version>1.9.4</aai.schema.service.version>
     </properties>
     <build>
         <pluginManagement>

diff --git a/version.properties b/version.properties
index 91deacb..651460a 100644 (file)
--- a/version.properties
+++ b/version.properties
@@ -5,7 +5,7 @@
 
 major_version=1
 minor_version=9
-patch_version=3
+patch_version=4
 
 base_version=${major_version}.${minor_version}.${patch_version}