From: Timoney, Dan (dt5972) Date: Tue, 8 Jan 2019 19:40:54 +0000 (-0500) Subject: Prepare for release build X-Git-Tag: 0.4.2~160^2~51 X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=ad9f4aec4cc149e760f6b0094b287ff6c32938b4;p=ccsdk%2Fcds.git Prepare for release build Prepare for release of early ODL-Oxygen based CCSDK Dublin Change-Id: I63929ef52de41309905ee31e3fbcf49b64063059 Issue-ID: CCSDK-870 Signed-off-by: Timoney, Dan (dt5972) --- diff --git a/ms/controllerblueprints/application/pom.xml b/ms/controllerblueprints/application/pom.xml index bb0f7686d..bd244e0db 100644 --- a/ms/controllerblueprints/application/pom.xml +++ b/ms/controllerblueprints/application/pom.xml @@ -1,260 +1,254 @@ - - - - - 4.0.0 - - org.onap.ccsdk.apps.controllerblueprints - parent - 0.4.0-SNAPSHOT - ../parent - - application - Controller Blueprints Application - - ${basedir}/target/src/main/resources/swagger-ui - 1.8 - org.onap.ccsdk.apps - controllerblueprints - - jacoco - reuseReports - ${basedir}/target/surefire-reports - ${basedir}/target/failsafe-reports - ${basedir}/target/jacoco_report - ${basedir}/target/jacoco_itReport - ${basedir}/target/jacoco-ut.exec - ${basedir}/target/jacoco-it.exec - java - 2.0.7 - - - - - org.onap.ccsdk.apps.controllerblueprints - service - - - org.springframework.boot - spring-boot-starter-security - - - org.springframework.boot - spring-boot-starter-actuator - - - org.powermock - powermock-api-mockito2 - test - - - org.springframework.boot - spring-boot-starter-test - test - - - org.springframework.security - spring-security-test - test - - - org.jetbrains.kotlin - kotlin-test-junit - test - - - io.projectreactor - reactor-test - test - - - - - - - ${basedir}/etc - ${basedir}/target/etc - true - - **/* - - - - - ${basedir}/src/main/resources - ${basedir}/target/src/main/resources - true - - **/* - - - - src/main/resources - - **/* - - true - - - - - maven-resources-plugin - 2.6 - - - copy-dockerfile - - copy-resources - - validate - - ${basedir}/target/docker-stage - - - src/main/docker - - * - - true - - - - - - - - - org.jacoco - jacoco-maven-plugin - 0.7.5.201505241946 - - - - pre-unit-test - - prepare-agent - - - - ${sonar.jacoco.reportPath} - surefireArgLine - - - - - post-unit-test - test - - report - - - - ${sonar.jacoco.reportPath} - - ${jacoco.path} - - - - - - org.apache.maven.plugins - maven-antrun-plugin - - - ant-test - package - - - - - - - run - - - - - - maven-compiler-plugin - 3.1 - - - 1.8 - 1.8 - - - - com.github.kongchen - swagger-maven-plugin - 3.1.7 - - - - true - org.onap.ccsdk.apps.controllerblueprints.service.rs - - - http - https - - /api/v1 - - Controller Blueprints - ${project.version} - - Controller blueprints API for VNF Self Service. - - - Terms of service - - - brindasanth@gmail.com - Brinda Santh - http://onap.com - - - http://www.apache.org/licenses/LICENSE-2.0.html - Apache 2.0 - - - ${swagger.directory} - - - - - - compile - - generate - - - - - - - - - - + + + + 4.0.0 + + org.onap.ccsdk.apps.controllerblueprints + parent + 0.4.0-SNAPSHOT + ../parent + + application + Controller Blueprints Application + + ${basedir}/target/src/main/resources/swagger-ui + 1.8 + org.onap.ccsdk.apps + controllerblueprints + + jacoco + reuseReports + ${basedir}/target/surefire-reports + ${basedir}/target/failsafe-reports + ${basedir}/target/jacoco_report + ${basedir}/target/jacoco_itReport + ${basedir}/target/jacoco-ut.exec + ${basedir}/target/jacoco-it.exec + java + 2.0.7 + + + + + org.onap.ccsdk.apps.controllerblueprints + service + + + org.springframework.boot + spring-boot-starter-security + + + org.springframework.boot + spring-boot-starter-actuator + + + org.powermock + powermock-api-mockito2 + test + + + org.springframework.boot + spring-boot-starter-test + test + + + org.springframework.security + spring-security-test + test + + + org.jetbrains.kotlin + kotlin-test-junit + test + + + io.projectreactor + reactor-test + test + + + + + + + ${basedir}/etc + ${basedir}/target/etc + true + + **/* + + + + + ${basedir}/src/main/resources + ${basedir}/target/src/main/resources + true + + **/* + + + + src/main/resources + + **/* + + true + + + + + maven-resources-plugin + 2.6 + + + copy-dockerfile + + copy-resources + + validate + + ${basedir}/target/docker-stage + + + src/main/docker + + * + + true + + + + + + + + + org.jacoco + jacoco-maven-plugin + 0.7.5.201505241946 + + + + pre-unit-test + + prepare-agent + + + + ${sonar.jacoco.reportPath} + surefireArgLine + + + + + post-unit-test + test + + report + + + + ${sonar.jacoco.reportPath} + + ${jacoco.path} + + + + + + org.apache.maven.plugins + maven-antrun-plugin + + + ant-test + package + + + + + + + run + + + + + + maven-compiler-plugin + 3.1 + + + 1.8 + 1.8 + + + + com.github.kongchen + swagger-maven-plugin + 3.1.7 + + + + true + org.onap.ccsdk.apps.controllerblueprints.service.rs + + + http + https + + /api/v1 + + Controller Blueprints + ${project.version} + + Controller blueprints API for VNF Self Service. + + + Terms of service + + + brindasanth@gmail.com + Brinda Santh + http://onap.com + + + http://www.apache.org/licenses/LICENSE-2.0.html + Apache 2.0 + + + ${swagger.directory} + + + + + + compile + + generate + + + + + + + + + diff --git a/ms/controllerblueprints/distribution/pom.xml b/ms/controllerblueprints/distribution/pom.xml index 33690024b..afbc6617a 100644 --- a/ms/controllerblueprints/distribution/pom.xml +++ b/ms/controllerblueprints/distribution/pom.xml @@ -1,202 +1,196 @@ - - - - - 4.0.0 - - org.onap.ccsdk.apps.controllerblueprints - parent - 0.4.0-SNAPSHOT - ../parent - - distribution - pom - Controller Blueprints Distribution - - maven - org.onap.ccsdk.apps - controllerblueprints - onap/ccsdk-controllerblueprints - ${https_proxy} - deploy - true - - - - - org.onap.ccsdk.apps.controllerblueprints - application - - - - - - maven-resources-plugin - 2.6 - - - copy-dockerfile - - copy-resources - - validate - - ${basedir}/target/docker-stage - - - src/main/docker - - * - - true - - - - - - - - org.apache.maven.plugins - maven-antrun-plugin - - - ant-test - package - - - - - - - run - - - - - - - maven-assembly-plugin - 3.1.0 - - - ${basedir}/target/docker-stage - - src/main/docker/distribution.xml - - posix - - - - ${assembly.id} - package - - single - - - - - - org.codehaus.groovy.maven - gmaven-plugin - 1.0 - - - validate - - execute - - - - println project.properties['ccsdk.project.version']; - def versionArray; - if (project.properties['ccsdk.project.version'] != null ) { - versionArray = project.properties['ccsdk.project.version'].split('\\.'); - } - - if (project.properties['ccsdk.project.version'].endsWith("-SNAPSHOT")) - { - project.properties['project.docker.latesttag.version']=versionArray[0] + '.' + versionArray[1] + "-STAGING-latest"; - } else { - project.properties['project.docker.latesttag.version']=versionArray[0]+'.' + versionArray[1]+"-STAGING-latest"; - } - - println 'New Tag for docker:' + project.properties['project.docker.latesttag.version']; - - - - - - - - - - - - docker - - - - io.fabric8 - docker-maven-plugin - 0.26.1 - false - - - - ${image.name} - - try - ${basedir}/target/docker-stage - - ${project.version} - ${project.version}-STAGING-${maven.build.timestamp} - ${project.docker.latesttag.version} - - - - - true - - - - generate-images - package - - build - - - - push-images - ${docker.push.phase} - - build - push - - - - - - - - - - - + + + + 4.0.0 + + org.onap.ccsdk.apps.controllerblueprints + parent + 0.4.0-SNAPSHOT + ../parent + + distribution + pom + Controller Blueprints Distribution + + maven + org.onap.ccsdk.apps + controllerblueprints + onap/ccsdk-controllerblueprints + ${https_proxy} + deploy + true + + + + + org.onap.ccsdk.apps.controllerblueprints + application + + + + + + maven-resources-plugin + 2.6 + + + copy-dockerfile + + copy-resources + + validate + + ${basedir}/target/docker-stage + + + src/main/docker + + * + + true + + + + + + + + org.apache.maven.plugins + maven-antrun-plugin + + + ant-test + package + + + + + + + run + + + + + + + maven-assembly-plugin + 3.1.0 + + + ${basedir}/target/docker-stage + + src/main/docker/distribution.xml + + posix + + + + ${assembly.id} + package + + single + + + + + + org.codehaus.groovy.maven + gmaven-plugin + 1.0 + + + validate + + execute + + + + println project.properties['ccsdk.project.version']; + def versionArray; + if (project.properties['ccsdk.project.version'] != null ) { + versionArray = project.properties['ccsdk.project.version'].split('\\.'); + } + + if (project.properties['ccsdk.project.version'].endsWith("-SNAPSHOT")) + { + project.properties['project.docker.latesttag.version']=versionArray[0] + '.' + versionArray[1] + "-STAGING-latest"; + } else { + project.properties['project.docker.latesttag.version']=versionArray[0]+'.' + versionArray[1]+"-STAGING-latest"; + } + + println 'New Tag for docker:' + project.properties['project.docker.latesttag.version']; + + + + + + + + + + + + docker + + + + io.fabric8 + docker-maven-plugin + 0.26.1 + false + + + + ${image.name} + + try + ${basedir}/target/docker-stage + + ${project.version} + ${project.version}-STAGING-${maven.build.timestamp} + ${project.docker.latesttag.version} + + + + + true + + + + generate-images + package + + build + + + + push-images + ${docker.push.phase} + + build + push + + + + + + + + + + diff --git a/ms/controllerblueprints/pom.xml b/ms/controllerblueprints/pom.xml index aeff4db9d..d88956f0d 100644 --- a/ms/controllerblueprints/pom.xml +++ b/ms/controllerblueprints/pom.xml @@ -14,9 +14,7 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> - - + org.onap.ccsdk.apps ccsdk-apps-ms @@ -45,4 +43,3 @@ distribution -