summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGary Wu <gary.i.wu@huawei.com>2017-11-09 09:22:27 -0800
committerGary Wu <gary.i.wu@huawei.com>2017-11-09 09:43:37 -0800
commit3bad8b860a0529bb23b4d461378fd13e2a448827 (patch)
tree318c862b85bd66f3868528eb570328e6718f5e3b
parent9755e880831e16080a7a4e4a88ab5c0c5ab3c955 (diff)
Sort the manifests by artifact names
Change-Id: Ic71b29c6bf0fe0ecaaf1055ed6bfb3c04b953f88 Issue-ID: INT-124 Signed-off-by: Gary Wu <gary.i.wu@huawei.com>
-rw-r--r--version-manifest/pom.xml36
-rw-r--r--version-manifest/src/main/resources/docker-manifest.csv44
-rw-r--r--version-manifest/src/main/resources/java-manifest.csv71
3 files changed, 93 insertions, 58 deletions
diff --git a/version-manifest/pom.xml b/version-manifest/pom.xml
index 361262e83..163b7f1e4 100644
--- a/version-manifest/pom.xml
+++ b/version-manifest/pom.xml
@@ -87,6 +87,42 @@
<generateGitPropertiesFile>true</generateGitPropertiesFile>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>exec-maven-plugin</artifactId>
+ <version>1.6.0</version>
+ <configuration>
+ <executable>sort</executable>
+ </configuration>
+ <executions>
+ <execution>
+ <id>check-docker-manifest-sorted</id>
+ <phase>validate</phase>
+ <goals>
+ <goal>exec</goal>
+ </goals>
+ <configuration>
+ <arguments>
+ <argument>-c</argument>
+ <argument>${project.basedir}/src/main/resources/docker-manifest.csv</argument>
+ </arguments>
+ </configuration>
+ </execution>
+ <execution>
+ <id>check-java-manifest-sorted</id>
+ <phase>validate</phase>
+ <goals>
+ <goal>exec</goal>
+ </goals>
+ <configuration>
+ <arguments>
+ <argument>-c</argument>
+ <argument>${project.basedir}/src/main/resources/java-manifest.csv</argument>
+ </arguments>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
</project>
diff --git a/version-manifest/src/main/resources/docker-manifest.csv b/version-manifest/src/main/resources/docker-manifest.csv
index 68677a3a6..cdd00aa29 100644
--- a/version-manifest/src/main/resources/docker-manifest.csv
+++ b/version-manifest/src/main/resources/docker-manifest.csv
@@ -1,44 +1,44 @@
image,tag
-onap/cli,v1.1.0
-onap/clamp,v1.1.0
-onap/portal-apps,v1.3.0
-onap/portal-db,v1.3.0
-onap/portal-wms,v1.3.0
-onap/policy/policy-db,1.1-STAGING-latest
-onap/policy/policy-pe,1.1-STAGING-latest
-onap/policy/policy-drools,1.1-STAGING-latest
-onap/policy/policy-nexus,1.1-STAGING-latest
+onap/admportal-sdnc-image,1.2-STAGING-latest
+onap/ccsdk-dgbuilder-image,0.1-STAGING-latest
onap/ccsdk-odl-image,0.1-STAGING-latest
onap/ccsdk-odlsli-image,0.1-STAGING-latest
-onap/ccsdk-dgbuilder-image,0.1-STAGING-latest
-onap/sdnc-image,1.2-STAGING-latest
-onap/admportal-sdnc-image,1.2-STAGING-latest
+onap/clamp,v1.1.0
+onap/cli,v1.1.0
onap/holmes/dsa,1.0.0-STAGING-latest
onap/holmes/engine-management,1.0.0-STAGING-latest
onap/holmes/rule-management,1.0.0-STAGING-latest
-onap/msb/msb_discovery,1.0.0-STAGING-latest
onap/msb/msb_apigateway,1.0.0-STAGING-latest
+onap/msb/msb_discovery,1.0.0-STAGING-latest
onap/oom/kube2msb,1.0.0-STAGING-latest
-onap/vnfsdk/refrepo,1.0.0-STAGING-latest
-openecomp/mso,1.1-STAGING-latest
-onap/vfc/emsdriver,1.0.1-STAGING-latest
+onap/policy/policy-db,1.1-STAGING-latest
+onap/policy/policy-drools,1.1-STAGING-latest
+onap/policy/policy-nexus,1.1-STAGING-latest
+onap/policy/policy-pe,1.1-STAGING-latest
+onap/portal-apps,v1.3.0
+onap/portal-db,v1.3.0
+onap/portal-wms,v1.3.0
+onap/sdnc-image,1.2-STAGING-latest
onap/vfc/catalog,1.0.1-STAGING-latest
+onap/vfc/emsdriver,1.0.1-STAGING-latest
onap/vfc/gvnfmdriver,1.0.1-STAGING-latest
onap/vfc/jujudriver,1.0.0-STAGING-latest
+onap/vfc/nfvo/svnfm/huawei,1.0.0-STAGING-latest
+onap/vfc/nfvo/svnfm/nokia,1.0.0-STAGING-latest
onap/vfc/nslcm,1.0.1-STAGING-latest
onap/vfc/resmanagement,1.0.0-STAGING-latest
-onap/vfc/vnfmgr,1.0.1-STAGING-latest
onap/vfc/vnflcm,1.0.1-STAGING-latest
+onap/vfc/vnfmgr,1.0.1-STAGING-latest
onap/vfc/vnfres,1.0.1-STAGING-latest
-onap/vfc/ztesdncdriver,1.0.0-STAGING-latest
-onap/vfc/wfengine-mgrservice,1.0.0-STAGING-latest
onap/vfc/wfengine-activiti,1.0.0-STAGING-latest
+onap/vfc/wfengine-mgrservice,1.0.0-STAGING-latest
+onap/vfc/ztesdncdriver,1.0.0-STAGING-latest
onap/vfc/ztevmanagerdriver,1.0.1-STAGING-latest
-onap/vfc/nfvo/svnfm/huawei,1.0.0-STAGING-latest
-onap/vfc/nfvo/svnfm/nokia,1.0.0-STAGING-latest
+onap/vnfsdk/refrepo,1.0.0-STAGING-latest
+openecomp/mso,1.1-STAGING-latest
openecomp/sdc-backend,1.1-STAGING-latest
-openecomp/sdc-frontend,1.1-STAGING-latest
openecomp/sdc-elasticsearch,1.1-STAGING-latest
+openecomp/sdc-frontend,1.1-STAGING-latest
openecomp/sdc-kibana,1.1-STAGING-latest
openecomp/sdc-sanity,1.1-STAGING-latest
openecomp/vid,v1.1.0
diff --git a/version-manifest/src/main/resources/java-manifest.csv b/version-manifest/src/main/resources/java-manifest.csv
index 26a470260..d4a73c0c9 100644
--- a/version-manifest/src/main/resources/java-manifest.csv
+++ b/version-manifest/src/main/resources/java-manifest.csv
@@ -1,26 +1,4 @@
groupId,artifactId,version
-org.onap.cli,cli-zip,1.1.0
-org.onap.cli,cli-framework,1.1.0
-org.onap.cli,cli-main,1.1.0
-org.onap.cli,cli-plugins-aai,1.1.0
-org.onap.cli,cli-plugins-msb,1.1.0
-org.onap.cli,cli-plugins-sample,1.1.0
-org.onap.cli,cli-plugins-sdc,1.1.0
-org.onap.cli,cli-plugins-so,1.1.0
-org.onap.cli,cli-sample-mock-generator,1.1.0
-org.onap.cli,cli-sample-yaml-generator,1.1.0
-org.onap.cli,cli-validation,1.1.0
-org.onap.oparent,oparent,0.1.1
-org.onap.portal.sdk,epsdk-analytics,1.3.2
-org.onap.portal.sdk,epsdk-app-common,1.3.2
-org.onap.portal.sdk,epsdk-app-overlay,1.3.2
-org.onap.portal.sdk,epsdk-core,1.3.2
-org.onap.portal.sdk,epsdk-fw,1.3.2
-org.onap.portal.sdk,epsdk-workflow,1.3.2
-org.onap.policy.common,common-modules,1.1.0
-org.onap.policy.drools-pdp,drools-pdp,1.1.0
-org.onap.policy.drools-applications,drools-pdp-apps,1.1.0
-org.onap.policy.engine,PolicyEngineSuite,1.1.0
org.onap.ccsdk.parent,odlparent-carbon-sr1,0.0.2
org.onap.ccsdk.sli.adaptors,aai-service-provider,0.1.0
org.onap.ccsdk.sli.adaptors,mdsal-resource-provider,0.1.0
@@ -28,11 +6,11 @@ org.onap.ccsdk.sli.adaptors,resource-assignment-provider,0.1.0
org.onap.ccsdk.sli.adaptors,sql-resource-provider,0.1.0
org.onap.ccsdk.sli.core,dblib-provider,0.1.0
org.onap.ccsdk.sli.core,filters-provider,0.1.0
+org.onap.ccsdk.sli.core,sliapi-provider,0.1.0
org.onap.ccsdk.sli.core,sli-common,0.1.0
+org.onap.ccsdk.sli.core,sliPluginUtils-provider,0.1.0
org.onap.ccsdk.sli.core,sli-provider,0.1.0
org.onap.ccsdk.sli.core,sli-recording,0.1.0
-org.onap.ccsdk.sli.core,sliapi-provider,0.1.0
-org.onap.ccsdk.sli.core,sliPluginUtils-provider,0.1.0
org.onap.ccsdk.sli.core,utils-provider,0.1.0
org.onap.ccsdk.sli.northbound,asdcApi-provider,0.1.0
org.onap.ccsdk.sli.northbound,dataChange-provider,0.1.0
@@ -44,32 +22,53 @@ org.onap.ccsdk.sli.plugins,restapi-call-node-provider,0.1.0
org.onap.ccsdk.storage.pgaas,pgaas,1.0.0
org.onap.ccsdk.utils,utils,1.0.0
org.onap.clamp.clds.clamp,clamp,1.1.0
-org.onap.sdnc.northbound,generic-resource-api.provider,1.2.0
-org.onap.sdnc.northbound,vnfapi-provider,1.2.0
-org.onap.sdnc.northbound,vnftools-provider,1.2.0
+org.onap.cli,cli-framework,1.1.0
+org.onap.cli,cli-main,1.1.0
+org.onap.cli,cli-plugins-aai,1.1.0
+org.onap.cli,cli-plugins-msb,1.1.0
+org.onap.cli,cli-plugins-sample,1.1.0
+org.onap.cli,cli-plugins-sdc,1.1.0
+org.onap.cli,cli-plugins-so,1.1.0
+org.onap.cli,cli-sample-mock-generator,1.1.0
+org.onap.cli,cli-sample-yaml-generator,1.1.0
+org.onap.cli,cli-validation,1.1.0
+org.onap.cli,cli-zip,1.1.0
org.onap.holmes.common,holmes-actions,1.0.0
org.onap.holmes.dsa,dmaap-dsa,1.0.0
org.onap.holmes.engine-management,holmes-engine-d,1.0.0
org.onap.holmes.rule-management,holmes-rulemgt,1.0.0
org.onap.msb.java-sdk,msb-java-sdk,1.0.0
org.onap.msb.swagger-sdk,swagger-sdk,1.0.0
-org.onap.vfc.nfvo.lcm,vfc-nfvo-lcm,1.0.1
+org.onap.oparent,oparent,0.1.1
+org.onap.policy.common,common-modules,1.1.0
+org.onap.policy.drools-applications,drools-pdp-apps,1.1.0
+org.onap.policy.drools-pdp,drools-pdp,1.1.0
+org.onap.policy.engine,PolicyEngineSuite,1.1.0
+org.onap.portal.sdk,epsdk-analytics,1.3.2
+org.onap.portal.sdk,epsdk-app-common,1.3.2
+org.onap.portal.sdk,epsdk-app-overlay,1.3.2
+org.onap.portal.sdk,epsdk-core,1.3.2
+org.onap.portal.sdk,epsdk-fw,1.3.2
+org.onap.portal.sdk,epsdk-workflow,1.3.2
+org.onap.sdnc.northbound,generic-resource-api.provider,1.2.0
+org.onap.sdnc.northbound,vnfapi-provider,1.2.0
+org.onap.sdnc.northbound,vnftools-provider,1.2.0
+org.onap.vfc.gvnfm.vnflcm.lcm,vfc-gvnfm-vnflcm-lcm,1.0.1
+org.onap.vfc.gvnfm.vnfmgr.mgr,vfc-gvnfm-vnfmgr-mgr,1.0.1
+org.onap.vfc.gvnfm.vnfres.res,vfc-gvnfm-vnfres-res,1.0.1
org.onap.vfc.nfvo.catalog,vfc-nfvo-catalog,1.0.1
org.onap.vfc.nfvo.driver.ems.ems,emsdriver-standalone,1.0.1
+org.onap.vfc.nfvo.driver.sfc.zte.sfc-driver-standalone,vfc-nfvo-driver-sfc-zte-sfc-driver,1.0.0
org.onap.vfc.nfvo.driver.vnfm.gvnfm.gvnfmadapter,vfc-nfvo-driver-vnfm-gvnfm-gvnfmadapter,1.0.1
-org.onap.vfc.nfvo.driver.vnfm.svnfm.zte.vmanager,vfc-nfvo-driver-vnfm-svnfm-zte-vmanager,1.0.1
org.onap.vfc.nfvo.driver.vnfm.svnfm.huawei.vnfmadapter,hw-vnfmadapter-deployment,1.0.0
org.onap.vfc.nfvo.driver.vnfm.svnfm,vfcadaptor-deployment,1.0.0
-org.onap.vfc.nfvo.driver.sfc.zte.sfc-driver-standalone,vfc-nfvo-driver-sfc-zte-sfc-driver,1.0.0
-org.onap.vfc.gvnfm.vnflcm.lcm,vfc-gvnfm-vnflcm-lcm,1.0.1
-org.onap.vfc.gvnfm.vnfmgr.mgr,vfc-gvnfm-vnfmgr-mgr,1.0.1
-org.onap.vfc.gvnfm.vnfres.res,vfc-gvnfm-vnfres-res,1.0.1
+org.onap.vfc.nfvo.driver.vnfm.svnfm.zte.vmanager,vfc-nfvo-driver-vnfm-svnfm-zte-vmanager,1.0.1
+org.onap.vfc.nfvo.lcm,vfc-nfvo-lcm,1.0.1
org.onap.vfc.nfvo.resmanagement,vfc-nfvo-resmanagement-deployment,1.0.0
org.onap.vfc.nfvo.wfengine,activiti-extension,1.0.0
org.onap.vfc.nfvo.wfengine,workflow-engine-mgr-service,1.0.0
-org.openecomp.sdc.sdc-distribution-client,sdc-main-distribution-client,1.1.32
org.openecomp.sdc.jtosca,jtosca,1.1.1
-org.openecomp.sdc.sdc-tosca,sdc-tosca,1.1.32
+org.openecomp.sdc.sdc-distribution-client,sdc-main-distribution-client,1.1.32
org.openecomp.sdc.sdc-titan-cassandra,sdc-titan-cassandra,1.0.0
+org.openecomp.sdc.sdc-tosca,sdc-tosca,1.1.32
org.openecomp.vid,asdcclient,1.0.2
-