Fix dcaepolicyplugin dependency

In offline environment
and define it in more generic way

Issue-ID: DCAEGEN2-2854
Signed-off-by: Krystian Kedron <k.kedron@partner.samsung.com>
Change-Id: I0e33d9d766683b369b9c9dfe2dfa3f79b318c9ee

diff --git a/clamp-policy/clamppolicyplugin_types.yaml b/clamp-policy/clamppolicyplugin_types.yaml
index dbd9485..63bd16e 100644 (file)
--- a/clamp-policy/clamppolicyplugin_types.yaml
+++ b/clamp-policy/clamppolicyplugin_types.yaml
@@ -20,13 +20,13 @@ tosca_definitions_version: cloudify_dsl_1_3
 
 imports:
     - http://www.getcloudify.org/spec/cloudify/4.5.5/types.yaml
-    - https://nexus.onap.org/service/local/repositories/raw/content/org.onap.dcaegen2.platform.plugins/R6/dcaepolicyplugin/2.4.0/dcaepolicyplugin_types.yaml
+    - plugin:dcaepolicyplugin?version=2.4.0
 
 plugins:
   clamppolicy:
     executor: 'central_deployment_agent'
     package_name: clamppolicyplugin
-    package_version: 1.1.0
+    package_version: 1.1.1
 
 relationships:
   # relationship that maintains mapping between micro-service and corresponding model id

diff --git a/clamp-policy/pom.xml b/clamp-policy/pom.xml
index 4bfe5d1..19181bf 100644 (file)
--- a/clamp-policy/pom.xml
+++ b/clamp-policy/pom.xml
@@ -28,7 +28,7 @@ limitations under the License.
   <groupId>org.onap.dcaegen2.platform.plugins</groupId>
   <artifactId>clamp-policy</artifactId>
   <name>clamp-policy-plugin</name>
-  <version>1.1.0</version>
+  <version>1.1.1</version>
   <url>http://maven.apache.org</url>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

diff --git a/clamp-policy/setup.py b/clamp-policy/setup.py
index e3c7e94..e03df9c 100644 (file)
--- a/clamp-policy/setup.py
+++ b/clamp-policy/setup.py
@@ -24,7 +24,7 @@ from setuptools import setup
 setup(
     name='clamppolicyplugin',
     description='Cloudify plugin for clamp.nodes.policy node to retrieve the policy model id',
-    version="1.1.0",
+    version="1.1.1",
     author='Vignesh K',
     packages=['clamppolicyplugin'],
     install_requires=[