<parent>
<groupId>org.onap.aai.aai-common</groupId>
<artifactId>aai-common</artifactId>
- <version>1.3.0-SNAPSHOT</version>
+ <version>1.6.0-SNAPSHOT</version>
</parent>
<artifactId>aai-core</artifactId>
<name>aai-core</name>
- <version>1.3.0-SNAPSHOT</version>
+ <version>1.6.0-SNAPSHOT</version>
<packaging>jar</packaging>
<properties>
+ <springframework.version>4.3.24.RELEASE</springframework.version>
<sonar.language>java</sonar.language>
<sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
<sonar.surefire.reportsPath>${project.build.directory}/surefire-reports</sonar.surefire.reportsPath>
<sonar.projectVersion>${project.version}</sonar.projectVersion>
<httpclient.version>4.5.5</httpclient.version>
<jackson.version>2.2.3</jackson.version>
- <eelf.core.version>1.0.0</eelf.core.version>
+ <eelf.core.version>1.0.1-oss</eelf.core.version>
<logback.version>1.2.3</logback.version>
<freemarker.version>2.3.21</freemarker.version>
<activemq.version>5.15.6</activemq.version>
<jacoco.line.coverage.limit>0.50</jacoco.line.coverage.limit>
<gremlin.version>3.2.2</gremlin.version>
- <groovy.version>2.4.15</groovy.version>
+ <groovy.version>2.4.15</groovy.version>
<jetty.version>9.4.11.v20180605</jetty.version>
<!-- Start of Default ONAP Schema Properties -->
<aai.wiki.link>https://wiki.onap.org/</aai.wiki.link>
- <gendoc.version>v14</gendoc.version>
+ <gendoc.version>v15</gendoc.version>
<aai.release>onap</aai.release>
<schema.uri.base.path>/aai</schema.uri.base.path>
<schema.configuration.location>N/A</schema.configuration.location>
<schema.nodes.location>aai-schema/src/main/resources/${aai.release}/oxm</schema.nodes.location>
<schema.edges.location>aai-schema/src/main/resources/${aai.release}/dbedgerules</schema.edges.location>
- <schema.version.depth.start>v9</schema.version.depth.start>
+ <schema.version.depth.start>v10</schema.version.depth.start>
<schema.version.related.link.start>v10</schema.version.related.link.start>
<schema.version.app.root.start>v11</schema.version.app.root.start>
<schema.version.namespace.change.start>v12</schema.version.namespace.change.start>
<schema.version.edge.label.start>v12</schema.version.edge.label.start>
- <schema.version.api.default>v14</schema.version.api.default>
- <schema.version.list>v8,v9,v10,v11,v12,v13,v14</schema.version.list>
+ <schema.version.api.default>v15</schema.version.api.default>
+ <schema.version.list>v10,v11,v12,v13,v14,v15</schema.version.list>
+ <schema.translator.list>config</schema.translator.list>
<!-- End of Default ONAP Schema Properties -->
</properties>
<profiles>
<profile>
<id>onap</id>
<properties>
+ <springframework.version>4.3.24.RELEASE</springframework.version>
<aai.release>onap</aai.release>
<schema.configuration.location>N/A</schema.configuration.location>
<schema.nodes.location>aai-schema/src/main/resources/${aai.release}/oxm</schema.nodes.location>
<schema.edges.location>aai-schema/src/main/resources/${aai.release}/dbedgerules</schema.edges.location>
- <schema.version.depth.start>v9</schema.version.depth.start>
+ <schema.version.depth.start>v10</schema.version.depth.start>
<schema.version.related.link.start>v10</schema.version.related.link.start>
<schema.version.app.root.start>v11</schema.version.app.root.start>
<schema.version.edge.label.start>v12</schema.version.edge.label.start>
<schema.version.namespace.change.start>v12</schema.version.namespace.change.start>
- <schema.version.api.default>v14</schema.version.api.default>
- <schema.version.list>v8,v9,v10,v11,v12,v13,v14</schema.version.list>
- <gendoc.version>v14</gendoc.version>
+ <schema.version.api.default>v15</schema.version.api.default>
+ <schema.version.list>v10,v11,v12,v13,v14,v15</schema.version.list>
+ <gendoc.version>v15</gendoc.version>
</properties>
</profile>
<!-- End of ONAP profile -->
- <profile>
- <id>generateXsd</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>exec-maven-plugin</artifactId>
- <version>1.1.1</version>
- <executions>
- <execution>
- <phase>process-classes</phase>
- <goals>
- <goal>java</goal>
- </goals>
- <configuration>
- <mainClass>org.onap.aai.util.GenerateXsd</mainClass>
- <systemProperties>
- <systemProperty>
- <key>gen_version</key>
- <value>${gendoc.version}</value>
- </systemProperty>
- <systemProperty>
- <key>gen_type</key>
- <value>XSD</value>
- </systemProperty>
- <systemProperty>
- <key>yamlresponses_url</key>
- <value></value>
- </systemProperty>
- <systemProperty>
- <key>yamlresponses_label</key>
- <value></value>
- </systemProperty>
- <systemProperty>
- <key>schema.configuration.location</key>
- <value>${schema.configuration.location}</value>
- </systemProperty>
- <systemProperty>
- <key>schema.nodes.location</key>
- <value>${schema.nodes.location}</value>
- </systemProperty>
- <systemProperty>
- <key>schema.edges.location</key>
- <value>${schema.edges.location}</value>
- </systemProperty>
- <systemProperty>
- <key>schema.version.list</key>
- <value>${schema.version.list}</value>
- </systemProperty>
- <systemProperty>
- <key>schema.version.depth.start</key>
- <value>${schema.version.depth.start}</value>
- </systemProperty>
- <systemProperty>
- <key>schema.version.depth.start</key>
- <value>${schema.version.depth.start}</value>
- </systemProperty>
- <systemProperty>
- <key>schema.version.related.link.start</key>
- <value>${schema.version.related.link.start}</value>
- </systemProperty>
- <systemProperty>
- <key>schema.version.app.root.start</key>
- <value>${schema.version.app.root.start}</value>
- </systemProperty>
- <systemProperty>
- <key>schema.version.edge.label.start</key>
- <value>${schema.version.app.root.start}</value>
- </systemProperty>
- <systemProperty>
- <key>schema.version.namespace.change.start</key>
- <value>${schema.version.namespace.change.start}</value>
- </systemProperty>
- <systemProperty>
- <key>schema.version.api.default</key>
- <value>${schema.version.api.default}</value>
- </systemProperty>
- <systemProperty>
- <key>schema.uri.base.path</key>
- <value>${schema.uri.base.path}</value>
- </systemProperty>
- <systemProperty>
- <key>aai.release</key>
- <value>${aai.release}</value>
- </systemProperty>
- </systemProperties>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
- <id>generateYaml</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>exec-maven-plugin</artifactId>
- <version>1.1.1</version>
- <executions>
- <execution>
- <phase>process-classes</phase>
- <goals>
- <goal>java</goal>
- </goals>
- <configuration>
- <mainClass>org.onap.aai.util.GenerateXsd</mainClass>
- <systemProperties>
- <systemProperty>
- <key>gen_version</key>
- <value>${gendoc.version}</value>
- </systemProperty>
- <systemProperty>
- <key>gen_type</key>
- <value>YAML</value>
- </systemProperty>
- <systemProperty>
- <key>yamlresponses_url</key>
- <value>https://wiki.web.att.com/pages/viewpage.action?pageId=607391054
- </value>
- </systemProperty>
- <systemProperty>
- <key>yamlresponses_label</key>
- <value>Response codes found in [response codes]</value>
- </systemProperty>
- <systemProperty>
- <key>schema.configuration.location</key>
- <value>${schema.configuration.location}</value>
- </systemProperty>
- <systemProperty>
- <key>schema.nodes.location</key>
- <value>${schema.nodes.location}</value>
- </systemProperty>
- <systemProperty>
- <key>schema.edges.location</key>
- <value>${schema.edges.location}</value>
- </systemProperty>
- <systemProperty>
- <key>schema.version.list</key>
- <value>${schema.version.list}</value>
- </systemProperty>
- <systemProperty>
- <key>schema.version.depth.start</key>
- <value>${schema.version.depth.start}</value>
- </systemProperty>
- <systemProperty>
- <key>schema.version.depth.start</key>
- <value>${schema.version.depth.start}</value>
- </systemProperty>
- <systemProperty>
- <key>schema.version.related.link.start</key>
- <value>${schema.version.related.link.start}</value>
- </systemProperty>
- <systemProperty>
- <key>schema.version.app.root.start</key>
- <value>${schema.version.app.root.start}</value>
- </systemProperty>
- <systemProperty>
- <key>schema.version.edge.label.start</key>
- <value>${schema.version.app.root.start}</value>
- </systemProperty>
- <systemProperty>
- <key>schema.version.namespace.change.start</key>
- <value>${schema.version.namespace.change.start}</value>
- </systemProperty>
- <systemProperty>
- <key>schema.version.api.default</key>
- <value>${schema.version.api.default}</value>
- </systemProperty>
- <systemProperty>
- <key>schema.uri.base.path</key>
- <value>${schema.uri.base.path}</value>
- </systemProperty>
- <systemProperty>
- <key>aai.release</key>
- <value>${aai.release}</value>
- </systemProperty>
- </systemProperties>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
- <id>generateHtml</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>exec-maven-plugin</artifactId>
- <version>1.1.1</version>
- <executions>
- <execution>
- <phase>process-classes</phase>
- <goals>
- <goal>java</goal>
- </goals>
- <configuration>
- <mainClass>org.onap.aai.util.swagger.GenerateSwagger</mainClass>
- <systemProperties>
- <property>
- <key>aai.generate.version</key>
- <value>${gendoc.version}</value>
- </property>
- <property>
- <key>aai.wiki.link</key>
- <value>${aai.wiki.link}</value>
- </property>
- <systemProperty>
- <key>schema.configuration.location</key>
- <value>${schema.configuration.location}</value>
- </systemProperty>
- <systemProperty>
- <key>schema.nodes.location</key>
- <value>${schema.nodes.location}</value>
- </systemProperty>
- <systemProperty>
- <key>schema.edges.location</key>
- <value>${schema.edges.location}</value>
- </systemProperty>
- <systemProperty>
- <key>schema.version.list</key>
- <value>${schema.version.list}</value>
- </systemProperty>
- <systemProperty>
- <key>schema.version.depth.start</key>
- <value>${schema.version.depth.start}</value>
- </systemProperty>
- <systemProperty>
- <key>schema.version.depth.start</key>
- <value>${schema.version.depth.start}</value>
- </systemProperty>
- <systemProperty>
- <key>schema.version.related.link.start</key>
- <value>${schema.version.related.link.start}</value>
- </systemProperty>
- <systemProperty>
- <key>schema.version.app.root.start</key>
- <value>${schema.version.app.root.start}</value>
- </systemProperty>
- <systemProperty>
- <key>schema.version.edge.label.start</key>
- <value>${schema.version.app.root.start}</value>
- </systemProperty>
- <systemProperty>
- <key>schema.version.namespace.change.start</key>
- <value>${schema.version.namespace.change.start}</value>
- </systemProperty>
- <systemProperty>
- <key>schema.version.api.default</key>
- <value>${schema.version.api.default}</value>
- </systemProperty>
- <systemProperty>
- <key>schema.uri.base.path</key>
- <value>${schema.uri.base.path}</value>
- </systemProperty>
- <systemProperty>
- <key>aai.release</key>
- <value>${aai.release}</value>
- </systemProperty>
- </systemProperties>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
- <id>autoGenerate</id>
- <activation>
- <property>
- <name>aai.generate.schema</name>
- <value>!false</value>
- </property>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>exec-maven-plugin</artifactId>
- <version>1.1.1</version>
- <executions>
- <execution>
- <id>autoGenerateXsd</id>
- <phase>process-classes</phase>
- <goals>
- <goal>java</goal>
- </goals>
- <configuration>
- <mainClass>org.onap.aai.util.GenerateXsd</mainClass>
- <systemProperties>
- <systemProperty>
- <key>gen_version</key>
- <value>ALL</value>
- </systemProperty>
- <systemProperty>
- <key>gen_type</key>
- <value>XSD</value>
- </systemProperty>
- <systemProperty>
- <key>yamlresponses_url</key>
- <value></value>
- </systemProperty>
- <systemProperty>
- <key>yamlresponses_label</key>
- <value></value>
- </systemProperty>
- <systemProperty>
- <key>schema.configuration.location</key>
- <value>${schema.configuration.location}</value>
- </systemProperty>
- <systemProperty>
- <key>schema.nodes.location</key>
- <value>${schema.nodes.location}</value>
- </systemProperty>
- <systemProperty>
- <key>schema.edges.location</key>
- <value>${schema.edges.location}</value>
- </systemProperty>
- <systemProperty>
- <key>schema.version.list</key>
- <value>${schema.version.list}</value>
- </systemProperty>
- <systemProperty>
- <key>schema.version.depth.start</key>
- <value>${schema.version.depth.start}</value>
- </systemProperty>
- <systemProperty>
- <key>schema.version.depth.start</key>
- <value>${schema.version.depth.start}</value>
- </systemProperty>
- <systemProperty>
- <key>schema.version.related.link.start</key>
- <value>${schema.version.related.link.start}</value>
- </systemProperty>
- <systemProperty>
- <key>schema.version.app.root.start</key>
- <value>${schema.version.app.root.start}</value>
- </systemProperty>
- <systemProperty>
- <key>schema.version.edge.label.start</key>
- <value>${schema.version.app.root.start}</value>
- </systemProperty>
- <systemProperty>
- <key>schema.version.namespace.change.start</key>
- <value>${schema.version.namespace.change.start}</value>
- </systemProperty>
- <systemProperty>
- <key>schema.version.api.default</key>
- <value>${schema.version.api.default}</value>
- </systemProperty>
- <systemProperty>
- <key>schema.uri.base.path</key>
- <value>${schema.uri.base.path}</value>
- </systemProperty>
- <systemProperty>
- <key>aai.release</key>
- <value>${aai.release}</value>
- </systemProperty>
- </systemProperties>
- </configuration>
- </execution>
- <execution>
- <id>autoGenerateYaml</id>
- <phase>process-classes</phase>
- <goals>
- <goal>java</goal>
- </goals>
- <configuration>
- <mainClass>org.onap.aai.util.GenerateXsd</mainClass>
- <systemProperties>
- <systemProperty>
- <key>gen_version</key>
- <value>ALL</value>
- </systemProperty>
- <systemProperty>
- <key>gen_type</key>
- <value>YAML</value>
- </systemProperty>
- <systemProperty>
- <key>yamlresponses_url</key>
- <value>https://wiki.web.att.com/pages/viewpage.action?pageId=607391054
- </value>
- </systemProperty>
- <systemProperty>
- <key>yamlresponses_label</key>
- <value>Response codes found in [response codes]</value>
- </systemProperty>
- <systemProperty>
- <key>schema.configuration.location</key>
- <value>${schema.configuration.location}</value>
- </systemProperty>
- <systemProperty>
- <key>schema.nodes.location</key>
- <value>${schema.nodes.location}</value>
- </systemProperty>
- <systemProperty>
- <key>schema.edges.location</key>
- <value>${schema.edges.location}</value>
- </systemProperty>
- <systemProperty>
- <key>schema.version.list</key>
- <value>${schema.version.list}</value>
- </systemProperty>
- <systemProperty>
- <key>schema.version.depth.start</key>
- <value>${schema.version.depth.start}</value>
- </systemProperty>
- <systemProperty>
- <key>schema.version.depth.start</key>
- <value>${schema.version.depth.start}</value>
- </systemProperty>
- <systemProperty>
- <key>schema.version.related.link.start</key>
- <value>${schema.version.related.link.start}</value>
- </systemProperty>
- <systemProperty>
- <key>schema.version.app.root.start</key>
- <value>${schema.version.app.root.start}</value>
- </systemProperty>
- <systemProperty>
- <key>schema.version.edge.label.start</key>
- <value>${schema.version.app.root.start}</value>
- </systemProperty>
- <systemProperty>
- <key>schema.version.namespace.change.start</key>
- <value>${schema.version.namespace.change.start}</value>
- </systemProperty>
- <systemProperty>
- <key>schema.version.api.default</key>
- <value>${schema.version.api.default}</value>
- </systemProperty>
- <systemProperty>
- <key>aai.release</key>
- <value>${aai.release}</value>
- </systemProperty>
- </systemProperties>
- </configuration>
- </execution>
- <execution>
- <id>autoGenerateHtml</id>
- <phase>process-classes</phase>
- <goals>
- <goal>java</goal>
- </goals>
- <configuration>
- <mainClass>org.onap.aai.util.AutoGenerateHtml</mainClass>
- <systemProperties>
- <property>
- <key>aai.generate.version</key>
- <value>${gendoc.version}</value>
- </property>
- <property>
- <key>aai.wiki.link</key>
- <value>${aai.wiki.link}</value>
- </property>
- <systemProperty>
- <key>schema.configuration.location</key>
- <value>${schema.configuration.location}</value>
- </systemProperty>
- <systemProperty>
- <key>schema.nodes.location</key>
- <value>${schema.nodes.location}</value>
- </systemProperty>
- <systemProperty>
- <key>schema.edges.location</key>
- <value>${schema.edges.location}</value>
- </systemProperty>
- <systemProperty>
- <key>schema.version.list</key>
- <value>${schema.version.list}</value>
- </systemProperty>
- <systemProperty>
- <key>schema.version.depth.start</key>
- <value>${schema.version.depth.start}</value>
- </systemProperty>
- <systemProperty>
- <key>schema.version.depth.start</key>
- <value>${schema.version.depth.start}</value>
- </systemProperty>
- <systemProperty>
- <key>schema.version.related.link.start</key>
- <value>${schema.version.related.link.start}</value>
- </systemProperty>
- <systemProperty>
- <key>schema.version.app.root.start</key>
- <value>${schema.version.app.root.start}</value>
- </systemProperty>
- <systemProperty>
- <key>schema.version.edge.label.start</key>
- <value>${schema.version.app.root.start}</value>
- </systemProperty>
- <systemProperty>
- <key>schema.version.namespace.change.start</key>
- <value>${schema.version.namespace.change.start}</value>
- </systemProperty>
- <systemProperty>
- <key>schema.version.api.default</key>
- <value>${schema.version.api.default}</value>
- </systemProperty>
- <systemProperty>
- <key>aai.release</key>
- <value>${aai.release}</value>
- </systemProperty>
- </systemProperties>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
</profiles>
<build>
<plugins>
</systemPropertyVariables>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <version>2.8</version>
+ </plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>sonar-maven-plugin</artifactId>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
</plugin>
- <plugin>
- <groupId>org.sonatype.plugins</groupId>
- <artifactId>nexus-staging-maven-plugin</artifactId>
- </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
<artifactId>json-simple</artifactId>
<version>1.1.1</version>
</dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-web</artifactId>
- <version>4.3.18.RELEASE</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-context</artifactId>
- <version>4.3.18.RELEASE</version>
- </dependency>
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
<version>${groovy.version}</version>
<classifier>indy</classifier>
</dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context</artifactId>
+ <version>${springframework.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-web</artifactId>
+ <version>${springframework.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-core</artifactId>
+ <version>${springframework.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-expression</artifactId>
+ <version>${springframework.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-webmvc</artifactId>
+ <version>${springframework.version}</version>
+ </dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
- <version>4.3.18.RELEASE</version>
+ <version>${springframework.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-test</artifactId>
- <version>1.5.1.RELEASE</version>
+ <version>1.5.21.RELEASE</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.tinkerpop</groupId>
<artifactId>gremlin-groovy</artifactId>
<version>${gremlin.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.codehaus.groovy</groupId>
+ <artifactId>groovy</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-jms</artifactId>
- <version>4.3.18.RELEASE</version>
+ <version>${springframework.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
Code Review / aai / aai-common.git / blobdiff