summaryrefslogtreecommitdiffstats
path: root/ms/controllerblueprints
diff options
context:
space:
mode:
Diffstat (limited to 'ms/controllerblueprints')
-rw-r--r--ms/controllerblueprints/.gitignore25
-rwxr-xr-xms/controllerblueprints/README.md26
-rw-r--r--ms/controllerblueprints/README_FIRST.txt0
-rw-r--r--ms/controllerblueprints/modules/blueprint-core/pom.xml4
-rw-r--r--ms/controllerblueprints/modules/blueprint-proto/pom.xml54
-rw-r--r--ms/controllerblueprints/modules/blueprint-validation/pom.xml4
-rw-r--r--ms/controllerblueprints/modules/pom.xml6
-rw-r--r--ms/controllerblueprints/modules/resource-dict/pom.xml5
-rw-r--r--ms/controllerblueprints/parent/pom.xml32
-rw-r--r--ms/controllerblueprints/pom.xml21
-rw-r--r--ms/controllerblueprints/repoproject.txt1
-rw-r--r--ms/controllerblueprints/time.txt1
12 files changed, 92 insertions, 87 deletions
diff --git a/ms/controllerblueprints/.gitignore b/ms/controllerblueprints/.gitignore
deleted file mode 100644
index 4b5c1c0a4..000000000
--- a/ms/controllerblueprints/.gitignore
+++ /dev/null
@@ -1,25 +0,0 @@
-/target/
-/logs/
-.classpath
-.settings/
-
-# Target dirs in all projects
-**/target-ide/*
-**/target/*
-**/logs/*
-**/debug-logs/*
-**/tokens/*
-
-# Added for Intellij IDEA IDE
-**/debug-logs/*
-**/.idea/*
-**/*.iml
-**/*.project
-**/.springBeans
-**/.directory
-
-
-**/*versionsBackup
-**/blackDuckHub*
-**/*.jsonld
-/target-ide/
diff --git a/ms/controllerblueprints/README.md b/ms/controllerblueprints/README.md
index b96dbf71a..0cb7a131b 100755
--- a/ms/controllerblueprints/README.md
+++ b/ms/controllerblueprints/README.md
@@ -1,13 +1,13 @@
-Application VM Arguments :
-
--DappName=ControllerBluePrints
--Dms_name=org.onap.ccsdk.cds.controllerblueprints
--DappVersion=1.0.0
--Dlogging.config=etc/logback.xml
--Dspring.config.location=opt/app/onap/config/
--Dspring.datasource.url=jdbc:mysql://127.0.0.1:3306/sdnctl
--Dspring.datasource.username=sdnctl
--Dspring.datasource.password=sdnctl
--Dcontrollerblueprints.loadInitialData=true
--Dspring.profiles.active=dev
-
+Application VM Arguments :
+
+-DappName=ControllerBluePrints
+-Dms_name=org.onap.ccsdk.cds.controllerblueprints
+-DappVersion=1.0.0
+-Dlogging.config=etc/logback.xml
+-Dspring.config.location=opt/app/onap/config/
+-Dspring.datasource.url=jdbc:mysql://127.0.0.1:3306/sdnctl
+-Dspring.datasource.username=sdnctl
+-Dspring.datasource.password=sdnctl
+-Dcontrollerblueprints.loadInitialData=true
+-Dspring.profiles.active=dev
+
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-core/pom.xml b/ms/controllerblueprints/modules/blueprint-core/pom.xml
index 1cb912c1b..5dd5f1bb2 100644
--- a/ms/controllerblueprints/modules/blueprint-core/pom.xml
+++ b/ms/controllerblueprints/modules/blueprint-core/pom.xml
@@ -17,12 +17,15 @@
-->
<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.controllerblueprints</groupId>
<artifactId>modules</artifactId>
<version>0.7.0-SNAPSHOT</version>
</parent>
+
<artifactId>blueprint-core</artifactId>
+
<name>Controller Blueprints Core</name>
<dependencies>
@@ -95,5 +98,4 @@
<scope>test</scope>
</dependency>
</dependencies>
-
</project>
diff --git a/ms/controllerblueprints/modules/blueprint-proto/pom.xml b/ms/controllerblueprints/modules/blueprint-proto/pom.xml
index 7d4d60028..91097b9d9 100644
--- a/ms/controllerblueprints/modules/blueprint-proto/pom.xml
+++ b/ms/controllerblueprints/modules/blueprint-proto/pom.xml
@@ -15,17 +15,17 @@
~ limitations under the License.
-->
-<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">
+<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.controllerblueprints</groupId>
<artifactId>modules</artifactId>
<version>0.7.0-SNAPSHOT</version>
</parent>
- <modelVersion>4.0.0</modelVersion>
<artifactId>blueprint-proto</artifactId>
+
<name>Controller Blueprints Proto</name>
<description>Controller Blueprints Proto</description>
@@ -37,13 +37,6 @@
</dependencies>
<build>
- <extensions>
- <extension>
- <groupId>kr.motd.maven</groupId>
- <artifactId>os-maven-plugin</artifactId>
- <version>1.6.2</version>
- </extension>
- </extensions>
<plugins>
<plugin>
<groupId>org.xolstice.maven.plugins</groupId>
@@ -73,24 +66,26 @@
</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>
- <artifactId>kotlin-maven-plugin</artifactId>
<groupId>org.jetbrains.kotlin</groupId>
+ <artifactId>kotlin-maven-plugin</artifactId>
<version>${kotlin.maven.version}</version>
<executions>
<execution>
@@ -102,12 +97,19 @@
<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>
</executions>
</plugin>
</plugins>
+ <extensions>
+ <extension>
+ <groupId>kr.motd.maven</groupId>
+ <artifactId>os-maven-plugin</artifactId>
+ <version>1.6.2</version>
+ </extension>
+ </extensions>
</build>
</project>
diff --git a/ms/controllerblueprints/modules/blueprint-validation/pom.xml b/ms/controllerblueprints/modules/blueprint-validation/pom.xml
index 04c751127..5bc2e2a6b 100644
--- a/ms/controllerblueprints/modules/blueprint-validation/pom.xml
+++ b/ms/controllerblueprints/modules/blueprint-validation/pom.xml
@@ -18,12 +18,15 @@
-->
<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.controllerblueprints</groupId>
<artifactId>modules</artifactId>
<version>0.7.0-SNAPSHOT</version>
</parent>
+
<artifactId>blueprint-validation</artifactId>
+
<name>Controller Blueprints Validation Service</name>
<dependencies>
@@ -44,7 +47,6 @@
<artifactId>resource-dict</artifactId>
</dependency>
-
<!--Testing dependencies-->
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
diff --git a/ms/controllerblueprints/modules/pom.xml b/ms/controllerblueprints/modules/pom.xml
index 6cb4ea80a..028e28bf0 100644
--- a/ms/controllerblueprints/modules/pom.xml
+++ b/ms/controllerblueprints/modules/pom.xml
@@ -17,16 +17,19 @@
-->
<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.controllerblueprints</groupId>
<artifactId>parent</artifactId>
<version>0.7.0-SNAPSHOT</version>
<relativePath>../parent</relativePath>
</parent>
+
<artifactId>modules</artifactId>
- <name>Controller Blueprints Modules</name>
<packaging>pom</packaging>
+ <name>Controller Blueprints Modules</name>
+
<modules>
<module>blueprint-core</module>
<module>resource-dict</module>
@@ -85,5 +88,4 @@
</plugin>
</plugins>
</build>
-
</project>
diff --git a/ms/controllerblueprints/modules/resource-dict/pom.xml b/ms/controllerblueprints/modules/resource-dict/pom.xml
index 4ee4f91a0..b6803d4be 100644
--- a/ms/controllerblueprints/modules/resource-dict/pom.xml
+++ b/ms/controllerblueprints/modules/resource-dict/pom.xml
@@ -18,12 +18,15 @@
-->
<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.controllerblueprints</groupId>
<artifactId>modules</artifactId>
<version>0.7.0-SNAPSHOT</version>
</parent>
+
<artifactId>resource-dict</artifactId>
+
<name>Controller Blueprints Resource Dictionary</name>
<dependencies>
@@ -37,6 +40,4 @@
<scope>test</scope>
</dependency>
</dependencies>
-
-
</project>
diff --git a/ms/controllerblueprints/parent/pom.xml b/ms/controllerblueprints/parent/pom.xml
index 86a721149..c5e01a6b6 100644
--- a/ms/controllerblueprints/parent/pom.xml
+++ b/ms/controllerblueprints/parent/pom.xml
@@ -18,26 +18,37 @@
-->
<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</groupId>
<artifactId>controllerblueprints</artifactId>
<version>0.7.0-SNAPSHOT</version>
</parent>
+
<groupId>org.onap.ccsdk.cds.controllerblueprints</groupId>
<artifactId>parent</artifactId>
- <name>Controller Blueprints Parent</name>
<packaging>pom</packaging>
+
+ <name>Controller Blueprints Parent</name>
+
<properties>
<eelf.version>1.0.0</eelf.version>
<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>
<dependencies>
<!-- Spring boot -->
@@ -82,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>
@@ -109,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>
@@ -214,7 +230,6 @@
<version>${h2database.version}</version>
</dependency>
-
<!-- Application Components -->
<dependency>
<groupId>org.onap.ccsdk.cds.controllerblueprints</groupId>
@@ -265,7 +280,6 @@
</dependency>
</dependencies>
</dependencyManagement>
-
<dependencies>
<dependency>
<groupId>org.apache.commons</groupId>
@@ -290,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>
@@ -367,8 +385,8 @@
</plugin>
<plugin>
- <artifactId>kotlin-maven-plugin</artifactId>
<groupId>org.jetbrains.kotlin</groupId>
+ <artifactId>kotlin-maven-plugin</artifactId>
<version>${kotlin.maven.version}</version>
<executions>
<execution>
diff --git a/ms/controllerblueprints/pom.xml b/ms/controllerblueprints/pom.xml
index 8abb36e67..611741a88 100644
--- a/ms/controllerblueprints/pom.xml
+++ b/ms/controllerblueprints/pom.xml
@@ -14,17 +14,27 @@
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
-<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/maven-v4_0_0.xsd">
+<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</groupId>
<artifactId>ms</artifactId>
<version>0.7.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
- <modelVersion>4.0.0</modelVersion>
+
<artifactId>controllerblueprints</artifactId>
- <name>Controller Blueprints Root</name>
<version>0.7.0-SNAPSHOT</version>
+ <packaging>pom</packaging>
+
+ <name>Controller Blueprints Root</name>
+
+ <modules>
+ <module>parent</module>
+ <module>modules</module>
+ </modules>
+
<properties>
<service.name>ControllerBlueprints</service.name>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -36,9 +46,4 @@
<maven.compiler.source>1.8</maven.compiler.source>
<ccsdk.project.version>${project.version}</ccsdk.project.version>
</properties>
- <packaging>pom</packaging>
- <modules>
- <module>parent</module>
- <module>modules</module>
- </modules>
</project>
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