diff options
| author |   Kajur, Harish (vk250x) <vk250x@att.com> | 2018-08-10 12:42:00 -0400 |
|---|---|---|
| committer | Kajur, Harish (vk250x) <vk250x@att.com> | 2018-08-12 16:48:34 -0400 |
| commit | a86d6a6644d6de3f3f814cd6e25cfe2213d5dd05 (patch) | |
| tree | 9935a64d7f830ebedf2742e0febef40e898cea91 /aai-schema/pom.xml | |
| parent | a395fa69a28a04d0a667fe458b4f10497a1d6794 (diff) | |
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>
Diffstat (limited to 'aai-schema/pom.xml')
| -rw-r--r-- | aai-schema/pom.xml | 75 |
1 files changed, 53 insertions, 22 deletions
diff --git a/aai-schema/pom.xml b/aai-schema/pom.xml index e4ee3601..7facd99f 100644 --- a/aai-schema/pom.xml +++ b/aai-schema/pom.xml @@ -33,7 +33,11 @@ <name>aai-schema</name> <version>1.3.0-SNAPSHOT</version> <properties> - <onap.nexus.url>https://nexus.onap.org</onap.nexus.url> + <onap.nexus.url>https://nexus.onap.org</onap.nexus.url> + <!-- Start of Default ONAP Schema Properties --> + <aai.xsd.source>src/main/resources/onap/aai_schema</aai.xsd.source> + <aai.bindings.source>src/main/xjb/bindings-onap.xjb</aai.bindings.source> + <!-- End of Default ONAP Schema Properties --> </properties> <dependencies> <dependency> @@ -41,6 +45,18 @@ <artifactId>aai-annotations</artifactId> <version>${project.version}</version> </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>4.12</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> + <version>RELEASE</version> + <scope>test</scope> + </dependency> </dependencies> <build> <plugins> @@ -54,6 +70,27 @@ <goals> <goal>xjc</goal> </goals> + <configuration> + <outputDirectory>${project.build.directory}/generated-sources</outputDirectory> + <sources> + <source>${aai.xsd.source}</source> + </sources> + <xjbSources> + <xjbSource>${aai.bindings.source}</xjbSource> + </xjbSources> + <xjcSourceExcludeFilters> + <filter + implementation="org.codehaus.mojo.jaxb2.shared.filters.pattern.PatternFileFilter"> + <patterns> + <pattern>edgetagquery\.xsd</pattern> + </patterns> + </filter> + </xjcSourceExcludeFilters> + <extension>true</extension> + <arguments> + <argument>-Xannotate</argument> + </arguments> + </configuration> </execution> </executions> <dependencies> @@ -68,25 +105,10 @@ <version>${project.version}</version> </dependency> </dependencies> - <configuration> - <outputDirectory>${project.build.directory}/generated-sources</outputDirectory> - <sources> - <source>src/main/resources/aai_schema</source> - </sources> - <xjcSourceExcludeFilters> - <filter - implementation="org.codehaus.mojo.jaxb2.shared.filters.pattern.PatternFileFilter"> - <patterns> - <pattern>edgetagquery\.xsd</pattern> - </patterns> - </filter> - </xjcSourceExcludeFilters> - <extension>true</extension> - <arguments> - <argument>-Xannotate</argument> - </arguments> - <bindingDirectory>src/main/xjb</bindingDirectory> - </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-source-plugin</artifactId> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> @@ -101,9 +123,18 @@ <artifactId>nexus-staging-maven-plugin</artifactId> </plugin> </plugins> + <resources> + <resource> + <directory>src/main/resources</directory> + <filtering>false</filtering> + <includes> + <include>**/*</include> + </includes> + </resource> + </resources> </build> - <!-- Plugins and repositories --> + <!-- Start of ONAP Specific Repositories --> <pluginRepositories> <pluginRepository> <id>central</id> @@ -115,5 +146,5 @@ <url>http://www.evosuite.org/m2</url> </pluginRepository> </pluginRepositories> - + <!-- End of ONAP Specific Repositories --> </project> |