Enforce consistent sort order across environments

Change-Id: If4b753ca344fecfaf32b3a6c498edb58c4f6a0f6
Issue-ID: INT-124
Signed-off-by: Gary Wu <gary.i.wu@huawei.com>

diff --git a/version-manifest/pom.xml b/version-manifest/pom.xml
index 27a8d03..b2102d5 100644 (file)
--- a/version-manifest/pom.xml
+++ b/version-manifest/pom.xml
@@ -92,7 +92,7 @@
         <artifactId>exec-maven-plugin</artifactId>
         <version>1.6.0</version>
         <configuration>
-          <executable>sort</executable>
+          <executable>bash</executable>
         </configuration>
         <executions>
           <execution>
@@ -103,7 +103,7 @@
             </goals>
             <configuration>
               <arguments>
-                <argument>-c</argument>
+                <argument>${project.basedir}/src/main/scripts/check-sorted.sh</argument>
                 <argument>${project.basedir}/src/main/resources/docker-manifest.csv</argument>
               </arguments>
             </configuration>
@@ -116,7 +116,7 @@
             </goals>
             <configuration>
               <arguments>
-                <argument>-c</argument>
+                <argument>${project.basedir}/src/main/scripts/check-sorted.sh</argument>
                 <argument>${project.basedir}/src/main/resources/java-manifest.csv</argument>
               </arguments>
             </configuration>

diff --git a/version-manifest/src/main/resources/docker-manifest.csv b/version-manifest/src/main/resources/docker-manifest.csv
index 441b86d..42bb6bb 100644 (file)
--- a/version-manifest/src/main/resources/docker-manifest.csv
+++ b/version-manifest/src/main/resources/docker-manifest.csv
@@ -1,9 +1,9 @@
 image,tag
 onap/aaf,latest
-onap/aai/esr-gui,1.1.0-SNAPSHOT
-onap/aai/esr-server,1.1.0-SNAPSHOT
 onap/aai-resources,1.2-STAGING-latest
 onap/aai-traversal,1.2-STAGING-latest
+onap/aai/esr-gui,1.1.0-SNAPSHOT
+onap/aai/esr-server,1.1.0-SNAPSHOT
 onap/admportal-sdnc-image,1.3-STAGING-latest
 onap/appc-image,1.3.0-SNAPSHOT-latest
 onap/ccsdk-dgbuilder-image,0.2.1-SNAPSHOT
@@ -15,8 +15,8 @@ onap/data-router,1.2-STAGING-latest
 onap/dmaap/dmaap-mr,1.0.1
 onap/holmes/engine-management,v1.0.0
 onap/holmes/rule-management,v1.0.0
-onap/modeling/javatoscachecker,latest
 onap/model-loader,1.2-STAGING-latest
+onap/modeling/javatoscachecker,latest
 onap/msb/msb_apigateway,1.1.0-STAGING-latest
 onap/msb/msb_discovery,1.1.0-STAGING-latest
 onap/multicloud/framework,v1.0.0

diff --git a/version-manifest/src/main/resources/java-manifest.csv b/version-manifest/src/main/resources/java-manifest.csv
index 95c06f4..91e9e58 100644 (file)
--- a/version-manifest/src/main/resources/java-manifest.csv
+++ b/version-manifest/src/main/resources/java-manifest.csv
@@ -22,6 +22,8 @@ org.onap.aaf.authz.misc,aaf-misc-env,2.1.0
 org.onap.aaf.authz.misc,aaf-misc-log4j,2.1.0
 org.onap.aaf.authz.misc,aaf-misc-rosetta,2.1.0
 org.onap.aaf.authz.misc,aaf-misc-xgen,2.1.0
+org.onap.aai,rest-client,1.2.0
+org.onap.aai,search-data-service,1.2.0
 org.onap.aai.aai-common,aai-annotations,1.2.1
 org.onap.aai.aai-common,aai-auth,1.2.1
 org.onap.aai.aai-common,aai-common,1.2.1
@@ -48,9 +50,7 @@ org.onap.aai.logging-service,logging-service,1.2.0
 org.onap.aai.model-loader,model-loader,1.2.0
 org.onap.aai.resources,aai-resources,1.2.0
 org.onap.aai.resources,resources,1.2.0
-org.onap.aai,rest-client,1.2.0
 org.onap.aai.router-core,router-core,1.2.0
-org.onap.aai,search-data-service,1.2.0
 org.onap.aai.sparky-be,sparky-be,1.2.0
 org.onap.aai.sparky-fe,sparky-fe,1.2.0
 org.onap.aai.traversal,aai-traversal,1.2.0
@@ -62,11 +62,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.2
 org.onap.ccsdk.sli.core,filters-provider,0.1.2
-org.onap.ccsdk.sli.core,sliapi-provider,0.1.2
 org.onap.ccsdk.sli.core,sli-common,0.1.2
-org.onap.ccsdk.sli.core,sliPluginUtils-provider,0.1.2
 org.onap.ccsdk.sli.core,sli-provider,0.1.2
 org.onap.ccsdk.sli.core,sli-recording,0.1.2
+org.onap.ccsdk.sli.core,sliPluginUtils-provider,0.1.2
+org.onap.ccsdk.sli.core,sliapi-provider,0.1.2
 org.onap.ccsdk.sli.core,utils-provider,1.0.0
 org.onap.ccsdk.sli.northbound,asdcApi-provider,0.1.0
 org.onap.ccsdk.sli.northbound,dataChange-provider,0.1.0
@@ -89,6 +89,7 @@ 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.dcaegen2,dcaegen2,1.1.0
 org.onap.dcaegen2.analytics.tca,dcae-analytics,2.0.0
 org.onap.dcaegen2.analytics.tca,dcae-analytics-aai,2.0.0
 org.onap.dcaegen2.analytics.tca,dcae-analytics-cdap-common,2.0.0
@@ -101,7 +102,6 @@ org.onap.dcaegen2.analytics.tca,dcae-analytics-model,2.0.0
 org.onap.dcaegen2.analytics.tca,dcae-analytics-tca,2.0.0
 org.onap.dcaegen2.analytics.tca,dcae-analytics-test,2.0.0
 org.onap.dcaegen2.collectors.ves,VESCollector,1.1.4
-org.onap.dcaegen2,dcaegen2,1.1.0
 org.onap.dcaegen2.platform,inventory-api,1.0.0
 org.onap.dcaegen2.platform,servicechange-handler,1.0.0
 org.onap.dmaap.messagerouter.dmaapclient,dmaapClient,1.0.0
@@ -113,17 +113,17 @@ 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.modeling.toscaparsers,Checker,1.0.0
+org.onap.modeling.toscaparsers,Service,1.0.0
 org.onap.modeling.toscaparsers,kwalify,1.0.0
 org.onap.modeling.toscaparsers.nfvparser,modeling-toscaparsers-nfvparser,1.0.0
-org.onap.modeling.toscaparsers,Service,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.multicloud.framework,multivimbroker,1.0.0
 org.onap.multicloud.openstack,newton,1.0.0
 org.onap.multicloud.openstack,ocata,1.0.0
+org.onap.multicloud.openstack,windriver,1.0.0
 org.onap.multicloud.openstack.vmware,vesagent,1.0.0
 org.onap.multicloud.openstack.vmware,vio,1.0.0
-org.onap.multicloud.openstack,windriver,1.0.0
 org.onap.oparent,oparent,1.1.0
 org.onap.policy.common,common-modules,1.1.3
 org.onap.policy.drools-applications,drools-pdp-apps,1.1.3
@@ -139,8 +139,8 @@ org.onap.sdc.sdc-workflow-designer,sdc-workflow-designer,1.0.0
 org.onap.sdnc.northbound,generic-resource-api.provider,1.2.2
 org.onap.sdnc.northbound,vnfapi-provider,1.2.2
 org.onap.sdnc.northbound,vnftools-provider,1.2.2
-org.onap.usecase-ui.server,usecase-ui-server,1.0.1
 org.onap.usecase-ui,usecaseui-common,1.0.1
+org.onap.usecase-ui.server,usecase-ui-server,1.0.1
 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
@@ -148,8 +148,8 @@ org.onap.vfc.nfvo.catalog,vfc-nfvo-catalog,1.0.2
 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.huawei.vnfmadapter,hw-vnfmadapter-deployment,1.0.0
 org.onap.vfc.nfvo.driver.vnfm.svnfm,vfcadaptor-deployment,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.zte.vmanager,vfc-nfvo-driver-vnfm-svnfm-zte-vmanager,1.0.2
 org.onap.vfc.nfvo.lcm,vfc-nfvo-lcm,1.0.2
 org.onap.vfc.nfvo.resmanagement,vfc-nfvo-resmanagement-deployment,1.0.0
@@ -208,31 +208,35 @@ org.openecomp.appc,appc-ssh-adapter-tests,1.2.0
 org.openecomp.appc,appc-workflow-management-api,1.2.0
 org.openecomp.appc,appc-workflow-management-core,1.2.0
 org.openecomp.appc,appc-yang-generator,1.2.0
-org.openecomp.appc.client,client-kit,1.2.0
-org.openecomp.appc.client,client-lib,1.2.0
-org.openecomp.appc.client,client-simulator,1.2.0
-org.openecomp.appc.client,code-generator,1.2.0
 org.openecomp.appc,execution-queue-management-lib,1.2.0
 org.openecomp.appc,lock-manager-api,1.2.0
 org.openecomp.appc,lock-manager-impl,1.2.0
-org.openecomp.appc.plugins,dg-loader-provider,1.2.0
 org.openecomp.appc,state-machine-lib,1.2.0
 org.openecomp.appc,transaction-recorder,1.2.0
+org.openecomp.appc.client,client-kit,1.2.0
+org.openecomp.appc.client,client-lib,1.2.0
+org.openecomp.appc.client,client-simulator,1.2.0
+org.openecomp.appc.client,code-generator,1.2.0
+org.openecomp.appc.plugins,dg-loader-provider,1.2.0
 org.openecomp.sdc.jtosca,jtosca,1.1.1
 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.so.adapters,mso-adapters-rest-interface,1.1.1
+org.openecomp.so,MSOCommonBPMN,1.1.1
+org.openecomp.so,MSOCoreBPMN,1.1.1
+org.openecomp.so,MSOInfrastructureBPMN,1.1.1
+org.openecomp.so,MSORESTClient,1.1.1
+org.openecomp.so,common,1.1.1
+org.openecomp.so,mso-api-handler-common,1.1.1
+org.openecomp.so,mso-catalog-db,1.1.1
+org.openecomp.so,mso-requests-db,1.1.1
+org.openecomp.so,status-control,1.1.1
 org.openecomp.so.adapters,mso-adapter-utils,1.1.1
+org.openecomp.so.adapters,mso-adapters-rest-interface,1.1.1
 org.openecomp.so.adapters,mso-network-adapter-async-client,1.1.1
 org.openecomp.so.adapters,mso-vnf-adapter-async-client,1.1.1
-org.openecomp.so,common,1.1.1
 org.openecomp.so.libs.openstack-java-sdk,ceilometer-client,1.1.0
 org.openecomp.so.libs.openstack-java-sdk,ceilometer-model,1.1.0
-org.openecomp.so.libs.openstack-java-sdk.client-connectors,http-connector,1.1.0
-org.openecomp.so.libs.openstack-java-sdk.client-connectors,jersey2-connector,1.1.0
-org.openecomp.so.libs.openstack-java-sdk.client-connectors,jersey-connector,1.1.0
-org.openecomp.so.libs.openstack-java-sdk.client-connectors,resteasy-connector,1.1.0
 org.openecomp.so.libs.openstack-java-sdk,glance-client,1.1.0
 org.openecomp.so.libs.openstack-java-sdk,glance-model,1.1.0
 org.openecomp.so.libs.openstack-java-sdk,heat-client,1.1.0
@@ -246,12 +250,8 @@ org.openecomp.so.libs.openstack-java-sdk,quantum-client,1.1.0
 org.openecomp.so.libs.openstack-java-sdk,quantum-model,1.1.0
 org.openecomp.so.libs.openstack-java-sdk,swift-client,1.1.0
 org.openecomp.so.libs.openstack-java-sdk,swift-model,1.1.0
-org.openecomp.so,mso-api-handler-common,1.1.1
-org.openecomp.so,mso-catalog-db,1.1.1
-org.openecomp.so,MSOCommonBPMN,1.1.1
-org.openecomp.so,MSOCoreBPMN,1.1.1
-org.openecomp.so,MSOInfrastructureBPMN,1.1.1
-org.openecomp.so,mso-requests-db,1.1.1
-org.openecomp.so,MSORESTClient,1.1.1
-org.openecomp.so,status-control,1.1.1
+org.openecomp.so.libs.openstack-java-sdk.client-connectors,http-connector,1.1.0
+org.openecomp.so.libs.openstack-java-sdk.client-connectors,jersey-connector,1.1.0
+org.openecomp.so.libs.openstack-java-sdk.client-connectors,jersey2-connector,1.1.0
+org.openecomp.so.libs.openstack-java-sdk.client-connectors,resteasy-connector,1.1.0
 org.openecomp.vid,asdcclient,1.0.2

diff --git a/version-manifest/src/main/scripts/check-sorted.sh b/version-manifest/src/main/scripts/check-sorted.sh
new file mode 100755 (executable)
index 0000000..d926409
--- /dev/null
+++ b/version-manifest/src/main/scripts/check-sorted.sh
@@ -0,0 +1,12 @@
+#!/bin/bash
+LC_ALL=C sort -c $1
+retval=$?
+if [ $retval -ne 0 ]; then
+    echo
+    echo "ERROR: $1 is not properly sorted.  Please sort it with the following commands:"
+    echo
+    echo "  LC_ALL=C sort < $1 > $1.tmp"
+    echo "  mv $1.tmp $1"
+    echo
+fi
+exit $retval