Upversion babel in master

[aai/babel.git] / pom.xml

diff --git a/pom.xml b/pom.xml
index 5f45688..38d2949 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -4,8 +4,8 @@
     ============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.
@@ -21,20 +21,21 @@
     ============LICENSE_END=========================================================
 
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<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>
 
        <parent>
                <groupId>org.onap.oparent</groupId>
                <artifactId>oparent</artifactId>
-               <version>1.2.0</version>
+               <version>2.0.0</version>
                <relativePath />
        </parent>
 
        <groupId>org.onap.aai</groupId>
        <artifactId>babel</artifactId>
-       <version>1.3.0-SNAPSHOT</version>
+       <version>1.6.0-SNAPSHOT</version>
        <packaging>jar</packaging>
 
        <name>aai-babel</name>
@@ -42,7 +43,7 @@
 
        <properties>
                <!-- Spring boot version -->
-               <spring.boot.version>1.5.15.RELEASE</spring.boot.version>
+               <spring.boot.version>2.1.6.RELEASE</spring.boot.version>
 
                <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
                <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
@@ -53,12 +54,12 @@
 
                <!-- Dependency Versions -->
                <common.logging.version>1.2.2</common.logging.version>
-               <sdc.tosca.version>1.4.5</sdc.tosca.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</aai-schema.version>
+               <aai-schema.group.id>org.onap.aai.schema-service</aai-schema.group.id>
+               <aai-schema.version>1.5.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>
@@ -88,6 +89,12 @@
                <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>
@@ -116,7 +123,6 @@
                <dependency>
                        <groupId>org.apache.commons</groupId>
                        <artifactId>commons-lang3</artifactId>
-                       <version>${apache.lang3.version}</version>
                </dependency>
                <dependency>
                        <groupId>javax.ws.rs</groupId>
@@ -125,7 +131,7 @@
                </dependency>
                <dependency>
                        <groupId>org.codehaus.groovy</groupId>
-                       <artifactId>groovy-all</artifactId>
+                       <artifactId>groovy</artifactId>
                </dependency>
                <dependency>
                        <groupId>org.onap.sdc.sdc-tosca</groupId>
@@ -137,7 +143,7 @@
                        <artifactId>rest-client</artifactId>
                        <version>${aai.rest.client.version}</version>
                </dependency>
-
+               
                <!-- Testing -->
                <dependency>
                        <groupId>org.springframework.boot</groupId>
@@ -169,8 +175,7 @@
                                        <jvmArguments>
                                                -DCONFIG_HOME=./appconfig-local
                                                -DAPP_HOME=.
-                                               -Dartifactgenerator.config=./appconfig-local/artifact-generator.properties
-                                               -Dgroupfilter.config=./appconfig-local/filter-types.properties
+                                               -Dtosca.mappings.config=./appconfig-local/tosca-mappings.json
                                                -DKEY_STORE_PASSWORD=${KEY_STORE_PASSWORD}
                                        </jvmArguments>
                                </configuration>