Merge "Update appc version manifest versions"

diff --git a/bootstrap/jenkins/vagrant/jjb/java-jobs.yaml b/bootstrap/jenkins/vagrant/jjb/java-jobs.yaml
index 73d320e..0cbaf5e 100644 (file)
--- a/bootstrap/jenkins/vagrant/jjb/java-jobs.yaml
+++ b/bootstrap/jenkins/vagrant/jjb/java-jobs.yaml
@@ -459,27 +459,3 @@
      - 'vnfsdk_validation':
          repo: 'vnfsdk/validation'
          pom: 'pom.xml'
-     - 'vvp_cms':
-         repo: 'vvp/cms'
-         pom: 'pom.xml'
-     - 'vvp_engagementmgr':
-         repo: 'vvp/engagementmgr'
-         pom: 'pom.xml'
-     - 'vvp_gitlab':
-         repo: 'vvp/gitlab'
-         pom: 'pom.xml'
-     - 'vvp_image-scanner':
-         repo: 'vvp/image-scanner'
-         pom: 'pom.xml'
-     - 'vvp_jenkins':
-         repo: 'vvp/jenkins'
-         pom: 'pom.xml'
-     - 'vvp_portal':
-         repo: 'vvp/portal'
-         pom: 'pom.xml'
-     - 'vvp_postgresql':
-         repo: 'vvp/postgresql'
-         pom: 'pom.xml'
-     - 'vvp_test-engine':
-         repo: 'vvp/test-engine'
-         pom: 'pom.xml'

diff --git a/version-manifest/src/main/resources/docker-manifest-staging.csv b/version-manifest/src/main/resources/docker-manifest-staging.csv
index ded8311..ca196d7 100644 (file)
--- a/version-manifest/src/main/resources/docker-manifest-staging.csv
+++ b/version-manifest/src/main/resources/docker-manifest-staging.csv
@@ -161,14 +161,6 @@ onap/vnfsdk/ice,1.1.0
 onap/vnfsdk/refrepo,1.2.0
 onap/vnfsdk/refrepo/postgres,1.2.0
 onap/vnfsdk/vnftest,1.1.0
-onap/vvp/cms,1.0.0
-onap/vvp/engagementmgr,1.0.0
-onap/vvp/gitlab,1.0.0
-onap/vvp/image-scanner,1.0.0
-onap/vvp/jenkins,1.0.0
-onap/vvp/portal,1.0.0
-onap/vvp/postgresql,1.0.0
-onap/vvp/test-engine,1.0.0
 onap/workflow-backend,1.4.0-SNAPSHOT
 onap/workflow-frontend,1.4.0-SNAPSHOT
 onap/workflow-init,1.4.0-SNAPSHOT

diff --git a/version-manifest/src/main/resources/docker-manifest.csv b/version-manifest/src/main/resources/docker-manifest.csv
index 9c89f6f..2c14a96 100644 (file)
--- a/version-manifest/src/main/resources/docker-manifest.csv
+++ b/version-manifest/src/main/resources/docker-manifest.csv
@@ -159,14 +159,6 @@ onap/vnfsdk/ice,1.1.0
 onap/vnfsdk/refrepo,1.2.0
 onap/vnfsdk/refrepo/postgres,1.2.0
 onap/vnfsdk/vnftest,1.1.0
-onap/vvp/cms,1.0.0
-onap/vvp/engagementmgr,1.0.0
-onap/vvp/gitlab,1.0.0
-onap/vvp/image-scanner,1.0.0
-onap/vvp/jenkins,1.0.0
-onap/vvp/portal,1.0.0
-onap/vvp/postgresql,1.0.0
-onap/vvp/test-engine,1.0.0
 onap/workflow-backend,1.3.2
 onap/workflow-frontend,1.3.2
 onap/workflow-init,1.3.2