From 8edec22767a6fdb055af92ef815e374987ed8d22 Mon Sep 17 00:00:00 2001 From: Dan Timoney Date: Tue, 7 Apr 2020 11:51:20 -0400 Subject: Roll to next Guilin snapshot Roll to next Guilin snapshot release Issue-ID: CCSDK-2152 Signed-off-by: Dan Timoney Change-Id: I1a5ea68da8821ffe28ac84e60177af05e26b3585 --- cds-ui/application/pom.xml | 5 +- cds-ui/application/pom.xml-n | 114 +++++++++++++++++++++++ cds-ui/client/pom.xml | 5 +- cds-ui/client/pom.xml-n | 95 +++++++++++++++++++ cds-ui/designer-client/pom.xml | 5 +- cds-ui/designer-client/pom.xml-n | 95 +++++++++++++++++++ cds-ui/pom.xml | 5 +- cds-ui/pom.xml-n | 54 +++++++++++ cds-ui/server/pom.xml | 5 +- cds-ui/server/pom.xml-n | 192 +++++++++++++++++++++++++++++++++++++++ 10 files changed, 565 insertions(+), 10 deletions(-) create mode 100644 cds-ui/application/pom.xml-n create mode 100644 cds-ui/client/pom.xml-n create mode 100644 cds-ui/designer-client/pom.xml-n create mode 100644 cds-ui/pom.xml-n create mode 100644 cds-ui/server/pom.xml-n (limited to 'cds-ui') diff --git a/cds-ui/application/pom.xml b/cds-ui/application/pom.xml index b773bebd3..5a8325e3a 100644 --- a/cds-ui/application/pom.xml +++ b/cds-ui/application/pom.xml @@ -18,18 +18,19 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ============LICENSE_END============================================ --> + 4.0.0 org.onap.ccsdk.cds ui - 0.7.1-SNAPSHOT + 1.0.0-SNAPSHOT .. application - 0.7.1-SNAPSHOT + 1.0.0-SNAPSHOT pom CDS UI Application diff --git a/cds-ui/application/pom.xml-n b/cds-ui/application/pom.xml-n new file mode 100644 index 000000000..6db0a3b02 --- /dev/null +++ b/cds-ui/application/pom.xml-n @@ -0,0 +1,114 @@ + + + + 4.0.0 + + + org.onap.ccsdk.cds + ui + 1.0.0-SNAPSHOT + .. + + + application + 1.0.0-SNAPSHOT + pom + + CDS UI Application + + + onap/ccsdk-cds-ui + ${project.version} + ${project.version} + ${maven.build.timestamp} + yyyyMMdd'T'HHmmss'Z' + true + + + + + + org.codehaus.groovy.maven + gmaven-plugin + + + validate + + execute + + + ${project.basedir}/../../TagVersion.groovy + + + + + + + + + + docker + + + + io.fabric8 + docker-maven-plugin + 0.28.0 + false + + + + ${image.name} + + try + + ${project.docker.latestminortag.version} + ${project.docker.latestfulltag.version} + ${project.docker.latesttagtimestamp.version} + + + + + + + + generate-images + package + + build + + + + + push-images + deploy + + build + push + + + + + + + + + diff --git a/cds-ui/client/pom.xml b/cds-ui/client/pom.xml index 9cc4d2549..d2309f89d 100644 --- a/cds-ui/client/pom.xml +++ b/cds-ui/client/pom.xml @@ -18,18 +18,19 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ============LICENSE_END============================================ --> + 4.0.0 org.onap.ccsdk.cds ui - 0.7.1-SNAPSHOT + 1.0.0-SNAPSHOT .. ui-client - 0.7.1-SNAPSHOT + 1.0.0-SNAPSHOT pom CDS UI Client diff --git a/cds-ui/client/pom.xml-n b/cds-ui/client/pom.xml-n new file mode 100644 index 000000000..c493b6825 --- /dev/null +++ b/cds-ui/client/pom.xml-n @@ -0,0 +1,95 @@ + + + + 4.0.0 + + + org.onap.ccsdk.cds + ui + 1.0.0-SNAPSHOT + .. + + + ui-client + 1.0.0-SNAPSHOT + pom + + CDS UI Client + + + UTF-8 + npm + https://nexus.onap.org + + + + + + com.github.eirslett + frontend-maven-plugin + + 1.3 + + v8.12.0 + 6.4.1 + https://nodejs.org/dist/ + ./ + + + + install node and npm + + install-node-and-npm + + generate-resources + + + + npm install + + npm + + + generate-resources + + + install + + + + + npm build + + npm + + + generate-resources + + + run build + + + + + + + + diff --git a/cds-ui/designer-client/pom.xml b/cds-ui/designer-client/pom.xml index 24e1d2305..0d3331d92 100644 --- a/cds-ui/designer-client/pom.xml +++ b/cds-ui/designer-client/pom.xml @@ -18,18 +18,19 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ============LICENSE_END============================================ --> + 4.0.0 org.onap.ccsdk.cds ui - 0.7.1-SNAPSHOT + 1.0.0-SNAPSHOT .. designer-client - 0.7.1-SNAPSHOT + 1.0.0-SNAPSHOT pom CDS designer Client diff --git a/cds-ui/designer-client/pom.xml-n b/cds-ui/designer-client/pom.xml-n new file mode 100644 index 000000000..fc0c4232c --- /dev/null +++ b/cds-ui/designer-client/pom.xml-n @@ -0,0 +1,95 @@ + + + + 4.0.0 + + + org.onap.ccsdk.cds + ui + 1.0.0-SNAPSHOT + .. + + + designer-client + 1.0.0-SNAPSHOT + pom + + CDS designer Client + + + UTF-8 + npm + https://nexus.onap.org + + + + + + com.github.eirslett + frontend-maven-plugin + + 1.3 + + v13.7.0 + 6.13.6 + https://nodejs.org/dist/ + ./ + + + + install node and npm + + install-node-and-npm + + generate-resources + + + + npm install + + npm + + + generate-resources + + + install + + + + + npm build + + npm + + + generate-resources + + + run build + + + + + + + + diff --git a/cds-ui/pom.xml b/cds-ui/pom.xml index fd505b4a4..68667a1a8 100644 --- a/cds-ui/pom.xml +++ b/cds-ui/pom.xml @@ -18,19 +18,20 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ============LICENSE_END============================================ --> + 4.0.0 org.onap.ccsdk.parent spring-boot-starter-parent - 1.5.2 + 2.0.0-SNAPSHOT org.onap.ccsdk.cds ui - 0.7.1-SNAPSHOT + 1.0.0-SNAPSHOT pom CDS UI Parent diff --git a/cds-ui/pom.xml-n b/cds-ui/pom.xml-n new file mode 100644 index 000000000..26e3ff370 --- /dev/null +++ b/cds-ui/pom.xml-n @@ -0,0 +1,54 @@ + + + + 4.0.0 + + + org.onap.ccsdk.parent + spring-boot-starter-parent + 2.0.0-SNAPSHOT + + + + org.onap.ccsdk.cds + ui + 1.0.0-SNAPSHOT + pom + + CDS UI Parent + Creates Controller Design Studio UI Docker container + + + client + designer-client + server + application + + + + onap/ccsdk-cds-ui + ${project.version} + ${project.version} + ${maven.build.timestamp} + yyyyMMdd'T'HHmmss'Z' + true + + diff --git a/cds-ui/server/pom.xml b/cds-ui/server/pom.xml index c36139e07..11bfd9fd7 100644 --- a/cds-ui/server/pom.xml +++ b/cds-ui/server/pom.xml @@ -18,18 +18,19 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ============LICENSE_END============================================ --> + 4.0.0 org.onap.ccsdk.cds ui - 0.7.1-SNAPSHOT + 1.0.0-SNAPSHOT .. ui-server - 0.7.1-SNAPSHOT + 1.0.0-SNAPSHOT pom CDS UI Server diff --git a/cds-ui/server/pom.xml-n b/cds-ui/server/pom.xml-n new file mode 100644 index 000000000..4229fa172 --- /dev/null +++ b/cds-ui/server/pom.xml-n @@ -0,0 +1,192 @@ + + + + 4.0.0 + + + org.onap.ccsdk.cds + ui + 1.0.0-SNAPSHOT + .. + + + ui-server + 1.0.0-SNAPSHOT + pom + + CDS UI Server + + + UTF-8 + npm + https://nexus.onap.org + onap/ccsdk-cds-ui-server + deploy + + + + + + org.apache.maven.plugins + maven-dependency-plugin + 3.1.1 + + + unpack-blueprint-grpc-proto + generate-resources + + unpack + + + + + org.onap.ccsdk.cds.blueprintsprocessor + blueprint-proto + ${project.version} + jar + true + ${project.build.directory}/generated/proto-definition/proto + **/*.proto + + + + + + + + + com.github.eirslett + frontend-maven-plugin + + 1.3 + + v8.12.0 + 6.4.1 + https://nodejs.org/dist/ + ./ + + + + install node and npm + + install-node-and-npm + + generate-resources + + + + npm install + + npm + + + generate-resources + + + install + + + + + npm build + + npm + + + generate-resources + + + run build + + + + + + + org.codehaus.groovy.maven + gmaven-plugin + 1.0 + + + validate + + execute + + + ${basedir}/../../TagVersion.groovy + + + + + + + + + + docker + + + + io.fabric8 + docker-maven-plugin + 0.26.1 + false + + + + ${image.name} + + try + ${basedir} + + ${project.docker.latestminortag.version} + ${project.docker.latestfulltag.version} + ${project.docker.latesttagtimestamp.version} + + + + + true + + + + generate-images + package + + build + + + + push-images + ${docker.push.phase} + + build + push + + + + + + + + + + -- cgit 1.2.3-korg