Merge "Removing submodules for apex & distribution"

diff --git a/.gitmodules b/.gitmodules
index 7e89be0..afd2675 100644 (file)
--- a/.gitmodules
+++ b/.gitmodules
@@ -333,11 +333,6 @@
        url = ../aaf/sms
        branch = .
        ignore = dirty
-[submodule "docs/submodules/policy/apex-pdp.git"]
-       path = docs/submodules/policy/apex-pdp.git
-       url = ../policy/apex-pdp
-       branch = .
-       ignore = dirty
 [submodule "docs/submodules/multicloud/azure.git"]
        path = docs/submodules/multicloud/azure.git
        url = ../multicloud/azure
@@ -353,11 +348,6 @@
        url = ../optf/cmso
        branch = .
        ignore = dirty
-[submodule "docs/submodules/policy/distribution.git"]
-       path = docs/submodules/policy/distribution.git
-       url = ../policy/distribution
-       branch = .
-       ignore = dirty
 [submodule "docs/submodules/logging-analytics/pomba/pomba-audit-common.git"]
        path = docs/submodules/logging-analytics/pomba/pomba-audit-common.git
        url = ../logging-analytics/pomba/pomba-audit-common

diff --git a/docs/guides/onap-developer/developing/index.rst b/docs/guides/onap-developer/developing/index.rst
index b88790e..567f5b0 100644 (file)
--- a/docs/guides/onap-developer/developing/index.rst
+++ b/docs/guides/onap-developer/developing/index.rst
@@ -247,8 +247,6 @@ Policy Framework
 
    ../../../submodules/policy/parent.git/docs/index
    ../../../submodules/policy/engine.git/docs/index
-   ../../../submodules/policy/apex-pdp.git/docs/index
-   ../../../submodules/policy/distribution.git/docs/index
 
 Portal Platform
 ---------------

diff --git a/docs/release/repolist.rst b/docs/release/repolist.rst
index e75abf1..9f59f00 100644 (file)
--- a/docs/release/repolist.rst
+++ b/docs/release/repolist.rst
@@ -78,7 +78,7 @@ Project/Components
    integration <../submodules/integration.git/docs/index>
    msb/discovery <../submodules/msb/discovery.git/docs/index>
    msb/java-sdk <../submodules/msb/java-sdk.git/docs/index>
-   policy/apex-pdp <../submodules/policy/apex-pdp.git/docs/index>
+   policy/parent <../submodules/policy/parent.git/docs/index>
    sdc/jtosca <../submodules/sdc/jtosca.git/docs/index>
    sdc/sdc-distribution-client <../submodules/sdc/sdc-distribution-client.git/docs/index>
    sdc/sdc-docker-base <../submodules/sdc/sdc-docker-base.git/docs/index>

diff --git a/docs/submodules/policy/apex-pdp.git b/docs/submodules/policy/apex-pdp.git
deleted file mode 160000 (submodule)
index 45d7389..0000000
--- a/docs/submodules/policy/apex-pdp.git
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 45d7389dacffb824b66e8a7c43583dc0212cb7d5

diff --git a/docs/submodules/policy/distribution.git b/docs/submodules/policy/distribution.git
deleted file mode 160000 (submodule)
index d1e0acb..0000000
--- a/docs/submodules/policy/distribution.git
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit d1e0acb7a85403e365764589327b9aef62509318