From e16f216637acf369060b63fcc8e921047fcdaf22 Mon Sep 17 00:00:00 2001
From: Michael O'Brien <michael@obrienlabs.org>
Date: Wed, 27 Dec 2017 13:40:38 -0500
Subject: [PATCH] #14 use google gerrit.googlesource.com/git-repo

---
 onap-manifest/default.xml | 225 ++++++++++++++++++++++++++++++++++++++
 oom_rancher_setup_1.sh    |   4 +-
 pom.xml                   |  19 ++--
 3 files changed, 239 insertions(+), 9 deletions(-)
 create mode 100755 onap-manifest/default.xml

diff --git a/onap-manifest/default.xml b/onap-manifest/default.xml
new file mode 100755
index 0000000..954ff69
--- /dev/null
+++ b/onap-manifest/default.xml
@@ -0,0 +1,225 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<manifest>
+    <remote name="origin"
+        fetch="https://gerrit.onap.org/r"
+        review="https://gerrit.onap.org/"
+        revision="master" />
+    <default revision="master"
+        remote="origin"
+        sync-j="4" />
+    <!-- based on David Bainbridge github.com/dbainbri-ciena/onap-manifest -->
+    <project path="aaf/authz" name="aaf/authz" groups="build,aaf"/>
+    <project path="aaf/cadi" name="aaf/cadi" groups="build,aaf"/>
+    <project path="aaf/inno" name="aaf/inno" groups="build,aaf"/>
+    <project path="aaf/luaplugin" name="aaf/luaplugin" groups="build,aaf"/>
+    <project path="aai/aai-common" name="aai/aai-common" groups="build,aai"/>
+    <project path="aai/aai-config" name="aai/aai-config" groups="build,aai"/>
+    <project path="aai/aai-data" name="aai/aai-data" groups="build,aai"/>
+    <!-- build deprecated - not compiling - lists.onap.org/pipermail/onap-discuss/2017-November/006191.html -->
+    <!--project path="aai/aai-service" name="aai/aai-service" groups="build,aai"/-->
+    <project path="aai/babel" name="aai/babel" groups="build,aai"/>
+    <project path="aai/champ" name="aai/champ" groups="build,aai"/>
+    <project path="aai/data-router" name="aai/data-router" groups="build,aai"/>
+    <project path="aai/esr-gui" name="aai/esr-gui" groups="build,aai"/>
+    <project path="aai/esr-server" name="aai/esr-server" groups="build,aai"/>
+    <project path="aai/gizmo" name="aai/gizmo" groups="build,aai"/>
+    <project path="aai/logging-service" name="aai/logging-service" groups="build,aai"/>
+    <project path="aai/model-loader" name="aai/model-loader" groups="build,aai"/>
+    <project path="aai/resources" name="aai/resources" groups="build,aai"/>
+    <project path="aai/rest-client" name="aai/rest-client" groups="build,aai"/>
+    <project path="aai/router-core" name="aai/router-core" groups="build,aai"/>
+    <project path="aai/search-data-service" name="aai/search-data-service" groups="build,aai"/>
+    <project path="aai/sparky-be" name="aai/sparky-be" groups="build,aai"/>
+    <project path="aai/sparky-fe" name="aai/sparky-fe" groups="build,aai"/>
+    <project path="aai/test-config" name="aai/test-config" groups="build,aai"/>
+    <project path="aai/traversal" name="aai/traversal" groups="build,aai"/>
+    <project path="appc" name="appc" groups="build,appc"/>
+    <project path="appc/deployment" name="appc/deployment" groups="build,appc"/>
+    <project path="ccsdk/dashboard" name="ccsdk/dashboard" groups="build,ccsdk"/>
+    <project path="ccsdk/distribution" name="ccsdk/distribution" groups="build,ccsdk"/>
+    <project path="ccsdk/parent" name="ccsdk/parent" groups="build,ccsdk"/>
+    <project path="ccsdk/platform/blueprints" name="ccsdk/platform/blueprints" groups="build,ccsdk"/>
+    <project path="ccsdk/platform/nbapi" name="ccsdk/platform/nbapi" groups="build,ccsdk"/>
+    <project path="ccsdk/platform/plugins" name="ccsdk/platform/plugins" groups="build,ccsdk"/>
+    <project path="ccsdk/sli/adaptors" name="ccsdk/sli/adaptors" groups="build,ccsdk"/>
+    <project path="ccsdk/sli/core" name="ccsdk/sli/core" groups="build,ccsdk"/>
+    <project path="ccsdk/sli/northbound" name="ccsdk/sli/northbound" groups="build,ccsdk"/>
+    <project path="ccsdk/sli/plugins" name="ccsdk/sli/plugins" groups="build,ccsdk"/>
+    <project path="ccsdk/storage/esaas" name="ccsdk/storage/esaas" groups="build,ccsdk"/>
+    <project path="ccsdk/storage/pgaas" name="ccsdk/storage/pgaas" groups="build,ccsdk"/>
+    <project path="ccsdk/utils" name="ccsdk/utils" groups="build,ccsdk"/>
+    <project path="ci-management" name="ci-management" groups="build"/>
+    <project path="clamp" name="clamp" groups="build"/>
+    <project path="cli" name="cli" groups="build"/>
+    <!-- dcae replaced by dcaegen2 -->
+    <!--project path="dcae" name="dcae" groups="locked,dcae,notdefault"/>
+    <project path="dcae/apod" name="dcae/apod" groups="locked,dcae,notdefault"/>
+    <project path="dcae/apod/analytics" name="dcae/apod/analytics" groups="locked,dcae,notdefault"/>
+    <project path="dcae/apod/buildtools" name="dcae/apod/buildtools" groups="locked,dcae,notdefault"/>
+    <project path="dcae/apod/cdap" name="dcae/apod/cdap" groups="locked,dcae,notdefault"/>
+    <project path="dcae/collectors" name="dcae/collectors" groups="locked,dcae,notdefault"/>
+    <project path="dcae/collectors/ves" name="dcae/collectors/ves" groups="locked,dcae,notdefault"/>
+    <project path="dcae/controller" name="dcae/controller" groups="locked,dcae,notdefault"/>
+    <project path="dcae/controller/analytics" name="dcae/controller/analytics" groups="locked,dcae,notdefault"/>
+    <project path="dcae/dcae-inventory" name="dcae/dcae-inventory" groups="locked,dcae,notdefault"/>
+    <project path="dcae/demo" name="dcae/demo" groups="locked,dcae,notdefault"/>
+    <project path="dcae/demo/startup" name="dcae/demo/startup" groups="locked,dcae,notdefault"/>
+    <project path="dcae/demo/startup/aaf" name="dcae/demo/startup/aaf" groups="locked,dcae,notdefault"/>
+    <project path="dcae/demo/startup/controller" name="dcae/demo/startup/controller" groups="locked,dcae,notdefault"/>
+    <project path="dcae/demo/startup/message-router" name="dcae/demo/startup/message-router" groups="locked,dcae,notdefault"/>
+    <project path="dcae/dmaapbc" name="dcae/dmaapbc" groups="locked,dcae,notdefault"/>
+    <project path="dcae/operation" name="dcae/operation" groups="locked,dcae,notdefault"/>
+    <project path="dcae/operation/utils" name="dcae/operation/utils" groups="locked,dcae,notdefault"/>
+    <project path="dcae/orch-dispatcher" name="dcae/orch-dispatcher" groups="locked,dcae,notdefault"/>
+    <project path="dcae/pgaas" name="dcae/pgaas" groups="locked,dcae,notdefault"/>
+    <project path="dcae/utils" name="dcae/utils" groups="locked,dcae,notdefault"/>
+    <project path="dcae/utils/buildtools" name="dcae/utils/buildtools" groups="locked,dcae,notdefault"/-->
+    <project path="dcaegen2" name="dcaegen2" groups="build,dcaegen2"/>
+    <project path="dcaegen2/analytics" name="dcaegen2/analytics" groups="build,dcaegen2"/>
+    <project path="dcaegen2/analytics/tca" name="dcaegen2/analytics/tca" groups="build,dcaegen2"/>
+    <project path="dcaegen2/collectors" name="dcaegen2/collectors" groups="build,dcaegen2"/>
+    <project path="dcaegen2/collectors/snmptrap" name="dcaegen2/collectors/snmptrap" groups="build,dcaegen2"/>
+    <project path="dcaegen2/collectors/ves" name="dcaegen2/collectors/ves" groups="build,dcaegen2"/>
+    <project path="dcaegen2/deployments" name="dcaegen2/deployments" groups="build,dcaegen2"/>
+    <project path="dcaegen2/platform" name="dcaegen2/platform" groups="build,dcaegen2"/>
+    <project path="dcaegen2/platform/blueprints" name="dcaegen2/platform/blueprints" groups="build,dcaegen2"/>
+    <project path="dcaegen2/platform/cdapbroker" name="dcaegen2/platform/cdapbroker" groups="build,dcaegen2"/>
+    <project path="dcaegen2/platform/cli" name="dcaegen2/platform/cli" groups="build,dcaegen2"/>
+    <project path="dcaegen2/platform/configbinding" name="dcaegen2/platform/configbinding" groups="build,dcaegen2"/>
+    <project path="dcaegen2/platform/deployment-handler" name="dcaegen2/platform/deployment-handler" groups="build,dcaegen2"/>
+    <project path="dcaegen2/platform/inventory-api" name="dcaegen2/platform/inventory-api" groups="build,dcaegen2"/>
+    <project path="dcaegen2/platform/plugins" name="dcaegen2/platform/plugins" groups="build,dcaegen2"/>
+    <project path="dcaegen2/platform/policy-handler" name="dcaegen2/platform/policy-handler" groups="build,dcaegen2"/>
+    <project path="dcaegen2/platform/registrator" name="dcaegen2/platform/registrator" groups="build,dcaegen2"/>
+    <project path="dcaegen2/platform/servicechange-handler" name="dcaegen2/platform/servicechange-handler" groups="build,dcaegen2"/>
+    <project path="dcaegen2/utils" name="dcaegen2/utils" groups="build,dcaegen2"/>
+    <project path="demo" name="demo" groups="build"/>
+    <project path="dmaap/buscontroller" name="dmaap/buscontroller" groups="build,dmaap"/>
+    <project path="dmaap/datarouter" name="dmaap/datarouter" groups="build,dmaap"/>
+    <project path="dmaap/dbcapi" name="dmaap/dbcapi" groups="build,dmaap"/>
+    <project path="dmaap/messagerouter/dmaapclient" name="dmaap/messagerouter/dmaapclient" groups="build,dmaap"/>
+    <project path="dmaap/messagerouter/messageservice" name="dmaap/messagerouter/messageservice" groups="build,dmaap"/>
+    <project path="dmaap/messagerouter/mirroragent" name="dmaap/messagerouter/mirroragent" groups="build,dmaap"/>
+    <project path="dmaap/messagerouter/msgrtr" name="dmaap/messagerouter/msgrtr" groups="build,dmaap"/>
+    <project path="doc" name="doc" groups="build,doc"/>
+    <project path="doc/tools" name="doc/tools" groups="build,doc"/>
+    <project path="ecompsdkos" name="ecompsdkos" groups="locked,notdefault"/>
+    <project path="externalapi/nbi" name="externalapi/nbi" groups="build"/>
+    <project path="holmes/common" name="holmes/common" groups="build,holmes"/>
+    <project path="holmes/dsa" name="holmes/dsa" groups="build,holmes"/>
+    <project path="holmes/engine-management" name="holmes/engine-management" groups="build,holmes"/>
+    <project path="holmes/rule-management" name="holmes/rule-management" groups="build,holmes"/>
+    <project path="integration" name="integration" groups="build"/>
+    <project path="logging-analytics" name="logging-analytics" groups="build"/>
+    <project path="modeling/modelspec" name="modeling/modelspec" groups="build,modeling"/>
+    <project path="modeling/toscaparsers" name="modeling/toscaparsers" groups="build,modeling"/>
+    <project path="msb/apigateway" name="msb/apigateway" groups="build,msb"/>
+    <project path="msb/discovery" name="msb/discovery" groups="build,msb"/>
+    <project path="msb/java-sdk" name="msb/java-sdk" groups="build,msb"/>
+    <project path="msb/swagger-sdk" name="msb/swagger-sdk" groups="build,msb"/>
+    <!-- replaced by so -->
+    <!--project path="mso" name="mso" groups="locked,mso,notdefault"/>
+    <project path="mso/chef-repo" name="mso/chef-repo" groups="locked,mso,notdefault"/>
+    <project path="mso/docker-config" name="mso/docker-config" groups="locked,mso,notdefault"/>
+    <project path="mso/libs" name="mso/libs" groups="locked,mso,notdefault"/>
+    <project path="mso/mso-config" name="mso/mso-config" groups="locked,mso,notdefault"/-->
+    <project path="multicloud/azure" name="multicloud/azure" groups="build,multicloud"/>
+    <project path="multicloud/framework" name="multicloud/framework" groups="build,multicloud"/>
+    <project path="multicloud/openstack" name="multicloud/openstack" groups="build,multicloud"/>
+    <project path="multicloud/openstack/vmware" name="multicloud/openstack/vmware" groups="build,multicloud"/>
+    <project path="multicloud/openstack/windriver" name="multicloud/openstack/windriver" groups="build,multicloud"/>
+    <!-- ncomp deprecated -->
+    <!--project path="ncomp" name="ncomp" groups="locked,ncomp,notdefault"/>
+    <project path="ncomp/cdap" name="ncomp/cdap" groups="locked,ncomp,notdefault"/>
+    <project path="ncomp/core" name="ncomp/core" groups="locked,ncomp,notdefault"/>
+    <project path="ncomp/docker" name="ncomp/docker" groups="locked,ncomp,notdefault"/>
+    <project path="ncomp/maven" name="ncomp/maven" groups="locked,ncomp,notdefault"/>
+    <project path="ncomp/openstack" name="ncomp/openstack" groups="locked,ncomp,notdefault"/>
+    <project path="ncomp/sirius" name="ncomp/sirius" groups="locked,ncomp,notdefault"/>
+    <project path="ncomp/sirius/manager" name="ncomp/sirius/manager" groups="locked,ncomp,notdefault"/>
+    <project path="ncomp/utils" name="ncomp/utils" groups="locked,ncomp,notdefault"/-->
+    <!-- oom is infrastructure only -->
+    <project path="oom" name="oom" groups="build,oom"/>
+    <project path="oom/registrator" name="oom/registrator" groups="build,oom"/>
+    <project path="oparent" name="oparent" groups="build"/>
+    <project path="optf/cmso" name="optf/cmso" groups="build,optf"/>
+    <project path="optf/has" name="optf/has" groups="build,optf"/>
+    <project path="optf/osdf" name="optf/osdf" groups="build,optf"/>
+    <project path="policy/api" name="policy/api" groups="build,policy"/>
+    <project path="policy/common" name="policy/common" groups="build,policy"/>
+    <project path="policy/docker" name="policy/docker" groups="build,policy"/>
+    <project path="policy/drools-applications" name="policy/drools-applications" groups="build,policy"/>
+    <project path="policy/drools-pdp" name="policy/drools-pdp" groups="build,policy"/>
+    <project path="policy/engine" name="policy/engine" groups="build,policy"/>
+    <project path="policy/gui" name="policy/gui" groups="build,policy"/>
+    <project path="policy/pap" name="policy/pap" groups="build,policy"/>
+    <project path="policy/pdp" name="policy/pdp" groups="build,policy"/>
+    <project path="portal" name="portal" groups="build,portal"/>
+    <project path="portal/sdk" name="portal/sdk" groups="build,portal"/>
+    <project path="sdc" name="sdc" groups="build,sdc"/>
+    <project path="sdc/jtosca" name="sdc/jtosca" groups="build,sdc"/>
+    <project path="sdc/sdc-distribution-client" name="sdc/sdc-distribution-client" groups="build,sdc"/>
+    <project path="sdc/sdc-docker-base" name="sdc/sdc-docker-base" groups="build,sdc"/>
+    <project path="sdc/sdc-titan-cassandra" name="sdc/sdc-titan-cassandra" groups="build,sdc"/>
+    <project path="sdc/sdc-tosca" name="sdc/sdc-tosca" groups="build,sdc"/>
+    <project path="sdc/sdc-workflow-designer" name="sdc/sdc-workflow-designer" groups="build,sdc"/>
+    <project path="sdnc/adaptors" name="sdnc/adaptors" groups="build,sdnc"/>
+    <project path="sdnc/architecture" name="sdnc/architecture" groups="build,sdnc"/>
+    <project path="sdnc/core" name="sdnc/core" groups="build,sdnc"/>
+    <project path="sdnc/features" name="sdnc/features" groups="build,sdnc"/>
+    <project path="sdnc/northbound" name="sdnc/northbound" groups="build,sdnc"/>
+    <project path="sdnc/oam" name="sdnc/oam" groups="build,sdnc"/>
+    <project path="sdnc/parent" name="sdnc/parent" groups="build,sdnc"/>
+    <project path="sdnc/plugins" name="sdnc/plugins" groups="build,sdnc"/>
+    <project path="so" name="so" groups="build,so"/>
+    <project path="so/chef-repo" name="so/chef-repo" groups="build,so"/>
+    <project path="so/docker-config" name="so/docker-config" groups="build,so"/>
+    <project path="so/libs" name="so/libs" groups="build,so"/>
+    <project path="so/so-config" name="so/so-config" groups="build,so"/>
+    <project path="testsuite" name="testsuite" groups="build,testsuite"/>
+    <project path="testsuite/heatbridge" name="testsuite/heatbridge" groups="build,testsuite"/>
+    <project path="testsuite/properties" name="testsuite/properties" groups="build,testsuite"/>
+    <project path="testsuite/python-testing-utils" name="testsuite/python-testing-utils" groups="build,testsuite"/>
+    <project path="ui" name="ui" groups="build,ui"/>
+    <project path="ui/dmaapbc" name="ui/dmaapbc" groups="build,ui"/>
+    <project path="university" name="university" groups="build"/>
+    <project path="usecase-ui" name="usecase-ui" groups="build,usecase-ui"/>
+    <project path="usecase-ui/server" name="usecase-ui/server" groups="build,usecase-ui"/>
+    <project path="vfc/gvnfm/vnflcm" name="vfc/gvnfm/vnflcm" groups="build,vfc"/>
+    <project path="vfc/gvnfm/vnfmgr" name="vfc/gvnfm/vnfmgr" groups="build,vfc"/>
+    <project path="vfc/gvnfm/vnfres" name="vfc/gvnfm/vnfres" groups="build,vfc"/>
+    <project path="vfc/nfvo/catalog" name="vfc/nfvo/catalog" groups="build,vfc"/>
+    <project path="vfc/nfvo/driver/ems" name="vfc/nfvo/driver/ems" groups="build,vfc"/>
+    <project path="vfc/nfvo/driver/sfc" name="vfc/nfvo/driver/sfc" groups="build,vfc"/>
+    <project path="vfc/nfvo/driver/vnfm/gvnfm" name="vfc/nfvo/driver/vnfm/gvnfm" groups="build,vfc"/>
+    <project path="vfc/nfvo/driver/vnfm/svnfm" name="vfc/nfvo/driver/vnfm/svnfm" groups="build,vfc"/>
+    <project path="vfc/nfvo/lcm" name="vfc/nfvo/lcm" groups="build,vfc"/>
+    <project path="vfc/nfvo/resmanagement" name="vfc/nfvo/resmanagement" groups="build,vfc"/>
+    <project path="vfc/nfvo/wfengine" name="vfc/nfvo/wfengine" groups="build,vfc"/>
+    <project path="vid" name="vid" groups="build,vid"/>
+    <project path="vid/asdcclient" name="vid/asdcclient" groups="build,vid"/>
+    <project path="vnfrqts/epics" name="vnfrqts/epics" groups="build,vnfrqts"/>
+    <project path="vnfrqts/guidelines" name="vnfrqts/guidelines" groups="build,vnfrqts"/>
+    <project path="vnfrqts/requirements" name="vnfrqts/requirements" groups="build,vnfrqts"/>
+    <project path="vnfrqts/testcases" name="vnfrqts/testcases" groups="build,vnfrqts"/>
+    <project path="vnfrqts/usecases" name="vnfrqts/usecases" groups="build,vnfrqts"/>
+    <project path="vnfsdk/compliance" name="vnfsdk/compliance" groups="build,vnfsdk"/>
+    <project path="vnfsdk/functest" name="vnfsdk/functest" groups="build,vnfsdk"/>
+    <project path="vnfsdk/lctest" name="vnfsdk/lctest" groups="build,vnfsdk"/>
+    <project path="vnfsdk/model" name="vnfsdk/model" groups="build,vnfsdk"/>
+    <project path="vnfsdk/pkgtools" name="vnfsdk/pkgtools" groups="build,vnfsdk"/>
+    <project path="vnfsdk/refrepo" name="vnfsdk/refrepo" groups="build,vnfsdk"/>
+    <project path="vnfsdk/validation" name="vnfsdk/validation" groups="build,vnfsdk"/>
+    <project path="vvp/ansible-ice-bootstrap" name="vvp/ansible-ice-bootstrap" groups="build,vvp"/>
+    <project path="vvp/cms" name="vvp/cms" groups="build,vvp"/>
+    <project path="vvp/devkit" name="vvp/devkit" groups="build,vvp"/>
+    <project path="vvp/documentation" name="vvp/documentation" groups="build,vvp"/>
+    <project path="vvp/engagementmgr" name="vvp/engagementmgr" groups="build,vvp"/>
+    <project path="vvp/gitlab" name="vvp/gitlab" groups="build,vvp"/>
+    <project path="vvp/image-scanner" name="vvp/image-scanner" groups="build,vvp"/>
+    <project path="vvp/jenkins" name="vvp/jenkins" groups="build,vvp"/>
+    <project path="vvp/portal" name="vvp/portal" groups="build,vvp"/>
+    <project path="vvp/postgresql" name="vvp/postgresql" groups="build,vvp"/>
+    <project path="vvp/test-engine" name="vvp/test-engine" groups="build,vvp"/>
+    <project path="vvp/validation-scripts" name="vvp/validation-scripts" groups="build,vvp"/>
+</manifest>
diff --git a/oom_rancher_setup_1.sh b/oom_rancher_setup_1.sh
index 09783b3..3b227df 100755
--- a/oom_rancher_setup_1.sh
+++ b/oom_rancher_setup_1.sh
@@ -3,10 +3,10 @@
 curl https://releases.rancher.com/install-docker/1.12.sh | sh
 # when running as non-root (ubuntu) run the following and logout/log back in
 #sudo usermod -aG docker ubuntu
-docker run -d --restart=unless-stopped -p 8880:8080 rancher/server:v1.6.10
+docker run -d --restart=unless-stopped -p 8880:8080 --name rancher-server rancher/server:v1.6.10
 # no Kubernetes 1.9.0 yet
 #curl -LO https://storage.googleapis.com/kubernetes-release/release/$(curl -s https://storage.googleapis.com/kubernetes-release/release/stable.txt)/bin/linux/amd64/kubectl
-curl -LO https://storage.googleapis.com/kubernetes-release/release/v1.8.4/bin/linux/amd64/kubectl
+curl -LO https://storage.googleapis.com/kubernetes-release/release/v1.8.6/bin/linux/amd64/kubectl
 chmod +x ./kubectl
 sudo mv ./kubectl /usr/local/bin/kubectl
 mkdir ~/.kube
diff --git a/pom.xml b/pom.xml
index 2b0ccba..4e4ab4b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,6 +11,7 @@
   <url>http://maven.apache.org</url>
   
   <!-- 1.1.0/R1 specific (post Jun 2017) - current master 20170731 -->
+  <!-- 20171227 updated --?
   <!-- note new repos are indented -->
   <!-- mvn clean install -U  -DskipTests=true -Dmaven.test.skip=true -Dmaven.javadoc.skip=true -->
 
@@ -24,7 +25,8 @@
 <!--module>aai/babel</module--> <!-- empty -->
 <module>aai/champ</module>
 <!--module>aai/gizmo</module--> <!-- empty -->
-      <module>aai/aai-service</module>
+<!-- not compiling - deprecated lists.onap.org/pipermail/onap-discuss/2017-November/006191.html -->
+      <!--module>aai/aai-service</module-->
 <module>aai/data-router</module>
       <module>aai/logging-service</module>
       <module>aai/model-loader</module>
@@ -47,8 +49,8 @@
 <module>clamp</module>
 <module>cli</module>
 
-      <!-- all of dcae replaced by dcaegen2 ? TBD -->
-      <module>dcae/apod/analytics</module>
+      <!-- all of dcae replaced by dcaegen2 -->
+      <!--module>dcae/apod/analytics</module>
       <module>dcae/collectors/ves</module>
       <module>dcae/controller/analytics</module>
       <module>dcae/controller/dcae-controller-core</module>
@@ -59,7 +61,7 @@
       <module>dcae/dcae-inventory</module>
       <module>dcae/demo</module>
       <module>dcae/dmaapbc</module>
-      <module>dcae/operation/utils</module>
+      <module>dcae/operation/utils</module-->
 <!--module>dcaegen2/analytics</module>
 <module>dcaegen2/analytics/tca</module>
 <module>dcaegen2/collectors</module>
@@ -102,14 +104,17 @@
 
       <!--module>demo</module--> <!-- error in parent refs in sample_plugin -->
       <module>ecompsdkos/ecomp-sdk</module>
-      <module>mso</module>
-      <module>ncomp/cdap</module> <!-- emf resolution -->
+      <!-- replaced by so -->
+      <!--module>mso</module-->
+      <!-- ncomp deprecated -->
+      <!--module>ncomp/cdap</module>
       <module>ncomp/core</module>
       <module>ncomp/docker</module>
       <module>ncomp/maven</module>
       <module>ncomp/openstack</module>
 <module>ncomp/sirius/manager</module>
-      <module>ncomp/utils</module>
+      <module>ncomp/utils</module-->
+      <!-- oom is an infrastructure project -->
 <!--module>oom</module-->
 <!--module>policy/api</module>
 <module>policy/gui</module>