Fix JUnit test for the Info status report

[aai/babel.git] / pom.xml

diff --git a/pom.xml b/pom.xml
index b883910..d6ebade 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    ============LICENSE_START=======================================================
+    ============LICENSE_START=======================================================
     org.onap.aai
     ================================================================================
     Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
@@ -28,13 +28,13 @@
        <parent>
                <groupId>org.onap.oparent</groupId>
                <artifactId>oparent</artifactId>
-               <version>1.1.0</version>
+               <version>1.2.0</version>
                <relativePath />
        </parent>
 
        <groupId>org.onap.aai</groupId>
        <artifactId>babel</artifactId>
-       <version>1.2.0-SNAPSHOT</version>
+       <version>1.3.1-SNAPSHOT</version>
        <packaging>jar</packaging>
 
        <name>aai-babel</name>
@@ -42,26 +42,29 @@
 
        <properties>
                <!-- Spring boot version -->
-               <spring.boot.version>1.5.12.RELEASE</spring.boot.version>
+               <spring.boot.version>1.5.15.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.3.0</sdc.tosca.version>
-               <commons.compress.version>1.16.1</commons.compress.version>
+               <sdc.tosca.version>1.4.4</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.2.3</aai-schema.version>
+               <aai-schema.version>1.3.0</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>
+               <antrun.version>1.8</antrun.version>
        </properties>
 
        <dependencyManagement>
@@ -101,7 +104,6 @@
                        <artifactId>logback-core</artifactId>
                        <version>${logback.version}</version><!--$NO-MVN-MAN-VER$-->
                </dependency>
-
                <dependency>
                        <groupId>commons-codec</groupId>
                        <artifactId>commons-codec</artifactId>
@@ -125,13 +127,6 @@
                        <groupId>org.codehaus.groovy</groupId>
                        <artifactId>groovy-all</artifactId>
                </dependency>
-               <dependency>
-                       <groupId>javax</groupId>
-                       <artifactId>javaee-api</artifactId>
-                       <version>8.0</version>
-                       <scope>provided</scope>
-               </dependency>
-
                <dependency>
                        <groupId>org.onap.sdc.sdc-tosca</groupId>
                        <artifactId>sdc-tosca</artifactId>
@@ -175,6 +170,7 @@
                                                -DCONFIG_HOME=./appconfig-local
                                                -DAPP_HOME=.
                                                -Dartifactgenerator.config=./appconfig-local/artifact-generator.properties
+                                               -Dgroupfilter.config=./appconfig-local/filter-types.properties
                                                -DKEY_STORE_PASSWORD=${KEY_STORE_PASSWORD}
                                        </jvmArguments>
                                </configuration>
@@ -203,14 +199,37 @@
                                                                        <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>
@@ -224,9 +243,9 @@
                                        </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>