diff options
34 files changed, 142 insertions, 124 deletions
diff --git a/adapters/mso-adapter-utils/pom.xml b/adapters/mso-adapter-utils/pom.xml index a3120a3c8d..62e7153473 100644 --- a/adapters/mso-adapter-utils/pom.xml +++ b/adapters/mso-adapter-utils/pom.xml @@ -2,11 +2,11 @@ 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.openecomp.so.framework</groupId> + <groupId>org.openecomp.so</groupId> <artifactId>adapters</artifactId> <version>1.1.0-SNAPSHOT</version> </parent> - <groupId>org.openecomp.so.framework.adapters</groupId> + <groupId>org.openecomp.so.adapters</groupId> <artifactId>mso-adapter-utils</artifactId> <name>mso-adapter-utils</name> <description>Common MSO utilities, including Openstack client wrappers.</description> @@ -64,12 +64,12 @@ <version>${openstack.version}</version> </dependency> <dependency> - <groupId>org.openecomp.so.framework</groupId> + <groupId>org.openecomp.so</groupId> <artifactId>common</artifactId> <version>${project.version}</version> </dependency> <dependency> - <groupId>org.openecomp.so.framework</groupId> + <groupId>org.openecomp.so</groupId> <artifactId>mso-catalog-db</artifactId> <version>${project.version}</version> </dependency> diff --git a/adapters/mso-adapters-rest-interface/pom.xml b/adapters/mso-adapters-rest-interface/pom.xml index 7efa2296b6..b83d6f82f8 100644 --- a/adapters/mso-adapters-rest-interface/pom.xml +++ b/adapters/mso-adapters-rest-interface/pom.xml @@ -2,11 +2,11 @@ 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.openecomp.so.framework</groupId> + <groupId>org.openecomp.so</groupId> <artifactId>adapters</artifactId> <version>1.1.0-SNAPSHOT</version> </parent> - <groupId>org.openecomp.so.framework.adapters</groupId> + <groupId>org.openecomp.so.adapters</groupId> <artifactId>mso-adapters-rest-interface</artifactId> <packaging>jar</packaging> <name>mso-adapters-rest-interface</name> @@ -44,7 +44,7 @@ <version>3.0.19.Final</version> </dependency> <dependency> - <groupId>org.openecomp.so.framework.adapters</groupId> + <groupId>org.openecomp.so.adapters</groupId> <artifactId>mso-adapter-utils</artifactId> <version>${project.version}</version> </dependency> diff --git a/adapters/mso-catalog-db-adapter/pom.xml b/adapters/mso-catalog-db-adapter/pom.xml index 33a1702ade..4459660240 100644 --- a/adapters/mso-catalog-db-adapter/pom.xml +++ b/adapters/mso-catalog-db-adapter/pom.xml @@ -2,12 +2,12 @@ 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.openecomp.so.framework</groupId> + <groupId>org.openecomp.so</groupId> <artifactId>adapters</artifactId> <version>1.1.0-SNAPSHOT</version> </parent> - <groupId>org.openecomp.so.framework.adapters</groupId> + <groupId>org.openecomp.so.adapters</groupId> <artifactId>mso-catalog-db-adapter</artifactId> <packaging>war</packaging> @@ -65,7 +65,7 @@ <dependencies> <dependency> - <groupId>org.openecomp.so.framework</groupId> + <groupId>org.openecomp.so</groupId> <artifactId>mso-catalog-db</artifactId> <version>${project.version}</version> </dependency> @@ -95,7 +95,7 @@ <version>3.0.16.Final</version> </dependency> <!--<dependency> - <groupId>org.openecomp.so.framework</groupId> + <groupId>org.openecomp.so</groupId> <artifactId>status-control</artifactId> <version>${project.version}</version> </dependency>--> diff --git a/adapters/mso-network-adapter-async-client/pom.xml b/adapters/mso-network-adapter-async-client/pom.xml index 155de315f3..6e0c9bf702 100644 --- a/adapters/mso-network-adapter-async-client/pom.xml +++ b/adapters/mso-network-adapter-async-client/pom.xml @@ -2,11 +2,11 @@ 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.openecomp.so.framework</groupId>
+ <groupId>org.openecomp.so</groupId>
<artifactId>adapters</artifactId>
<version>1.1.0-SNAPSHOT</version> </parent>
- <groupId>org.openecomp.so.framework.adapters</groupId>
+ <groupId>org.openecomp.so.adapters</groupId>
<artifactId>mso-network-adapter-async-client</artifactId>
<packaging>jar</packaging>
<name>mso-network-adapter-async-client</name>
diff --git a/adapters/mso-network-adapter/pom.xml b/adapters/mso-network-adapter/pom.xml index a89cfc7797..94e5759ee3 100644 --- a/adapters/mso-network-adapter/pom.xml +++ b/adapters/mso-network-adapter/pom.xml @@ -2,11 +2,11 @@ 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.openecomp.so.framework</groupId> + <groupId>org.openecomp.so</groupId> <artifactId>adapters</artifactId> <version>1.1.0-SNAPSHOT</version> </parent> - <groupId>org.openecomp.so.framework.adapters</groupId> + <groupId>org.openecomp.so.adapters</groupId> <artifactId>mso-network-adapter</artifactId> <packaging>war</packaging> <name>mso-network-adapter</name> @@ -53,7 +53,7 @@ <version>2.2.7</version> </dependency> <dependency> - <groupId>org.openecomp.so.framework.adapters</groupId> + <groupId>org.openecomp.so.adapters</groupId> <artifactId>mso-adapter-utils</artifactId> <version>${project.version}</version> </dependency> @@ -106,17 +106,17 @@ <scope>provided</scope> </dependency> <dependency> - <groupId>org.openecomp.so.framework.adapters</groupId> + <groupId>org.openecomp.so.adapters</groupId> <artifactId>mso-adapter-utils</artifactId> <version>${project.version}</version> </dependency> <dependency> - <groupId>org.openecomp.so.framework.adapters</groupId> + <groupId>org.openecomp.so.adapters</groupId> <artifactId>mso-network-adapter-async-client</artifactId> <version>${project.version}</version> </dependency> <dependency> - <groupId>org.openecomp.so.framework.adapters</groupId> + <groupId>org.openecomp.so.adapters</groupId> <artifactId>mso-adapters-rest-interface</artifactId> <version>${project.version}</version> </dependency> @@ -145,7 +145,7 @@ <scope>provided</scope> </dependency> <dependency> - <groupId>org.openecomp.so.framework</groupId> + <groupId>org.openecomp.so</groupId> <artifactId>status-control</artifactId> <version>${project.version}</version> </dependency> diff --git a/adapters/mso-requests-db-adapter/pom.xml b/adapters/mso-requests-db-adapter/pom.xml index 7ef6ff6847..c3ed987cab 100644 --- a/adapters/mso-requests-db-adapter/pom.xml +++ b/adapters/mso-requests-db-adapter/pom.xml @@ -2,12 +2,12 @@ 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.openecomp.so.framework</groupId> + <groupId>org.openecomp.so</groupId> <artifactId>adapters</artifactId> <version>1.1.0-SNAPSHOT</version> </parent> - <groupId>org.openecomp.so.framework.adapters</groupId> + <groupId>org.openecomp.so.adapters</groupId> <artifactId>mso-requests-db-adapter</artifactId> <packaging>war</packaging> @@ -15,7 +15,7 @@ <dependencies> <dependency> - <groupId>org.openecomp.so.framework</groupId> + <groupId>org.openecomp.so</groupId> <artifactId>mso-requests-db</artifactId> <version>${project.version}</version> </dependency> @@ -40,7 +40,7 @@ </exclusions> </dependency> <dependency> - <groupId>org.openecomp.so.framework</groupId> + <groupId>org.openecomp.so</groupId> <artifactId>status-control</artifactId> <version>${project.version}</version> </dependency> @@ -85,7 +85,7 @@ <version>2.2.7</version> </dependency> <dependency> - <groupId>org.openecomp.so.framework.adapters</groupId> + <groupId>org.openecomp.so.adapters</groupId> <artifactId>mso-adapter-utils</artifactId> <version>${project.version}</version> </dependency> diff --git a/adapters/mso-sdnc-adapter/pom.xml b/adapters/mso-sdnc-adapter/pom.xml index 866e5ac14a..7c1ba1a47f 100644 --- a/adapters/mso-sdnc-adapter/pom.xml +++ b/adapters/mso-sdnc-adapter/pom.xml @@ -2,11 +2,11 @@ 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.openecomp.so.framework</groupId> + <groupId>org.openecomp.so</groupId> <artifactId>adapters</artifactId> <version>1.1.0-SNAPSHOT</version> </parent> - <groupId>org.openecomp.so.framework.adapters</groupId> + <groupId>org.openecomp.so.adapters</groupId> <artifactId>mso-sdnc-adapter</artifactId> <packaging>war</packaging> <name>mso-sdnc-adapter</name> @@ -67,7 +67,7 @@ </build> <dependencies> <dependency> - <groupId>org.openecomp.so.framework.adapters</groupId> + <groupId>org.openecomp.so.adapters</groupId> <artifactId>mso-adapter-utils</artifactId> <version>${project.version}</version> @@ -91,12 +91,12 @@ <scope>provided</scope> </dependency> <dependency> - <groupId>org.openecomp.so.framework</groupId> + <groupId>org.openecomp.so</groupId> <artifactId>status-control</artifactId> <version>${project.version}</version> </dependency> <dependency> - <groupId>org.openecomp.so.framework.adapters</groupId> + <groupId>org.openecomp.so.adapters</groupId> <artifactId>mso-adapters-rest-interface</artifactId> <version>${project.version}</version> </dependency> diff --git a/adapters/mso-tenant-adapter/pom.xml b/adapters/mso-tenant-adapter/pom.xml index 049111e15f..3ceb853f27 100644 --- a/adapters/mso-tenant-adapter/pom.xml +++ b/adapters/mso-tenant-adapter/pom.xml @@ -2,11 +2,11 @@ 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.openecomp.so.framework</groupId> + <groupId>org.openecomp.so</groupId> <artifactId>adapters</artifactId> <version>1.1.0-SNAPSHOT</version> </parent> - <groupId>org.openecomp.so.framework.adapters</groupId> + <groupId>org.openecomp.so.adapters</groupId> <artifactId>mso-tenant-adapter</artifactId> <packaging>war</packaging> <name>mso-tenant-adapter</name> @@ -72,7 +72,7 @@ <version>2.2.7</version> </dependency> <dependency> - <groupId>org.openecomp.so.framework.adapters</groupId> + <groupId>org.openecomp.so.adapters</groupId> <artifactId>mso-adapter-utils</artifactId> <version>${project.version}</version> </dependency> @@ -119,12 +119,12 @@ </build> <dependencies> <dependency> - <groupId>org.openecomp.so.framework.adapters</groupId> + <groupId>org.openecomp.so.adapters</groupId> <artifactId>mso-adapter-utils</artifactId> <version>${project.version}</version> </dependency> <dependency> - <groupId>org.openecomp.so.framework.adapters</groupId> + <groupId>org.openecomp.so.adapters</groupId> <artifactId>mso-adapters-rest-interface</artifactId> <version>${project.version}</version> </dependency> @@ -147,7 +147,7 @@ <scope>provided</scope> </dependency> <dependency> - <groupId>org.openecomp.so.framework</groupId> + <groupId>org.openecomp.so</groupId> <artifactId>status-control</artifactId> <version>${project.version}</version> </dependency> diff --git a/adapters/mso-vnf-adapter-async-client/pom.xml b/adapters/mso-vnf-adapter-async-client/pom.xml index f4fe110ec9..c42c002dc1 100644 --- a/adapters/mso-vnf-adapter-async-client/pom.xml +++ b/adapters/mso-vnf-adapter-async-client/pom.xml @@ -2,11 +2,11 @@ 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.openecomp.so.framework</groupId>
+ <groupId>org.openecomp.so</groupId>
<artifactId>adapters</artifactId>
<version>1.1.0-SNAPSHOT</version> </parent>
- <groupId>org.openecomp.so.framework.adapters</groupId>
+ <groupId>org.openecomp.so.adapters</groupId>
<artifactId>mso-vnf-adapter-async-client</artifactId>
<packaging>jar</packaging>
<name>mso-vnf-adapter-async-client</name>
diff --git a/adapters/mso-vnf-adapter/pom.xml b/adapters/mso-vnf-adapter/pom.xml index 3ccb49b70c..ba0c87ab5e 100644 --- a/adapters/mso-vnf-adapter/pom.xml +++ b/adapters/mso-vnf-adapter/pom.xml @@ -2,11 +2,11 @@ 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.openecomp.so.framework</groupId>
+ <groupId>org.openecomp.so</groupId>
<artifactId>adapters</artifactId>
<version>1.1.0-SNAPSHOT</version> </parent>
- <groupId>org.openecomp.so.framework.adapters</groupId>
+ <groupId>org.openecomp.so.adapters</groupId>
<artifactId>mso-vnf-adapter</artifactId>
<packaging>war</packaging>
<name>mso-vnf-adapter</name>
@@ -56,7 +56,7 @@ </executions>
<dependencies>
<dependency>
- <groupId>org.openecomp.so.framework.adapters</groupId>
+ <groupId>org.openecomp.so.adapters</groupId>
<artifactId>mso-adapter-utils</artifactId>
<version>${project.version}</version>
</dependency>
@@ -107,17 +107,17 @@ </build>
<dependencies>
<dependency>
- <groupId>org.openecomp.so.framework.adapters</groupId>
+ <groupId>org.openecomp.so.adapters</groupId>
<artifactId>mso-adapter-utils</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.openecomp.so.framework.adapters</groupId>
+ <groupId>org.openecomp.so.adapters</groupId>
<artifactId>mso-adapters-rest-interface</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.openecomp.so.framework.adapters</groupId>
+ <groupId>org.openecomp.so.adapters</groupId>
<artifactId>mso-vnf-adapter-async-client</artifactId>
<version>${project.version}</version>
</dependency>
@@ -140,13 +140,13 @@ <scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.openecomp.so.framework</groupId>
+ <groupId>org.openecomp.so</groupId>
<artifactId>status-control</artifactId>
<version>${project.version}</version>
</dependency>
<!-- <dependency> -->
- <!-- <groupId>org.openecomp.so.framework</groupId> -->
+ <!-- <groupId>org.openecomp.so</groupId> -->
<!-- <artifactId>mso-catalog-db</artifactId> -->
<!-- <version>${project.version}</version> -->
<!-- </dependency> -->
diff --git a/adapters/mso-workflow-message-adapter/pom.xml b/adapters/mso-workflow-message-adapter/pom.xml index 1e5020e513..5ee3fbfa38 100644 --- a/adapters/mso-workflow-message-adapter/pom.xml +++ b/adapters/mso-workflow-message-adapter/pom.xml @@ -2,11 +2,11 @@ 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.openecomp.so.framework</groupId> + <groupId>org.openecomp.so</groupId> <artifactId>adapters</artifactId> <version>1.1.0-SNAPSHOT</version> </parent> - <groupId>org.openecomp.so.framework.adapters</groupId> + <groupId>org.openecomp.so.adapters</groupId> <artifactId>mso-workflow-message-adapter</artifactId> <packaging>war</packaging> <name>mso-workflow-message-adapter</name> @@ -29,12 +29,12 @@ <dependencies> <dependency> - <groupId>org.openecomp.so.framework.adapters</groupId> + <groupId>org.openecomp.so.adapters</groupId> <artifactId>mso-adapter-utils</artifactId> <version>${project.version}</version> </dependency> <dependency> - <groupId>org.openecomp.so.framework.adapters</groupId> + <groupId>org.openecomp.so.adapters</groupId> <artifactId>mso-adapters-rest-interface</artifactId> <version>${project.version}</version> </dependency> @@ -62,7 +62,7 @@ <version>4.5.2</version> </dependency> <dependency> - <groupId>org.openecomp.so.framework</groupId> + <groupId>org.openecomp.so</groupId> <artifactId>status-control</artifactId> <version>${project.version}</version> </dependency> diff --git a/adapters/pom.xml b/adapters/pom.xml index 750fa7eca5..388ebd8b37 100644 --- a/adapters/pom.xml +++ b/adapters/pom.xml @@ -3,11 +3,11 @@ <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.openecomp.so</groupId> - <artifactId>framework</artifactId> + <artifactId>so-parent</artifactId> <version>1.1.0-SNAPSHOT</version> </parent> - <groupId>org.openecomp.so.framework</groupId> + <groupId>org.openecomp.so</groupId> <artifactId>adapters</artifactId> <name>MSO Adapters</name> <description>Adapters for MSO</description> diff --git a/asdc-controller/pom.xml b/asdc-controller/pom.xml index a7dab443ea..68bfed21db 100644 --- a/asdc-controller/pom.xml +++ b/asdc-controller/pom.xml @@ -3,11 +3,11 @@ <modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.openecomp.so</groupId>
- <artifactId>framework</artifactId>
+ <artifactId>so-parent</artifactId>
<version>1.1.0-SNAPSHOT</version>
</parent>
- <groupId>org.openecomp.so.framework</groupId>
+ <groupId>org.openecomp.so</groupId>
<artifactId>asdc-controller</artifactId>
<name>asdc-controller</name>
<description>ASDC CLient and Controller</description>
@@ -47,7 +47,7 @@ <scope>test</scope>
</dependency>
<dependency>
- <groupId>org.openecomp.so.framework</groupId>
+ <groupId>org.openecomp.so</groupId>
<artifactId>mso-catalog-db</artifactId>
<version>${project.version}</version>
</dependency>
@@ -91,7 +91,7 @@ </dependency>
<dependency>
- <groupId>org.openecomp.so.framework</groupId>
+ <groupId>org.openecomp.so</groupId>
<artifactId>common</artifactId>
<version>${project.version}</version>
</dependency>
@@ -109,7 +109,7 @@ <scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.openecomp.so.framework</groupId>
+ <groupId>org.openecomp.so</groupId>
<artifactId>status-control</artifactId>
<version>${project.version}</version>
</dependency>
diff --git a/bpmn/MSOCockpit/pom.xml b/bpmn/MSOCockpit/pom.xml index b817e280d6..5fa9e7e2f1 100644 --- a/bpmn/MSOCockpit/pom.xml +++ b/bpmn/MSOCockpit/pom.xml @@ -1,13 +1,13 @@ <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">
<parent>
- <groupId>org.openecomp.so.framework</groupId>
+ <groupId>org.openecomp.so</groupId>
<artifactId>bpmn</artifactId>
<version>1.1.0-SNAPSHOT</version> </parent>
<modelVersion>4.0.0</modelVersion>
- <groupId>org.openecomp.so.framework</groupId>
+ <groupId>org.openecomp.so</groupId>
<artifactId>MSOCockpit</artifactId>
<packaging>pom</packaging>
<name>MSOCockpit</name>
@@ -47,17 +47,17 @@ </dependency>
<dependency>
- <groupId>org.openecomp.so.framework</groupId>
+ <groupId>org.openecomp.so</groupId>
<artifactId>common</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.openecomp.so.framework</groupId>
+ <groupId>org.openecomp.so</groupId>
<artifactId>cockpit-urnmap-plugin</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.openecomp.so.framework</groupId>
+ <groupId>org.openecomp.so</groupId>
<artifactId>MSOCoreBPMN</artifactId>
<version>${project.version}</version>
</dependency>
diff --git a/bpmn/MSOCommonBPMN/pom.xml b/bpmn/MSOCommonBPMN/pom.xml index 799d9f3ef0..3452fe3fdd 100644 --- a/bpmn/MSOCommonBPMN/pom.xml +++ b/bpmn/MSOCommonBPMN/pom.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.openecomp.so.framework</groupId>
+ <groupId>org.openecomp.so</groupId>
<artifactId>bpmn</artifactId>
<version>1.1.0-SNAPSHOT</version>
</parent>
@@ -296,13 +296,13 @@ <version>3.4</version>
</dependency>
<dependency>
- <groupId>org.openecomp.so.framework</groupId>
+ <groupId>org.openecomp.so</groupId>
<artifactId>MSOCoreBPMN</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<!-- unit test utilities -->
- <groupId>org.openecomp.so.framework</groupId>
+ <groupId>org.openecomp.so</groupId>
<artifactId>MSOCoreBPMN</artifactId>
<version>${project.version}</version>
<classifier>tests</classifier>
@@ -320,14 +320,14 @@ <version>4.3.2.RELEASE</version>
</dependency>
<dependency>
- <groupId>org.openecomp.so.framework</groupId>
+ <groupId>org.openecomp.so</groupId>
<artifactId>MSOMockServer</artifactId>
<version>${project.version}</version>
<classifier>classes</classifier>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.openecomp.so.framework</groupId>
+ <groupId>org.openecomp.so</groupId>
<artifactId>MSORESTClient</artifactId>
<version>${project.version}</version>
</dependency>
diff --git a/bpmn/MSOCoreBPMN/pom.xml b/bpmn/MSOCoreBPMN/pom.xml index 9de2793d44..29ea1b6e01 100644 --- a/bpmn/MSOCoreBPMN/pom.xml +++ b/bpmn/MSOCoreBPMN/pom.xml @@ -2,12 +2,12 @@ <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"> <parent> - <groupId>org.openecomp.so.framework</groupId> + <groupId>org.openecomp.so</groupId> <artifactId>bpmn</artifactId> <version>1.1.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> - <groupId>org.openecomp.so.framework</groupId> + <groupId>org.openecomp.so</groupId> <artifactId>MSOCoreBPMN</artifactId> <packaging>jar</packaging> @@ -134,7 +134,7 @@ <artifactId>Saxon-HE</artifactId> </dependency> <dependency> - <groupId>org.openecomp.so.framework</groupId> + <groupId>org.openecomp.so</groupId> <artifactId>common</artifactId> <version>${project.version}</version> </dependency> @@ -169,7 +169,7 @@ <version>1.6</version> </dependency> <dependency> - <groupId>org.openecomp.so.framework</groupId> + <groupId>org.openecomp.so</groupId> <artifactId>status-control</artifactId> <version>${project.version}</version> </dependency> diff --git a/bpmn/MSOInfrastructureBPMN/pom.xml b/bpmn/MSOInfrastructureBPMN/pom.xml index 374253175a..5c0eff96bb 100644 --- a/bpmn/MSOInfrastructureBPMN/pom.xml +++ b/bpmn/MSOInfrastructureBPMN/pom.xml @@ -1,7 +1,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">
<parent>
- <groupId>org.openecomp.so.framework</groupId>
+ <groupId>org.openecomp.so</groupId>
<artifactId>bpmn</artifactId>
<version>1.1.0-SNAPSHOT</version>
</parent>
@@ -282,17 +282,17 @@ <version>3.4</version>
</dependency>
<dependency>
- <groupId>org.openecomp.so.framework</groupId>
+ <groupId>org.openecomp.so</groupId>
<artifactId>MSOCoreBPMN</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.openecomp.so.framework</groupId>
+ <groupId>org.openecomp.so</groupId>
<artifactId>MSOCommonBPMN</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.openecomp.so.framework</groupId>
+ <groupId>org.openecomp.so</groupId>
<artifactId>MSOCommonBPMN</artifactId>
<version>${project.version}</version>
<classifier>tests</classifier>
@@ -300,7 +300,7 @@ </dependency>
<dependency>
<!-- unit test utilities -->
- <groupId>org.openecomp.so.framework</groupId>
+ <groupId>org.openecomp.so</groupId>
<artifactId>MSOCoreBPMN</artifactId>
<version>${project.version}</version>
<classifier>tests</classifier>
@@ -318,14 +318,14 @@ <version>4.3.2.RELEASE</version>
</dependency>
<dependency>
- <groupId>org.openecomp.so.framework</groupId>
+ <groupId>org.openecomp.so</groupId>
<artifactId>MSOMockServer</artifactId>
<version>${project.version}</version>
<scope>test</scope>
<classifier>classes</classifier>
</dependency>
<dependency>
- <groupId>org.openecomp.so.framework</groupId>
+ <groupId>org.openecomp.so</groupId>
<artifactId>MSORESTClient</artifactId>
<version>${project.version}</version>
</dependency>
diff --git a/bpmn/MSOMockServer/pom.xml b/bpmn/MSOMockServer/pom.xml index 38e2df6d92..34f7a2331d 100644 --- a/bpmn/MSOMockServer/pom.xml +++ b/bpmn/MSOMockServer/pom.xml @@ -1,12 +1,12 @@ <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"> <parent> - <groupId>org.openecomp.so.framework</groupId> + <groupId>org.openecomp.so</groupId> <artifactId>bpmn</artifactId> <version>1.1.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> - <groupId>org.openecomp.so.framework</groupId> + <groupId>org.openecomp.so</groupId> <artifactId>MSOMockServer</artifactId> <packaging>war</packaging> diff --git a/bpmn/MSORESTClient/pom.xml b/bpmn/MSORESTClient/pom.xml index f92c0c9a72..e17a58f488 100644 --- a/bpmn/MSORESTClient/pom.xml +++ b/bpmn/MSORESTClient/pom.xml @@ -4,12 +4,12 @@ <modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.openecomp.so.framework</groupId>
+ <groupId>org.openecomp.so</groupId>
<artifactId>bpmn</artifactId>
<version>1.1.0-SNAPSHOT</version> </parent>
- <groupId>org.openecomp.so.framework</groupId>
+ <groupId>org.openecomp.so</groupId>
<artifactId>MSORESTClient</artifactId>
<packaging>jar</packaging>
diff --git a/bpmn/MSOURN-plugin/pom.xml b/bpmn/MSOURN-plugin/pom.xml index f2160ccb4f..a8b198de58 100644 --- a/bpmn/MSOURN-plugin/pom.xml +++ b/bpmn/MSOURN-plugin/pom.xml @@ -3,12 +3,12 @@ <modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.openecomp.so.framework</groupId>
+ <groupId>org.openecomp.so</groupId>
<artifactId>bpmn</artifactId>
<version>1.1.0-SNAPSHOT</version>
</parent>
- <groupId>org.openecomp.so.framework</groupId>
+ <groupId>org.openecomp.so</groupId>
<artifactId>cockpit-urnmap-plugin</artifactId>
<packaging>jar</packaging>
@@ -56,7 +56,7 @@ <scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.openecomp.so.framework</groupId>
+ <groupId>org.openecomp.so</groupId>
<artifactId>common</artifactId>
<version>${project.version}</version>
<scope>compile</scope>
diff --git a/bpmn/pom.xml b/bpmn/pom.xml index 1c9a7c8d8a..c3d1132a2e 100644 --- a/bpmn/pom.xml +++ b/bpmn/pom.xml @@ -4,11 +4,11 @@ <parent> <groupId>org.openecomp.so</groupId> - <artifactId>framework</artifactId> + <artifactId>so-parent</artifactId> <version>1.1.0-SNAPSHOT</version> </parent> - <groupId>org.openecomp.so.framework</groupId> + <groupId>org.openecomp.so</groupId> <artifactId>bpmn</artifactId> <name>BPMN Subsystem</name> <description>BPMN Subsystem for MSO</description> diff --git a/common/pom.xml b/common/pom.xml index ee8fae59cb..3bd5038b8d 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -3,11 +3,11 @@ <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.openecomp.so</groupId> - <artifactId>framework</artifactId> + <artifactId>so-parent</artifactId> <version>1.1.0-SNAPSHOT</version> </parent> - <groupId>org.openecomp.so.framework</groupId> + <groupId>org.openecomp.so</groupId> <artifactId>common</artifactId> <name>MSO Common classes</name> <description>MSO Common classes:- Logger</description> @@ -205,7 +205,7 @@ </executions> <dependencies> <dependency> - <groupId>org.openecomp.so.framework</groupId> + <groupId>org.openecomp.so</groupId> <artifactId>common</artifactId> <version>${project.version}</version> </dependency> diff --git a/mso-api-handlers/mso-api-handler-common/pom.xml b/mso-api-handlers/mso-api-handler-common/pom.xml index 016fc2dd44..9159bb2a52 100644 --- a/mso-api-handlers/mso-api-handler-common/pom.xml +++ b/mso-api-handlers/mso-api-handler-common/pom.xml @@ -3,13 +3,13 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.openecomp.so.framework</groupId> + <groupId>org.openecomp.so</groupId> <artifactId>mso-api-handlers</artifactId> <version>1.1.0-SNAPSHOT</version> </parent> - <groupId>org.openecomp.so.framework</groupId> + <groupId>org.openecomp.so</groupId> <artifactId>mso-api-handler-common</artifactId> <name>ECOMP MSO API Handler common</name> @@ -73,13 +73,13 @@ </dependency> <dependency> - <groupId>org.openecomp.so.framework</groupId> + <groupId>org.openecomp.so</groupId> <artifactId>mso-catalog-db</artifactId> <version>${project.version}</version> </dependency> <dependency> - <groupId>org.openecomp.so.framework</groupId> + <groupId>org.openecomp.so</groupId> <artifactId>mso-requests-db</artifactId> <version>${project.version}</version> </dependency> diff --git a/mso-api-handlers/mso-api-handler-infra/pom.xml b/mso-api-handlers/mso-api-handler-infra/pom.xml index 1aead5f7e0..2eb5f1e185 100644 --- a/mso-api-handlers/mso-api-handler-infra/pom.xml +++ b/mso-api-handlers/mso-api-handler-infra/pom.xml @@ -3,7 +3,7 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.openecomp.so.framework</groupId> + <groupId>org.openecomp.so</groupId> <artifactId>mso-api-handlers</artifactId> <version>1.1.0-SNAPSHOT</version> </parent> @@ -68,22 +68,22 @@ </dependency> <dependency> - <groupId>org.openecomp.so.framework</groupId> + <groupId>org.openecomp.so</groupId> <artifactId>mso-catalog-db</artifactId> <version>${project.version}</version> </dependency> <dependency> - <groupId>org.openecomp.so.framework</groupId> + <groupId>org.openecomp.so</groupId> <artifactId>mso-requests-db</artifactId> <version>${project.version}</version> </dependency> <dependency> - <groupId>org.openecomp.so.framework</groupId> + <groupId>org.openecomp.so</groupId> <artifactId>mso-api-handler-common</artifactId> <version>${project.version}</version> </dependency> <dependency> - <groupId>org.openecomp.so.framework</groupId> + <groupId>org.openecomp.so</groupId> <artifactId>status-control</artifactId> <version>${project.version}</version> </dependency> diff --git a/mso-api-handlers/mso-requests-db/pom.xml b/mso-api-handlers/mso-requests-db/pom.xml index 007da9a784..ef69e8acb1 100644 --- a/mso-api-handlers/mso-requests-db/pom.xml +++ b/mso-api-handlers/mso-requests-db/pom.xml @@ -3,7 +3,7 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.openecomp.so.framework</groupId> + <groupId>org.openecomp.so</groupId> <artifactId>mso-api-handlers</artifactId> <version>1.1.0-SNAPSHOT</version> </parent> @@ -97,7 +97,7 @@ <version>1.0.0.Final</version> </dependency> <dependency> - <groupId>org.openecomp.so.framework</groupId> + <groupId>org.openecomp.so</groupId> <artifactId>common</artifactId> <version>${project.version}</version> </dependency> diff --git a/mso-api-handlers/pom.xml b/mso-api-handlers/pom.xml index 3418a21a4a..f06b4b2a2f 100644 --- a/mso-api-handlers/pom.xml +++ b/mso-api-handlers/pom.xml @@ -3,11 +3,11 @@ <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.openecomp.so</groupId> - <artifactId>framework</artifactId> + <artifactId>so-parent</artifactId> <version>1.1.0-SNAPSHOT</version> </parent> - <groupId>org.openecomp.so.framework</groupId> + <groupId>org.openecomp.so</groupId> <artifactId>mso-api-handlers</artifactId> <name>API Handler</name> <description>API Handler for MSO</description> diff --git a/mso-catalog-db/pom.xml b/mso-catalog-db/pom.xml index 7e620a32e0..fdd5198152 100644 --- a/mso-catalog-db/pom.xml +++ b/mso-catalog-db/pom.xml @@ -3,11 +3,11 @@ <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.openecomp.so</groupId> - <artifactId>framework</artifactId> + <artifactId>so-parent</artifactId> <version>1.1.0-SNAPSHOT</version> </parent> - <groupId>org.openecomp.so.framework</groupId> + <groupId>org.openecomp.so</groupId> <artifactId>mso-catalog-db</artifactId> <name>mso-catalog-db</name> <description>MSO Catalog Database definition and Hibernate objects</description> @@ -164,7 +164,7 @@ <scope>test</scope> </dependency> <dependency> - <groupId>org.openecomp.so.framework</groupId> + <groupId>org.openecomp.so</groupId> <artifactId>common</artifactId> <version>${project.version}</version> </dependency> diff --git a/packages/arquillian-unit-tests/pom.xml b/packages/arquillian-unit-tests/pom.xml index 46009e714b..a557f56f46 100644 --- a/packages/arquillian-unit-tests/pom.xml +++ b/packages/arquillian-unit-tests/pom.xml @@ -2,12 +2,12 @@ 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.openecomp.so.framework</groupId> + <groupId>org.openecomp.so</groupId> <artifactId>packages</artifactId> <version>1.1.0-SNAPSHOT</version> </parent> - <groupId>org.openecomp.so.framework.packages</groupId> + <groupId>org.openecomp.so.packages</groupId> <name>Arquillian Unit Testing on MSO</name> <artifactId>arquillian-unit-tests</artifactId> @@ -225,7 +225,7 @@ </dependency> <dependency> - <groupId>org.openecomp.so.framework</groupId> + <groupId>org.openecomp.so</groupId> <artifactId>asdc-controller</artifactId> <version>${project.version}</version> <scope>test</scope> @@ -233,7 +233,7 @@ </dependency> <!-- <dependency> - <groupId>org.openecomp.so.framework.adapters</groupId> + <groupId>org.openecomp.so.adapters</groupId> <artifactId>mso-appc-adapter</artifactId> <version>${project.version}</version> <scope>test</scope> @@ -255,7 +255,7 @@ </dependency> <dependency> - <groupId>org.openecomp.so.framework</groupId> + <groupId>org.openecomp.so</groupId> <artifactId>mso-catalog-db</artifactId> <version>${project.version}</version> <scope>test</scope> diff --git a/packages/deliveries/pom.xml b/packages/deliveries/pom.xml index c2fb01a15b..e083a28656 100644 --- a/packages/deliveries/pom.xml +++ b/packages/deliveries/pom.xml @@ -2,12 +2,12 @@ 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.openecomp.so.framework</groupId> + <groupId>org.openecomp.so</groupId> <artifactId>packages</artifactId> <version>1.1.0-SNAPSHOT</version> </parent> - <groupId>org.openecomp.so.framework.packages</groupId> + <groupId>org.openecomp.so.packages</groupId> <artifactId>mso-deliveries</artifactId> <packaging>pom</packaging> diff --git a/packages/docker/pom.xml b/packages/docker/pom.xml index 5eba3f0c5b..c37d68a5ed 100644 --- a/packages/docker/pom.xml +++ b/packages/docker/pom.xml @@ -3,13 +3,13 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.openecomp.so.framework</groupId> + <groupId>org.openecomp.so</groupId> <artifactId>packages</artifactId> <version>1.1.0-SNAPSHOT</version> </parent> <packaging>pom</packaging> - <groupId>org.openecomp.so.framework</groupId> + <groupId>org.openecomp.so</groupId> <artifactId>docker</artifactId> <name>MSO Docker Deliveries</name> diff --git a/packages/docker/src/main/docker/docker-files/Dockerfile.aria b/packages/docker/src/main/docker/docker-files/Dockerfile.aria index bcff903958..43371b5fa1 100644 --- a/packages/docker/src/main/docker/docker-files/Dockerfile.aria +++ b/packages/docker/src/main/docker/docker-files/Dockerfile.aria @@ -1,3 +1,21 @@ +# +# ============LICENSE_START=================================================== +# Copyright (c) 2017 Cloudify.co. All rights reserved. +# =================================================================== +# Licensed under the Apache License, Version 2.0 (the "License"); you may not +# use this file except in compliance with the License. You may obtain a copy +# of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +# License for the specific language governing permissions and limitations under +# the License. +# ============LICENSE_END==================================================== +# + FROM httpd:alpine RUN apk update diff --git a/packages/pom.xml b/packages/pom.xml index 49aa078177..19d5ed670c 100644 --- a/packages/pom.xml +++ b/packages/pom.xml @@ -3,11 +3,11 @@ <modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.openecomp.so</groupId>
- <artifactId>framework</artifactId>
+ <artifactId>so-parent</artifactId>
<version>1.1.0-SNAPSHOT</version>
</parent>
- <groupId>org.openecomp.so.framework</groupId>
+ <groupId>org.openecomp.so</groupId>
<artifactId>packages</artifactId>
<packaging>pom</packaging>
<name>MSO Packages</name>
@@ -2,7 +2,7 @@ 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> <groupId>org.openecomp.so</groupId> - <artifactId>framework</artifactId> + <artifactId>so-parent</artifactId> <packaging>pom</packaging> <version>1.1.0-SNAPSHOT</version> <name>MSO main project</name> diff --git a/status-control/pom.xml b/status-control/pom.xml index 40f3bad5f5..d1f2fb1920 100644 --- a/status-control/pom.xml +++ b/status-control/pom.xml @@ -5,11 +5,11 @@ <modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.openecomp.so</groupId>
- <artifactId>framework</artifactId>
+ <artifactId>so-parent</artifactId>
<version>1.1.0-SNAPSHOT</version> </parent>
- <groupId>org.openecomp.so.framework</groupId>
+ <groupId>org.openecomp.so</groupId>
<artifactId>status-control</artifactId>
<name>MSO Status Control module</name>
<description>Contains classes to update and query the MSO status per site</description>
@@ -22,17 +22,17 @@ <scope>test</scope>
</dependency>
<dependency>
- <groupId>org.openecomp.so.framework</groupId>
+ <groupId>org.openecomp.so</groupId>
<artifactId>common</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.openecomp.so.framework</groupId>
+ <groupId>org.openecomp.so</groupId>
<artifactId>mso-catalog-db</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.openecomp.so.framework</groupId>
+ <groupId>org.openecomp.so</groupId>
<artifactId>mso-requests-db</artifactId>
<version>${project.version}</version>
</dependency>
|