From e0036a4325e0717e6d154673e3bfadc622cece07 Mon Sep 17 00:00:00 2001
From: Vijay Venkatesh Kumar <vv770d@att.com>
Date: Sat, 3 Nov 2018 07:40:27 +0000
Subject: R4 tag update

Change-Id: I01adbf2a2188cf5ee57659bd526594c51cca6f7c
Signed-off-by: Vijay Venkatesh Kumar <vv770d@att.com>
Issue-ID: DCAEGEN2-937
---
 cm-container/test-expand.sh            | 2 +-
 heat/setup.sh                          | 2 +-
 k8s-bootstrap-container/test-expand.sh | 4 ++--
 mvn-phase-script.sh                    | 2 +-
 pom.xml                                | 3 ---
 5 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/cm-container/test-expand.sh b/cm-container/test-expand.sh
index 7faee6c..1c6531c 100755
--- a/cm-container/test-expand.sh
+++ b/cm-container/test-expand.sh
@@ -1,2 +1,2 @@
 #!/bin/bash
-sed -e 's#{{ ONAPTEMPLATE_RAWREPOURL_org_onap_dcaegen2_platform_plugins_releases }}#https://nexus.onap.org/content/sites/raw/org.onap.dcaegen2.platform.plugins/R3#g' Dockerfile-template > Dockerfile
+sed -e 's#{{ ONAPTEMPLATE_RAWREPOURL_org_onap_dcaegen2_platform_plugins_releases }}#https://nexus.onap.org/content/sites/raw/org.onap.dcaegen2.platform.plugins/R4#g' Dockerfile-template > Dockerfile
diff --git a/heat/setup.sh b/heat/setup.sh
index 289f6e0..126a527 100755
--- a/heat/setup.sh
+++ b/heat/setup.sh
@@ -44,7 +44,7 @@ pip install pip==9.0.3
 cfy profiles use 127.0.0.1 -u admin -p admin -t default_tenant
 cfy status
 cd /tmp/bin
-./build-plugins.sh https://nexus.onap.org/service/local/repositories/raw/content/org.onap.dcaegen2.platform.plugins/R3 https://nexus.onap.org/service/local/repositories/raw/content/org.onap.ccsdk.platform.plugins/releases
+./build-plugins.sh https://nexus.onap.org/service/local/repositories/raw/content/org.onap.dcaegen2.platform.plugins/R4 https://nexus.onap.org/service/local/repositories/raw/content/org.onap.ccsdk.platform.plugins/releases
 for wagon in ./wagons/*.wgn; do cfy plugins upload \$wagon ; done
 deactivate
 EOL
diff --git a/k8s-bootstrap-container/test-expand.sh b/k8s-bootstrap-container/test-expand.sh
index 62af674..1fd4786 100755
--- a/k8s-bootstrap-container/test-expand.sh
+++ b/k8s-bootstrap-container/test-expand.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 sed \
-  -e 's#{{ ONAPTEMPLATE_RAWREPOURL_org_onap_dcaegen2_platform_plugins_releases }}#https://nexus.onap.org/service/local/repositories/raw/content/org.onap.dcaegen2.platform.plugins/R3#' \
+  -e 's#{{ ONAPTEMPLATE_RAWREPOURL_org_onap_dcaegen2_platform_plugins_releases }}#https://nexus.onap.org/service/local/repositories/raw/content/org.onap.dcaegen2.platform.plugins/R4#' \
   -e 's#{{ ONAPTEMPLATE_RAWREPOURL_org_onap_ccsdk_platform_plugins_releases }}#https://nexus.onap.org/service/local/repositories/raw/content/org.onap.ccsdk.platform.plugins#' \
-  -e 's#{{ ONAPTEMPLATE_RAWREPOURL_org_onap_dcaegen2_platform_blueprints_releases }}#https://nexus.onap.org/service/local/repositories/raw/content/org.onap.dcaegen2.platform.blueprints/R3#' \
+  -e 's#{{ ONAPTEMPLATE_RAWREPOURL_org_onap_dcaegen2_platform_blueprints_releases }}#https://nexus.onap.org/service/local/repositories/raw/content/org.onap.dcaegen2.platform.blueprints/R4#' \
 Dockerfile-template > Dockerfile
diff --git a/mvn-phase-script.sh b/mvn-phase-script.sh
index e5bb58e..064226c 100755
--- a/mvn-phase-script.sh
+++ b/mvn-phase-script.sh
@@ -28,7 +28,7 @@ PROJECT_ROOT=$(dirname $0)
 
 
 echo "MVN_RELEASE_TAG is set to [$MVN_RELEASE_TAG]"
-RELEASE_TAG=${MVN_RELEASE_TAG:-R3}
+RELEASE_TAG=${MVN_RELEASE_TAG:-R4}
 if [ "$RELEASE_TAG" != "R1" ]; then
   RELEASE_TAGGED_DIR="${RELEASE_TAG}/"
 else
diff --git a/pom.xml b/pom.xml
index 7cfc3d0..17109c4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -37,9 +37,6 @@ limitations under the License.
 
   <modules>
      <module>heat</module>
-     <module>scripts</module>
-     <module>cloud_init</module>
-     <module>bootstrap</module>
      <module>redis-cluster-container</module>
      <module>cm-container</module>
      <module>k8s-bootstrap-container</module>
-- 
cgit 1.2.3-korg