</parent>
<groupId>org.onap.aai.graphadmin</groupId>
<artifactId>aai-graphadmin</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
<properties>
<skip.integration.tests>true</skip.integration.tests>
<!-- End of Test Related Properties -->
+ <spring.boot.version>1.5.19.RELEASE</spring.boot.version>
+
<!-- Start of Sonar Related Properties -->
<sonar.language>java</sonar.language>
<sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
<aai.project.version>${project.version}</aai.project.version>
<!-- Start of Database Related Properties -->
- <hbase.version>1.0.2</hbase.version>
<janusgraph.version>0.2.0</janusgraph.version>
<gremlin.driver.version>3.0.1-incubating</gremlin.driver.version>
<gremlin.version>3.2.2</gremlin.version>
<maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format>
- <activemq.version>5.14.3</activemq.version>
+ <activemq.version>5.15.6</activemq.version>
<logback.version>1.2.3</logback.version>
<mockito.version>1.10.19</mockito.version>
- <httpclient.version>4.5.1</httpclient.version>
+ <httpclient.version>4.5.3</httpclient.version>
<gson.version>2.7</gson.version>
<json.version>20090211</json.version>
- <aai.core.version>1.3.0-SNAPSHOT</aai.core.version>
- <aai.schema.version>1.3.0-SNAPSHOT</aai.schema.version>
+ <aai.core.version>1.4.2</aai.core.version>
+ <aai.schema.version>1.0.1</aai.schema.version>
<netty.handler.version>4.1.9.Final</netty.handler.version>
- <netty.version>4.0.37.Final</netty.version>
+ <netty.version>4.0.56.Final</netty.version>
- <spring.test.version>4.3.6.RELEASE</spring.test.version>
- <spring.web.version>4.3.6.RELEASE</spring.web.version>
+ <spring.test.version>4.3.22.RELEASE</spring.test.version>
<cxf.version>3.2.2</cxf.version>
<antlr4.listener>true</antlr4.listener>
<antlr.version>4.7</antlr.version>
+ <plexus.utils.version>3.1.0</plexus.utils.version>
+
<eelf.core.version>1.0.0</eelf.core.version>
- <google.guava.version>16.0</google.guava.version>
+ <google.guava.version>19.0</google.guava.version>
<jaxb.version>2.2.11</jaxb.version>
<eclipse.persistence.version>2.6.2</eclipse.persistence.version>
<dmaap.client.version>0.2.12</dmaap.client.version>
- <springframework.version>4.3.4.RELEASE</springframework.version>
+ <springframework.version>4.3.22.RELEASE</springframework.version>
<spring.jms.version>4.3.2.RELEASE</spring.jms.version>
<spring.security.version>1.0.3.RELEASE</spring.security.version>
<start-class>org.onap.aai.GraphAdminApp</start-class>
<snapshot.file>${project.basedir}/snapshots/int1-data.graphson</snapshot.file>
- <jacoco.line.coverage.limit>0.27</jacoco.line.coverage.limit>
+ <jacoco.line.coverage.limit>0.46</jacoco.line.coverage.limit>
<!-- Start of Default ONAP Schema Properties -->
<schema.source.name>onap</schema.source.name>
<schema.configuration.location>N/A</schema.configuration.location>
<schema.nodes.location>${project.basedir}/src/main/resources/schema/${schema.source.name}/oxm</schema.nodes.location>
<schema.edges.location>${project.basedir}/src/main/resources/schema/${schema.source.name}/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>v16</schema.version.api.default>
+ <schema.version.list>v10,v11,v12,v13,v14,v15,v16</schema.version.list>
<schema.uri.base.path>/aai</schema.uri.base.path>
<!-- End of Default ONAP Schema Properties -->
</properties>
<properties>
<schema.source.name>onap</schema.source.name>
<schema.version.namespace.change.start>v12</schema.version.namespace.change.start>
- <schema.version.list>v8,v9,v10,v11,v12,v13,v14</schema.version.list>
+ <schema.version.list>v10,v11,v12,v13,v14,v15,v16</schema.version.list>
</properties>
</profile>
<!-- End of ONAP Profile -->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
- <version>1.5.12.RELEASE</version>
+ <version>${spring.boot.version}</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
</exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.janusgraph</groupId>
- <artifactId>janusgraph-hbase-parent</artifactId>
- <version>${janusgraph.version}</version>
- <type>pom</type>
- <exclusions>
<exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
+ <groupId>dom4j</groupId>
+ <artifactId>dom4j</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.janusgraph</groupId>
- <artifactId>janusgraph-hbase</artifactId>
+ <artifactId>janusgraph-cassandra</artifactId>
<version>${janusgraph.version}</version>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>dom4j</groupId>
+ <artifactId>dom4j</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.janusgraph</groupId>
- <artifactId>janusgraph-cassandra</artifactId>
+ <artifactId>janusgraph-cql</artifactId>
<version>${janusgraph.version}</version>
<exclusions>
<exclusion>
<artifactId>tinkergraph-gremlin</artifactId>
<version>${gremlin.version}</version>
</dependency>
+
+ <dependency>
+ <groupId>org.antlr</groupId>
+ <artifactId>antlr4-runtime</artifactId>
+ <version>${antlr.version}</version>
+ </dependency>
<dependency>
<groupId>org.apache.tinkerpop</groupId>
<artifactId>gremlin-core</artifactId>
<groupId>org.apache.tinkerpop</groupId>
<artifactId>gremlin-driver</artifactId>
<version>${gremlin.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.codehaus.groovy</groupId>
+ <artifactId>groovy</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<!-- End of Tinkerpop Dependencies -->
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-core</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-http</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-server</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-web</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.codehaus.jackson</groupId>
+ <artifactId>jackson-mapper-asl</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-json</artifactId>
<version>1.18</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.codehaus.jackson</groupId>
+ <artifactId>jackson-mapper-asl</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<!-- Do not use the jersey-client since jersey client 1.0 version clashes
with jersey 2 which we are using -->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-jersey</artifactId>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-web</artifactId>
- <version>${spring.web.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-tomcat</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
</exclusions>
</dependency>
<!-- End of Antlr dependencies for DSL -->
+ <!-- Start of Plexus dependencies for DSL -->
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-utils</artifactId>
+ <version>${plexus.utils.version}</version>
+ </dependency>
+ <!-- End of Plexus dependencies for DSL -->
<!-- Start of Junit Test Dependencies -->
<dependency>
<groupId>org.hamcrest</groupId>
<configuration>
<artifactItems>
<artifactItem>
- <groupId>org.onap.aai.aai-common</groupId>
+ <groupId>org.onap.aai.schema-service</groupId>
<artifactId>aai-schema</artifactId>
<version>${aai.schema.version}</version>
<outputDirectory>${project.basedir}/src/main/resources/schema/</outputDirectory>
<configuration>
<artifactItems>
<artifactItem>
- <groupId>org.onap.aai.aai-common</groupId>
+ <groupId>org.onap.aai.schema-service</groupId>
<artifactId>aai-schema</artifactId>
<version>${aai.schema.version}</version>
<outputDirectory>${project.basedir}/src/main/resources/schema/</outputDirectory>
<include>src/test/java/**</include>
<include>pom.xml</include>
</includes>
- <skipExistingHeaders>false</skipExistingHeaders>
+ <skipExistingHeaders>true</skipExistingHeaders>
<skip>false</skip>
</configuration>
<executions>
</plugins>
</pluginManagement>
<plugins>
+ <!--
+ Using https://code.revelc.net/formatter-maven-plugin/ for Eclipse formatter
+ Using https://github.com/diffplug/spotless/tree/master/plugin-maven for import order
+ Use in combination to rewrite code and imports, then checkstyle
+
+ mvn formatter:format spotless:apply process-sources
+ -->
+ <plugin>
+ <groupId>net.revelc.code.formatter</groupId>
+ <artifactId>formatter-maven-plugin</artifactId>
+ <version>2.8.1</version>
+ <configuration>
+ <configFile>${project.basedir}/onap-java-formatter.xml</configFile>
+ </configuration>
+ <!-- https://code.revelc.net/formatter-maven-plugin/
+ use mvn formatter:format to rewrite source files
+ use mvn formatter:validate to validate source files -->
+ </plugin>
+ <plugin>
+ <groupId>com.diffplug.spotless</groupId>
+ <artifactId>spotless-maven-plugin</artifactId>
+ <version>1.18.0</version>
+ <configuration>
+ <java>
+ <importOrder>
+ <order>com,java,javax,org</order>
+ </importOrder>
+ </java>
+ </configuration>
+ <!-- https://github.com/diffplug/spotless/tree/master/plugin-maven
+ use mvn spotless:apply to rewrite source files
+ use mvn spotless:check to validate source files -->
+ </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
+ <!--
+ Issue with the spring 1.5.15.RELEASE plugin is causing build errors
+ due to the fact that the plugin 1.5.15.RELEASE was built using maven 3.5 while
+ the current build version being used by our jenkins is 3.3.9
+ -->
+ <version>1.5.12.RELEASE</version>
<configuration>
<mainClass>${start-class}</mainClass>
<layout>ZIP</layout>
Code Review / aai / graphadmin.git / blobdiff