diff options
| author |   MD IRSHAD SHEIKH <md.irshad.sheikh@huawei.com> | 2021-02-25 18:43:27 +0530 |
|---|---|---|
| committer | MD IRSHAD SHEIKH <md.irshad.sheikh@huawei.com> | 2021-02-26 10:48:30 +0530 |
| commit | 5e25f850cb0d1ae5f8f32088048eae148986daf2 (patch) | |
| tree | 0e0baf7bcc47b8ee081b726b950fad38021876c3 | |
| parent | e3efc9f015b8bd8bf384c5d476272c0e42def34a (diff) | |
mso-cnf-adapter changes for docker tag name
Issue-ID: SO-3518
Signed-off-by: MD IRSHAD SHEIKH <md.irshad.sheikh@huawei.com>
Change-Id: I3fa9e3249b5ba79effe233ef0c44fa865f4cccbd
| -rw-r--r-- | pom.xml | 63 |
1 files changed, 39 insertions, 24 deletions
@@ -25,10 +25,10 @@ <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.onap.so</groupId> - <artifactId>adapters</artifactId> + <artifactId>so</artifactId> <version>1.8.0-SNAPSHOT</version> </parent> - <groupId>org.onap.so.adapters</groupId> + <!-- <groupId>org.onap.so.adapters</groupId --> <artifactId>so-cnf-adapter</artifactId> <packaging>jar</packaging> <name>so-cnf-adapter</name> @@ -136,25 +136,16 @@ </dependencies> </plugin> <plugin> - <groupId>com.spotify</groupId> - <artifactId>dockerfile-maven-plugin</artifactId> - <version>1.4.3</version> - <dependencies> - <dependency> - <groupId>javax.activation</groupId> - <artifactId>activation</artifactId> - <version>1.1.1</version> - </dependency> - </dependencies> - <executions> - <execution> - <id>docker-build</id> - <goals> - <goal>build</goal> - </goals> - </execution> - </executions> - <configuration> + <groupId>org.codehaus.mojo</groupId> + <artifactId>exec-maven-plugin</artifactId> + <executions> + <execution> + <id>docker-build</id> + <phase>install</phase> + <goals> + <goal>exec</goal> + </goals> + <configuration> <dockerFile>Dockerfile</dockerFile> <executable>docker</executable> <workingDirectory>${project.basedir}</workingDirectory> @@ -168,10 +159,10 @@ <JAR_FILE>${project.artifactId}-${project.version}.jar</JAR_FILE> <ARTIFACT_ID>${project.artifactId}</ARTIFACT_ID> </buildArgs> - <repository>${project.artifactId}</repository> - <tag>${project.version}</tag> </configuration> - </plugin> + </execution> + </executions> + </plugin> </plugins> </build> <dependencies> @@ -214,6 +205,30 @@ <artifactId>spring-boot-starter-test</artifactId> <scope>test</scope> </dependency> + <dependency> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpclient</artifactId> + </dependency> + <dependency> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpcore</artifactId> + </dependency> + <dependency> + <groupId>org.springframework.cloud</groupId> + <artifactId>spring-cloud-contract-wiremock</artifactId> + <version>1.2.4.RELEASE</version> + </dependency> + <dependency> + <groupId>org.onap.so</groupId> + <artifactId>aai-client</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>com.sun.xml.ws</groupId> + <artifactId>jaxws-ri</artifactId> + <version>2.3.0</version> + <type>pom</type> + </dependency> </dependencies> </project> |