X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=datarouter-prov%2Fpom.xml;h=4cbb97f31f62367e7f78e782ca35a37116649584;hb=ee6fa61e2cd7df99891092709765235b6166a041;hp=4685499fb35701227a82d2efca790c95048249ee;hpb=90d9273e98248b1de99542b990cb6abc5e621d5b;p=dmaap%2Fdatarouter.git

diff --git a/datarouter-prov/pom.xml b/datarouter-prov/pom.xml
index 4685499f..4cbb97f3 100755
--- a/datarouter-prov/pom.xml
+++ b/datarouter-prov/pom.xml
@@ -3,6 +3,7 @@
   * org.onap.dmaap
   * ===========================================================================
   * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+  * Modifications Copyright (C) 2018 Nokia. All rights reserved.
   * ===========================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -25,7 +26,7 @@
     <parent>
         <groupId>org.onap.dmaap.datarouter</groupId>
         <artifactId>parent</artifactId>
-        <version>1.0.1-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>datarouter-prov</artifactId>
@@ -43,7 +44,12 @@
     </properties>
     <dependencies>
         <dependency>
-            <groupId>dom4j</groupId>
+            <groupId>xml-apis</groupId>
+            <artifactId>xml-apis</artifactId>
+            <version>${xml-apis.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.dom4j</groupId>
             <artifactId>dom4j</artifactId>
             <version>${dom4j.version}</version>
         </dependency>
@@ -82,7 +88,7 @@
         <dependency>
             <groupId>javax.mail</groupId>
             <artifactId>javax.mail-api</artifactId>
-            <version>1.5.5</version>
+            <version>${javax.mail-api.version}</version>
         </dependency>
         <dependency>
             <groupId>com.att.eelf</groupId>
@@ -240,6 +246,12 @@
             <groupId>org.hibernate</groupId>
             <artifactId>hibernate-entitymanager</artifactId>
             <version>5.2.9.Final</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>dom4j</groupId>
+                    <artifactId>dom4j</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
     </dependencies>
     <profiles>
@@ -258,7 +270,7 @@
                         <version>1.0.0</version>
                         <configuration>
                             <imageName>${onap.nexus.dockerregistry.daily}/${datarouter.prov.image.name}</imageName>
-                            <dockerDirectory>${docker.location}</dockerDirectory>
+                            <baseImage>java:8</baseImage>
                             <serverId>${onap.nexus.dockerregistry.daily}</serverId>
                             <skipDockerBuild>false</skipDockerBuild>
                             <imageTags>
@@ -266,22 +278,25 @@
                                 <imageTag>latest</imageTag>
                             </imageTags>
                             <forceTags>true</forceTags>
+                            <entryPoint>["/startup.sh", "start"]</entryPoint>
                             <resources>
                                 <resource>
-                                    <targetPath>/</targetPath>
-                                    <directory>${project.basedir}</directory>
-                                    <excludes>
-                                        <exclude>target/**/*</exclude>
-                                        <exclude>pom.xml</exclude>
-                                    </excludes>
+                                    <targetPath>/opt</targetPath>
+                                    <directory>${project.build.directory}/opt</directory>
                                 </resource>
-
                                 <resource>
                                     <targetPath>/</targetPath>
-                                    <directory>${project.build.directory}</directory>
-                                    <include>**/**</include>
+                                    <directory>${docker.location}</directory>
+                                    <include>startup.sh</include>
                                 </resource>
                             </resources>
+                            <runs>
+                                <run>chmod 0700 /startup.sh</run>
+                            </runs>
+                            <exposes>
+                                <expose>8080</expose>
+                                <expose>8443</expose>
+                            </exposes>
                         </configuration>
                     </plugin>
                 </plugins>