diff options
Diffstat (limited to 'ms/blueprintsprocessor')
4 files changed, 8 insertions, 22 deletions
diff --git a/ms/blueprintsprocessor/application/pom.xml b/ms/blueprintsprocessor/application/pom.xml index fdfd7d157..08390bd47 100755 --- a/ms/blueprintsprocessor/application/pom.xml +++ b/ms/blueprintsprocessor/application/pom.xml @@ -38,9 +38,6 @@ <name.space>org.onap.ccsdk.cds</name.space> <serviceArtifactName>blueprintsprocessor</serviceArtifactName> <image.name>onap/ccsdk-blueprintsprocessor</image.name> - <docker.push.phase>deploy</docker.push.phase> - <docker.verbose>true</docker.verbose> - <ccsdk.build.timestamp>${maven.build.timestamp}</ccsdk.build.timestamp> </properties> <dependencies> @@ -339,7 +336,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> @@ -356,18 +353,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/blueprintsprocessor/application/src/main/docker/Dockerfile b/ms/blueprintsprocessor/application/src/main/docker/Dockerfile index 6326bb862..c4da384f5 100755 --- a/ms/blueprintsprocessor/application/src/main/docker/Dockerfile +++ b/ms/blueprintsprocessor/application/src/main/docker/Dockerfile @@ -9,7 +9,7 @@ COPY @project.build.finalName@-@assembly.id@.tar.gz /source.tar.gz RUN tar -xzf /source.tar.gz -C /tmp \ && cp -rf /tmp/@project.build.finalName@/opt / \ && rm -rf /source.tar.gz \ - && rm -rf /tmp/@project.build.finalName@ + && rm -rf /tmp/@project.build.finalName@ \ && touch /velocity.log \ && chown onap:onap /velocity.log \ && chmod 755 /velocity.log \ diff --git a/ms/blueprintsprocessor/application/src/test/resources/logback-test.xml b/ms/blueprintsprocessor/application/src/test/resources/logback-test.xml index 90dfed324..ed1fb9d00 100644 --- a/ms/blueprintsprocessor/application/src/test/resources/logback-test.xml +++ b/ms/blueprintsprocessor/application/src/test/resources/logback-test.xml @@ -29,8 +29,8 @@ </sift> </appender> - <logger name="org.springframework.web.HttpLogging" level="trace"/> - <logger name="org.springframework.web.reactive.function.client.ExchangeFunctions" level="trace"/> + <logger name="org.springframework.web.HttpLogging" level="debug"/> + <logger name="org.springframework.web.reactive.function.client.ExchangeFunctions" level="debug"/> <!-- Helpful to optimize Spring Context caching to speed-up tests and prevent resorting to @DirtiesContext as much as possible --> @@ -39,7 +39,7 @@ <!-- Please refer to https://thoughts-on-java.org/hibernate-logging-guide/ for a lengthy discussion on good Hibernate logging practices --> <logger name="org.hibernate.SQL" level="debug"/> - <logger name="org.hibernate.type.descriptor.sql" level="trace"/> + <logger name="org.hibernate.type.descriptor.sql" level="debug"/> <logger name="org.apache.http" level="debug"/> <logger name="org.apache.http.wire" level="error"/> diff --git a/ms/blueprintsprocessor/pom.xml b/ms/blueprintsprocessor/pom.xml index f87ff14db..7db4c7dfa 100755 --- a/ms/blueprintsprocessor/pom.xml +++ b/ms/blueprintsprocessor/pom.xml @@ -40,10 +40,5 @@ <properties> <service.name>BlueprintsProcessor</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> |