Merge "Fix multiplicity between service-instance and pnf"

diff --git a/aai-core/pom.xml b/aai-core/pom.xml
index 20575cb..f372dd7 100644 (file)
--- a/aai-core/pom.xml
+++ b/aai-core/pom.xml
@@ -146,7 +146,7 @@
         <dependency>
             <groupId>org.onap.aai.aai-common</groupId>
             <artifactId>aai-schema</artifactId>
-            <version>${aai.schema.version}</version>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>commons-lang</groupId>

diff --git a/aai-schema/pom.xml b/aai-schema/pom.xml
index c145d91..0ec1b3b 100644 (file)
--- a/aai-schema/pom.xml
+++ b/aai-schema/pom.xml
@@ -18,7 +18,7 @@
         <dependency>
             <groupId>org.onap.aai.aai-common</groupId>
             <artifactId>aai-annotations</artifactId>
-            <version>${aai.annotations.version}</version>
+            <version>${project.version}</version>
         </dependency>
     </dependencies>
     <build>
@@ -44,7 +44,7 @@
                     <dependency>
                         <groupId>org.onap.aai.aai-common</groupId>
                         <artifactId>aai-annotations</artifactId>
-                        <version>${aai.annotations.version}</version>
+                        <version>${project.version}</version>
                     </dependency>
                 </dependencies>
                 <configuration>

diff --git a/aai-schema/src/main/resources/oxm/aai_oxm_v11.xml b/aai-schema/src/main/resources/oxm/aai_oxm_v11.xml
index 89bf91d..90d023c 100644 (file)
--- a/aai-schema/src/main/resources/oxm/aai_oxm_v11.xml
+++ b/aai-schema/src/main/resources/oxm/aai_oxm_v11.xml
@@ -2976,6 +2976,7 @@
                                <xml-property name="uniqueProps" value="configuration-id" />
                                <xml-property name="container" value="configurations" />
                                <xml-property name="namespace" value="network" />
+                               <xml-property name="nameProps" value="configuration-type" />
                        </xml-properties>
                </java-type>
 

diff --git a/pom.xml b/pom.xml
index 965168e..3862477 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -25,9 +25,6 @@
     <properties>
         <sitePath>/content/sites/site/org/onap/aai/aai-common/${project.artifactId}/${project.version}</sitePath>
        <onap.nexus.url>https://nexus.onap.org</onap.nexus.url>
-        <aai.annotations.version>1.1.0-SNAPSHOT</aai.annotations.version>
-        <aai.schema.version>1.1.0-SNAPSHOT</aai.schema.version>
-        <aai.core.version>1.1.0-SNAPSHOT</aai.core.version>
     </properties>
 
     <build>