============LICENSE_START=======================================================
org.onap.aai
================================================================================
- Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
- Copyright © 2017-2018 European Software Marketing Ltd.
+ Copyright (c) 2017-2019 AT&T Intellectual Property. All rights reserved.
+ Copyright (c) 2017-2019 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.
<parent>
<groupId>org.onap.oparent</groupId>
<artifactId>oparent</artifactId>
- <version>1.1.0</version>
+ <version>1.2.1</version>
<relativePath />
</parent>
<groupId>org.onap.aai</groupId>
<artifactId>babel</artifactId>
- <version>1.3.0-SNAPSHOT</version>
+ <version>1.4.1-SNAPSHOT</version>
<packaging>jar</packaging>
<name>aai-babel</name>
<properties>
<!-- Spring boot version -->
- <spring.boot.version>1.5.14.RELEASE</spring.boot.version>
+ <spring.boot.version>1.5.19.RELEASE</spring.boot.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<java.version>1.8</java.version>
<docker.location>${basedir}/target</docker.location>
+ <aai.schema.source.folder>onap/aai_schema</aai.schema.source.folder>
+ <aai.schema.target.folder>${project.build.directory}/aai-schema</aai.schema.target.folder>
<!-- Dependency Versions -->
<common.logging.version>1.2.2</common.logging.version>
- <sdc.tosca.version>1.4.1</sdc.tosca.version>
- <commons.compress.version>1.16.1</commons.compress.version>
+ <sdc.tosca.version>1.5.1</sdc.tosca.version>
+ <commons.compress.version>1.18</commons.compress.version>
<javax.ws.rs.version>2.1</javax.ws.rs.version>
<mvn.jaxb2.version>0.13.2</mvn.jaxb2.version>
- <aai-schema.group.id>org.onap.aai.aai-common</aai-schema.group.id>
- <aai-schema.version>1.3.0-SNAPSHOT</aai-schema.version>
+ <aai-schema.group.id>org.onap.aai.schema-service</aai-schema.group.id>
+ <aai-schema.version>1.0.5</aai-schema.version>
<apache.lang3.version>3.7</apache.lang3.version>
<aai.rest.client.version>1.2.1</aai.rest.client.version>
<sdc.distribution.client.version>1.3.0</sdc.distribution.client.version>
<xmlunit.version>1.6</xmlunit.version>
<logback.version>1.2.3</logback.version>
- <guava.version>25.1-jre</guava.version>
+ <antrun.version>1.8</antrun.version>
</properties>
<dependencyManagement>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-jersey</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-tomcat</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.onap.aai.logging-service</groupId>
<artifactId>logback-core</artifactId>
<version>${logback.version}</version><!--$NO-MVN-MAN-VER$-->
</dependency>
-
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
<groupId>org.codehaus.groovy</groupId>
<artifactId>groovy-all</artifactId>
</dependency>
-
<dependency>
<groupId>org.onap.sdc.sdc-tosca</groupId>
<artifactId>sdc-tosca</artifactId>
<version>${sdc.tosca.version}</version>
</dependency>
- <dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- <version>${guava.version}</version>
- </dependency>
-
<dependency>
<groupId>org.onap.aai</groupId>
<artifactId>rest-client</artifactId>
<version>${aai.rest.client.version}</version>
</dependency>
-
+
<!-- Testing -->
<dependency>
<groupId>org.springframework.boot</groupId>
<jvmArguments>
-DCONFIG_HOME=./appconfig-local
-DAPP_HOME=.
- -Dartifactgenerator.config=./appconfig-local/artifact-generator.properties
+ -Dtosca.mappings.config=./appconfig-local/tosca-mappings.json
-DKEY_STORE_PASSWORD=${KEY_STORE_PASSWORD}
</jvmArguments>
</configuration>
<artifactId>aai-schema</artifactId>
<version>${aai-schema.version}</version>
<type>jar</type>
- <includes>aai_schema/aai_schema_v**.xsd</includes>
- <outputDirectory>target/tmp</outputDirectory>
+ <includes>${aai.schema.source.folder}/aai_schema_v**.xsd</includes>
+ <outputDirectory>${project.build.directory}/tmp</outputDirectory>
</artifactItem>
</artifactItems>
</configuration>
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>${antrun.version}</version>
+ <executions>
+ <execution>
+ <id>Flatten XSDs</id>
+ <phase>initialize</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <target>
+ <copy todir="${aai.schema.target.folder}" flatten="true">
+ <fileset dir="${project.build.directory}/tmp">
+ <include name="**/*.xsd" />
+ </fileset>
+ </copy>
+ </target>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
<plugin>
<groupId>org.jvnet.jaxb2.maven2</groupId>
<artifactId>maven-jaxb2-plugin</artifactId>
</execution>
</executions>
<configuration>
- <schemaDirectory>target/tmp/aai_schema</schemaDirectory>
+ <schemaDirectory>${aai.schema.target.folder}</schemaDirectory>
<generatePackage>org.onap.aai.babel.xml.generator.xsd</generatePackage>
- <generateDirectory>target/generated-sources</generateDirectory>
+ <generateDirectory>${project.build.directory}/generated-sources</generateDirectory>
<schemaIncludes>
<include>aai_schema_latest.xsd</include>
</schemaIncludes>