Update k8splugin & type file versions

Also stop loading docker type file, never used.

Issue-ID: DCAEGEN2-1136
Change-Id: I378d5df461dce7368aa4f4521ef086eb510b7f48
Signed-off-by: Jack Lucas <jflucas@research.att.com>

diff --git a/cm-container/pom.xml b/cm-container/pom.xml
index 21cf722..bc6ae97 100644 (file)
--- a/cm-container/pom.xml
+++ b/cm-container/pom.xml
@@ -27,7 +27,7 @@ limitations under the License.
   <groupId>org.onap.dcaegen2.deployments</groupId>
   <artifactId>cm-container</artifactId>
   <name>dcaegen2-deployments-cm-container</name>
-  <version>1.6.0</version>
+  <version>1.6.1</version>
   <url>http://maven.apache.org</url>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

diff --git a/cm-container/scripts/get-type-files.sh b/cm-container/scripts/get-type-files.sh
index e6a346f..c931467 100755 (executable)
--- a/cm-container/scripts/get-type-files.sh
+++ b/cm-container/scripts/get-type-files.sh
@@ -16,8 +16,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 # ============LICENSE_END=========================================================
-#
-# ECOMP is a trademark and service mark of AT&T Intellectual Property.
 
 # Pull type files from repos
 # Set up the CM import resolver
@@ -33,7 +31,7 @@ DCAETYPEFILES=\
 /dcaepolicyplugin/2.3.0/dcaepolicyplugin_types.yaml \
 /relationshipplugin/1.0.0/relationshipplugin_types.yaml \
 /k8splugin/1.4.5/k8splugin_types.yaml \
-/dockerplugin/3.2.1/dockerplugin_types.yaml \
+/k8splugin/1.4.12/k8splugin_types.yaml \
 
 "
 

diff --git a/cm-container/test-expand.sh b/cm-container/test-expand.sh
deleted file mode 100755 (executable)
index 1c6531c..0000000
--- a/cm-container/test-expand.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/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/R4#g' Dockerfile-template > Dockerfile

diff --git a/k8s-bootstrap-container/build-plugins.sh b/k8s-bootstrap-container/build-plugins.sh
index fc660ca..f7bc393 100755 (executable)
--- a/k8s-bootstrap-container/build-plugins.sh
+++ b/k8s-bootstrap-container/build-plugins.sh
@@ -33,7 +33,7 @@ DEST=wagons
 DCAEPLUGINFILES=\
 "\
 k8splugin/1.4.5/k8splugin-1.4.5.tgz
-k8splugin/1.4.10/k8splugin-1.4.10.tgz
+k8splugin/1.4.12/k8splugin-1.4.12.tgz
 relationshipplugin/1.0.0/relationshipplugin-1.0.0.tgz
 dcaepolicyplugin/2.3.0/dcaepolicyplugin-2.3.0.tgz \
 "

diff --git a/k8s-bootstrap-container/pom.xml b/k8s-bootstrap-container/pom.xml
index 2e4f1d2..dc7393a 100644 (file)
--- a/k8s-bootstrap-container/pom.xml
+++ b/k8s-bootstrap-container/pom.xml
@@ -27,7 +27,7 @@ limitations under the License.
   <groupId>org.onap.dcaegen2.deployments</groupId>
   <artifactId>k8s-bootstrap-container</artifactId>
   <name>dcaegen2-deployments-k8s-bootstrap-container</name>
-  <version>1.4.10</version>
+  <version>1.4.11</version>
   <url>http://maven.apache.org</url>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>