summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--cds-ui/application/pom.xml1
-rw-r--r--components/model-catalog/blueprint-model/cba-assembly-descriptor/pom.xml40
-rw-r--r--components/model-catalog/blueprint-model/cba-assembly-descriptor/src/main/resources/assemblies/cba_zip.xml2
-rw-r--r--components/model-catalog/blueprint-model/test-blueprint-kotlin-parent/pom.xml10
-rw-r--r--components/model-catalog/blueprint-model/test-blueprint/capability_cli/pom.xml6
-rw-r--r--components/model-catalog/blueprint-model/test-blueprint/resource-audit/pom.xml6
-rw-r--r--ms/blueprintsprocessor/functions/ansible-awx-executor/src/test/resources/payload/requests/remote-ansible-request-full.json2
-rw-r--r--ms/blueprintsprocessor/functions/ansible-awx-executor/src/test/resources/payload/requests/sample-remote-ansible-request.json2
-rw-r--r--ms/blueprintsprocessor/functions/netconf-executor/src/test/resources/payload/requests/sample-activate-request.json2
-rw-r--r--ms/blueprintsprocessor/functions/netconf-executor/src/test/resources/requests/sample-activate-request.json2
-rw-r--r--ms/blueprintsprocessor/functions/netconf-executor/src/test/resources/requests/sample-resourceresolution-request.json2
-rw-r--r--ms/blueprintsprocessor/functions/python-executor/src/test/resources/payload/requests/sample-activate-request.json2
-rw-r--r--ms/blueprintsprocessor/functions/python-executor/src/test/resources/payload/requests/sample-remote-python-request.json2
-rw-r--r--ms/blueprintsprocessor/functions/resource-resolution/src/test/resources/payload/requests/sample-resourceresolution-request.json2
-rwxr-xr-xms/blueprintsprocessor/modules/inbounds/selfservice-api/pom.xml3
-rw-r--r--ms/blueprintsprocessor/modules/services/execution-service/src/test/resources/payload/requests/sample-execution-request.json2
16 files changed, 67 insertions, 19 deletions
diff --git a/cds-ui/application/pom.xml b/cds-ui/application/pom.xml
index 5a8325e3a..52eb555d4 100644
--- a/cds-ui/application/pom.xml
+++ b/cds-ui/application/pom.xml
@@ -49,6 +49,7 @@ limitations under the License.
<plugin>
<groupId>org.codehaus.groovy.maven</groupId>
<artifactId>gmaven-plugin</artifactId>
+ <version>1.0</version>
<executions>
<execution>
<phase>validate</phase>
diff --git a/components/model-catalog/blueprint-model/cba-assembly-descriptor/pom.xml b/components/model-catalog/blueprint-model/cba-assembly-descriptor/pom.xml
index 5a2432953..084b72fc6 100644
--- a/components/model-catalog/blueprint-model/cba-assembly-descriptor/pom.xml
+++ b/components/model-catalog/blueprint-model/cba-assembly-descriptor/pom.xml
@@ -18,10 +18,44 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.onap.ccsdk.cds.cba</groupId>
+ <artifactId>blueprint-model</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ </parent>
+
<groupId>org.onap.ccsdk.cds.blueprintsprocessor</groupId>
<artifactId>cba-assembly-descriptor</artifactId>
- <version>1.0.0-SNAPSHOT</version>
- <name>CBA - Assembly Sescriptor</name>
+ <name>CBA - Assembly Descriptor</name>
<description>Shared assembly descriptor</description>
-</project> \ No newline at end of file
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ <version>2.6</version>
+ <executions>
+ <execution>
+ <id>process-proc</id>
+ <phase>process-resources</phase>
+ <goals>
+ <goal>copy-resources</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>target/classes</outputDirectory>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ <filtering>true</filtering>
+ </resource>
+ </resources>
+ <includeEmptyDirs>true</includeEmptyDirs>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
diff --git a/components/model-catalog/blueprint-model/cba-assembly-descriptor/src/main/resources/assemblies/cba_zip.xml b/components/model-catalog/blueprint-model/cba-assembly-descriptor/src/main/resources/assemblies/cba_zip.xml
index c6c3bde71..4d16bc8d0 100644
--- a/components/model-catalog/blueprint-model/cba-assembly-descriptor/src/main/resources/assemblies/cba_zip.xml
+++ b/components/model-catalog/blueprint-model/cba-assembly-descriptor/src/main/resources/assemblies/cba_zip.xml
@@ -19,7 +19,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0 http://maven.apache.org/xsd/assembly-2.0.0.xsd">
<!-- create a tar.gz file containing the projects dependencies -->
- <id>cba</id>
+ <id>cba_zip</id>
<formats>
<format>zip</format>
</formats>
diff --git a/components/model-catalog/blueprint-model/test-blueprint-kotlin-parent/pom.xml b/components/model-catalog/blueprint-model/test-blueprint-kotlin-parent/pom.xml
index de321f86f..1513d25d2 100644
--- a/components/model-catalog/blueprint-model/test-blueprint-kotlin-parent/pom.xml
+++ b/components/model-catalog/blueprint-model/test-blueprint-kotlin-parent/pom.xml
@@ -54,10 +54,6 @@
</dependency>
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
- <artifactId>kotlin-stdlib</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-test-junit</artifactId>
<scope>test</scope>
</dependency>
@@ -253,6 +249,12 @@
<groupId>org.onap.ccsdk.cds.blueprintsprocessor</groupId>
<artifactId>cba-assembly-descriptor</artifactId>
<version>1.0.0-SNAPSHOT</version>
+ <exclusions>
+ <exclusion>
+ <groupId>*</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
</dependencies>
<executions>
diff --git a/components/model-catalog/blueprint-model/test-blueprint/capability_cli/pom.xml b/components/model-catalog/blueprint-model/test-blueprint/capability_cli/pom.xml
index c3138da4e..ff9e8d985 100644
--- a/components/model-catalog/blueprint-model/test-blueprint/capability_cli/pom.xml
+++ b/components/model-catalog/blueprint-model/test-blueprint/capability_cli/pom.xml
@@ -46,6 +46,12 @@
<groupId>org.onap.ccsdk.cds.blueprintsprocessor</groupId>
<artifactId>cba-assembly-descriptor</artifactId>
<version>1.0.0-SNAPSHOT</version>
+ <exclusions>
+ <exclusion>
+ <groupId>*</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
</dependencies>
<version>3.1.0</version>
diff --git a/components/model-catalog/blueprint-model/test-blueprint/resource-audit/pom.xml b/components/model-catalog/blueprint-model/test-blueprint/resource-audit/pom.xml
index 3cc08222d..3edcf0aaf 100644
--- a/components/model-catalog/blueprint-model/test-blueprint/resource-audit/pom.xml
+++ b/components/model-catalog/blueprint-model/test-blueprint/resource-audit/pom.xml
@@ -48,6 +48,12 @@
<groupId>org.onap.ccsdk.cds.blueprintsprocessor</groupId>
<artifactId>cba-assembly-descriptor</artifactId>
<version>1.0.0-SNAPSHOT</version>
+ <exclusions>
+ <exclusion>
+ <groupId>*</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
</dependencies>
<executions>
diff --git a/ms/blueprintsprocessor/functions/ansible-awx-executor/src/test/resources/payload/requests/remote-ansible-request-full.json b/ms/blueprintsprocessor/functions/ansible-awx-executor/src/test/resources/payload/requests/remote-ansible-request-full.json
index 11bb90b50..286c5759d 100644
--- a/ms/blueprintsprocessor/functions/ansible-awx-executor/src/test/resources/payload/requests/remote-ansible-request-full.json
+++ b/ms/blueprintsprocessor/functions/ansible-awx-executor/src/test/resources/payload/requests/remote-ansible-request-full.json
@@ -7,7 +7,7 @@
},
"commonHeader": {
"flags": {
- "force": true,
+ "isForce": true,
"ttl": 3600
},
"originatorId": "mock",
diff --git a/ms/blueprintsprocessor/functions/ansible-awx-executor/src/test/resources/payload/requests/sample-remote-ansible-request.json b/ms/blueprintsprocessor/functions/ansible-awx-executor/src/test/resources/payload/requests/sample-remote-ansible-request.json
index 6169da9c7..1dc144f4e 100644
--- a/ms/blueprintsprocessor/functions/ansible-awx-executor/src/test/resources/payload/requests/sample-remote-ansible-request.json
+++ b/ms/blueprintsprocessor/functions/ansible-awx-executor/src/test/resources/payload/requests/sample-remote-ansible-request.json
@@ -7,7 +7,7 @@
},
"commonHeader": {
"flags": {
- "force": true,
+ "isForce": true,
"ttl": 3600
},
"originatorId": "mock",
diff --git a/ms/blueprintsprocessor/functions/netconf-executor/src/test/resources/payload/requests/sample-activate-request.json b/ms/blueprintsprocessor/functions/netconf-executor/src/test/resources/payload/requests/sample-activate-request.json
index 694589de1..b94e9f91a 100644
--- a/ms/blueprintsprocessor/functions/netconf-executor/src/test/resources/payload/requests/sample-activate-request.json
+++ b/ms/blueprintsprocessor/functions/netconf-executor/src/test/resources/payload/requests/sample-activate-request.json
@@ -7,7 +7,7 @@
},
"commonHeader": {
"flags": {
- "force": true,
+ "isForce": true,
"ttl": 3600
},
"originatorId": "sdnc",
diff --git a/ms/blueprintsprocessor/functions/netconf-executor/src/test/resources/requests/sample-activate-request.json b/ms/blueprintsprocessor/functions/netconf-executor/src/test/resources/requests/sample-activate-request.json
index d0b4a0c1e..c6b7b8d7f 100644
--- a/ms/blueprintsprocessor/functions/netconf-executor/src/test/resources/requests/sample-activate-request.json
+++ b/ms/blueprintsprocessor/functions/netconf-executor/src/test/resources/requests/sample-activate-request.json
@@ -7,7 +7,7 @@
},
"commonHeader": {
"flags": {
- "force": true,
+ "isForce": true,
"ttl": 3600
},
"originatorId": "sdnc",
diff --git a/ms/blueprintsprocessor/functions/netconf-executor/src/test/resources/requests/sample-resourceresolution-request.json b/ms/blueprintsprocessor/functions/netconf-executor/src/test/resources/requests/sample-resourceresolution-request.json
index c37e88912..d312d10a2 100644
--- a/ms/blueprintsprocessor/functions/netconf-executor/src/test/resources/requests/sample-resourceresolution-request.json
+++ b/ms/blueprintsprocessor/functions/netconf-executor/src/test/resources/requests/sample-resourceresolution-request.json
@@ -7,7 +7,7 @@
},
"commonHeader": {
"flags": {
- "force": true,
+ "isForce": true,
"ttl": 3600
},
"originatorId": "sdnc",
diff --git a/ms/blueprintsprocessor/functions/python-executor/src/test/resources/payload/requests/sample-activate-request.json b/ms/blueprintsprocessor/functions/python-executor/src/test/resources/payload/requests/sample-activate-request.json
index 694589de1..b94e9f91a 100644
--- a/ms/blueprintsprocessor/functions/python-executor/src/test/resources/payload/requests/sample-activate-request.json
+++ b/ms/blueprintsprocessor/functions/python-executor/src/test/resources/payload/requests/sample-activate-request.json
@@ -7,7 +7,7 @@
},
"commonHeader": {
"flags": {
- "force": true,
+ "isForce": true,
"ttl": 3600
},
"originatorId": "sdnc",
diff --git a/ms/blueprintsprocessor/functions/python-executor/src/test/resources/payload/requests/sample-remote-python-request.json b/ms/blueprintsprocessor/functions/python-executor/src/test/resources/payload/requests/sample-remote-python-request.json
index 7fe12bdf0..8291e67ab 100644
--- a/ms/blueprintsprocessor/functions/python-executor/src/test/resources/payload/requests/sample-remote-python-request.json
+++ b/ms/blueprintsprocessor/functions/python-executor/src/test/resources/payload/requests/sample-remote-python-request.json
@@ -7,7 +7,7 @@
},
"commonHeader": {
"flags": {
- "force": true,
+ "isForce": true,
"ttl": 3600
},
"originatorId": "sdnc",
diff --git a/ms/blueprintsprocessor/functions/resource-resolution/src/test/resources/payload/requests/sample-resourceresolution-request.json b/ms/blueprintsprocessor/functions/resource-resolution/src/test/resources/payload/requests/sample-resourceresolution-request.json
index cc653ccd6..3ca754f87 100644
--- a/ms/blueprintsprocessor/functions/resource-resolution/src/test/resources/payload/requests/sample-resourceresolution-request.json
+++ b/ms/blueprintsprocessor/functions/resource-resolution/src/test/resources/payload/requests/sample-resourceresolution-request.json
@@ -7,7 +7,7 @@
},
"commonHeader": {
"flags": {
- "force": true,
+ "isForce": true,
"ttl": 3600
},
"originatorId": "sdnc",
diff --git a/ms/blueprintsprocessor/modules/inbounds/selfservice-api/pom.xml b/ms/blueprintsprocessor/modules/inbounds/selfservice-api/pom.xml
index 616b8e144..73e838146 100755
--- a/ms/blueprintsprocessor/modules/inbounds/selfservice-api/pom.xml
+++ b/ms/blueprintsprocessor/modules/inbounds/selfservice-api/pom.xml
@@ -73,8 +73,7 @@
<!-- Apache Kafka -->
<dependency>
<groupId>org.apache.kafka</groupId>
- <artifactId>kafka_2.11</artifactId>
- <version>${kafka.version}</version>
+ <artifactId>kafka_2.13</artifactId>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
diff --git a/ms/blueprintsprocessor/modules/services/execution-service/src/test/resources/payload/requests/sample-execution-request.json b/ms/blueprintsprocessor/modules/services/execution-service/src/test/resources/payload/requests/sample-execution-request.json
index c9b8ed2a7..09d9b04f4 100644
--- a/ms/blueprintsprocessor/modules/services/execution-service/src/test/resources/payload/requests/sample-execution-request.json
+++ b/ms/blueprintsprocessor/modules/services/execution-service/src/test/resources/payload/requests/sample-execution-request.json
@@ -7,7 +7,7 @@
},
"commonHeader": {
"flags": {
- "force": true,
+ "isForce": true,
"ttl": 3600
},
"originatorId": "sdnc",