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