summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorClaudio D. Gasparini <claudio.gasparini@pantheon.tech>2021-02-04 14:57:39 +0100
committerClaudio D. Gasparini <claudio.gasparini@pantheon.tech>2021-02-09 10:56:52 +0100
commit4ec225ce071d68c02cbc2388847d416c268bfa40 (patch)
tree363eeeeaf7f40d5596c66e1687c3c62c09956650
parente5cf0fcacb7239cdd4a041769007715e1b8ffd9b (diff)
Image name
- cps-service - cps-nf-proxy - cps-and-nf-proxy Issue-ID: CPS-175 Signed-off-by: Claudio D. Gasparini <claudio.gasparini@pantheon.tech> Change-Id: I579d3646f54adebc131196acbe74e24299b4ead6
-rw-r--r--cps-application/pom.xml24
-rwxr-xr-xcps-parent/pom.xml21
2 files changed, 20 insertions, 25 deletions
diff --git a/cps-application/pom.xml b/cps-application/pom.xml
index 92cff35fec..e5b46f6a4f 100644
--- a/cps-application/pom.xml
+++ b/cps-application/pom.xml
@@ -33,7 +33,12 @@
<artifactId>cps-application</artifactId>
<properties>
+ <app>org.onap.cps.Application</app>
+ <image.name>cps-service</image.name>
+ <image.version>${project.version}</image.version>
+ <jib-maven-plugin.version>2.6.0</jib-maven-plugin.version>
<minimum-coverage>0.0</minimum-coverage>
+ <nexus.repository>nexus3.onap.org:10003/onap/</nexus.repository>
</properties>
<dependencies>
@@ -63,6 +68,19 @@
<plugin>
<groupId>com.google.cloud.tools</groupId>
<artifactId>jib-maven-plugin</artifactId>
+ <version>${jib-maven-plugin.version}</version>
+ <configuration>
+ <container>
+ <mainClass>${app}</mainClass>
+ <creationTime>USE_CURRENT_TIMESTAMP</creationTime>
+ </container>
+ <from>
+ <image>${base.image}</image>
+ </from>
+ <to>
+ <image>${nexus.repository}${image.name}:${image.version}</image>
+ </to>
+ </configuration>
<executions>
<execution>
<phase>package</phase>
@@ -113,8 +131,7 @@
</activation>
<properties>
- <app>org.onap.cps.Application</app>
- <repository.name>${docker.pushRegistry}onap/cps-nf-proxy</repository.name>
+ <image.name>cps-nf-proxy</image.name>
</properties>
<dependencies>
@@ -131,8 +148,7 @@
</activation>
<properties>
- <app>org.onap.cps.Application</app>
- <repository.name>${docker.pushRegistry}onap/cps-and-nf-proxy</repository.name><!-- better naming? -->
+ <image.name>cps-and-nf-proxy</image.name>
</properties>
<dependencies>
diff --git a/cps-parent/pom.xml b/cps-parent/pom.xml
index 00aa89e80e..91d1f4186b 100755
--- a/cps-parent/pom.xml
+++ b/cps-parent/pom.xml
@@ -38,14 +38,11 @@
<app>org.onap.cps.Application</app>
<base.image>openjdk:11-jre-slim</base.image>
<java.version>11</java.version>
- <jib-maven-plugin.version>2.6.0</jib-maven-plugin.version>
<minimum-coverage>0.9</minimum-coverage>
<nexusproxy>https://nexus.onap.org</nexusproxy>
<oparent.version>3.1.0</oparent.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<releaseNexusPath>/content/repositories/releases/</releaseNexusPath>
- <docker.pushRegistry>nexus3.onap.org:10003/</docker.pushRegistry>
- <repository.name>${docker.pushRegistry}onap/cps-service</repository.name>
<spotbugs-maven-plugin.version>4.1.3</spotbugs-maven-plugin.version>
<spring-boot-maven-plugin.version>2.3.3.RELEASE</spring-boot-maven-plugin.version>
<spotbugs.slf4j.version>1.8.0-beta4</spotbugs.slf4j.version>
@@ -53,7 +50,6 @@
<spotbugs.version>4.2.0</spotbugs.version>
<swagger-codegen-maven-plugin.version>3.0.18</swagger-codegen-maven-plugin.version>
<snapshotNexusPath>/content/repositories/snapshots/</snapshotNexusPath>
- <image.version>${project.version}</image.version>
<jacoco.reportDirectory.aggregate>${project.reporting.outputDirectory}/jacoco-aggregate</jacoco.reportDirectory.aggregate>
<sonar.coverage.jacoco.xmlReportPaths>
@@ -144,23 +140,6 @@
<version>${swagger-codegen-maven-plugin.version}</version>
</plugin>
<plugin>
- <groupId>com.google.cloud.tools</groupId>
- <artifactId>jib-maven-plugin</artifactId>
- <version>${jib-maven-plugin.version}</version>
- <configuration>
- <container>
- <mainClass>${app}</mainClass>
- <creationTime>USE_CURRENT_TIMESTAMP</creationTime>
- </container>
- <from>
- <image>${base.image}</image>
- </from>
- <to>
- <image>${repository.name}:${image.version}</image>
- </to>
- </configuration>
- </plugin>
- <plugin>
<groupId>com.github.spotbugs</groupId>
<artifactId>spotbugs-maven-plugin</artifactId>
<version>${spotbugs-maven-plugin.version}</version>