summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--dcae-analytics/dcae-analytics-tca-web/pom.xml11
-rw-r--r--dcae-analytics/pom.xml9
-rw-r--r--pom.xml8
3 files changed, 23 insertions, 5 deletions
diff --git a/dcae-analytics/dcae-analytics-tca-web/pom.xml b/dcae-analytics/dcae-analytics-tca-web/pom.xml
index 002edcd..2e1195d 100644
--- a/dcae-analytics/dcae-analytics-tca-web/pom.xml
+++ b/dcae-analytics/dcae-analytics-tca-web/pom.xml
@@ -138,8 +138,14 @@
<!-- DOCKER PLUGIN -->
<plugin>
<groupId>com.spotify</groupId>
- <artifactId>dockerfile-maven-plugin</artifactId>
- <executions>
+ <artifactId>docker-maven-plugin</artifactId>
+ <configuration>
+ <skipDocker>false</skipDocker>
+ <repository>${docker.repository}/onap/${project.groupId}.${project.artifactId}</repository>
+ <tag>${project.version}</tag>
+ </configuration>
+<!-- <artifactId>dockerfile-maven-plugin</artifactId>
+ <executions>
<execution>
<id>build-image</id>
<phase>package</phase>
@@ -155,6 +161,7 @@
</goals>
</execution>
</executions>
+-->
</plugin>
</plugins>
</build>
diff --git a/dcae-analytics/pom.xml b/dcae-analytics/pom.xml
index fc48e7e..8bdcf1d 100644
--- a/dcae-analytics/pom.xml
+++ b/dcae-analytics/pom.xml
@@ -86,7 +86,8 @@
<lombok.plugin.version>1.16.18.1</lombok.plugin.version>
<gitcommitid.plugin.version>2.2.3</gitcommitid.plugin.version>
<maven.build.helper.plugin.version>3.0.0</maven.build.helper.plugin.version>
- <dockerfile-maven-version>1.4.3</dockerfile-maven-version>
+ <!--<dockerfile-maven-version>1.4.3</dockerfile-maven-version>-->
+ <docker-maven-version>1.0.0</docker-maven-version>
<!--PLUGIN SETTINGS -->
<compiler.source.version>1.8</compiler.source.version>
@@ -629,15 +630,17 @@
</plugin>
<!-- DOCKER PLUGIN -->
+ <!--
<plugin>
<groupId>com.spotify</groupId>
- <artifactId>dockerfile-maven-plugin</artifactId>
- <version>${dockerfile-maven-version}</version>
+ <artifactId>docker-maven-plugin</artifactId>
+ <version>${docker-maven-version}</version>
<configuration>
<repository>${docker.repository}/onap/${project.groupId}.${project.artifactId}</repository>
<tag>${project.version}</tag>
</configuration>
</plugin>
+ -->
</plugins>
diff --git a/pom.xml b/pom.xml
index d894d3f..47c9ace 100644
--- a/pom.xml
+++ b/pom.xml
@@ -49,6 +49,14 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>com.spotify</groupId>
+ <artifactId>docker-maven-plugin</artifactId>
+ <version>1.1.0</version>
+ <configuration>
+ <skipDocker>true</skipDocker>
+ </configuration>
+ </plugin>
</plugins>
</build>