aboutsummaryrefslogtreecommitdiffstats
path: root/ms/controllerblueprints/modules
diff options
context:
space:
mode:
Diffstat (limited to 'ms/controllerblueprints/modules')
-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
5 files changed, 41 insertions, 32 deletions
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>