diff options
author | Leonard, Mark (ml401d) <ml401d@att.com> | 2018-03-21 18:40:41 +0000 |
---|---|---|
committer | Mark Leonard <mark.j.leonard@gmail.com> | 2018-03-28 13:50:51 +0100 |
commit | 66b3afa06776e9944ad515206d281d67747c9770 (patch) | |
tree | 427098937879fe09ae4fc3af4ae004359a60212a /pom.xml | |
parent | 161f5a7d9b900ae34a4886d7f7fb01ea496f71eb (diff) |
Incorporate the ECOMP SDC Artefact Generator code
Remove the Maven dependency on openecomp-sdc-artifact-generator-core,
because this is not maintained in the ONAP source code repositories.
The functionality provided by the SDC Artifact Generator is replaced
with equivalent code that depends on the SDC-TOSCA parsing library,
without introducing any backwards-compatibility breaks.
The intention is to make this Maven project more maintainable by
depending only the common ONAP libraries.
Change-Id: I01d78575d3b7c70a11e4c7989a021de3c0913a06
Issue-ID: AAI-943
Signed-off-by: mark.j.leonard <mark.j.leonard@gmail.com>
Diffstat (limited to 'pom.xml')
-rw-r--r-- | pom.xml | 253 |
1 files changed, 170 insertions, 83 deletions
@@ -1,3 +1,21 @@ +<!-- ============LICENSE_START======================================================= --> +<!-- org.onap.aai --> +<!-- ================================================================================ --> +<!-- Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved. --> +<!-- Copyright © 2017-2018 European Software Marketing Ltd. --> +<!-- ================================================================================ --> +<!-- Licensed under the Apache License, Version 2.0 (the "License"); --> +<!-- you may not use this file except in compliance with the License. --> +<!-- You may obtain a copy of the License at --> +<!-- --> +<!-- http://www.apache.org/licenses/LICENSE-2.0 --> +<!-- --> +<!-- Unless required by applicable law or agreed to in writing, software --> +<!-- distributed under the License is distributed on an "AS IS" BASIS, --> +<!-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. --> +<!-- See the License for the specific language governing permissions and --> +<!-- limitations under the License. --> +<!-- ============LICENSE_END========================================================= --> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> @@ -7,9 +25,9 @@ <groupId>com.att.ajsc</groupId> <version>2.0.0</version> </parent> - <groupId>org.onap.aai.babel</groupId> + <groupId>org.onap.aai</groupId> <artifactId>babel</artifactId> - <version>2.0.0-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <name>aai-babel</name> <properties> @@ -18,11 +36,7 @@ <ajscRuntimeVersion>2.0.0</ajscRuntimeVersion> <absoluteDistFilesRoot>/appl/${project.artifactId}</absoluteDistFilesRoot> - <!-- For NO Versioning, REMOVE the /${project.version} from the <distFilesRoot> - property, below. PLEASE, NOTE: If your ${project.version} is a "-SNAPSHOT" - version, THIS will be used as your directory structure. If you do NOT want - this, simply remove the "-SNAPSHOT" from your <version> declaration at the - top of pom.xml --> + <!-- For NO Versioning, REMOVE the /${project.version} from the <distFilesRoot> property below. --> <distFilesRoot>/appl/${project.artifactId}/${project.version}</distFilesRoot> <runAjscHome>${basedir}/target/swm/package/nix/dist_files${distFilesRoot}</runAjscHome> @@ -31,9 +45,9 @@ <installOwnerGroup>aaiadmin</installOwnerGroup> <ownerManagementGroup>com.att.csid.lab</ownerManagementGroup> - <!-- Port Selection. A value of 0 will allow for dynamic port selection. - For local testing, you may choose to hardcode this value to something like - 8080 --> + <!-- Port Selection. A value of 0 will allow for dynamic port selection. + For local testing, you may choose to hardcode this value to something like + 8080 --> <serverPort>9515</serverPort> <sslport>9516</sslport> @@ -43,20 +57,23 @@ <sitePath>/content/sites/site/org/onap/aai/babel/${project.artifactId}/${project.version}</sitePath> <!-- Dependency Versions --> - <aai.artifact.generator.version>1.1.0</aai.artifact.generator.version> - <apache.lang3.version>3.6</apache.lang3.version> + <aai.rest.client.version>1.2.1</aai.rest.client.version> + <apache.lang3.version>3.6</apache.lang3.version> <commons-compress.version>1.14</commons-compress.version> - <common.logging.version>1.1.0</common.logging.version> + <common.logging.version>1.2.2</common.logging.version> <dom4j.version>1.6.1</dom4j.version> - <fasterxml.version>2.8.1</fasterxml.version> <hamcrest.version>1.3</hamcrest.version> <javaassist.version>3.21.0-GA</javaassist.version> <logback.version>1.1.9</logback.version> + <mvn.jaxb2.version>0.13.2</mvn.jaxb2.version> <mockito.version>1.10.19</mockito.version> <powermock.version>1.6.2</powermock.version> <sdc.distribution.client.version>1.1.32</sdc.distribution.client.version> - <snakeyamle.version>1.18</snakeyamle.version> + <sdc.tosca.version>1.3.3</sdc.tosca.version> + <fasterxml.version>2.9.4</fasterxml.version> <jacoco.version>0.7.9</jacoco.version> + <xmlunit.version>1.6</xmlunit.version> + <aai-schema.version>1.2.1</aai-schema.version> <onap.nexus.url>https://nexus.onap.org</onap.nexus.url> <docker.location>${basedir}/target</docker.location> </properties> @@ -112,18 +129,21 @@ <artifactId>commons-lang3</artifactId> <version>${apache.lang3.version}</version> </dependency> - - <!-- Artifact generation --> <dependency> - <groupId>org.openecomp.sdc.common</groupId> - <artifactId>openecomp-sdc-artifact-generator-core</artifactId> - <version>${aai.artifact.generator.version}</version> + <groupId>org.onap.sdc.sdc-tosca</groupId> + <artifactId>sdc-tosca</artifactId> + <version>${sdc.tosca.version}</version> </dependency> <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-core</artifactId> - <version>${fasterxml.version}</version> + <version>${fasterxml.version}</version><!--$NO-MVN-MAN-VER$ --> </dependency> + <dependency> + <groupId>org.onap.aai</groupId> + <artifactId>rest-client</artifactId> + <version>${aai.rest.client.version}</version> + </dependency> <!-- Testing --> <dependency> @@ -165,21 +185,22 @@ <groupId>org.openecomp.sdc.sdc-distribution-client</groupId> <artifactId>sdc-distribution-client</artifactId> <version>${sdc.distribution.client.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>xmlunit</groupId> + <artifactId>xmlunit</artifactId> + <version>${xmlunit.version}</version> + <scope>test</scope> </dependency> - <dependency> - <groupId>xmlunit</groupId> - <artifactId>xmlunit</artifactId> - <version>1.6</version> - <scope>test</scope> - </dependency> </dependencies> <repositories> - <repository> - <id>ecomp-staging</id> - <name>ECOMP Staging Repository</name> - <url>${onap.nexus.url}/content/repositories/staging/</url> - </repository> + <repository> + <id>ecomp-staging</id> + <name>ECOMP Staging Repository</name> + <url>${onap.nexus.url}/content/repositories/staging/</url> + </repository> </repositories> <distributionManagement> @@ -202,6 +223,87 @@ <build> <plugins> <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <executions> + <execution> + <id>unpack</id> + <phase>initialize</phase> + <goals> + <goal>unpack</goal> + </goals> + <configuration> + <artifactItems> + <artifactItem> + <groupId>org.onap.aai.aai-common</groupId> + <artifactId>aai-schema</artifactId> + <version>${aai-schema.version}</version> + <type>jar</type> + <includes>aai_schema/aai_schema_v**.xsd</includes> + <outputDirectory>target/tmp</outputDirectory> + </artifactItem> + </artifactItems> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.jvnet.jaxb2.maven2</groupId> + <artifactId>maven-jaxb2-plugin</artifactId> + <version>${mvn.jaxb2.version}</version> + <executions> + <execution> + <phase>process-sources</phase> + <goals> + <goal>generate</goal> + </goals> + </execution> + </executions> + <configuration> + <schemaDirectory>target/tmp/aai_schema</schemaDirectory> + <generatePackage>org.onap.aai.babel.xml.generator.xsd</generatePackage> + <generateDirectory>target/generated-sources</generateDirectory> + <schemaIncludes> + <include>aai_schema_latest.xsd</include> + </schemaIncludes> + <extension>true</extension> + <args> + <arg>-Xannotate</arg> + </args> + <plugins> + <plugin> + <groupId>org.jvnet.jaxb2_commons</groupId> + <artifactId>jaxb2-basics-annotate</artifactId> + <version>0.6.4</version> + </plugin> + <!-- Add the dependencies with your annotations as 'plugins' below --> + <plugin> + <groupId>org.jvnet.jaxb2_commons</groupId> + <artifactId>jaxb2-annotate-plugin-test-annox-annotations</artifactId> + <version>1.0.0</version> + </plugin> + </plugins> + </configuration> + </plugin> + <plugin> + <artifactId>exec-maven-plugin</artifactId> + <groupId>org.codehaus.mojo</groupId> + <executions> + <execution><!-- Run our script to get latest xsd version --> + <id>Get latest xsd version</id> + <phase>generate-sources</phase> + <goals> + <goal>exec</goal> + </goals> + <configuration> + <workingDirectory>${basedir}/scripts</workingDirectory> + <executable>bash</executable> + <commandlineArgs>get-latest-xsd-version.sh ${basedir}</commandlineArgs> + </configuration> + </execution> + </executions> + </plugin> + <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>sonar-maven-plugin</artifactId> <version>3.2</version> @@ -216,12 +318,15 @@ </execution> </executions> </plugin> - <plugin> <groupId>org.jacoco</groupId> <artifactId>jacoco-maven-plugin</artifactId> <version>${jacoco.version}</version> - + <configuration> + <excludes> + <exclude>**/xml/generator/xsd/*.class</exclude> + </excludes> + </configuration> <executions> <execution> <id>prepare-agent</id> @@ -238,7 +343,6 @@ </goals> </execution> </executions> - </plugin> <plugin> @@ -276,6 +380,7 @@ </execution> </executions> </plugin> + <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jar-plugin</artifactId> @@ -305,37 +410,16 @@ <imageName>${docker.push.registry}/onap/${project.artifactId}</imageName> <dockerDirectory>${docker.location}</dockerDirectory> <imageTags> - <imageTag>latest</imageTag> + <imageTag>latest</imageTag> </imageTags> <forceTags>true</forceTags> </configuration> </plugin> - <!-- license plugin --> - <plugin> - <groupId>com.mycila</groupId> - <artifactId>license-maven-plugin</artifactId> - <version>3.0</version> - <configuration> - <header>License.txt</header> - <includes> - <include>src/main/java/**</include> - <include>src/test/java/**</include> - </includes> - </configuration> - <executions> - <execution> - <goals> - <goal>format</goal> - </goals> - <phase>process-sources</phase> - </execution> - </executions> - </plugin> - <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-deploy-plugin</artifactId> + <version>2.8.2</version> <configuration> <classifier>client</classifier> </configuration> @@ -362,31 +446,34 @@ </reportPlugins> </configuration> </plugin> - + <plugin> - <groupId>org.sonatype.plugins</groupId> - <artifactId>nexus-staging-maven-plugin</artifactId> - <version>1.6.7</version> - <extensions>true</extensions> - <configuration> - <nexusUrl>${onap.nexus.url}</nexusUrl> - <stagingProfileId>176c31dfe190a</stagingProfileId> - <serverId>ecomp-staging</serverId> - </configuration> + <groupId>org.sonatype.plugins</groupId> + <artifactId>nexus-staging-maven-plugin</artifactId> + <version>1.6.7</version> + <extensions>true</extensions> + <configuration> + <nexusUrl>${onap.nexus.url}</nexusUrl> + <stagingProfileId>176c31dfe190a</stagingProfileId> + <serverId>ecomp-staging</serverId> + </configuration> </plugin> + <!-- Strong recommendation to use forkCount and reuseForks parameters as forkMode is deprecated since v2.14 --> <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <reuseForks>false</reuseForks> - <forkCount>1</forkCount> - </configuration> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <reuseForks>false</reuseForks> + <forkCount>1</forkCount> + <environmentVariables> + <AJSC_HOME>.</AJSC_HOME> + </environmentVariables> + </configuration> </plugin> </plugins> - </build> - <!-- Added to fix build warnings caused by parent pom and bom --> + </build> <profiles> <profile> @@ -478,13 +565,13 @@ </systemProperty> </systemProperties> - <!-- Command Line Arguments to add to the java command. Here, you - can specify the port as well as the Context you want your service to run - in. Use context=/ to run in an unnamed Context (Root Context). The default - configuration of the AJSC is to run under the / Context. Setting the port - here can aid during the development phase of your service. However, you can - leave this argument out entirely, and the AJSC will default to using an Ephemeral - port. --> + <!-- Command Line Arguments to add to the java command. Here, you + can specify the port as well as the Context you want your service to run + in. Use context=/ to run in an unnamed Context (Root Context). The default + configuration of the AJSC is to run under the / Context. Setting the port + here can aid during the development phase of your service. However, you can + leave this argument out entirely, and the AJSC will default to using an Ephemeral + port. --> <arguments> <argument>context=/</argument> <argument>port=${serverPort}</argument> |