diff options
| author |   Gary Wu <gary.i.wu@huawei.com> | 2018-05-11 15:00:25 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2018-05-11 15:00:25 +0000 |
| commit | 07362af32f100a1c2ded2ad88359e7b6de4640db (patch) | |
| tree | cc68fae4a42bea573d2525a4e09811e433723841 | |
| parent | 4713ef1c5bb2a280a02310b4a6fc32f736b63e7e (diff) | |
| parent | 57c49c5f01d110e91cc8770a4bdf7b2fcbb0d53b (diff) | |
Merge "Correction problem in pom.xml in pnf simulator"
| -rw-r--r-- | test/mocks/pnfsimulator/pom.xml | 52 |
1 files changed, 27 insertions, 25 deletions
diff --git a/test/mocks/pnfsimulator/pom.xml b/test/mocks/pnfsimulator/pom.xml index 4b39d751b..29376e464 100644 --- a/test/mocks/pnfsimulator/pom.xml +++ b/test/mocks/pnfsimulator/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> - <parent> + <parent> <groupId>org.onap.oparent</groupId> <artifactId>oparent</artifactId> <version>0.1.1</version> @@ -22,7 +22,8 @@ <maven.compiler.target>1.8</maven.compiler.target> <simulator.main.class>org.onap.pnfsimulator.Main</simulator.main.class> <dependency.directory.name>libs</dependency.directory.name> - <dependency.directory.location>${project.build.directory}/${dependency.directory.name}</dependency.directory.location> + <dependency.directory.location>${project.build.directory}/${dependency.directory.name} + </dependency.directory.location> <onap.nexus.dockerregistry.daily>nexus3.onap.org:10003</onap.nexus.dockerregistry.daily> </properties> @@ -125,29 +126,30 @@ <groupId>com.spotify</groupId> <artifactId>docker-maven-plugin</artifactId> <configuration> - <skipDockerBuild>false</skipDockerBuild> - <imageName> - ${onap.nexus.dockerregistry.daily}/onap/${project.groupId}.${project.artifactId} - </imageName> - <cmd>java -cp ${dependency.directory.name}/*:${project.build.finalName}.jar ${simulator.main.class} - </cmd> - <resources> - <resource> - <targetPath>${dependency.directory.name}</targetPath> - <directory>${dependency.directory.location}</directory> - </resource> - <resource> - <targetPath>/</targetPath> - <directory>${project.build.directory}</directory> - <include>${project.build.finalName}.jar</include> - </resource> - </resources> - <imageTags> - <imageTag>${project.version}-SNAPSHOT-${maven.build.timestamp}Z</imageTag> - <imageTag>${project.version}</imageTag> - <imageTag>latest</imageTag> - </imageTags> - <serverId>${onap.nexus.dockerregistry.daily}</serverId> + <skipDockerBuild>false</skipDockerBuild> + <imageName> + ${onap.nexus.dockerregistry.daily}/onap/${project.groupId}.${project.artifactId} + </imageName> + <cmd>java -cp ${dependency.directory.name}/*:${project.build.finalName}.jar ${simulator.main.class} + </cmd> + <resources> + <resource> + <targetPath>${dependency.directory.name}</targetPath> + <directory>${dependency.directory.location}</directory> + </resource> + <resource> + <targetPath>/</targetPath> + <directory>${project.build.directory}</directory> + <include>${project.build.finalName}.jar</include> + </resource> + </resources> + <imageTags> + <imageTag>${project.version}-SNAPSHOT-${maven.build.timestamp}Z</imageTag> + <imageTag>${project.version}</imageTag> + <imageTag>latest</imageTag> + </imageTags> + <serverId>${onap.nexus.dockerregistry.daily}</serverId> + </configuration> </plugin> </plugins> </build> |