summaryrefslogtreecommitdiffstats
path: root/a1-policy-management
diff options
context:
space:
mode:
authorSingal, Kapil (ks220y) <ks220y@att.com>2021-06-19 21:18:24 -0400
committerKAPIL SINGAL <ks220y@att.com>2021-06-20 01:40:53 +0000
commit9f9ad5548aa7c735910b5b8d013d48a281fc4ed0 (patch)
treeaab46a4c6cbafd83ce8c8cb8ece5f7f76541dc39 /a1-policy-management
parent9f99c19662c8190ad821144f3f4406c60d48025c (diff)
Updating parent version to 2.1.71.1.6
Issue-ID: CCSDK-3345 Signed-off-by: Singal, Kapil (ks220y) <ks220y@att.com> Change-Id: I8595cde511f33aba85f1936c4675e6a6c5fffdfd
Diffstat (limited to 'a1-policy-management')
-rw-r--r--a1-policy-management/pom.xml72
1 files changed, 29 insertions, 43 deletions
diff --git a/a1-policy-management/pom.xml b/a1-policy-management/pom.xml
index 6a3c51e8..09d37320 100644
--- a/a1-policy-management/pom.xml
+++ b/a1-policy-management/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
- <version>2.1.4</version>
+ <version>2.1.7</version>
<relativePath/>
</parent>
<groupId>org.onap.ccsdk.oran</groupId>
@@ -42,7 +42,6 @@
<formatter-maven-plugin.version>2.13.0</formatter-maven-plugin.version>
<spotless-maven-plugin.version>2.5.0</spotless-maven-plugin.version>
<commons-io.version>2.5</commons-io.version>
- <docker-maven-plugin>0.30.0</docker-maven-plugin>
<surefire-maven-plugin.version>3.0.0-M5</surefire-maven-plugin.version>
<!-- Version must be higher than version 2.19.1 that is defined in the parent pom for JUnit 5 tests to be run. Do not remove! -->
<jacoco-maven-plugin.version>0.8.6</jacoco-maven-plugin.version>
@@ -366,48 +365,26 @@
</execution>
</executions>
</plugin>
- <plugin>
- <groupId>io.fabric8</groupId>
- <artifactId>docker-maven-plugin</artifactId>
- <version>${docker-maven-plugin}</version>
- <inherited>false</inherited>
- <executions>
- <execution>
- <id>generate-policy-management-service-image</id>
- <phase>package</phase>
- <goals>
- <goal>build</goal>
- </goals>
+ </plugins>
+ </build>
+
+ <profiles>
+ <profile>
+ <id>docker</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>io.fabric8</groupId>
+ <artifactId>docker-maven-plugin</artifactId>
+ <version>0.34.0</version>
+ <inherited>false</inherited>
<configuration>
<images>
<image>
<name>onap/ccsdk-oran-a1policymanagementservice:${project.version}</name>
<build>
<cleanup>try</cleanup>
- <contextDir>${basedir}</contextDir>
- <dockerFile>Dockerfile</dockerFile>
- <args>
- <JAR>${project.build.finalName}.jar</JAR>
- </args>
- <tags>
- <tag>${project.version}</tag>
- </tags>
- </build>
- </image>
- </images>
- </configuration>
- </execution>
- <execution>
- <id>push-policy-management-service-image</id>
- <goals>
- <goal>build</goal>
- <goal>push</goal>
- </goals>
- <configuration>
- <images>
- <image>
- <name>onap/ccsdk-oran-a1policymanagementservice:${project.version}</name>
- <build>
+ <noCache>true</noCache>
<contextDir>${basedir}</contextDir>
<dockerFile>Dockerfile</dockerFile>
<args>
@@ -422,9 +399,18 @@
</image>
</images>
</configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
+ <executions>
+ <execution>
+ <id>build-push-image</id>
+ <goals>
+ <goal>build</goal>
+ <goal>push</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>