diff options
| author |   SINGAL, KAPIL (ks220y) <ks220y@att.com> | 2019-09-17 16:36:59 +0000 |
|---|---|---|
| committer |   Brinda Santh Muthuramalingam <brindasanth@in.ibm.com> | 2019-09-17 17:01:40 +0000 |
| commit | 24f39fda67bec6f622c25effcd2a1626efae772a (patch) | |
| tree | 44a81cd9a479c2d01535a609775e8c9122828934 | |
| parent | fdc1a2b71f8fa2c8071310d38116d608c0466f6b (diff) | |
Plugin to format/validate POM
Adding tidy-maven-plugin and related profile to format/vaidate pom files
To format POM Files just run mvn process-sources -P format
Issue-ID: CCSDK-1739
Signed-off-by: SINGAL, KAPIL (ks220y) <ks220y@att.com>
Change-Id: I58dc261ac7b3179a91a0ab5a06237990707543f5
49 files changed, 253 insertions, 123 deletions
diff --git a/cds-ui/application/pom.xml b/cds-ui/application/pom.xml index 87cb4f282..de8827f4a 100644 --- a/cds-ui/application/pom.xml +++ b/cds-ui/application/pom.xml @@ -111,5 +111,4 @@ limitations under the License. </build> </profile> </profiles> - </project> diff --git a/cds-ui/client/pom.xml b/cds-ui/client/pom.xml index f25e78228..4217ac5c9 100644 --- a/cds-ui/client/pom.xml +++ b/cds-ui/client/pom.xml @@ -40,7 +40,6 @@ limitations under the License. <onap.nexus.url>https://nexus.onap.org</onap.nexus.url> </properties> - <build> <plugins> <plugin> diff --git a/cds-ui/pom.xml b/cds-ui/pom.xml index de2be3542..34a72bdf5 100644 --- a/cds-ui/pom.xml +++ b/cds-ui/pom.xml @@ -36,6 +36,12 @@ limitations under the License. <name>cds-ui-parent</name> <description>Creates Controller Design Studio UI Docker container</description> + <modules> + <module>client</module> + <module>server</module> + <module>application</module> + </modules> + <properties> <image.name>onap/ccsdk-cds-ui</image.name> <ccsdk.project.version>${project.version}</ccsdk.project.version> @@ -44,11 +50,4 @@ limitations under the License. <maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format> <docker.verbose>true</docker.verbose> </properties> - - <modules> - <module>client</module> - <module>server</module> - <module>application</module> - </modules> - </project> diff --git a/cds-ui/server/pom.xml b/cds-ui/server/pom.xml index 2d6d6465b..dedf129ab 100644 --- a/cds-ui/server/pom.xml +++ b/cds-ui/server/pom.xml @@ -42,7 +42,6 @@ limitations under the License. <docker.push.phase>deploy</docker.push.phase> </properties> - <build> <plugins> <plugin> @@ -139,8 +138,8 @@ limitations under the License. </plugin> </plugins> </build> - - <profiles> + + <profiles> <profile> <id>docker</id> <build> diff --git a/ms/blueprintsprocessor/application/pom.xml b/ms/blueprintsprocessor/application/pom.xml index a67b10d4a..90e9f501b 100755 --- a/ms/blueprintsprocessor/application/pom.xml +++ b/ms/blueprintsprocessor/application/pom.xml @@ -19,14 +19,17 @@ --> <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.blueprintsprocessor</groupId> <artifactId>parent</artifactId> <version>0.7.0-SNAPSHOT</version> <relativePath>../parent</relativePath> </parent> + <artifactId>application</artifactId> <packaging>jar</packaging> + <name>Blueprints Processor Application</name> <description>Blueprints Processor Application</description> @@ -147,6 +150,7 @@ <artifactId>logback-classic</artifactId> </dependency> </dependencies> + <build> <resources> <resource> diff --git a/ms/blueprintsprocessor/cba-parent/pom.xml b/ms/blueprintsprocessor/cba-parent/pom.xml index a1b6beff4..5bdf59579 100644 --- a/ms/blueprintsprocessor/cba-parent/pom.xml +++ b/ms/blueprintsprocessor/cba-parent/pom.xml @@ -16,16 +16,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.blueprintsprocessor</groupId> <artifactId>parent</artifactId> <version>0.7.0-SNAPSHOT</version> <relativePath>../parent</relativePath> </parent> + <artifactId>cba-parent</artifactId> - <name>CBA Parent</name> <packaging>pom</packaging> + <name>CBA Parent</name> + <build> <sourceDirectory>${project.basedir}/Scripts/kotlin</sourceDirectory> <testSourceDirectory>${project.basedir}/Tests/kotlin</testSourceDirectory> diff --git a/ms/blueprintsprocessor/distribution/pom.xml b/ms/blueprintsprocessor/distribution/pom.xml index 4037c98e6..884d76a66 100755 --- a/ms/blueprintsprocessor/distribution/pom.xml +++ b/ms/blueprintsprocessor/distribution/pom.xml @@ -16,15 +16,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.blueprintsprocessor</groupId> <artifactId>parent</artifactId> <version>0.7.0-SNAPSHOT</version> <relativePath>../parent</relativePath> </parent> + <artifactId>distribution</artifactId> <packaging>pom</packaging> + <name>Blueprints Processor Distribution</name> + <properties> <assembly.id>maven</assembly.id> <name.space>org.onap.ccsdk.cds</name.space> @@ -43,6 +47,7 @@ <artifactId>application</artifactId> </dependency> </dependencies> + <build> <plugins> <plugin> @@ -88,8 +93,7 @@ </execution> </executions> </plugin> - <plugin> - <!--build the final artifact for docker deployment --> + <plugin><!--build the final artifact for docker deployment --> <artifactId>maven-assembly-plugin</artifactId> <version>3.1.0</version> <configuration> diff --git a/ms/blueprintsprocessor/functions/ansible-awx-executor/pom.xml b/ms/blueprintsprocessor/functions/ansible-awx-executor/pom.xml index 9613030cd..d40ae210f 100644 --- a/ms/blueprintsprocessor/functions/ansible-awx-executor/pom.xml +++ b/ms/blueprintsprocessor/functions/ansible-awx-executor/pom.xml @@ -15,16 +15,18 @@ ~ 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"> + <modelVersion>4.0.0</modelVersion> + <parent> - <artifactId>functions</artifactId> <groupId>org.onap.ccsdk.cds.blueprintsprocessor</groupId> + <artifactId>functions</artifactId> <version>0.7.0-SNAPSHOT</version> </parent> - <modelVersion>4.0.0</modelVersion> <groupId>org.onap.ccsdk.cds.blueprintsprocessor.functions</groupId> <artifactId>ansible-awx-executor</artifactId> <version>0.7.0-SNAPSHOT</version> + <name>Blueprints Processor Function - Ansible AWX Executor</name> <description>Blueprints Processor Function - Ansible Executor</description> @@ -51,5 +53,4 @@ <version>${apache.httpcomponents.client.version}</version> </dependency> </dependencies> - </project> diff --git a/ms/blueprintsprocessor/functions/cli-executor/pom.xml b/ms/blueprintsprocessor/functions/cli-executor/pom.xml index b45fdb3f8..07efd551c 100644 --- a/ms/blueprintsprocessor/functions/cli-executor/pom.xml +++ b/ms/blueprintsprocessor/functions/cli-executor/pom.xml @@ -15,15 +15,18 @@ ~ 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"> + <modelVersion>4.0.0</modelVersion> + <parent> - <artifactId>functions</artifactId> <groupId>org.onap.ccsdk.cds.blueprintsprocessor</groupId> + <artifactId>functions</artifactId> <version>0.7.0-SNAPSHOT</version> </parent> - <modelVersion>4.0.0</modelVersion> + <groupId>org.onap.ccsdk.cds.blueprintsprocessor.functions</groupId> <artifactId>cli-executor</artifactId> <version>0.7.0-SNAPSHOT</version> + <name>Blueprints Processor Function - CLI Executor</name> <description>Blueprints Processor Function - CLI Executor</description> @@ -37,6 +40,4 @@ <artifactId>ssh-lib</artifactId> </dependency> </dependencies> - - </project> diff --git a/ms/blueprintsprocessor/functions/config-snapshots/pom.xml b/ms/blueprintsprocessor/functions/config-snapshots/pom.xml index 0ad979683..0801e6d7f 100644 --- a/ms/blueprintsprocessor/functions/config-snapshots/pom.xml +++ b/ms/blueprintsprocessor/functions/config-snapshots/pom.xml @@ -15,16 +15,18 @@ ~ 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"> + <modelVersion>4.0.0</modelVersion> + <parent> - <artifactId>functions</artifactId> <groupId>org.onap.ccsdk.cds.blueprintsprocessor</groupId> + <artifactId>functions</artifactId> <version>0.7.0-SNAPSHOT</version> </parent> - <modelVersion>4.0.0</modelVersion> <groupId>org.onap.ccsdk.cds.blueprintsprocessor.functions</groupId> <artifactId>config-snapshots</artifactId> <version>0.7.0-SNAPSHOT</version> + <name>Blueprints Processor Function - Config Snapshots</name> <description>Blueprints Processor Function - Config Snapshots</description> @@ -55,5 +57,4 @@ <scope>test</scope> </dependency> </dependencies> - </project> diff --git a/ms/blueprintsprocessor/functions/netconf-executor/pom.xml b/ms/blueprintsprocessor/functions/netconf-executor/pom.xml index a10dfba38..07415c37d 100644 --- a/ms/blueprintsprocessor/functions/netconf-executor/pom.xml +++ b/ms/blueprintsprocessor/functions/netconf-executor/pom.xml @@ -15,15 +15,18 @@ ~ 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"> + <modelVersion>4.0.0</modelVersion> + <parent> <groupId>org.onap.ccsdk.cds.blueprintsprocessor</groupId> <artifactId>functions</artifactId> <version>0.7.0-SNAPSHOT</version> </parent> - <modelVersion>4.0.0</modelVersion> + <groupId>org.onap.ccsdk.cds.blueprintsprocessor.functions</groupId> <artifactId>netconf-executor</artifactId> <version>0.7.0-SNAPSHOT</version> + <name>Blueprints Processor Function - Netconf Executor</name> <description>Blueprints Processor Function - Netconf Executor</description> diff --git a/ms/blueprintsprocessor/functions/pom.xml b/ms/blueprintsprocessor/functions/pom.xml index 73daf22a5..3ee6737ef 100755 --- a/ms/blueprintsprocessor/functions/pom.xml +++ b/ms/blueprintsprocessor/functions/pom.xml @@ -16,17 +16,21 @@ ~ 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"> + <modelVersion>4.0.0</modelVersion> + <parent> <groupId>org.onap.ccsdk.cds.blueprintsprocessor</groupId> <artifactId>parent</artifactId> <version>0.7.0-SNAPSHOT</version> <relativePath>../parent</relativePath> </parent> - <modelVersion>4.0.0</modelVersion> - <packaging>pom</packaging> + <artifactId>functions</artifactId> + <packaging>pom</packaging> + <name>Blueprints Processor Functions</name> <description>Blueprints Processor Functions</description> + <modules> <module>resource-resolution</module> <module>ansible-awx-executor</module> diff --git a/ms/blueprintsprocessor/functions/python-executor/pom.xml b/ms/blueprintsprocessor/functions/python-executor/pom.xml index 872e5a61c..5601922a7 100644 --- a/ms/blueprintsprocessor/functions/python-executor/pom.xml +++ b/ms/blueprintsprocessor/functions/python-executor/pom.xml @@ -15,15 +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"> + <modelVersion>4.0.0</modelVersion> + <parent> - <artifactId>functions</artifactId> <groupId>org.onap.ccsdk.cds.blueprintsprocessor</groupId> + <artifactId>functions</artifactId> <version>0.7.0-SNAPSHOT</version> </parent> - <modelVersion>4.0.0</modelVersion> <groupId>org.onap.ccsdk.cds.blueprintsprocessor.functions</groupId> <artifactId>python-executor</artifactId> + <name>Blueprints Processor Function - Python Executor</name> <description>Blueprints Processor Function - Python Executor</description> @@ -33,6 +35,4 @@ <artifactId>jython-standalone</artifactId> </dependency> </dependencies> - - </project> diff --git a/ms/blueprintsprocessor/functions/resource-resolution/pom.xml b/ms/blueprintsprocessor/functions/resource-resolution/pom.xml index 66210f258..e8116b1e5 100644 --- a/ms/blueprintsprocessor/functions/resource-resolution/pom.xml +++ b/ms/blueprintsprocessor/functions/resource-resolution/pom.xml @@ -16,15 +16,18 @@ --> <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.blueprintsprocessor</groupId> <artifactId>functions</artifactId> <version>0.7.0-SNAPSHOT</version> </parent> + <groupId>org.onap.ccsdk.cds.blueprintsprocessor.functions</groupId> <artifactId>resource-resolution</artifactId> <version>0.7.0-SNAPSHOT</version> <packaging>jar</packaging> + <name>Blueprints Processor Function - Resource Resolution</name> <description>Blueprints Processor Function - Resource Resolution</description> @@ -61,5 +64,4 @@ <scope>test</scope> </dependency> </dependencies> - </project> diff --git a/ms/blueprintsprocessor/functions/restconf-executor/pom.xml b/ms/blueprintsprocessor/functions/restconf-executor/pom.xml index 2872a5a8f..8e75597c2 100644 --- a/ms/blueprintsprocessor/functions/restconf-executor/pom.xml +++ b/ms/blueprintsprocessor/functions/restconf-executor/pom.xml @@ -15,15 +15,18 @@ ~ 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"> + <modelVersion>4.0.0</modelVersion> + <parent> - <artifactId>functions</artifactId> <groupId>org.onap.ccsdk.cds.blueprintsprocessor</groupId> + <artifactId>functions</artifactId> <version>0.7.0-SNAPSHOT</version> </parent> - <modelVersion>4.0.0</modelVersion> + <groupId>org.onap.ccsdk.cds.blueprintsprocessor.functions</groupId> <artifactId>restconf-executor</artifactId> <version>0.7.0-SNAPSHOT</version> + <name>Blueprints Processor Function - Restconf Executor</name> <description>Blueprints Processor Function - Restconf Executor</description> @@ -38,6 +41,4 @@ <scope>test</scope> </dependency> </dependencies> - - </project> diff --git a/ms/blueprintsprocessor/modules/commons/db-lib/pom.xml b/ms/blueprintsprocessor/modules/commons/db-lib/pom.xml index 67b84240c..f444fde66 100644 --- a/ms/blueprintsprocessor/modules/commons/db-lib/pom.xml +++ b/ms/blueprintsprocessor/modules/commons/db-lib/pom.xml @@ -17,6 +17,7 @@ --> <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.blueprintsprocessor</groupId> <artifactId>commons</artifactId> @@ -25,6 +26,7 @@ <artifactId>db-lib</artifactId> <packaging>jar</packaging> + <name>Blueprints Processor DB Lib</name> <description>Blueprints Processor DB Lib</description> @@ -69,5 +71,4 @@ <scope>test</scope> </dependency> </dependencies> - </project> diff --git a/ms/blueprintsprocessor/modules/commons/dmaap-lib/pom.xml b/ms/blueprintsprocessor/modules/commons/dmaap-lib/pom.xml index 3ed0424ee..454962091 100644 --- a/ms/blueprintsprocessor/modules/commons/dmaap-lib/pom.xml +++ b/ms/blueprintsprocessor/modules/commons/dmaap-lib/pom.xml @@ -20,6 +20,7 @@ --> <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.blueprintsprocessor</groupId> <artifactId>commons</artifactId> @@ -28,10 +29,10 @@ <artifactId>dmaap-lib</artifactId> <packaging>jar</packaging> + <name>Blueprints Processor Dmaap Lib</name> <description>Blueprints Processor Dmaap Lib</description> - <dependencies> <dependency> <groupId>org.onap.dmaap.messagerouter.dmaapclient</groupId> @@ -79,5 +80,4 @@ <artifactId>processor-core</artifactId> </dependency> </dependencies> - </project> diff --git a/ms/blueprintsprocessor/modules/commons/grpc-lib/pom.xml b/ms/blueprintsprocessor/modules/commons/grpc-lib/pom.xml index 5cc29a65e..5945e29fd 100644 --- a/ms/blueprintsprocessor/modules/commons/grpc-lib/pom.xml +++ b/ms/blueprintsprocessor/modules/commons/grpc-lib/pom.xml @@ -15,15 +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"> + <modelVersion>4.0.0</modelVersion> + <parent> - <artifactId>commons</artifactId> <groupId>org.onap.ccsdk.cds.blueprintsprocessor</groupId> + <artifactId>commons</artifactId> <version>0.7.0-SNAPSHOT</version> </parent> - <modelVersion>4.0.0</modelVersion> <artifactId>grpc-lib</artifactId> <packaging>jar</packaging> + <name>Blueprints Processor GRPC Lib</name> <description>Blueprints Processor GRPC Lib</description> @@ -41,5 +43,4 @@ <artifactId>processor-core</artifactId> </dependency> </dependencies> - </project> diff --git a/ms/blueprintsprocessor/modules/commons/message-lib/pom.xml b/ms/blueprintsprocessor/modules/commons/message-lib/pom.xml index b5b8c46a3..f92a8f45a 100644 --- a/ms/blueprintsprocessor/modules/commons/message-lib/pom.xml +++ b/ms/blueprintsprocessor/modules/commons/message-lib/pom.xml @@ -15,16 +15,19 @@ ~ 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"> + <modelVersion>4.0.0</modelVersion> + <parent> - <artifactId>commons</artifactId> <groupId>org.onap.ccsdk.cds.blueprintsprocessor</groupId> + <artifactId>commons</artifactId> <version>0.7.0-SNAPSHOT</version> </parent> - <modelVersion>4.0.0</modelVersion> <artifactId>message-lib</artifactId> + <name>Blueprints Processor Messaging Lib</name> <description>Blueprints Processor Messaging Lib</description> + <dependencies> <dependency> <groupId>org.onap.ccsdk.cds.controllerblueprints</groupId> diff --git a/ms/blueprintsprocessor/modules/commons/pom.xml b/ms/blueprintsprocessor/modules/commons/pom.xml index 37dd5d77e..33255ac46 100755 --- a/ms/blueprintsprocessor/modules/commons/pom.xml +++ b/ms/blueprintsprocessor/modules/commons/pom.xml @@ -19,6 +19,7 @@ --> <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.blueprintsprocessor</groupId> <artifactId>modules</artifactId> @@ -27,6 +28,7 @@ <artifactId>commons</artifactId> <packaging>pom</packaging> + <name>Blueprints Processor Commons POM</name> <description>Blueprints Processor Commons</description> @@ -39,6 +41,7 @@ <module>message-lib</module> <module>ssh-lib</module> </modules> + <dependencies> <dependency> <groupId>org.onap.ccsdk.cds.controllerblueprints</groupId> @@ -76,5 +79,4 @@ <scope>test</scope> </dependency> </dependencies> - </project> diff --git a/ms/blueprintsprocessor/modules/commons/processor-core/pom.xml b/ms/blueprintsprocessor/modules/commons/processor-core/pom.xml index 673d1277c..0bc88449f 100644 --- a/ms/blueprintsprocessor/modules/commons/processor-core/pom.xml +++ b/ms/blueprintsprocessor/modules/commons/processor-core/pom.xml @@ -18,6 +18,7 @@ --> <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.blueprintsprocessor</groupId> <artifactId>commons</artifactId> @@ -26,8 +27,10 @@ <artifactId>processor-core</artifactId> <packaging>jar</packaging> + <name>Blueprints Processor Core</name> <description>Blueprints Processor Core</description> + <dependencies> <dependency> <groupId>org.springframework.boot</groupId> diff --git a/ms/blueprintsprocessor/modules/commons/rest-lib/pom.xml b/ms/blueprintsprocessor/modules/commons/rest-lib/pom.xml index 7c6cceb23..a7d49c5ed 100644 --- a/ms/blueprintsprocessor/modules/commons/rest-lib/pom.xml +++ b/ms/blueprintsprocessor/modules/commons/rest-lib/pom.xml @@ -18,6 +18,7 @@ --> <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.blueprintsprocessor</groupId> <artifactId>commons</artifactId> @@ -26,8 +27,10 @@ <artifactId>rest-lib</artifactId> <packaging>jar</packaging> + <name>Blueprints Processor Rest Lib</name> <description>Blueprints Processor Rest Lib</description> + <dependencies> <dependency> <groupId>org.onap.ccsdk.cds.controllerblueprints</groupId> @@ -61,5 +64,4 @@ <scope>test</scope> </dependency> </dependencies> - </project> diff --git a/ms/blueprintsprocessor/modules/commons/ssh-lib/pom.xml b/ms/blueprintsprocessor/modules/commons/ssh-lib/pom.xml index ff09b83f3..0e6a0bf1f 100644 --- a/ms/blueprintsprocessor/modules/commons/ssh-lib/pom.xml +++ b/ms/blueprintsprocessor/modules/commons/ssh-lib/pom.xml @@ -15,17 +15,20 @@ ~ 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"> + <modelVersion>4.0.0</modelVersion> + <parent> - <artifactId>commons</artifactId> <groupId>org.onap.ccsdk.cds.blueprintsprocessor</groupId> + <artifactId>commons</artifactId> <version>0.7.0-SNAPSHOT</version> </parent> - <modelVersion>4.0.0</modelVersion> <artifactId>ssh-lib</artifactId> <packaging>jar</packaging> + <name>Blueprints Processor SSH Lib</name> <description>Blueprints Processor SSH Lib</description> + <dependencies> <dependency> <groupId>org.onap.ccsdk.cds.controllerblueprints</groupId> diff --git a/ms/blueprintsprocessor/modules/inbounds/configs-api/pom.xml b/ms/blueprintsprocessor/modules/inbounds/configs-api/pom.xml index d4d030772..2cf5f5f57 100644 --- a/ms/blueprintsprocessor/modules/inbounds/configs-api/pom.xml +++ b/ms/blueprintsprocessor/modules/inbounds/configs-api/pom.xml @@ -16,14 +16,17 @@ --> <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.blueprintsprocessor</groupId> <artifactId>inbounds</artifactId> <version>0.7.0-SNAPSHOT</version> </parent> + <artifactId>configs-api</artifactId> <version>0.7.0-SNAPSHOT</version> <packaging>jar</packaging> + <name>Blueprints Processor Resource Configurations API</name> <description>Blueprints Processor Resource Configurations API</description> diff --git a/ms/blueprintsprocessor/modules/inbounds/designer-api/pom.xml b/ms/blueprintsprocessor/modules/inbounds/designer-api/pom.xml index 12cb8ae71..303168d74 100644 --- a/ms/blueprintsprocessor/modules/inbounds/designer-api/pom.xml +++ b/ms/blueprintsprocessor/modules/inbounds/designer-api/pom.xml @@ -15,15 +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"> + <modelVersion>4.0.0</modelVersion> + <parent> - <artifactId>inbounds</artifactId> <groupId>org.onap.ccsdk.cds.blueprintsprocessor</groupId> + <artifactId>inbounds</artifactId> <version>0.7.0-SNAPSHOT</version> </parent> - <modelVersion>4.0.0</modelVersion> + <artifactId>designer-api</artifactId> <packaging>jar</packaging> + <name>Blueprints Processor Designer API</name> <description>Blueprints Processor Designer API</description> - </project> diff --git a/ms/blueprintsprocessor/modules/inbounds/health-api/pom.xml b/ms/blueprintsprocessor/modules/inbounds/health-api/pom.xml index 6037804af..9d50e13d4 100644 --- a/ms/blueprintsprocessor/modules/inbounds/health-api/pom.xml +++ b/ms/blueprintsprocessor/modules/inbounds/health-api/pom.xml @@ -15,17 +15,18 @@ ~ 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 https://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> - <artifactId>inbounds</artifactId> <groupId>org.onap.ccsdk.cds.blueprintsprocessor</groupId> + <artifactId>inbounds</artifactId> <version>0.7.0-SNAPSHOT</version> </parent> - <artifactId>health-api</artifactId> + <artifactId>health-api</artifactId> <packaging>jar</packaging> + <name>Blueprints Processor Health API</name> <description>checking system check health endpoints</description> diff --git a/ms/blueprintsprocessor/modules/inbounds/pom.xml b/ms/blueprintsprocessor/modules/inbounds/pom.xml index a1d716110..1729f2ff1 100644 --- a/ms/blueprintsprocessor/modules/inbounds/pom.xml +++ b/ms/blueprintsprocessor/modules/inbounds/pom.xml @@ -17,6 +17,7 @@ --> <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.blueprintsprocessor</groupId> <artifactId>modules</artifactId> @@ -25,6 +26,7 @@ <artifactId>inbounds</artifactId> <packaging>pom</packaging> + <name>Blueprints Processor Inbounds POM</name> <description>Blueprints Processor Inbounds</description> @@ -35,6 +37,7 @@ <module>selfservice-api</module> <module>health-api</module> </modules> + <dependencies> <dependency> <groupId>org.springframework.security</groupId> diff --git a/ms/blueprintsprocessor/modules/inbounds/resource-api/pom.xml b/ms/blueprintsprocessor/modules/inbounds/resource-api/pom.xml index da233b882..32324bf6d 100644 --- a/ms/blueprintsprocessor/modules/inbounds/resource-api/pom.xml +++ b/ms/blueprintsprocessor/modules/inbounds/resource-api/pom.xml @@ -16,6 +16,7 @@ --> <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.blueprintsprocessor</groupId> <artifactId>inbounds</artifactId> @@ -24,6 +25,7 @@ <artifactId>resource-api</artifactId> <packaging>jar</packaging> + <name>Blueprints Processor Resource API</name> <description>Blueprints Processor Resource API</description> diff --git a/ms/blueprintsprocessor/modules/inbounds/selfservice-api/pom.xml b/ms/blueprintsprocessor/modules/inbounds/selfservice-api/pom.xml index b5cac581a..1a9b5fc80 100755 --- a/ms/blueprintsprocessor/modules/inbounds/selfservice-api/pom.xml +++ b/ms/blueprintsprocessor/modules/inbounds/selfservice-api/pom.xml @@ -19,6 +19,7 @@ --> <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.blueprintsprocessor</groupId> <artifactId>inbounds</artifactId> @@ -27,6 +28,7 @@ <artifactId>selfservice-api</artifactId> <packaging>jar</packaging> + <name>Blueprints Processor Selfservice API</name> <description>Blueprints Processor Selfservice API</description> diff --git a/ms/blueprintsprocessor/modules/outbounds/pom.xml b/ms/blueprintsprocessor/modules/outbounds/pom.xml index 34eba8366..81a5a3eb1 100644 --- a/ms/blueprintsprocessor/modules/outbounds/pom.xml +++ b/ms/blueprintsprocessor/modules/outbounds/pom.xml @@ -16,6 +16,7 @@ --> <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.blueprintsprocessor</groupId> <artifactId>modules</artifactId> @@ -24,7 +25,7 @@ <artifactId>outbounds</artifactId> <packaging>pom</packaging> + <name>Blueprints Processor Outbounds POM</name> <description>Blueprints Processor Outbounds</description> - </project> diff --git a/ms/blueprintsprocessor/modules/pom.xml b/ms/blueprintsprocessor/modules/pom.xml index ea39e2aa9..87dfb5652 100644 --- a/ms/blueprintsprocessor/modules/pom.xml +++ b/ms/blueprintsprocessor/modules/pom.xml @@ -18,6 +18,7 @@ --> <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.blueprintsprocessor</groupId> <artifactId>parent</artifactId> @@ -27,6 +28,7 @@ <artifactId>modules</artifactId> <packaging>pom</packaging> + <name>Blueprints Processor Modules</name> <description>Blueprints Processor Modules</description> @@ -36,6 +38,7 @@ <module>services</module> <module>inbounds</module> </modules> + <build> <plugins> <plugin> @@ -64,6 +67,4 @@ </plugin> </plugins> </build> - - </project> diff --git a/ms/blueprintsprocessor/modules/services/execution-service/pom.xml b/ms/blueprintsprocessor/modules/services/execution-service/pom.xml index 784906b4e..8bee7c91c 100644 --- a/ms/blueprintsprocessor/modules/services/execution-service/pom.xml +++ b/ms/blueprintsprocessor/modules/services/execution-service/pom.xml @@ -17,6 +17,7 @@ --> <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.blueprintsprocessor</groupId> <artifactId>services</artifactId> @@ -25,6 +26,7 @@ <artifactId>execution-service</artifactId> <packaging>jar</packaging> + <name>Blueprints Processor Execution Service</name> <description>Blueprints Processor Execution Service</description> diff --git a/ms/blueprintsprocessor/modules/services/pom.xml b/ms/blueprintsprocessor/modules/services/pom.xml index 0a5f9b63f..8976701c4 100755 --- a/ms/blueprintsprocessor/modules/services/pom.xml +++ b/ms/blueprintsprocessor/modules/services/pom.xml @@ -19,6 +19,7 @@ --> <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.blueprintsprocessor</groupId> <artifactId>modules</artifactId> @@ -26,9 +27,10 @@ </parent> <artifactId>services</artifactId> + <packaging>pom</packaging> + <name>Blueprints Processor Service POM</name> <description>Blueprints Processor Service</description> - <packaging>pom</packaging> <modules> <module>execution-service</module> diff --git a/ms/blueprintsprocessor/modules/services/workflow-service/pom.xml b/ms/blueprintsprocessor/modules/services/workflow-service/pom.xml index c3effa5d3..fe7dde994 100644 --- a/ms/blueprintsprocessor/modules/services/workflow-service/pom.xml +++ b/ms/blueprintsprocessor/modules/services/workflow-service/pom.xml @@ -16,14 +16,16 @@ ~ 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"> + <modelVersion>4.0.0</modelVersion> + <parent> <groupId>org.onap.ccsdk.cds.blueprintsprocessor</groupId> <artifactId>services</artifactId> <version>0.7.0-SNAPSHOT</version> </parent> - <modelVersion>4.0.0</modelVersion> <artifactId>workflow-service</artifactId> + <name>Blueprints Processor Workflow Service</name> <description>Blueprints Processor Workflow Service</description> @@ -41,6 +43,4 @@ <artifactId>sli-provider</artifactId> </dependency> </dependencies> - - </project> diff --git a/ms/blueprintsprocessor/parent/pom.xml b/ms/blueprintsprocessor/parent/pom.xml index cd4056485..726ba55c5 100755 --- a/ms/blueprintsprocessor/parent/pom.xml +++ b/ms/blueprintsprocessor/parent/pom.xml @@ -16,16 +16,20 @@ --> <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>blueprintsprocessor</artifactId> <version>0.7.0-SNAPSHOT</version> </parent> + <groupId>org.onap.ccsdk.cds.blueprintsprocessor</groupId> <artifactId>parent</artifactId> <packaging>pom</packaging> + <name>Blueprints Processor Parent</name> <description>Blueprints Processor Parent</description> + <properties> <sshd.version>2.2.0</sshd.version> <jsch.version>0.1.55</jsch.version> @@ -50,6 +54,7 @@ <xmlunit.version>2.6.3</xmlunit.version> <json-patch.version>1.9</json-patch.version> </properties> + <dependencyManagement> <dependencies> <!-- Spring Boot --> @@ -534,7 +539,6 @@ </dependencies> </dependencyManagement> - <dependencies> <dependency> <groupId>org.apache.commons</groupId> diff --git a/ms/blueprintsprocessor/pom.xml b/ms/blueprintsprocessor/pom.xml index 7714d856e..888f2a11c 100755 --- a/ms/blueprintsprocessor/pom.xml +++ b/ms/blueprintsprocessor/pom.xml @@ -17,17 +17,29 @@ --> <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> + <artifactId>blueprintsprocessor</artifactId> <packaging>pom</packaging> + <name>Blueprints Processor Root</name> <description>Blueprints Processor Root</description> + <modules> + <module>parent</module> + <module>cba-parent</module> + <module>modules</module> + <module>functions</module> + <module>application</module> + <module>distribution</module> + </modules> + <properties> <service.name>BlueprintsProcessor</service.name> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> @@ -39,14 +51,4 @@ <maven.compiler.source>1.8</maven.compiler.source> <ccsdk.project.version>${project.version}</ccsdk.project.version> </properties> - - <modules> - <module>parent</module> - <module>cba-parent</module> - <module>modules</module> - <module>functions</module> - <module>application</module> - <module>distribution</module> - </modules> - </project> diff --git a/ms/command-executor/pom.xml b/ms/command-executor/pom.xml index 5861912ca..0db7af92b 100755 --- a/ms/command-executor/pom.xml +++ b/ms/command-executor/pom.xml @@ -16,14 +16,17 @@ --> <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> + <artifactId>command-executor</artifactId> <packaging>pom</packaging> + <name>Command Executor</name> <description>Micro-service providing python environment with gRPC binding for command execution</description> 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> diff --git a/ms/sdclistener/application/pom.xml b/ms/sdclistener/application/pom.xml index 7b12e14ea..d1048acfd 100644 --- a/ms/sdclistener/application/pom.xml +++ b/ms/sdclistener/application/pom.xml @@ -16,6 +16,7 @@ --> <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.sdclistener</groupId> <artifactId>parent</artifactId> @@ -24,8 +25,9 @@ </parent> <artifactId>application</artifactId> - <packaging>jar</packaging> <version>0.7.0-SNAPSHOT</version> + <packaging>jar</packaging> + <name>SDC Listener Application</name> <properties> diff --git a/ms/sdclistener/distribution/pom.xml b/ms/sdclistener/distribution/pom.xml index 8f0120fa5..ca6947841 100755 --- a/ms/sdclistener/distribution/pom.xml +++ b/ms/sdclistener/distribution/pom.xml @@ -16,15 +16,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.sdclistener</groupId> <artifactId>parent</artifactId> <version>0.7.0-SNAPSHOT</version> <relativePath>../parent</relativePath> </parent> + <artifactId>distribution</artifactId> <packaging>pom</packaging> + <name>SDC Listener Distribution</name> + <properties> <assembly.id>maven</assembly.id> <name.space>org.onap.ccsdk.cds</name.space> @@ -44,6 +48,7 @@ <artifactId>application</artifactId> </dependency> </dependencies> + <build> <plugins> <plugin> @@ -89,8 +94,7 @@ </execution> </executions> </plugin> - <plugin> - <!--build the final artifact for docker deployment --> + <plugin><!--build the final artifact for docker deployment --> <artifactId>maven-assembly-plugin</artifactId> <version>3.1.0</version> <configuration> diff --git a/ms/sdclistener/parent/pom.xml b/ms/sdclistener/parent/pom.xml index 05bfdeff4..850dfa43f 100755 --- a/ms/sdclistener/parent/pom.xml +++ b/ms/sdclistener/parent/pom.xml @@ -16,19 +16,22 @@ ~ 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/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</groupId> <artifactId>sdclistener</artifactId> <version>0.7.0-SNAPSHOT</version> </parent> + <groupId>org.onap.ccsdk.cds.sdclistener</groupId> <artifactId>parent</artifactId> <packaging>pom</packaging> + <name>SDC Listener Parent</name> <description>SDC Listener Parent</description> + <properties> <spring.boot.version>2.1.3.RELEASE</spring.boot.version> <spring.version>5.1.5.RELEASE</spring.version> @@ -45,6 +48,7 @@ <jmockit.version>1.19</jmockit.version> <reactorcore.version>3.2.6.RELEASE</reactorcore.version> </properties> + <dependencyManagement> <dependencies> <!-- Spring Boot --> diff --git a/ms/sdclistener/pom.xml b/ms/sdclistener/pom.xml index 42c6a1acd..6439e31ab 100644 --- a/ms/sdclistener/pom.xml +++ b/ms/sdclistener/pom.xml @@ -16,6 +16,7 @@ --> <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> @@ -24,9 +25,16 @@ </parent> <artifactId>sdclistener</artifactId> + <packaging>pom</packaging> + <name>SDC Listener Root</name> <description>SDC Listener Root</description> - <packaging>pom</packaging> + + <modules> + <module>parent</module> + <module>application</module> + <module>distribution</module> + </modules> <properties> <service.name>sdclistener</service.name> @@ -39,11 +47,4 @@ <maven.compiler.source>1.8</maven.compiler.source> <ccsdk.project.version>${project.version}</ccsdk.project.version> </properties> - - <modules> - <module>parent</module> - <module>application</module> - <module>distribution</module> - </modules> - </project> @@ -16,6 +16,7 @@ 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/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.onap.ccsdk.parent</groupId> @@ -24,8 +25,6 @@ limitations under the License. <relativePath/> </parent> - <modelVersion>4.0.0</modelVersion> - <groupId>org.onap.ccsdk.cds</groupId> <artifactId>parent</artifactId> <version>0.7.0-SNAPSHOT</version> @@ -33,17 +32,16 @@ limitations under the License. <name>cds-parent</name> <description>CCSDK Controller Design Studio</description> + <url>https://wiki.onap.org</url> + <organization> + <name>ONAP</name> + </organization> <modules> <module>cds-ui</module> <module>ms</module> </modules> - <url>https://wiki.onap.org</url> - <organization> - <name>ONAP</name> - </organization> - <properties> <!--Don't set any language to let sonar enable multi-language support--> <sonar.language/> @@ -57,6 +55,10 @@ limitations under the License. <sonar.coverage.jacoco.xmlReportPaths>${project.reporting.outputDirectory}/jacoco-ut/jacoco.xml </sonar.coverage.jacoco.xmlReportPaths> <jacoco.version>0.8.3</jacoco.version> + + <!-- Properties for POM Format --> + <format.skipValidate>false</format.skipValidate> + <format.skipExecute>true</format.skipExecute> </properties> <build> @@ -66,6 +68,35 @@ limitations under the License. <artifactId>jacoco-maven-plugin</artifactId> <version>${jacoco.version}</version> </plugin> + + <!-- Plugin to Format/Validate POM Files --> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>tidy-maven-plugin</artifactId> + <version>1.1.0</version> + <executions> + <execution> + <id>format-pom</id> + <phase>process-sources</phase> + <goals> + <goal>pom</goal> + </goals> + <configuration> + <skip>${format.skipExecute}</skip> + </configuration> + </execution> + <execution> + <id>validate-pom</id> + <phase>validate</phase> + <goals> + <goal>check</goal> + </goals> + <configuration> + <skip>${format.skipValidate}</skip> + </configuration> + </execution> + </executions> + </plugin> </plugins> </build> @@ -101,6 +132,14 @@ limitations under the License. </plugins> </build> </profile> - </profiles> + <!-- Profile to format skip validate or execute --> + <profile> + <id>format</id> + <properties> + <format.skipValidate>true</format.skipValidate> + <format.skipExecute>false</format.skipExecute> + </properties> + </profile> + </profiles> </project> |