aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLusheng Ji <lji@research.att.com>2018-04-23 10:38:00 -0400
committerLusheng Ji <lji@research.att.com>2018-04-23 10:38:05 -0400
commit5f1976d4512bfed1d0f86191e7a9c33053a6a776 (patch)
treef535433b5d74090fed399fd95c2be5f37b6d993e
parent64529e826a27867549c56691d7c3a0914961a351 (diff)
Fix pom for docker build
Issue-ID: DCAEGEN2-459 Change-Id: I2b156298bc589d500ce08aa3f1e1a504cf9d55de Signed-off-by: Lusheng Ji <lji@research.att.com>
-rw-r--r--UniversalVesAdapter/pom.xml3
-rw-r--r--pom.xml14
-rw-r--r--snmpmapper/pom.xml3
3 files changed, 18 insertions, 2 deletions
diff --git a/UniversalVesAdapter/pom.xml b/UniversalVesAdapter/pom.xml
index 1c92eb1..2922ae2 100644
--- a/UniversalVesAdapter/pom.xml
+++ b/UniversalVesAdapter/pom.xml
@@ -145,8 +145,9 @@
<plugin>
<groupId>com.spotify</groupId>
<artifactId>docker-maven-plugin</artifactId>
- <version>1.0.0</version>
+ <version>${docker.maven.version}</version>
<configuration>
+ <skipDockerBuild>false</skipDockerBuild>
<imageName>${onap.nexus.dockerregistry.daily}/onap/${project.groupId}.${project.artifactId}</imageName>
<baseImage>openjdk:8-jre</baseImage>
<entryPoint>["java", "-jar", "/opt/${project.build.finalName}.jar", "server"]</entryPoint>
diff --git a/pom.xml b/pom.xml
index b5b4ba5..6b4e6d6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -73,6 +73,7 @@
<httpclient.version>4.5.2</httpclient.version>
<commons.lang3.version>3.5</commons.lang3.version>
+ <docker.maven.version>0.4.11</docker.maven.version>
<!--TESTING DEPENDENCIES -->
<junit.version>4.12</junit.version>
@@ -192,6 +193,11 @@
<version>${jayway.jsonpath.version}</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>com.spotify</groupId>
+ <artifactId>docker-maven-plugin</artifactId>
+ <version>${docker.maven.version}</version>
+ </dependency>
</dependencies>
@@ -554,6 +560,14 @@
<version>${surefire.report.plugin.version}</version>
</plugin> -->
+ <plugin>
+ <groupId>com.spotify</groupId>
+ <artifactId>docker-maven-plugin</artifactId>
+ <version>${docker.maven.version}</version>
+ <configuration>
+ <skipDockerBuild>true</skipDockerBuild>
+ </configuration>
+ </plugin>
</plugins>
</pluginManagement>
diff --git a/snmpmapper/pom.xml b/snmpmapper/pom.xml
index 69fde73..a2c620d 100644
--- a/snmpmapper/pom.xml
+++ b/snmpmapper/pom.xml
@@ -105,8 +105,9 @@
<plugin>
<groupId>com.spotify</groupId>
<artifactId>docker-maven-plugin</artifactId>
- <version>1.0.0</version>
+ <version>${docker.maven.version}</version>
<configuration>
+ <skipDockerBuild>false</skipDockerBuild>
<imageName>${onap.nexus.dockerregistry.daily}/onap/${project.groupId}.${project.artifactId}</imageName>
<baseImage>openjdk:8-jre</baseImage>
<entryPoint>["java", "-jar", "/opt/${project.build.finalName}.jar", "server"]</entryPoint>