From f380fb4be2d314984e238908b8d1b623762aadb8 Mon Sep 17 00:00:00 2001
From: nandkishorpatke <nandkishor-laxman.patke@t-systems.com>
Date: Thu, 26 Oct 2023 17:40:11 +0530
Subject: [AAI] Remove v28 version and Add Schema changes for Cell and
 Neighbour in v27 version
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Facing issue while using latest aai-shema(1.11.2) version so reverting aai-schema maven version
- Remove v28 version due to issue in aai-resource component
- Added AAI Cell band and Neighbour objects relation-type attributes into v27 version

Issue-ID: AAI-3663
Change-Id: Ic5aaab474652ff96ed67b0af42adbae09f0e963f
Signed-off-by: nandkishorpatke <nandkishor-laxman.patke@t-systems.com>
---
 aai-queries/pom.xml                                        | 14 +++++++-------
 .../src/test/resources/application-onap-test.properties    |  4 ++--
 aai-queries/src/test/resources/application-test.properties |  4 ++--
 aai-queries/src/test/resources/schema-ingest.properties    |  4 ++--
 4 files changed, 13 insertions(+), 13 deletions(-)

(limited to 'aai-queries')

diff --git a/aai-queries/pom.xml b/aai-queries/pom.xml
index 053c919..2409469 100644
--- a/aai-queries/pom.xml
+++ b/aai-queries/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.onap.aai.schema-service</groupId>
         <artifactId>schema-service</artifactId>
-        <version>1.12.2-SNAPSHOT</version>
+        <version>1.12.1-SNAPSHOT</version>
     </parent>
     <artifactId>aai-queries</artifactId>
     <name>aai-queries</name>
@@ -35,7 +35,7 @@
         <onap.nexus.url>https://nexus.onap.org</onap.nexus.url>
         <!-- Start of Default ONAP Schema Properties -->
         <aai.wiki.link>https://wiki.onap.org/</aai.wiki.link>
-        <gendoc.version>v28</gendoc.version>
+        <gendoc.version>v15</gendoc.version>
         <aai.release>onap</aai.release>
         <schema.uri.base.path>/aai</schema.uri.base.path>
         <schema.xsd.maxoccurs>5000</schema.xsd.maxoccurs>
@@ -47,8 +47,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>v28</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</schema.version.list>
+        <schema.version.api.default>v27</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</schema.version.list>
         <!-- End of Default ONAP Schema Properties -->
     </properties>
     <profiles>
@@ -66,9 +66,9 @@
                 <schema.version.app.root.start>v11</schema.version.app.root.start>
                 <schema.version.edge.label.start>v12</schema.version.edge.label.start>
                 <schema.version.namespace.change.start>v12</schema.version.namespace.change.start>
-                <schema.version.api.default>v28</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</schema.version.list>
-                <gendoc.version>v28</gendoc.version>
+                <schema.version.api.default>v27</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</schema.version.list>
+                <gendoc.version>v15</gendoc.version>
             </properties>
         </profile>
         <!-- End of ONAP profile -->
diff --git a/aai-queries/src/test/resources/application-onap-test.properties b/aai-queries/src/test/resources/application-onap-test.properties
index 9876ccf..5340e63 100644
--- a/aai-queries/src/test/resources/application-onap-test.properties
+++ b/aai-queries/src/test/resources/application-onap-test.properties
@@ -16,7 +16,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,v15,v16,v17,v18,v19,v20,v21,v22,v23,v24,v25,v26,v27,v28
+schema.version.list=v10,v11,v12,v13,v14,v15,v16,v17,v18,v19,v20,v21,v22,v23,v24,v25,v26,v27
 # 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
@@ -29,5 +29,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=v28
+schema.version.api.default=v27
 schema.translator.list=config
diff --git a/aai-queries/src/test/resources/application-test.properties b/aai-queries/src/test/resources/application-test.properties
index 8f980b7..d270730 100644
--- a/aai-queries/src/test/resources/application-test.properties
+++ b/aai-queries/src/test/resources/application-test.properties
@@ -16,7 +16,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,v15,v16,v17,v18,v19,v20,v21,v22,v23,v24,v25,v26,v27,v28
+schema.version.list=v10,v11,v12,v13,v14,v15,v16,v17,v18,v19,v20,v21,v22,v23,v24,v25,v26,v27
 # 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
@@ -29,6 +29,6 @@ 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=v28
+schema.version.api.default=v27
 
 schema.translator.list=config
diff --git a/aai-queries/src/test/resources/schema-ingest.properties b/aai-queries/src/test/resources/schema-ingest.properties
index 7aa0608..3421de2 100644
--- a/aai-queries/src/test/resources/schema-ingest.properties
+++ b/aai-queries/src/test/resources/schema-ingest.properties
@@ -2,9 +2,9 @@ schema.configuration.location=N/A
 schema.nodes.location=src/main/resources/schema/oxm/
 schema.edges.location=src/main/resources/schema/dbedgerules/
 
-schema.version.list=v10,v11,v12,v13,v14,v15,v16,v17,v18,v19,v20,v21,v22,v23,v24,v25,v26,v27,v28
+schema.version.list=v10,v11,v12,v13,v14,v15,v16,v17,v18,v19,v20,v21,v22,v23,v24,v25,v26,v27
 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=v28
+schema.version.api.default=v27
-- 
cgit 1.2.3-korg