diff options
Diffstat (limited to 'cds-ui')
| -rw-r--r-- | cds-ui/application/pom.xml | 19 | ||||
| -rw-r--r-- | cds-ui/client/pom.xml | 6 | ||||
| -rw-r--r-- | cds-ui/designer-client/pom.xml | 6 | ||||
| -rw-r--r-- | cds-ui/pom.xml | 5 | ||||
| -rw-r--r-- | cds-ui/server/pom.xml | 18 |
5 files changed, 14 insertions, 40 deletions
diff --git a/cds-ui/application/pom.xml b/cds-ui/application/pom.xml index 368cc9c4f..22d5cabc8 100644 --- a/cds-ui/application/pom.xml +++ b/cds-ui/application/pom.xml @@ -37,9 +37,6 @@ limitations under the License. <properties> <image.name>onap/ccsdk-cds-ui</image.name> - <ccsdk.build.timestamp>${maven.build.timestamp}</ccsdk.build.timestamp> - <maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format> - <docker.verbose>true</docker.verbose> </properties> <build> @@ -71,7 +68,7 @@ limitations under the License. <plugin> <groupId>io.fabric8</groupId> <artifactId>docker-maven-plugin</artifactId> - <version>0.28.0</version> + <version>0.34.0</version> <inherited>false</inherited> <configuration> <images> @@ -87,19 +84,13 @@ limitations under the License. </build> </image> </images> + <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> - <phase>deploy</phase> + <id>build-push-images</id> + <phase>${docker.push.phase}</phase> <goals> <goal>build</goal> <goal>push</goal> diff --git a/cds-ui/client/pom.xml b/cds-ui/client/pom.xml index c4b7ea908..ec0326a7e 100644 --- a/cds-ui/client/pom.xml +++ b/cds-ui/client/pom.xml @@ -35,12 +35,6 @@ limitations under the License. <name>UI Client</name> - <properties> - <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <npm.executable>npm</npm.executable> - <onap.nexus.url>https://nexus.onap.org</onap.nexus.url> - </properties> - <build> <plugins> <plugin> diff --git a/cds-ui/designer-client/pom.xml b/cds-ui/designer-client/pom.xml index 9a1ba2627..34f56e1f7 100644 --- a/cds-ui/designer-client/pom.xml +++ b/cds-ui/designer-client/pom.xml @@ -35,12 +35,6 @@ limitations under the License. <name>UI designer Client</name> - <properties> - <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <npm.executable>npm</npm.executable> - <onap.nexus.url>https://nexus.onap.org</onap.nexus.url> - </properties> - <build> <plugins> <plugin> diff --git a/cds-ui/pom.xml b/cds-ui/pom.xml index 1aa68131c..6d547326c 100644 --- a/cds-ui/pom.xml +++ b/cds-ui/pom.xml @@ -45,10 +45,15 @@ limitations under the License. </modules> <properties> + <npm.executable>npm</npm.executable> <image.name>onap/ccsdk-cds-ui</image.name> <ccsdk.cds.version>${project.version}</ccsdk.cds.version> <ccsdk.build.timestamp>${maven.build.timestamp}</ccsdk.build.timestamp> <maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format> + + <!-- docker related properties --> <docker.verbose>true</docker.verbose> + <docker.skip.push>false</docker.skip.push> + <docker.push.phase>deploy</docker.push.phase> </properties> </project> diff --git a/cds-ui/server/pom.xml b/cds-ui/server/pom.xml index 86e9ccbef..6444385ee 100644 --- a/cds-ui/server/pom.xml +++ b/cds-ui/server/pom.xml @@ -36,11 +36,7 @@ limitations under the License. <name>UI Server</name> <properties> - <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <npm.executable>npm</npm.executable> - <onap.nexus.url>https://nexus.onap.org</onap.nexus.url> <image.name>onap/ccsdk-cds-ui-server</image.name> - <docker.push.phase>deploy</docker.push.phase> </properties> <build> @@ -148,7 +144,7 @@ limitations under the License. <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> @@ -165,18 +161,12 @@ limitations under the License. </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> |