diff options
| author |   Claudio D. Gasparini <claudio.gasparini@pantheon.tech> | 2021-01-28 15:36:37 +0100 |
|---|---|---|
| committer | Claudio D. Gasparini <claudio.gasparini@pantheon.tech> | 2021-02-01 18:08:30 +0100 |
| commit | b77bf2529f15e60c852cf83d5150e75d30068bb0 (patch) | |
| tree | 74556b527ac48ac608db2d420929785c797a6a07 /cps-parent/pom.xml | |
| parent | 850e3ecdecbedd30e65ae7cbaa81fc5301766f45 (diff) | |
Decouple configuration from application
- Decouple configuration from application
- Generate all 3 types of docker variations
Issue-ID: CPS-175
Signed-off-by: Claudio D. Gasparini <claudio.gasparini@pantheon.tech>
Change-Id: I1e2e0577c5911f7c79801e4c691d196515dc02a1
Diffstat (limited to 'cps-parent/pom.xml')
| -rwxr-xr-x | cps-parent/pom.xml | 30 |
1 files changed, 4 insertions, 26 deletions
diff --git a/cps-parent/pom.xml b/cps-parent/pom.xml index b8f8975a67..36abc909cc 100755 --- a/cps-parent/pom.xml +++ b/cps-parent/pom.xml @@ -33,7 +33,7 @@ <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> - <tag.version>${project.version}</tag.version> + <image.version>${project.version}</image.version> <jacoco.reportDirectory.aggregate>${project.reporting.outputDirectory}/jacoco-aggregate</jacoco.reportDirectory.aggregate> <sonar.coverage.jacoco.xmlReportPaths> @@ -45,6 +45,8 @@ ../cps-rest/target/site/jacoco-aggregate/jacoco.xml, ../cps-nf-proxy-rest/target/site/jacoco-ut/jacoco.xml, ../cps-nf-proxy-rest/target/site/jacoco-aggregate/jacoco.xml, + ../cps-application/target/site/jacoco-ut/jacoco.xml, + ../cps-application/target/site/jacoco-aggregate/jacoco.xml </sonar.coverage.jacoco.xmlReportPaths> </properties> @@ -120,27 +122,6 @@ <groupId>io.swagger.codegen.v3</groupId> <artifactId>swagger-codegen-maven-plugin</artifactId> <version>${swagger-codegen-maven-plugin.version}</version> - <executions> - <execution> - <goals> - <goal>generate</goal> - </goals> - <configuration> - <inputSpec>${project.basedir}/docs/api/swagger/openapi.yml</inputSpec> - <invokerPackage>org.onap.cps.rest.controller</invokerPackage> - <modelPackage>org.onap.cps.rest.model</modelPackage> - <apiPackage>org.onap.cps.rest.api</apiPackage> - <language>spring</language> - <generateSupportingFiles>false</generateSupportingFiles> - <configOptions> - <sourceFolder>src/gen/java</sourceFolder> - <dateLibrary>java11</dateLibrary> - <interfaceOnly>true</interfaceOnly> - <useTags>true</useTags> - </configOptions> - </configuration> - </execution> - </executions> </plugin> <plugin> <groupId>com.google.cloud.tools</groupId> @@ -155,10 +136,7 @@ <image>${base.image}</image> </from> <to> - <image>${repository.name}</image> - <tags> - <tag>${tag.version}</tag> - </tags> + <image>${repository.name}:${image.version}</image> </to> </configuration> </plugin> |