Merge "[AAI] Update schema service to be on v26 by default and upversion to 1.9.4"

10 files changed, 26 insertions, 16 deletions

diff --git a/aai-annotations/pom.xml b/aai-annotations/pom.xml
index e23e41a..7c2253c 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.9.3-SNAPSHOT</version>
+        <version>1.9.4-SNAPSHOT</version>
     </parent>
     <artifactId>aai-annotations</artifactId>
     <name>aai-annotations</name>
diff --git a/aai-queries/pom.xml b/aai-queries/pom.xml
index cf54fae..255891e 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.9.3-SNAPSHOT</version>
+        <version>1.9.4-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 b85a992..122abb0 100644
--- a/aai-schema-gen/pom.xml
+++ b/aai-schema-gen/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.onap.aai.schema-service</groupId>
         <artifactId>schema-service</artifactId>
-        <version>1.9.3-SNAPSHOT</version>
+        <version>1.9.4-SNAPSHOT</version>
     </parent>
     <artifactId>aai-schema-gen</artifactId>
     <name>aai-schema-gen</name>
@@ -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>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>
 
         <!-- End of Default ONAP Schema Properties -->
     </properties>
diff --git a/aai-schema-service/pom.xml b/aai-schema-service/pom.xml
index 0d831fc..3c08ce3 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.9.3-SNAPSHOT</version>
+        <version>1.9.4-SNAPSHOT</version>
     </parent>
     <groupId>org.onap.aai.schema-service</groupId>
     <artifactId>aai-schema-service</artifactId>
@@ -72,8 +72,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-service</schema.uri.base.path>
         <!-- End of Default ONAP Schema Properties -->
 
@@ -184,7 +184,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,18,v19,v20,v21,v22,v23,v24</schema.version.list>
+                <schema.version.list>v10,v11,v12,v13,v14,v15,v16,v17,18,v19,v20,v21,v22,v23,v24,v25,v26</schema.version.list>
             </properties>
         </profile>
         <!-- End of ONAP Profile -->
diff --git a/aai-schema/pom.xml b/aai-schema/pom.xml
index 99e9c63..956c882 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.9.3-SNAPSHOT</version>
+        <version>1.9.4-SNAPSHOT</version>
     </parent>
     <artifactId>aai-schema</artifactId>
     <name>aai-schema</name>
diff --git a/aai-schema/src/main/resources/onap/oxm/v25/aai_oxm_v25.xml b/aai-schema/src/main/resources/onap/oxm/v25/aai_oxm_v25.xml
index 03044be..f658f16 100644
--- a/aai-schema/src/main/resources/onap/oxm/v25/aai_oxm_v25.xml
+++ b/aai-schema/src/main/resources/onap/oxm/v25/aai_oxm_v25.xml
@@ -12302,7 +12302,7 @@
                 </xml-element>
                 <xml-element java-attribute="enhancedMulticast" name="enhanced-multicast" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="String value indicating whether the EVC uses enhanced multicast. Possible Values:yes/no/[empty string]"/>
+                        <xml-property name="description" value="String value indicating whether the EVC uses enhanced multicast. Possible Values, yes/no/[empty string]"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="espEvcCircuitId" name="esp-evc-circuit-id" type="java.lang.String">
@@ -16749,7 +16749,7 @@
                 </xml-element>
                 <xml-element java-attribute="afIpv4" name="af-ipv4" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Flag to indicate generation of Internet Control Message Protocol (ICMP) unreachable messages for ipv4 address family Values: null, disable, enable"/>
+                        <xml-property name="description" value="Flag to indicate generation of Internet Control Message Protocol (ICMP) unreachable messages for ipv4 address family Values, null, disable, enable"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="afIpv6" name="af-ipv6" type="java.lang.String">
diff --git a/aai-schema/src/main/resources/onap/oxm/v26/aai_oxm_v26.xml b/aai-schema/src/main/resources/onap/oxm/v26/aai_oxm_v26.xml
index d0cec2a..f5b6c7f 100644
--- a/aai-schema/src/main/resources/onap/oxm/v26/aai_oxm_v26.xml
+++ b/aai-schema/src/main/resources/onap/oxm/v26/aai_oxm_v26.xml
@@ -12317,7 +12317,7 @@
                 </xml-element>
                 <xml-element java-attribute="enhancedMulticast" name="enhanced-multicast" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="String value indicating whether the EVC uses enhanced multicast. Possible Values:yes/no/[empty string]"/>
+                        <xml-property name="description" value="String value indicating whether the EVC uses enhanced multicast. Possible Values, yes/no/[empty string]"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="espEvcCircuitId" name="esp-evc-circuit-id" type="java.lang.String">
@@ -16784,7 +16784,7 @@
                 </xml-element>
                 <xml-element java-attribute="afIpv4" name="af-ipv4" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Flag to indicate generation of Internet Control Message Protocol (ICMP) unreachable messages for ipv4 address family Values: null, disable, enable"/>
+                        <xml-property name="description" value="Flag to indicate generation of Internet Control Message Protocol (ICMP) unreachable messages for ipv4 address family Values, null, disable, enable"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="afIpv6" name="af-ipv6" type="java.lang.String">
diff --git a/aai-schema/src/main/xjb/bindings-onap.xjb b/aai-schema/src/main/xjb/bindings-onap.xjb
index a80099e..49d8c46 100644
--- a/aai-schema/src/main/xjb/bindings-onap.xjb
+++ b/aai-schema/src/main/xjb/bindings-onap.xjb
@@ -89,6 +89,16 @@
     </jaxb:bindings>
     <jaxb:bindings scd="x-schema::a" xmlns:a="http://org.onap.aai.inventory/v24">
         <jaxb:schemaBindings>
+            <jaxb:package name="org.onap.aai.domain.yang.v24"/>
+        </jaxb:schemaBindings>
+    </jaxb:bindings>
+    <jaxb:bindings scd="x-schema::a" xmlns:a="http://org.onap.aai.inventory/v25">
+        <jaxb:schemaBindings>
+            <jaxb:package name="org.onap.aai.domain.yang.v25"/>
+        </jaxb:schemaBindings>
+    </jaxb:bindings>
+    <jaxb:bindings scd="x-schema::a" xmlns:a="http://org.onap.aai.inventory/v26">
+        <jaxb:schemaBindings>
             <jaxb:package name="org.onap.aai.domain.yang"/>
         </jaxb:schemaBindings>
     </jaxb:bindings>
diff --git a/pom.xml b/pom.xml
index d54bb3b..eb2bc92 100644
--- a/pom.xml
+++ b/pom.xml
@@ -30,7 +30,7 @@
     </parent>
     <groupId>org.onap.aai.schema-service</groupId>
     <artifactId>schema-service</artifactId>
-    <version>1.9.3-SNAPSHOT</version>
+    <version>1.9.4-SNAPSHOT</version>
     <name>aai-schema-service</name>
     <packaging>pom</packaging>
     <modules>
diff --git a/version.properties b/version.properties
index bce709e..b2afd4e 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=9
-patch_version=3
+patch_version=4
 
 base_version=${major_version}.${minor_version}.${patch_version}
 # Release must be completed with GIT information # in Jenkins