From a86d6a6644d6de3f3f814cd6e25cfe2213d5dd05 Mon Sep 17 00:00:00 2001
From: "Kajur, Harish (vk250x)" <vk250x@att.com>
Date: Fri, 10 Aug 2018 12:42:00 -0400
Subject: Integrate aai-schema-ingest library into aai-core

Integrate the aai-core into using the aai-schema-ingest
library to be agnostic to the schema changes
Remove any references to aai-schema dependency in aai-core
Reorder the components so the aai-schema-ingest is first installed
Moved the edge rules to the aai-schema as they are linked to schema
Rework the generation of the aai-schema to using aai-schema-ingest library
Also remove the yaml and html folders as they get generated on the fly
So when maven pushes the aai-schema jar, the jar contains the generated
yaml, html and xsd files at runtime due to the gerrit limit of filesize

Issue-ID: AAI-1455
Change-Id: I87ecd9eb2fc96a09d3a6399955637674f6e7fb21
Signed-off-by: Kajur, Harish (vk250x) <vk250x@att.com>
---
 pom.xml | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

(limited to 'pom.xml')

diff --git a/pom.xml b/pom.xml
index d1c24d37..2e156474 100644
--- a/pom.xml
+++ b/pom.xml
@@ -36,15 +36,16 @@
     <description>Contains all of the common code for resources and traversal repos</description>
 
     <modules>
-        <module>aai-schema</module>
         <module>aai-schema-ingest</module>
         <module>aai-annotations</module>
         <module>aai-core</module>
+        <module>aai-schema</module>
         <module>aai-auth</module>
         <module>aai-utils</module>
     </modules>
 
     <properties>
+        <aai.generate.schema>true</aai.generate.schema>
         <sitePath>/content/sites/site/org/onap/aai/aai-common/${project.artifactId}/${project.version}</sitePath>
         <onap.nexus.url>https://nexus.onap.org</onap.nexus.url>
     </properties>
@@ -60,6 +61,20 @@
                         <target>1.8</target>
                     </configuration>
                 </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-source-plugin</artifactId>
+                    <version>3.0.1</version>
+                    <executions>
+                        <execution>
+                            <id>attach-sources</id>
+                            <phase>deploy</phase>
+                            <goals>
+                                <goal>jar-no-fork</goal>
+                            </goals>
+                        </execution>
+                    </executions>
+                </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-deploy-plugin</artifactId>
@@ -185,6 +200,7 @@
         </plugins>
     </reporting>
 
+    <!-- Start of ONAP Specific Repositories -->
     <repositories>
         <repository>
             <id>AJSC</id>
@@ -218,4 +234,5 @@
             <url>${onap.nexus.url}/content/repositories/snapshots/</url>
         </repository>
     </repositories>
+    <!-- End of ONAP Specific Repositories -->
 </project>
-- 
cgit 1.2.3-korg