Renew AAF certs for DMaaP DR - Casablanca

[dmaap/datarouter.git] / datarouter-prov / pom.xml

diff --git a/datarouter-prov/pom.xml b/datarouter-prov/pom.xml
index 2c69cbd..a952b46 100755 (executable)
--- a/datarouter-prov/pom.xml
+++ b/datarouter-prov/pom.xml
@@ -26,7 +26,7 @@
     <parent>\r
         <groupId>org.onap.dmaap.datarouter</groupId>\r
         <artifactId>parent</artifactId>\r
-        <version>1.0.3-SNAPSHOT</version>\r
+        <version>1.0.8-SNAPSHOT</version>\r
         <relativePath>../pom.xml</relativePath>\r
     </parent>\r
     <artifactId>datarouter-prov</artifactId>\r
@@ -49,7 +49,7 @@
             <version>${xml-apis.version}</version>\r
         </dependency>\r
         <dependency>\r
-            <groupId>dom4j</groupId>\r
+            <groupId>org.dom4j</groupId>\r
             <artifactId>dom4j</artifactId>\r
             <version>${dom4j.version}</version>\r
         </dependency>\r
@@ -246,6 +246,12 @@
             <groupId>org.hibernate</groupId>\r
             <artifactId>hibernate-entitymanager</artifactId>\r
             <version>5.2.9.Final</version>\r
+            <exclusions>\r
+                <exclusion>\r
+                    <groupId>dom4j</groupId>\r
+                    <artifactId>dom4j</artifactId>\r
+                </exclusion>\r
+            </exclusions>\r
         </dependency>\r
     </dependencies>\r
     <profiles>\r
@@ -263,14 +269,10 @@
                         <artifactId>docker-maven-plugin</artifactId>\r
                         <version>1.0.0</version>\r
                         <configuration>\r
-                            <imageName>${onap.nexus.dockerregistry.daily}/${datarouter.prov.image.name}</imageName>\r
+                            <imageName>${onap.nexus.dockerregistry.daily}/${datarouter.prov.image.name}:${project.version}</imageName>\r
                             <baseImage>java:8</baseImage>\r
                             <serverId>${onap.nexus.dockerregistry.daily}</serverId>\r
                             <skipDockerBuild>false</skipDockerBuild>\r
-                            <imageTags>\r
-                                <imageTag>${project.version}</imageTag>\r
-                                <imageTag>latest</imageTag>\r
-                            </imageTags>\r
                             <forceTags>true</forceTags>\r
                             <entryPoint>["/startup.sh", "start"]</entryPoint>\r
                             <resources>\r