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 d8c3d80..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
@@ -19,21 +19,30 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.onap.ccsdk.cds.cba</groupId>
+        <groupId>org.onap.ccsdk.cds.components.cba</groupId>
         <artifactId>blueprint-model</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
+        <version>1.5.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>test-blueprint-kotlin-parent</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
-    <name>CBA - Test Kotlin scripts</name>
-    <description>CBA - Test Kotlin scripts</description>
+    <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>
         </dependency>
         <dependency>
@@ -44,13 +53,17 @@
             <groupId>org.onap.ccsdk.cds.blueprintsprocessor.functions</groupId>
             <artifactId>netconf-executor</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.onap.ccsdk.cds.blueprintsprocessor.functions</groupId>
+            <artifactId>restconf-executor</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.onap.ccsdk.cds.blueprintsprocessor.functions</groupId>
             <artifactId>cli-executor</artifactId>
         </dependency>
         <dependency>
             <groupId>org.onap.ccsdk.cds.blueprintsprocessor.functions</groupId>
-            <artifactId>message-prioritizaion</artifactId>
+            <artifactId>message-prioritization</artifactId>
         </dependency>
         <dependency>
             <groupId>org.jetbrains.kotlin</groupId>
@@ -62,7 +75,6 @@
             <artifactId>kotlinx-coroutines-test</artifactId>
             <scope>test</scope>
         </dependency>
-
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
@@ -78,7 +90,7 @@
         <dependency>
             <groupId>com.squareup.okhttp3</groupId>
             <artifactId>okhttp</artifactId>
-            <version>3.14.0</version>
+            <version>4.9.3</version>
         </dependency>
     </dependencies>
 
@@ -90,44 +102,12 @@
                 <directory>${project.basedir}/Environments</directory>
             </resource>
         </resources>
+        <testResources>
+            <testResource>
+                <directory>${project.basedir}/Tests/resources</directory>
+            </testResource>
+        </testResources>
         <plugins>
-            <plugin>
-                <artifactId>maven-antrun-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>validate-kotlin</id>
-                        <phase>validate</phase>
-                        <configuration>
-                            <target name="ktlint">
-                                <java taskname="ktlint" dir="${project.basedir}" fork="true" failonerror="true" classname="com.pinterest.ktlint.Main" classpathref="maven.plugin.classpath">
-                                    <arg value="Scripts/kotlin/**/*.kt"/>
-                                </java>
-                            </target>
-                            <skip>${format.skipValidate}</skip>
-                        </configuration>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                    </execution>
-                    <execution>
-                        <!-- Built-in formatter So that you wouldn't have to fix all style violations by hand.-->
-                        <id>format-kotlin</id>
-                        <phase>process-sources</phase>
-                        <configuration>
-                            <target name="ktlint">
-                                <java taskname="ktlint" dir="${project.basedir}" fork="true" failonerror="true" classname="com.pinterest.ktlint.Main" classpathref="maven.plugin.classpath">
-                                    <arg value="-F"/>
-                                    <arg value="Scripts/kotlin/**/*.kt"/>
-                                </java>
-                            </target>
-                            <skip>${format.skipExecute}</skip>
-                        </configuration>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
             <plugin>
                 <groupId>org.jacoco</groupId>
                 <artifactId>jacoco-maven-plugin</artifactId>
@@ -219,9 +199,9 @@
                 <artifactId>maven-assembly-plugin</artifactId>
                 <dependencies>
                     <dependency>
-                        <groupId>org.onap.ccsdk.cds.blueprintsprocessor</groupId>
+                        <groupId>org.onap.ccsdk.cds.components.cba</groupId>
                         <artifactId>cba-assembly-descriptor</artifactId>
-                        <version>1.0.0-SNAPSHOT</version>
+                        <version>${ccsdk.cds.version}</version>
                         <exclusions>
                             <exclusion>
                                 <groupId>*</groupId>
@@ -245,6 +225,52 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-failsafe-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>default</id>
+                        <phase>none</phase>
+                    </execution>
+                    <execution>
+                        <id>integration-tests</id>
+                        <phase>none</phase>
+                    </execution>
+                </executions>
+            </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>
 
@@ -309,17 +335,17 @@
 
                                         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()
+                                                    .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()
+                                                    .url("$protocol://$host:$port/$endpoint")
+                                                    .addHeader('Authorization', Credentials.basic(userName, password))
+                                                    .post(body)
+                                                    .build()
                                         }
 
                                         def logAndThrow(msg) {
@@ -339,8 +365,8 @@
                                             }
 
                                             IOUtils.copy(
-                                              response.body().byteStream(),
-                                              new FileOutputStream(new File(target, enrichedCba))
+                                                    response.body().byteStream(),
+                                                    new FileOutputStream(new File(target, enrichedCba))
                                             )
                                             log.info("Created enriched cba: $enrichedCba")