summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobby Maharajh <rx2202@us.att.com>2022-02-14 20:38:13 +0000
committerGerrit Code Review <gerrit@onap.org>2022-02-14 20:38:13 +0000
commita5b2e909099d5a4654e15ec2b0eeb9ba98a376b5 (patch)
tree7353916237a716d73c4f627548ac5b186e83aa05
parent5671240a21aa412f7b57c5e35ae6ab532703d20e (diff)
parent0fc2a03889ab772fc96c87276c4edd8d1beedf06 (diff)
Merge "[AAI] Update graphadmin to use the new v26 schema and upversion to 1.9.3"
-rwxr-xr-xpom.xml10
-rw-r--r--src/main/resources/application.properties4
-rw-r--r--src/test/resources/application-test.properties4
-rw-r--r--version.properties2
4 files changed, 10 insertions, 10 deletions
diff --git a/pom.xml b/pom.xml
index 13700ca..aec9fa0 100755
--- a/pom.xml
+++ b/pom.xml
@@ -30,7 +30,7 @@
</parent>
<groupId>org.onap.aai.graphadmin</groupId>
<artifactId>aai-graphadmin</artifactId>
- <version>1.9.2-SNAPSHOT</version>
+ <version>1.9.3-SNAPSHOT</version>
<properties>
@@ -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.9.0</aai.schema.service.version>
+ <aai.schema.service.version>1.9.4</aai.schema.service.version>
<aai.common.version>1.9.2</aai.common.version>
<aai.build.directory>${project.build.directory}/${project.artifactId}-${project.version}-build/
</aai.build.directory>
@@ -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>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>
<!-- End of Default ONAP Schema Properties -->
@@ -154,7 +154,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</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>
</properties>
</profile>
<!-- End of ONAP Profile -->
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index 89f8bf7..39e7064 100644
--- 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,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
@@ -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=v24
+schema.version.api.default=v26
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 5ac9491..537dbf4 100644
--- 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,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
@@ -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=v24
+schema.version.api.default=v26
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 8c30688..91deacb 100644
--- a/version.properties
+++ b/version.properties
@@ -5,7 +5,7 @@
major_version=1
minor_version=9
-patch_version=2
+patch_version=3
base_version=${major_version}.${minor_version}.${patch_version}