X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=pom.xml;h=16d43efd0240607f655f7cea41d8fbd0394bc769;hb=6aa19e259dddf790e341948bbd160a498d58815b;hp=51441e8963dfe2575a528ff0aab949fefbbd896d;hpb=dee6c34b3e5d3b40bc74fc73fafc1d116126c7fc;p=aai%2Fgizmo.git

diff --git a/pom.xml b/pom.xml
index 51441e8..16d43ef 100644
--- a/pom.xml
+++ b/pom.xml
@@ -36,7 +36,8 @@ limitations under the License.
 
     <properties>
         <docker.location>${basedir}/target</docker.location>
-        <version.org.onap.aai.aai-common>1.2.4</version.org.onap.aai.aai-common>
+        <version.org.onap.aai.aai-common>1.4.1-SNAPSHOT</version.org.onap.aai.aai-common>
+        <event.client.version>1.3.1</event.client.version>
     </properties>
 
     <dependencyManagement>
@@ -45,7 +46,7 @@ limitations under the License.
                 <!-- Import dependency management from Spring Boot -->
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-dependencies</artifactId>
-                <version>1.5.15.RELEASE</version>
+                <version>1.5.18.RELEASE</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
@@ -56,6 +57,12 @@ limitations under the License.
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.springframework.boot</groupId>
+                    <artifactId>spring-boot-starter-tomcat</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -74,6 +81,12 @@ limitations under the License.
         <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.springframework.boot</groupId>
@@ -87,6 +100,7 @@ limitations under the License.
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
@@ -122,15 +136,10 @@ limitations under the License.
             <groupId>org.onap.aai.aai-common</groupId>
             <artifactId>aai-schema-ingest</artifactId>
             <version>${version.org.onap.aai.aai-common}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.onap.aai.aai-common</groupId>
-            <artifactId>aai-core</artifactId>
-            <version>${version.org.onap.aai.aai-common}</version>
             <exclusions>
                 <exclusion>
-                    <groupId>*</groupId>
-                    <artifactId>*</artifactId>
+                  <groupId>org.powermock</groupId>
+                  <artifactId>*</artifactId>
                 </exclusion>
             </exclusions>
         </dependency>
@@ -149,7 +158,7 @@ limitations under the License.
         <dependency>
             <groupId>org.onap.aai.event-client</groupId>
             <artifactId>event-client-dmaap</artifactId>
-            <version>1.3.0</version>
+           <version>${event.client.version}</version>
             <exclusions>
                 <exclusion>
                     <groupId>org.slf4j</groupId>
@@ -160,7 +169,19 @@ limitations under the License.
         <dependency>
             <groupId>org.onap.aai.event-client</groupId>
             <artifactId>event-client-kafka</artifactId>
-            <version>1.3.0</version>
+           <version>${event.client.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.slf4j</groupId>
+                    <artifactId>slf4j-api</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+        <dependency>
+           <groupId>org.onap.aai.event-client</groupId>
+           <artifactId>event-client-rabbitmq</artifactId>
+           <version>${event.client.version}</version>
             <exclusions>
                 <exclusion>
                     <groupId>org.slf4j</groupId>
@@ -324,7 +345,7 @@ limitations under the License.
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-core</artifactId>
-            <version>1.10.19</version>
+            <version>2.15.0</version>
             <scope>test</scope>
             <exclusions>
                 <exclusion>
@@ -475,16 +496,7 @@ limitations under the License.
                                     <artifactId>aai-schema</artifactId>
                                     <version>${version.org.onap.aai.aai-common}</version>
                                     <type>jar</type>
-                                    <includes>oxm/</includes>
-                                    <outputDirectory>${project.build.directory}/bundleconfig-local/etc</outputDirectory>
-                                </artifactItem>
-                                <artifactItem>
-                                    <groupId>org.onap.aai.aai-common</groupId>
-                                    <artifactId>aai-core</artifactId>
-                                    <version>${version.org.onap.aai.aai-common}</version>
-                                    <type>jar</type>
-                                    <includes>dbedgerules/</includes>
-                                    <excludes>**/*.ftlh</excludes>
+                                    <includes>onap/**/</includes>
                                     <outputDirectory>${project.build.directory}/bundleconfig-local/etc</outputDirectory>
                                 </artifactItem>
                             </artifactItems>