diff options
Diffstat (limited to 'cds-ui/server')
| -rw-r--r-- | cds-ui/server/pom.xml | 33 | ||||
| -rw-r--r-- | cds-ui/server/src/controllers/blueprint-rest.controller.ts | 2 |
2 files changed, 12 insertions, 23 deletions
diff --git a/cds-ui/server/pom.xml b/cds-ui/server/pom.xml index 11bfd9fd7..c485cb27a 100644 --- a/cds-ui/server/pom.xml +++ b/cds-ui/server/pom.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- +<!-- ============LICENSE_START========================================== =================================================================== Copyright (C) 2018-19 IBM Intellectual Property. All rights reserved. @@ -24,23 +24,18 @@ limitations under the License. <parent> <groupId>org.onap.ccsdk.cds</groupId> - <artifactId>ui</artifactId> - <version>1.0.0-SNAPSHOT</version> + <artifactId>cds-ui</artifactId> + <version>1.1.0-SNAPSHOT</version> <relativePath>..</relativePath> </parent> - <artifactId>ui-server</artifactId> - <version>1.0.0-SNAPSHOT</version> + <artifactId>cds-ui-server</artifactId> <packaging>pom</packaging> - <name>CDS UI Server</name> + <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> @@ -59,9 +54,9 @@ limitations under the License. <configuration> <artifactItems> <artifactItem> - <groupId>org.onap.ccsdk.cds.blueprintsprocessor</groupId> + <groupId>org.onap.ccsdk.cds.blueprintsprocessor.modules</groupId> <artifactId>blueprint-proto</artifactId> - <version>${project.version}</version> + <version>${ccsdk.cds.version}</version> <type>jar</type> <overWrite>true</overWrite> <outputDirectory>${project.build.directory}/generated/proto-definition/proto</outputDirectory> @@ -148,7 +143,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 +160,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> diff --git a/cds-ui/server/src/controllers/blueprint-rest.controller.ts b/cds-ui/server/src/controllers/blueprint-rest.controller.ts index 870f9793f..91d7e66e3 100644 --- a/cds-ui/server/src/controllers/blueprint-rest.controller.ts +++ b/cds-ui/server/src/controllers/blueprint-rest.controller.ts @@ -307,7 +307,7 @@ export class BlueprintRestController { if (appConfig.action.grpcEnabled) return this.uploadFileToBlueprintProcessorGrpc(file, 'PUBLISH', response); else - return this.uploadFileToBlueprintProcessor(file, '/execution-service/upload/', response); + return this.uploadFileToBlueprintProcessor(file, '/blueprint-model/publish', response); }, err => { reject(err); }); |