Merge "switch drools pdp image to new one"

[integration.git] / test / mocks / sniroemulator / pom.xml

diff --git a/test/mocks/sniroemulator/pom.xml b/test/mocks/sniroemulator/pom.xml
index f7c91bf..7ad3e7a 100644 (file)
--- a/test/mocks/sniroemulator/pom.xml
+++ b/test/mocks/sniroemulator/pom.xml
@@ -5,27 +5,23 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.onap.integration</groupId>
     <artifactId>sniroemulator</artifactId>
-    <version>1.0-SNAPSHOT</version>
+    <version>1.1.0-SNAPSHOT</version>
     <name>sniroemulator</name>
     <description>onap sniro emulator project based on  Spring Boot</description>
 
 <parent>
         <groupId>org.onap.oparent</groupId>
         <artifactId>oparent</artifactId>
-        <version>0.1.1</version>
+        <version>1.2.1</version>
 </parent>
 
-<!-- <parent>
-    <groupId>org.springframework.boot</groupId>
-    <artifactId>spring-boot-starter-parent</artifactId>
-    <version>1.5.7.RELEASE</version>
-</parent>
--->
 <properties>
-    <dockerLocation>${basedir}/target</dockerLocation>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
     <java.version>1.8</java.version>
+    <dockerLocation>${basedir}/target</dockerLocation>
+    <docker.tag>latest</docker.tag>
+    <docker.maven.plugin.version>1.0.0</docker.maven.plugin.version>
     <versions.jackson>2.8.9</versions.jackson>
     <jetty.version>9.2.22.v20170606</jetty.version>
     <start-class>org.onap.integration.test.mocks.sniroemulator.MockApplication</start-class>
@@ -226,13 +222,14 @@
         <plugin>
             <groupId>com.spotify</groupId>
             <artifactId>docker-maven-plugin</artifactId>
-            <version>0.4.11</version>
+            <version>${docker.maven.plugin.version}</version>
             <configuration>
-                <imageName>openecomp/${project.artifactId}</imageName>
+                <verbose>true</verbose>
+                <registryUrl>${docker.push.registry}</registryUrl>
+                <imageName>${docker.push.registry}/onap/${project.artifactId}</imageName>
                 <dockerDirectory>${dockerLocation}</dockerDirectory>
-                <serverId>docker-hub</serverId>
                 <imageTags>
-                    <imageTag>latest</imageTag>
+                    <imageTag>${docker.tag}</imageTag>
                 </imageTags>
                 <forceTags>true</forceTags>
             </configuration>