diff options
| -rw-r--r-- | ms/blueprintsprocessor/.gitignore | 1 | ||||
| -rw-r--r-- | ms/blueprintsprocessor/application/pom.xml | 2 | ||||
| -rw-r--r-- | ms/blueprintsprocessor/modules/commons/pom.xml | 2 | ||||
| -rw-r--r-- | ms/blueprintsprocessor/modules/pom.xml | 6 | ||||
| -rw-r--r-- | ms/blueprintsprocessor/parent/pom.xml | 31 |
5 files changed, 26 insertions, 16 deletions
diff --git a/ms/blueprintsprocessor/.gitignore b/ms/blueprintsprocessor/.gitignore index 8dd19d0d3..b25ff7b05 100644 --- a/ms/blueprintsprocessor/.gitignore +++ b/ms/blueprintsprocessor/.gitignore @@ -22,6 +22,7 @@ **/*.iml **/*.project **/.springBeans +**/.directory **/*versionsBackup **/blackDuckHub* diff --git a/ms/blueprintsprocessor/application/pom.xml b/ms/blueprintsprocessor/application/pom.xml index 8a93df356..0fe62e9ee 100644 --- a/ms/blueprintsprocessor/application/pom.xml +++ b/ms/blueprintsprocessor/application/pom.xml @@ -60,7 +60,7 @@ </dependency> <dependency> <groupId>org.jetbrains.kotlin</groupId> - <artifactId>kotlin-test</artifactId> + <artifactId>kotlin-test-junit</artifactId> <scope>test</scope> </dependency> <dependency> diff --git a/ms/blueprintsprocessor/modules/commons/pom.xml b/ms/blueprintsprocessor/modules/commons/pom.xml index a2e7c78b1..299a87d6d 100644 --- a/ms/blueprintsprocessor/modules/commons/pom.xml +++ b/ms/blueprintsprocessor/modules/commons/pom.xml @@ -49,7 +49,7 @@ </dependency> <dependency> <groupId>org.jetbrains.kotlin</groupId> - <artifactId>kotlin-test</artifactId> + <artifactId>kotlin-test-junit</artifactId> <scope>test</scope> </dependency> <dependency> diff --git a/ms/blueprintsprocessor/modules/pom.xml b/ms/blueprintsprocessor/modules/pom.xml index 8a57da2cd..93f312b8f 100644 --- a/ms/blueprintsprocessor/modules/pom.xml +++ b/ms/blueprintsprocessor/modules/pom.xml @@ -38,10 +38,6 @@ <module>inbounds</module> </modules> - <properties> - <kotlin.version>1.2.60</kotlin.version> - </properties> - <dependencies> <dependency> <groupId>org.powermock</groupId> @@ -55,7 +51,7 @@ </dependency> <dependency> <groupId>org.jetbrains.kotlin</groupId> - <artifactId>kotlin-test</artifactId> + <artifactId>kotlin-test-junit</artifactId> <scope>test</scope> </dependency> <dependency> diff --git a/ms/blueprintsprocessor/parent/pom.xml b/ms/blueprintsprocessor/parent/pom.xml index 625216e8b..fd32ae120 100644 --- a/ms/blueprintsprocessor/parent/pom.xml +++ b/ms/blueprintsprocessor/parent/pom.xml @@ -29,13 +29,15 @@ <name>Blueprints Processor Parent</name> <description>Blueprints Processor Parent</description> <properties> - <controllerblueprints.version>0.3.1-SNAPSHOT</controllerblueprints.version> - <spring.boot.version>2.0.4.RELEASE</spring.boot.version> - <spring.version>5.0.8.RELEASE</spring.version> - <kotlin.version>1.2.60</kotlin.version> + <spring.boot.version>2.0.6.RELEASE</spring.boot.version> + <spring.version>5.0.10.RELEASE</spring.version> + <kotlin.version>1.3.0</kotlin.version> + <kotlin.couroutines.version>1.0.1</kotlin.couroutines.version> <eelf.version>1.0.0</eelf.version> + <guava.version>26.0-jre</guava.version> <springfox.swagger2.version>2.9.2</springfox.swagger2.version> <h2database.version>1.4.197</h2database.version> + <powermock.version>1.7.4</powermock.version> </properties> <dependencyManagement> <dependencies> @@ -63,15 +65,26 @@ </dependency> <dependency> <groupId>org.jetbrains.kotlin</groupId> + <artifactId>kotlinx-couroutines-core</artifactId> + <version>${kotlin.couroutines.version}</version> + </dependency> + <dependency> + <groupId>org.jetbrains.kotlin</groupId> + <artifactId>kotlin-reflect</artifactId> + <version>${kotlin.version}</version> + </dependency> + <dependency> + <groupId>org.jetbrains.kotlin</groupId> <artifactId>kotlin-stdlib-jdk8</artifactId> <version>${kotlin.version}</version> </dependency> <dependency> <groupId>org.jetbrains.kotlin</groupId> - <artifactId>kotlin-reflect</artifactId> + <artifactId>kotlin-stdlib-jdk7</artifactId> <version>${kotlin.version}</version> </dependency> + <!-- Application Module Dependencies --> <dependency> <groupId>org.onap.ccsdk.apps.blueprintsprocessor</groupId> @@ -118,7 +131,7 @@ <dependency> <groupId>org.onap.ccsdk.apps.controllerblueprints</groupId> <artifactId>resource-dict</artifactId> - <version>${controllerblueprints.version}</version> + <version>${project.version}</version> </dependency> <!--Swagger Dependencies --> @@ -157,7 +170,7 @@ <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> - <version>26.0-jre</version> + <version>${guava.version}</version> </dependency> <!-- Database --> @@ -170,12 +183,12 @@ <dependency> <groupId>org.powermock</groupId> <artifactId>powermock-api-mockito2</artifactId> - <version>1.7.4</version> + <version>${powermock.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.jetbrains.kotlin</groupId> - <artifactId>kotlin-test</artifactId> + <artifactId>kotlin-test-junit</artifactId> <version>${kotlin.version}</version> <scope>test</scope> </dependency> |