summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--aai-annotations/pom.xml2
-rw-r--r--aai-queries/pom.xml2
-rw-r--r--aai-schema-gen/pom.xml3
-rw-r--r--aai-schema-service/pom.xml6
-rw-r--r--aai-schema-service/src/main/resources/application.properties4
-rw-r--r--aai-schema-service/src/test/resources/application-test.properties4
-rw-r--r--aai-schema/pom.xml2
-rw-r--r--aai-schema/src/main/resources/onap/oxm/v19/aai_oxm_v19.xml2
-rw-r--r--pom.xml4
-rw-r--r--releases/1.6.0-maven-release.yaml4
-rw-r--r--releases/1.6.1-container-release.yaml7
-rw-r--r--releases/1.6.2-container-release.yaml8
-rw-r--r--releases/1.6.2-maven-release.yaml4
-rw-r--r--version.properties2
14 files changed, 38 insertions, 16 deletions
diff --git a/aai-annotations/pom.xml b/aai-annotations/pom.xml
index 2df2555..66e65c9 100644
--- a/aai-annotations/pom.xml
+++ b/aai-annotations/pom.xml
@@ -27,7 +27,7 @@
<parent>
<groupId>org.onap.aai.schema-service</groupId>
<artifactId>schema-service</artifactId>
- <version>1.6.1-SNAPSHOT</version>
+ <version>1.6.2-SNAPSHOT</version>
</parent>
<artifactId>aai-annotations</artifactId>
<name>aai-annotations</name>
diff --git a/aai-queries/pom.xml b/aai-queries/pom.xml
index cba7ab2..4ef2f75 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.6.1-SNAPSHOT</version>
+ <version>1.6.2-SNAPSHOT</version>
</parent>
<artifactId>aai-queries</artifactId>
<name>aai-queries</name>
diff --git a/aai-schema-gen/pom.xml b/aai-schema-gen/pom.xml
index 9f0fd66..a12c6d0 100644
--- a/aai-schema-gen/pom.xml
+++ b/aai-schema-gen/pom.xml
@@ -27,11 +27,10 @@
<parent>
<groupId>org.onap.aai.schema-service</groupId>
<artifactId>schema-service</artifactId>
- <version>1.6.1-SNAPSHOT</version>
+ <version>1.6.2-SNAPSHOT</version>
</parent>
<artifactId>aai-schema-gen</artifactId>
<name>aai-schema-gen</name>
- <version>1.6.1-SNAPSHOT</version>
<properties>
<onap.nexus.url>https://nexus.onap.org</onap.nexus.url>
<!-- Start of Default ONAP Schema Properties -->
diff --git a/aai-schema-service/pom.xml b/aai-schema-service/pom.xml
index 21f414e..63710de 100644
--- a/aai-schema-service/pom.xml
+++ b/aai-schema-service/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.onap.aai.schema-service</groupId>
<artifactId>schema-service</artifactId>
- <version>1.6.1-SNAPSHOT</version>
+ <version>1.6.2-SNAPSHOT</version>
</parent>
<groupId>org.onap.aai.schema-service</groupId>
<artifactId>aai-schema-service</artifactId>
@@ -81,8 +81,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>v16</schema.version.api.default>
- <schema.version.list>v10,v11,v12,v13,v14,v15,v16</schema.version.list>
+ <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.uri.base.path>/aai/schema-service</schema.uri.base.path>
<!-- End of Default ONAP Schema Properties -->
diff --git a/aai-schema-service/src/main/resources/application.properties b/aai-schema-service/src/main/resources/application.properties
index 0fbcfca..ea8934f 100644
--- a/aai-schema-service/src/main/resources/application.properties
+++ b/aai-schema-service/src/main/resources/application.properties
@@ -49,7 +49,7 @@ schema.ingest.file=${server.local.startpath}/application.properties
schema.uri.base.path=/aai/schema-service
# Lists all of the versions in the schema
-schema.version.list=v10,v11,v12,v13,v14,v15,v16
+schema.version.list=v10,v11,v12,v13,v14,v15,v16,v17,v18,v19
# 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,4 +62,4 @@ 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=v16
+schema.version.api.default=v19
diff --git a/aai-schema-service/src/test/resources/application-test.properties b/aai-schema-service/src/test/resources/application-test.properties
index 5f57a30..e80397f 100644
--- a/aai-schema-service/src/test/resources/application-test.properties
+++ b/aai-schema-service/src/test/resources/application-test.properties
@@ -40,7 +40,7 @@ schema.ingest.file=${server.local.startpath}/application.properties
# Schema Version Related Attributes
schema.uri.base.path=/aai/schema-service
# Lists all of the versions in the schema
-schema.version.list=v10,v11,v12,v13,v14,v15
+schema.version.list=v10,v11,v12,v13,v14,v15,v16,v17,v18,v19
# 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
@@ -53,4 +53,4 @@ 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=v15
+schema.version.api.default=v19
diff --git a/aai-schema/pom.xml b/aai-schema/pom.xml
index 39d5f6f..5b48579 100644
--- a/aai-schema/pom.xml
+++ b/aai-schema/pom.xml
@@ -27,7 +27,7 @@
<parent>
<groupId>org.onap.aai.schema-service</groupId>
<artifactId>schema-service</artifactId>
- <version>1.6.1-SNAPSHOT</version>
+ <version>1.6.2-SNAPSHOT</version>
</parent>
<artifactId>aai-schema</artifactId>
<name>aai-schema</name>
diff --git a/aai-schema/src/main/resources/onap/oxm/v19/aai_oxm_v19.xml b/aai-schema/src/main/resources/onap/oxm/v19/aai_oxm_v19.xml
index 4326ad4..17653bc 100644
--- a/aai-schema/src/main/resources/onap/oxm/v19/aai_oxm_v19.xml
+++ b/aai-schema/src/main/resources/onap/oxm/v19/aai_oxm_v19.xml
@@ -5423,12 +5423,12 @@
<xml-properties>
<xml-property name="description" value="Nf Role is the role performed by this instance in the network."/>
</xml-properties>
+ </xml-element>
<xml-element java-attribute="isAbstract" name="is-abstract" type="java.lang.Boolean">
<xml-properties>
<xml-property name="description" value="true, indicate abstract node"/>
</xml-properties>
</xml-element>
- </xml-element>
<xml-element java-attribute="adminStatus" name="admin-status" type="java.lang.String">
<xml-properties>
<xml-property name="description" value="admin Status of this PNF"/>
diff --git a/pom.xml b/pom.xml
index 19a3fdc..54a90f7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,11 +26,11 @@
<parent>
<groupId>org.onap.aai.aai-common</groupId>
<artifactId>aai-parent</artifactId>
- <version>1.6.1-SNAPSHOT</version>
+ <version>1.6.2-SNAPSHOT</version>
</parent>
<groupId>org.onap.aai.schema-service</groupId>
<artifactId>schema-service</artifactId>
- <version>1.6.1-SNAPSHOT</version>
+ <version>1.6.2-SNAPSHOT</version>
<name>aai-schema-service</name>
<packaging>pom</packaging>
<modules>
diff --git a/releases/1.6.0-maven-release.yaml b/releases/1.6.0-maven-release.yaml
new file mode 100644
index 0000000..47bae44
--- /dev/null
+++ b/releases/1.6.0-maven-release.yaml
@@ -0,0 +1,4 @@
+distribution_type: 'maven'
+version: '1.6.1'
+project: 'aai-schema-service'
+log_dir: 'aai-schema-service-maven-stage-master/208'
diff --git a/releases/1.6.1-container-release.yaml b/releases/1.6.1-container-release.yaml
new file mode 100644
index 0000000..df0980d
--- /dev/null
+++ b/releases/1.6.1-container-release.yaml
@@ -0,0 +1,7 @@
+distribution_type: container
+container_release_tag: 1.6.1
+project: aai/schema-service
+ref: 7c8d9e4024189e567556385ef6328d7fe64bc337
+containers:
+ - name: aai-schema-service
+ version: 1.6-STAGING-20200117T221407Z
diff --git a/releases/1.6.2-container-release.yaml b/releases/1.6.2-container-release.yaml
new file mode 100644
index 0000000..2581297
--- /dev/null
+++ b/releases/1.6.2-container-release.yaml
@@ -0,0 +1,8 @@
+distribution_type: container
+container_release_tag: 1.6.2
+project: aai/schema-service
+ref: 83ac45b4b0e17d0f70f56c7b2632450e6495ba37
+containers:
+ - name: aai-schema-service
+ version: 1.6-STAGING-20200122T182451Z
+
diff --git a/releases/1.6.2-maven-release.yaml b/releases/1.6.2-maven-release.yaml
new file mode 100644
index 0000000..2156253
--- /dev/null
+++ b/releases/1.6.2-maven-release.yaml
@@ -0,0 +1,4 @@
+distribution_type: 'maven'
+version: '1.6.2'
+project: 'aai-schema-service'
+log_dir: 'aai-schema-service-maven-stage-master/214'
diff --git a/version.properties b/version.properties
index 9d8a8b0..3d18baa 100644
--- a/version.properties
+++ b/version.properties
@@ -4,7 +4,7 @@
# because they are used in Jenkins, whose plug-in doesn't support
major_version=1
minor_version=6
-patch_version=1
+patch_version=2
base_version=${major_version}.${minor_version}.${patch_version}
# Release must be completed with GIT information # in Jenkins