diff options
| author |   Singal, Kapil (ks220y) <ks220y@att.com> | 2020-09-16 10:49:28 -0400 |
|---|---|---|
| committer | Singal, Kapil (ks220y) <ks220y@att.com> | 2020-09-18 14:20:00 -0400 |
| commit | fbbc9bceb83de1ade5b4b6a666546aba24a14e2f (patch) | |
| tree | 25586609f64ac3f4856ae0cc33fd446d5c93d322 /ms/sdclistener | |
| parent | 6c77ea314cb8cdac8f602cea608ae06108ab6062 (diff) | |
Fixing dockerFile
Fixing dockerFile and related items
Refactoring pom properties
Issue-ID: CCSDK-2794
Change-Id: Ib9d3cc38c2db65778cef2590ab774035305a16fa
Signed-off-by: Singal, Kapil (ks220y) <ks220y@att.com>
Diffstat (limited to 'ms/sdclistener')
| -rwxr-xr-x | ms/sdclistener/distribution/pom.xml | 17 | ||||
| -rwxr-xr-x | ms/sdclistener/parent/pom.xml | 1 | ||||
| -rw-r--r-- | ms/sdclistener/pom.xml | 6 |
3 files changed, 5 insertions, 19 deletions
diff --git a/ms/sdclistener/distribution/pom.xml b/ms/sdclistener/distribution/pom.xml index ac241230b..f8b0110ac 100755 --- a/ms/sdclistener/distribution/pom.xml +++ b/ms/sdclistener/distribution/pom.xml @@ -37,9 +37,6 @@ <image.name>onap/ccsdk-sdclistener</image.name> <!--disabled for now to mirror #85964 https://gerrit.onap.org/r/#/c/85964/2/ms/command-executor/pom.xml--> <!--<docker.buildArg.https_proxy>${https_proxy}</docker.buildArg.https_proxy>--> - <docker.push.phase>deploy</docker.push.phase> - <docker.verbose>true</docker.verbose> - <ccsdk.build.timestamp>${maven.build.timestamp}</ccsdk.build.timestamp> </properties> <dependencies> @@ -143,7 +140,7 @@ <plugin> <groupId>io.fabric8</groupId> <artifactId>docker-maven-plugin</artifactId> - <version>0.26.1</version> + <version>0.34.0</version> <inherited>false</inherited> <configuration> <images> @@ -160,18 +157,12 @@ </build> </image> </images> - <verbose>true</verbose> + <verbose>${docker.verbose}</verbose> + <skipPush>${docker.skip.push}</skipPush> </configuration> <executions> <execution> - <id>generate-images</id> - <phase>package</phase> - <goals> - <goal>build</goal> - </goals> - </execution> - <execution> - <id>push-images</id> + <id>build-push-images</id> <phase>${docker.push.phase}</phase> <goals> <goal>build</goal> diff --git a/ms/sdclistener/parent/pom.xml b/ms/sdclistener/parent/pom.xml index 93b694cde..9b79b8c61 100755 --- a/ms/sdclistener/parent/pom.xml +++ b/ms/sdclistener/parent/pom.xml @@ -43,7 +43,6 @@ <sdc-distribution-client.version>1.4.0</sdc-distribution-client.version> <jmockit.version>1.49</jmockit.version> <reactorcore.version>3.2.6.RELEASE</reactorcore.version> - <ccsdk.cds.version>${project.version}</ccsdk.cds.version> </properties> <dependencyManagement> diff --git a/ms/sdclistener/pom.xml b/ms/sdclistener/pom.xml index b46a68940..054f6a05a 100644 --- a/ms/sdclistener/pom.xml +++ b/ms/sdclistener/pom.xml @@ -38,10 +38,6 @@ <properties> <service.name>sdclistener</service.name> - <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> - <maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format> - <build.number>${maven.build.timestamp}</build.number> - <ccsdk.cds.version>${project.version}</ccsdk.cds.version> + </properties> </project> |