summaryrefslogtreecommitdiffstats
path: root/ms/controllerblueprints
diff options
context:
space:
mode:
Diffstat (limited to 'ms/controllerblueprints')
-rw-r--r--ms/controllerblueprints/modules/blueprint-core/pom.xml4
-rw-r--r--ms/controllerblueprints/modules/blueprint-proto/pom.xml24
-rw-r--r--ms/controllerblueprints/modules/blueprint-validation/pom.xml3
-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.xml10
-rw-r--r--ms/controllerblueprints/pom.xml21
7 files changed, 45 insertions, 28 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..eb4dd9f78 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>
@@ -89,8 +82,8 @@
</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>
@@ -109,5 +102,12 @@
</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..40fff14d4 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>
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..62f300c0a 100644
--- a/ms/controllerblueprints/parent/pom.xml
+++ b/ms/controllerblueprints/parent/pom.xml
@@ -18,15 +18,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</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>
@@ -38,6 +42,7 @@
<jinja.version>2.5.1</jinja.version>
<velocity.version>1.7</velocity.version>
</properties>
+
<dependencyManagement>
<dependencies>
<!-- Spring boot -->
@@ -265,7 +270,6 @@
</dependency>
</dependencies>
</dependencyManagement>
-
<dependencies>
<dependency>
<groupId>org.apache.commons</groupId>
@@ -367,8 +371,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>