From 094dd6840bfa4cebc120b0735797ff3617371296 Mon Sep 17 00:00:00 2001 From: guochuyicmri Date: Fri, 24 May 2019 10:48:50 +0800 Subject: modify usecase-ui pom files Change-Id: Ic45a790160522047e6dbcf868a7fcf0363008c49 Issue-ID: USECASEUI-259 Signed-off-by: guochuyicmri --- distribution/pom.xml | 467 ++++++++++++++++++++--------------------------- pom.xml | 115 +----------- usecaseui-portal/pom.xml | 206 +++++++++++---------- 3 files changed, 308 insertions(+), 480 deletions(-) diff --git a/distribution/pom.xml b/distribution/pom.xml index 2d1f452f..a41f6ca5 100644 --- a/distribution/pom.xml +++ b/distribution/pom.xml @@ -16,290 +16,217 @@ --> 4.0.0 - org.onap.usecase-ui - usecase-ui - 2.0.1 + usecase-ui-parent + 2.0.1-SNAPSHOT - distribution + usecase-ui-distribution pom - usecase-ui/distribution + usecase-ui-distribution + distribution for usecase-ui portal - usecase-ui - 1.1.2 - 1.7.6 - linux64 - win64 - target/assembly/${linux64id} - target/assembly/${win64id} - target/version 2.0.1 + UTF-8 + UTF-8 yyyyMMdd'T'HHmmss'Z' + target/assembly/linux64 + target/version/${usecaseui.version} - usecse-ui - - - org.apache.maven.plugins - maven-dependency-plugin - - - unpack-tomcat-to-temporary-dir - generate-resources - - unpack - - - - - org.apache.tomcat - tomcat - zip - target/tomcat - - - - - - - - maven-resources-plugin - - - copy-resources-portal-linux - process-resources - - copy-resources - - - ${linux64outputdir}/tomcat/webapps/ - - - ../usecaseui-portal/ - false - - usecase-ui.war - - - - true - - - - copy-resources-${linux64id} - process-resources - - copy-resources - - - ${linux64outputdir} - - - src/main/assembly/ - false - - **/* - - - **/*.bat - - - - true - - - - copy-tomcat-resources-${linux64id} - process-resources - - copy-resources - - - ${linux64outputdir}/tomcat - - - ${basedir}/target/tomcat/apache-tomcat-${tomcat.version} - - **/* - - - **/*.bat - - - - - - - copy-resources-portal-win - process-resources - - copy-resources - - - ${win64outputdir}/tomcat/webapps/ - - - ../usecaseui-portal/ - false - - usecase-ui.war - - - - true - - - - copy-resources-${win64id} - process-resources - - copy-resources - - - ${win64outputdir} - - - src/main/assembly/ - false - - **/* - - - **/*.sh - - - - true - - - - copy-tomcat-resources-${win64id} - process-resources - - copy-resources - - - ${win64outputdir}/tomcat - - - ${basedir}/target/tomcat/apache-tomcat-${tomcat.version} - - **/* - - - **/*.sh - - - - - - - copy-dockerfile - process-resources - - copy-resources - - - ${version.output} - - - src/main/assembly/ - false - - Dockerfile - - - - true - - - - - - org.apache.maven.plugins - maven-antrun-plugin - - - distribution - package - - run - - - - - - - - - - - - - - - - - - - - - - + usecse-ui + + + org.apache.maven.plugins + maven-dependency-plugin + + + unpack-tomcat-to-temporary-dir + generate-resources + + unpack + + + + + org.apache.tomcat + tomcat + zip + target/tomcat + + + + + + + + maven-resources-plugin + + + copy-resources-portal-linux + process-resources + + copy-resources + + + ${linux64outputdir}/tomcat/webapps/ + + + ../usecaseui-portal/ + false + + usecase-ui.war + + + + true + + + + copy-resources-linux64 + process-resources + + copy-resources + + + ${linux64outputdir} + + + src/main/assembly/ + false + + **/* + + + **/*.bat + + + + true + + + + copy-tomcat-resources-linux64 + process-resources + + copy-resources + + + ${linux64outputdir}/tomcat + + + ${basedir}/target/tomcat/apache-tomcat-${tomcat.version} + + **/* + + + **/*.bat + + + + + + + copy-dockerfile + process-resources + + copy-resources + + + ${dockeroutput} + + + src/main/assembly/ + false + + Dockerfile + + + + true + + + + + + org.apache.maven.plugins + maven-antrun-plugin + + + distribution + package + + run + + + + + + + + + + + + + + + + + + - - docker - - - - io.fabric8 - docker-maven-plugin - 0.16.5 - false - - - - onap/usecase-ui - - try - ${basedir}/${version.output} - ${basedir}/target/version/Dockerfile - - ${usecaseui.version}-SNAPSHOT-latest - ${usecaseui.version}-STAGING-latest - ${usecaseui.version}-STAGING-${maven.build.timestamp} - - - - - - - - generate-images - package - - build - - - - push-images - deploy - - build - push - - - - - - - + + docker + + + + io.fabric8 + docker-maven-plugin + 0.16.5 + false + + + + onap/usecase-ui + + try + ${basedir}/${dockeroutput} + ${basedir}/${dockeroutput}/Dockerfile + + ${usecaseui.version}-SNAPSHOT-latest + ${usecaseui.version}-STAGING-latest + ${usecaseui.version}-STAGING-${maven.build.timestamp} + + + + + + + + generate-images + package + + build + + + + push-images + deploy + + build + push + + + + + + + - diff --git a/pom.xml b/pom.xml index 4d50922d..67810198 100644 --- a/pom.xml +++ b/pom.xml @@ -16,7 +16,6 @@ --> 4.0.0 - org.onap.oparent oparent @@ -25,23 +24,25 @@ org.onap.usecase-ui - usecase-ui - 2.0.1 + usecase-ui-parent + 2.0.1-SNAPSHOT pom - usecase-ui + usecase-ui-parent + parent project for usecase-ui + UTF-8 + UTF-8 ${project.version} yyyyMMdd'T'HHmm https://nexus.onap.org - content/repositories/releases/ content/repositories/snapshots/ - content/repositories/public/ + content/repositories/releases/ content/sites/site/${project.groupId}/${project.artifactId}/${project.version}/ 9.0.19 - + - - - onap-public - ${nexusproxy}/${publicNexusPath} - - false - - - - onap-releases - ${nexusproxy}/${releaseNexusPath} - - false - - - - onap-snapshots - ${nexusproxy}/${snapshotNexusPath} - - false - - - - - - - - onap-plugin-public - ${nexusproxy}/${publicNexusPath} - - false - - - - onap-plugin-release - ${nexusproxy}/${releaseNexusPath} - - false - - - - onap-plugin-snapshots - ${nexusproxy}/${snapshotNexusPath} - - false - - - + + 4.0.0 + + org.onap.usecase-ui + usecase-ui-parent + 2.0.1-SNAPSHOT + - 4.0.0 - - org.onap.usecase-ui - usecase-ui - 2.0.1 - + usecase-ui-portal + pom + usecase-ui-portal + source code for usecase-ui portal - usecaseui-portal - pom - usecase-ui + + + + maven-clean-plugin + 3.1.0 + + + clean dist folder + clean + + clean + + + + + ${project.basedir}/dist + + + + + + + + com.github.eirslett + frontend-maven-plugin + 1.6 + + ${project.basedir} + + + + install node and npm + + install-node-and-npm + + + v8.11.4 + 5.6.0 + + + + npm set progress off + + npm + + + set progress=false + + + + npm install + + npm + + + install + + + + npm run src build + + npm + + + run build + + + + + + org.apache.maven.plugins + maven-antrun-plugin + - - - - maven-clean-plugin - 3.1.0 - - - clean dist folder - clean - - clean - - - - - ${project.basedir}/dist - - - - - - - - com.github.eirslett - frontend-maven-plugin - 1.6 - - ${project.basedir} - - - - install node and npm - - install-node-and-npm - - - v8.11.4 - 5.6.0 - - - - - npm set progress off - - npm - - - set progress=false - - - - - npm install - - npm - - - install - - - - - npm run src build - - npm - - - run build - - - - - - org.apache.maven.plugins - maven-antrun-plugin - - - distribution - package - - run - - - - - - - - - - - - - - + + distribution + package + + run + + + + + + + + + + + + + + -- cgit 1.2.3-korg