Update versions for London

[ccsdk/cds.git] / components / model-catalog / blueprint-model / test-blueprint-kotlin-parent / pom.xml

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 f3d39d3..41614b0 100644 (file)
--- a/components/model-catalog/blueprint-model/test-blueprint-kotlin-parent/pom.xml
+++ b/components/model-catalog/blueprint-model/test-blueprint-kotlin-parent/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.onap.ccsdk.cds.components.cba</groupId>
         <artifactId>blueprint-model</artifactId>
-        <version>1.2.1-SNAPSHOT</version>
+        <version>1.5.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>test-blueprint-kotlin-parent</artifactId>
@@ -30,6 +30,17 @@
     <name>Components Model Catalog - Blueprints Model - Test Kotlin Parent</name>
 
     <dependencies>
+        <dependency>
+            <groupId>org.onap.ccsdk.cds.blueprintsprocessor</groupId>
+            <artifactId>blueprintsprocessor-application</artifactId>
+            <version>${project.parent.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+
         <dependency>
             <groupId>org.onap.ccsdk.cds.blueprintsprocessor.modules</groupId>
             <artifactId>execution-service</artifactId>
@@ -79,7 +90,7 @@
         <dependency>
             <groupId>com.squareup.okhttp3</groupId>
             <artifactId>okhttp</artifactId>
-            <version>3.14.0</version>
+            <version>4.9.3</version>
         </dependency>
     </dependencies>
 
@@ -91,6 +102,11 @@
                 <directory>${project.basedir}/Environments</directory>
             </resource>
         </resources>
+        <testResources>
+            <testResource>
+                <directory>${project.basedir}/Tests/resources</directory>
+            </testResource>
+        </testResources>
         <plugins>
             <plugin>
                 <groupId>org.jacoco</groupId>
@@ -225,16 +241,36 @@
             </plugin>
             <plugin>
                 <artifactId>maven-surefire-plugin</artifactId>
+                <version>${maven-surefire-plugin.version}</version>
                 <executions>
                     <execution>
                         <id>default-test</id>
                         <phase>test</phase>
+                        <configuration>
+                            <!-- Sets the VM argument line used when unit tests are run. -->
+                            <argLine>-Xmx1024m </argLine>
+                            <reuseForks>false</reuseForks>
+                            <forkCount>1</forkCount>
+                        </configuration>
                         <goals>
                             <goal>test</goal>
                         </goals>
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <artifactId>maven-resources-plugin</artifactId>
+                <version>2.6</version>
+                <executions>
+                    <execution>
+                        <id>copy-test-resources</id>
+                        <goals>
+                            <goal>testResources</goal>
+                        </goals>
+                        <phase>process-test-resources</phase>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
     </build>
 
@@ -290,61 +326,61 @@
                                         def publishEndpoint = properties['cds.publish.endpoint'] ?: 'api/v1/blueprint-model/publish'
 
                                         def throwIfPropMissing(prop) {
-                                        value = properties[prop]
-                                        if (!value || "".equals(value)) {
-                                        throw new RuntimeException("Property missing: $prop")
-                                        }
-                                        return value
+                                            value = properties[prop]
+                                            if (!value || "".equals(value)) {
+                                                throw new RuntimeException("Property missing: $prop")
+                                            }
+                                            return value
                                         }
 
                                         def buildRequest(endpoint, fileName) {
-                                        body = new MultipartBody.Builder()
-                                        .setType(MultipartBody.FORM)
-                                        .addFormDataPart("file",
-                                        fileName,
-                                        RequestBody.create(MediaType.parse('application/zip'), new File(target, fileName)))
-                                        .build()
+                                            body = new MultipartBody.Builder()
+                                                    .setType(MultipartBody.FORM)
+                                                    .addFormDataPart("file",
+                                                            fileName,
+                                                            RequestBody.create(MediaType.parse('application/zip'), new File(target, fileName)))
+                                                    .build()
 
-                                        return new Request.Builder()
-                                        .url("$protocol://$host:$port/$endpoint")
-                                        .addHeader('Authorization', Credentials.basic(userName, password))
-                                        .post(body)
-                                        .build()
+                                            return new Request.Builder()
+                                                    .url("$protocol://$host:$port/$endpoint")
+                                                    .addHeader('Authorization', Credentials.basic(userName, password))
+                                                    .post(body)
+                                                    .build()
                                         }
 
                                         def logAndThrow(msg) {
-                                        if(response) {
-                                        log.error(response.body().string())
-                                        }
-                                        throw new RuntimeException(msg)
+                                            if(response) {
+                                                log.error(response.body().string())
+                                            }
+                                            throw new RuntimeException(msg)
                                         }
 
                                         response = null
                                         try {
-                                        def client = new OkHttpClient()
+                                            def client = new OkHttpClient()
 
-                                        response = client.newCall(buildRequest(enrichEndpoint, cba)).execute()
-                                        if (!response || !response.isSuccessful()) {
-                                        logAndThrow("Failed to enrich CBA")
-                                        }
+                                            response = client.newCall(buildRequest(enrichEndpoint, cba)).execute()
+                                            if (!response || !response.isSuccessful()) {
+                                                logAndThrow("Failed to enrich CBA")
+                                            }
 
-                                        IOUtils.copy(
-                                        response.body().byteStream(),
-                                        new FileOutputStream(new File(target, enrichedCba))
-                                        )
-                                        log.info("Created enriched cba: $enrichedCba")
+                                            IOUtils.copy(
+                                                    response.body().byteStream(),
+                                                    new FileOutputStream(new File(target, enrichedCba))
+                                            )
+                                            log.info("Created enriched cba: $enrichedCba")
 
-                                        response = client.newCall(buildRequest(publishEndpoint, enrichedCba)).execute()
-                                        if (!response || !response.isSuccessful()) {
-                                        logAndThrow("Failed to publish CBA")
-                                        }
+                                            response = client.newCall(buildRequest(publishEndpoint, enrichedCba)).execute()
+                                            if (!response || !response.isSuccessful()) {
+                                                logAndThrow("Failed to publish CBA")
+                                            }
 
-                                        log.info("CBA Deployed")
-                                        log.info(response.body().string())
+                                            log.info("CBA Deployed")
+                                            log.info(response.body().string())
                                         } finally {
-                                        if (response) {
-                                        response.close()
-                                        }
+                                            if (response) {
+                                                response.close()
+                                            }
                                         }
                                     </source>
                                 </configuration>