diff options
Diffstat (limited to 'ms/controllerblueprints')
| -rw-r--r-- | ms/controllerblueprints/README_FIRST.txt | 0 | ||||
| -rw-r--r-- | ms/controllerblueprints/modules/blueprint-proto/pom.xml | 30 | ||||
| -rw-r--r-- | ms/controllerblueprints/modules/blueprint-validation/pom.xml | 1 | ||||
| -rw-r--r-- | ms/controllerblueprints/parent/pom.xml | 22 | ||||
| -rw-r--r-- | ms/controllerblueprints/repoproject.txt | 1 | ||||
| -rw-r--r-- | ms/controllerblueprints/time.txt | 1 |
6 files changed, 34 insertions, 21 deletions
diff --git a/ms/controllerblueprints/README_FIRST.txt b/ms/controllerblueprints/README_FIRST.txt deleted file mode 100644 index e69de29bb..000000000 --- a/ms/controllerblueprints/README_FIRST.txt +++ /dev/null diff --git a/ms/controllerblueprints/modules/blueprint-proto/pom.xml b/ms/controllerblueprints/modules/blueprint-proto/pom.xml index eb4dd9f78..91097b9d9 100644 --- a/ms/controllerblueprints/modules/blueprint-proto/pom.xml +++ b/ms/controllerblueprints/modules/blueprint-proto/pom.xml @@ -66,19 +66,21 @@ </pluginArtifact> </configuration> </execution> -<!-- <execution>--> -<!-- <id>grpc-coroutines</id>--> -<!-- <goals>--> -<!-- <goal>compile-custom</goal>--> -<!-- </goals>--> -<!-- <configuration>--> -<!-- <pluginId>kroto-plus</pluginId>--> -<!-- <pluginArtifact>--> -<!-- com.github.marcoferrer.krotoplus:protoc-gen-kroto-plus:${kroto-plus.version}:jar:jvm8--> -<!-- </pluginArtifact>--> -<!-- <pluginParameter>ConfigPath=${project.basedir}/krotoPlusConfig.asciipb</pluginParameter>--> -<!-- </configuration>--> -<!-- </execution>--> + <!-- + <execution> + <id>grpc-coroutines</id> + <goals> + <goal>compile-custom</goal> + </goals> + <configuration> + <pluginId>kroto-plus</pluginId> + <pluginArtifact> + com.github.marcoferrer.krotoplus:protoc-gen-kroto-plus:${kroto-plus.version}:jar:jvm8 + </pluginArtifact> + <pluginParameter>ConfigPath=${project.basedir}/krotoPlusConfig.asciipb</pluginParameter> + </configuration> + </execution> + --> </executions> </plugin> <plugin> @@ -95,7 +97,7 @@ <sourceDirs> <sourceDir>${project.basedir}/target/generated-sources/protobuf/java</sourceDir> <sourceDir>${project.basedir}/target/generated-sources/protobuf/grpc-java</sourceDir> -<!-- <sourceDir>${project.basedir}/target/generated-sources/protobuf/kroto-plus</sourceDir>--> + <!--<sourceDir>${project.basedir}/target/generated-sources/protobuf/kroto-plus</sourceDir>--> </sourceDirs> </configuration> </execution> diff --git a/ms/controllerblueprints/modules/blueprint-validation/pom.xml b/ms/controllerblueprints/modules/blueprint-validation/pom.xml index 40fff14d4..5bc2e2a6b 100644 --- a/ms/controllerblueprints/modules/blueprint-validation/pom.xml +++ b/ms/controllerblueprints/modules/blueprint-validation/pom.xml @@ -47,7 +47,6 @@ <artifactId>resource-dict</artifactId> </dependency> - <!--Testing dependencies--> <dependency> <groupId>org.jetbrains.kotlin</groupId> diff --git a/ms/controllerblueprints/parent/pom.xml b/ms/controllerblueprints/parent/pom.xml index 62f300c0a..c5e01a6b6 100644 --- a/ms/controllerblueprints/parent/pom.xml +++ b/ms/controllerblueprints/parent/pom.xml @@ -36,11 +36,17 @@ <guava.version>27.0.1-jre</guava.version> <kroto-plus.version>0.5.0</kroto-plus.version> <springfox.swagger2.version>2.9.2</springfox.swagger2.version> + <h2database.version>1.4.197</h2database.version> <onap.logger.slf4j>1.2.2</onap.logger.slf4j> <powermock.version>1.7.4</powermock.version> + <jinja.version>2.5.1</jinja.version> <velocity.version>1.7</velocity.version> + <json-smart.version>2.3</json-smart.version> + <commons-io-version>2.6</commons-io-version> + <commons-lang3-version>3.2.1</commons-lang3-version> + <commons-collections-version>3.2.2</commons-collections-version> </properties> <dependencyManagement> @@ -87,17 +93,17 @@ <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-lang3</artifactId> - <version>3.2.1</version> + <version>${commons-lang3-version}</version> </dependency> <dependency> <groupId>commons-collections</groupId> <artifactId>commons-collections</artifactId> - <version>3.2.2</version> + <version>${commons-collections-version}</version> </dependency> <dependency> <groupId>commons-io</groupId> <artifactId>commons-io</artifactId> - <version>2.6</version> + <version>${commons-io-version}</version> </dependency> <dependency> <groupId>org.apache.velocity</groupId> @@ -114,6 +120,11 @@ <artifactId>guava</artifactId> <version>${guava.version}</version> </dependency> + <dependency> + <groupId>net.minidev</groupId> + <artifactId>json-smart</artifactId> + <version>${json-smart.version}</version> + </dependency> <!-- Kotlin Dependencies --> <dependency> @@ -219,7 +230,6 @@ <version>${h2database.version}</version> </dependency> - <!-- Application Components --> <dependency> <groupId>org.onap.ccsdk.cds.controllerblueprints</groupId> @@ -294,6 +304,10 @@ </exclusions> </dependency> <dependency> + <groupId>net.minidev</groupId> + <artifactId>json-smart</artifactId> + </dependency> + <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> </dependency> diff --git a/ms/controllerblueprints/repoproject.txt b/ms/controllerblueprints/repoproject.txt deleted file mode 100644 index 91a5c8e67..000000000 --- a/ms/controllerblueprints/repoproject.txt +++ /dev/null @@ -1 +0,0 @@ -ST_SDNCMS diff --git a/ms/controllerblueprints/time.txt b/ms/controllerblueprints/time.txt deleted file mode 100644 index 6ed29fb4a..000000000 --- a/ms/controllerblueprints/time.txt +++ /dev/null @@ -1 +0,0 @@ -Current time : 17:38:06 |