summaryrefslogtreecommitdiffstats
path: root/mod/bpgenerator
diff options
context:
space:
mode:
authorPANCHAL <dp023n@att.com>2020-05-12 09:12:14 -0400
committerDeven Panchal <dp023n@att.com>2020-05-29 16:35:36 +0000
commit8479ac77ba084f9d42e16b252e6671ff59aedd13 (patch)
tree25a0513f026611ac71980c09d6f8b60b1724a9be /mod/bpgenerator
parent265ca90a26db6ffc5f0a0d9b67e4f533cf01b8bf (diff)
Change R4 plugins to R6
Change bpgen R4 references to R6 because Runtime APi is defaulting to R4 Issue-ID: DCAEGEN2-2197 Signed-off-by: PANCHAL <dp023n@att.com> Change-Id: Id98fee8b5125cc056d852c343f3cc1d2df7e0a5d
Diffstat (limited to 'mod/bpgenerator')
-rw-r--r--mod/bpgenerator/TestCases/testImports.yaml2
-rw-r--r--mod/bpgenerator/pom.xml2
-rw-r--r--mod/bpgenerator/src/main/java/org/onap/blueprintgenerator/models/blueprint/Imports.java4
-rw-r--r--mod/bpgenerator/src/test/java/org/onap/blueprintgenerator/core/BlueprintGeneratorTest.java4
-rw-r--r--mod/bpgenerator/version.properties2
5 files changed, 7 insertions, 7 deletions
diff --git a/mod/bpgenerator/TestCases/testImports.yaml b/mod/bpgenerator/TestCases/testImports.yaml
index 2597e5e..95bd200 100644
--- a/mod/bpgenerator/TestCases/testImports.yaml
+++ b/mod/bpgenerator/TestCases/testImports.yaml
@@ -1,3 +1,3 @@
imports:
- http://www.getcloudify.org/spec/cloudify/3.4/types.yaml
-- https://nexus.onap.org/service/local/repositories/raw/content/org.onap.dcaegen2.platform.plugins/R4/k8splugin/1.4.13/k8splugin_types.yaml \ No newline at end of file
+- https://nexus.onap.org/service/local/repositories/raw/content/org.onap.dcaegen2.platform.plugins/R6/k8splugin/1.7.2/k8splugin_types.yaml \ No newline at end of file
diff --git a/mod/bpgenerator/pom.xml b/mod/bpgenerator/pom.xml
index 6255329..f097457 100644
--- a/mod/bpgenerator/pom.xml
+++ b/mod/bpgenerator/pom.xml
@@ -29,7 +29,7 @@
</parent>
<groupId>org.onap.dcaegen2.platform.mod</groupId>
<artifactId>blueprint-generator</artifactId>
- <version>1.3.1-SNAPSHOT</version>
+ <version>1.3.2-SNAPSHOT</version>
<properties>
<maven.compiler.source>1.6</maven.compiler.source>
<maven.compiler.target>1.6</maven.compiler.target>
diff --git a/mod/bpgenerator/src/main/java/org/onap/blueprintgenerator/models/blueprint/Imports.java b/mod/bpgenerator/src/main/java/org/onap/blueprintgenerator/models/blueprint/Imports.java
index 8bcdbbc..b17b045 100644
--- a/mod/bpgenerator/src/main/java/org/onap/blueprintgenerator/models/blueprint/Imports.java
+++ b/mod/bpgenerator/src/main/java/org/onap/blueprintgenerator/models/blueprint/Imports.java
@@ -48,8 +48,8 @@ public class Imports {
public static ArrayList<String> createOnapImports() {
ArrayList<String> imps = new ArrayList<String>();
imps.add("http://www.getcloudify.org/spec/cloudify/3.4/types.yaml");
- imps.add("https://nexus.onap.org/service/local/repositories/raw/content/org.onap.dcaegen2.platform.plugins/R4/k8splugin/1.4.5/k8splugin_types.yaml");
- imps.add("https://nexus.onap.org/service/local/repositories/raw/content/org.onap.dcaegen2.platform.plugins/R4/dcaepolicyplugin/2.3.0/dcaepolicyplugin_types.yaml");
+ imps.add("https://nexus.onap.org/service/local/repositories/raw/content/org.onap.dcaegen2.platform.plugins/R6/k8splugin/1.7.2/k8splugin_types.yaml");
+ imps.add("https://nexus.onap.org/service/local/repositories/raw/content/org.onap.dcaegen2.platform.plugins/R6/dcaepolicyplugin/2.4.0/dcaepolicyplugin_types.yaml");
return imps;
}
public static ArrayList<String> createDmaapImports(){
diff --git a/mod/bpgenerator/src/test/java/org/onap/blueprintgenerator/core/BlueprintGeneratorTest.java b/mod/bpgenerator/src/test/java/org/onap/blueprintgenerator/core/BlueprintGeneratorTest.java
index 404b899..1827349 100644
--- a/mod/bpgenerator/src/test/java/org/onap/blueprintgenerator/core/BlueprintGeneratorTest.java
+++ b/mod/bpgenerator/src/test/java/org/onap/blueprintgenerator/core/BlueprintGeneratorTest.java
@@ -242,8 +242,8 @@ public class BlueprintGeneratorTest {
ArrayList<String> imps = new ArrayList<String>();
imps.add("http://www.getcloudify.org/spec/cloudify/3.4/types.yaml");
- imps.add("https://nexus.onap.org/service/local/repositories/raw/content/org.onap.dcaegen2.platform.plugins/R4/k8splugin/1.4.5/k8splugin_types.yaml");
- imps.add("https://nexus.onap.org/service/local/repositories/raw/content/org.onap.dcaegen2.platform.plugins/R4/dcaepolicyplugin/2.3.0/dcaepolicyplugin_types.yaml");
+ imps.add("https://nexus.onap.org/service/local/repositories/raw/content/org.onap.dcaegen2.platform.plugins/R6/k8splugin/1.7.2/k8splugin_types.yaml");
+ imps.add("https://nexus.onap.org/service/local/repositories/raw/content/org.onap.dcaegen2.platform.plugins/R6/dcaepolicyplugin/2.4.0/dcaepolicyplugin_types.yaml");
assertEquals(bp.getImports(), imps);
}
diff --git a/mod/bpgenerator/version.properties b/mod/bpgenerator/version.properties
index fee4928..ef20baa 100644
--- a/mod/bpgenerator/version.properties
+++ b/mod/bpgenerator/version.properties
@@ -1,6 +1,6 @@
major=1
minor=3
-patch=1
+patch=2
base_version=${major}.${minor}.${patch}
release_version=${base_version}
snapshot_version=${base_version}-SNAPSHOT