diff options
Diffstat (limited to 'aai-schema')
| -rw-r--r-- | aai-schema/pom.xml | 4 | ||||
| -rw-r--r-- | aai-schema/src/main/resources/onap/dbedgerules/v14/DbEdgeRules_ccvpn_v14.json | 2 | ||||
| -rw-r--r-- | aai-schema/src/main/xjb/bindings-onap.xjb | 14 |
3 files changed, 12 insertions, 8 deletions
diff --git a/aai-schema/pom.xml b/aai-schema/pom.xml index 7facd99f..e949d236 100644 --- a/aai-schema/pom.xml +++ b/aai-schema/pom.xml @@ -27,11 +27,11 @@ <parent> <groupId>org.onap.aai.aai-common</groupId> <artifactId>aai-common</artifactId> - <version>1.3.0-SNAPSHOT</version> + <version>1.4.0-SNAPSHOT</version> </parent> <artifactId>aai-schema</artifactId> <name>aai-schema</name> - <version>1.3.0-SNAPSHOT</version> + <version>1.4.0-SNAPSHOT</version> <properties> <onap.nexus.url>https://nexus.onap.org</onap.nexus.url> <!-- Start of Default ONAP Schema Properties --> diff --git a/aai-schema/src/main/resources/onap/dbedgerules/v14/DbEdgeRules_ccvpn_v14.json b/aai-schema/src/main/resources/onap/dbedgerules/v14/DbEdgeRules_ccvpn_v14.json index 1b6d9405..62b6c52e 100644 --- a/aai-schema/src/main/resources/onap/dbedgerules/v14/DbEdgeRules_ccvpn_v14.json +++ b/aai-schema/src/main/resources/onap/dbedgerules/v14/DbEdgeRules_ccvpn_v14.json @@ -197,7 +197,7 @@ "to": "service-instance", "label": "org.onap.relationships.inventory.PartOf", "direction": "OUT", - "multiplicity": "ONE2MANY", + "multiplicity": "MANY2MANY", "contains-other-v": "NONE", "delete-other-v": "NONE", "prevent-delete": "NONE", diff --git a/aai-schema/src/main/xjb/bindings-onap.xjb b/aai-schema/src/main/xjb/bindings-onap.xjb index 85713f2e..f5579b81 100644 --- a/aai-schema/src/main/xjb/bindings-onap.xjb +++ b/aai-schema/src/main/xjb/bindings-onap.xjb @@ -2,7 +2,11 @@ <jaxb:bindings version="2.1" xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - xmlns:xs="http://www.w3.org/2001/XMLSchema"> + xmlns:xs="http://www.w3.org/2001/XMLSchema" + xmlns:xjc="http://java.sun.com/xml/ns/jaxb/xjc"> + <jaxb:globalBindings> + <xjc:serializable uid="14"/> + </jaxb:globalBindings> <jaxb:bindings scd="x-schema::a" xmlns:a="http://org.openecomp.aai.inventory/v8"> <jaxb:schemaBindings> <jaxb:package name="org.onap.aai.domain.yang.v8"/> @@ -16,7 +20,7 @@ <jaxb:bindings scd="x-schema::a" xmlns:a="http://org.openecomp.aai.inventory/v10"> <jaxb:schemaBindings> <jaxb:package name="org.onap.aai.domain.yang.v10"/> - </jaxb:schemaBindings> + </jaxb:schemaBindings> </jaxb:bindings> <jaxb:bindings scd="x-schema::a" xmlns:a="http://org.openecomp.aai.inventory/v11"> <jaxb:schemaBindings> @@ -26,7 +30,7 @@ <jaxb:bindings scd="x-schema::a" xmlns:a="http://org.onap.aai.inventory/v12"> <jaxb:schemaBindings> <jaxb:package name="org.onap.aai.domain.yang.v12"/> - </jaxb:schemaBindings> + </jaxb:schemaBindings> </jaxb:bindings> <jaxb:bindings scd="x-schema::a" xmlns:a="http://org.onap.aai.inventory/v13"> <jaxb:schemaBindings> @@ -35,7 +39,7 @@ </jaxb:bindings> <jaxb:bindings scd="x-schema::a" xmlns:a="http://org.onap.aai.inventory/v14"> <jaxb:schemaBindings> - <jaxb:package name="org.onap.aai.domain.yang"/> - </jaxb:schemaBindings> + <jaxb:package name="org.onap.aai.domain.yang"/> + </jaxb:schemaBindings> </jaxb:bindings> </jaxb:bindings> |