diff options
| -rwxr-xr-x | ms/blueprintsprocessor/application/pom.xml | 2 | ||||
| -rwxr-xr-x | ms/blueprintsprocessor/application/src/main/docker/Dockerfile | 2 | ||||
| -rwxr-xr-x | ms/command-executor/pom.xml | 1 | ||||
| -rw-r--r-- | ms/py-executor/pom.xml | 1 | ||||
| -rwxr-xr-x | ms/sdclistener/distribution/pom.xml | 4 | ||||
| -rwxr-xr-x | ms/sdclistener/distribution/src/main/docker/Dockerfile | 2 | ||||
| -rw-r--r-- | pom.xml | 5 |
7 files changed, 5 insertions, 12 deletions
diff --git a/ms/blueprintsprocessor/application/pom.xml b/ms/blueprintsprocessor/application/pom.xml index 2f398d3e7..00e7fe2c8 100755 --- a/ms/blueprintsprocessor/application/pom.xml +++ b/ms/blueprintsprocessor/application/pom.xml @@ -34,8 +34,6 @@ <name>MS Blueprints Processor Application</name> <properties> - <assembly.id>maven</assembly.id> - <name.space>org.onap.ccsdk.cds</name.space> <serviceArtifactName>blueprintsprocessor</serviceArtifactName> <image.name>onap/ccsdk-blueprintsprocessor</image.name> </properties> diff --git a/ms/blueprintsprocessor/application/src/main/docker/Dockerfile b/ms/blueprintsprocessor/application/src/main/docker/Dockerfile index c4da384f5..876bc35de 100755 --- a/ms/blueprintsprocessor/application/src/main/docker/Dockerfile +++ b/ms/blueprintsprocessor/application/src/main/docker/Dockerfile @@ -1,4 +1,4 @@ -FROM onap/ccsdk-alpine-j11-image:1.0.1 +FROM onap/ccsdk-alpine-j11-image:1.1.0 USER root # add entrypoint diff --git a/ms/command-executor/pom.xml b/ms/command-executor/pom.xml index 04e0614df..665e58585 100755 --- a/ms/command-executor/pom.xml +++ b/ms/command-executor/pom.xml @@ -32,7 +32,6 @@ <description>Micro-service providing python environment with gRPC binding for command execution</description> <properties> - <assembly.id>maven</assembly.id> <image.name>onap/ccsdk-commandexecutor</image.name> </properties> diff --git a/ms/py-executor/pom.xml b/ms/py-executor/pom.xml index be56787a8..2ea700849 100644 --- a/ms/py-executor/pom.xml +++ b/ms/py-executor/pom.xml @@ -30,7 +30,6 @@ <description>Micro-service providing python environment with gRPC binding for python script execution</description> <properties> - <assembly.id>maven</assembly.id> <image.name>onap/ccsdk-py-executor</image.name> <sonar.skip>true</sonar.skip> </properties> diff --git a/ms/sdclistener/distribution/pom.xml b/ms/sdclistener/distribution/pom.xml index 7a85394f4..75e0beff6 100755 --- a/ms/sdclistener/distribution/pom.xml +++ b/ms/sdclistener/distribution/pom.xml @@ -31,12 +31,8 @@ <name>MS SDC Listener - Distribution</name> <properties> - <assembly.id>maven</assembly.id> - <name.space>org.onap.ccsdk.cds</name.space> <serviceArtifactName>sdclistener</serviceArtifactName> <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>--> </properties> <dependencies> diff --git a/ms/sdclistener/distribution/src/main/docker/Dockerfile b/ms/sdclistener/distribution/src/main/docker/Dockerfile index b89cbc7ec..b9c61090d 100755 --- a/ms/sdclistener/distribution/src/main/docker/Dockerfile +++ b/ms/sdclistener/distribution/src/main/docker/Dockerfile @@ -1,4 +1,4 @@ -FROM onap/ccsdk-alpine-j11-image:1.0.1 +FROM onap/ccsdk-alpine-j11-image:1.1.0 USER root # add entrypoint @@ -55,8 +55,7 @@ limitations under the License. <!--Only include java and kt files to the scan--> <sonar.inclusions>**/*.java,**/*.kt</sonar.inclusions> <!--Specify path to load jacoco XLM report, as Sonar can't load Kotlin coverage from binary report--> - <sonar.coverage.jacoco.xmlReportPaths>${project.reporting.outputDirectory}/jacoco-ut/jacoco.xml - </sonar.coverage.jacoco.xmlReportPaths> + <sonar.coverage.jacoco.xmlReportPaths>${project.reporting.outputDirectory}/jacoco-ut/jacoco.xml</sonar.coverage.jacoco.xmlReportPaths> <jacoco.version>0.8.3</jacoco.version> <!-- Properties for POM Format --> @@ -67,8 +66,10 @@ limitations under the License. <maven-failsafe-plugin.version>3.0.0-M5</maven-failsafe-plugin.version> <!-- docker related properties --> + <assembly.id>maven</assembly.id> <docker.verbose>true</docker.verbose> <docker.skip.push>false</docker.skip.push> + <name.space>org.onap.ccsdk.cds</name.space> <ccsdk.build.timestamp>${maven.build.timestamp}</ccsdk.build.timestamp> <maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format> |