diff options
author | Dan Timoney <dtimoney@att.com> | 2020-08-10 14:09:14 -0400 |
---|---|---|
committer | Dan Timoney <dtimoney@att.com> | 2020-08-10 14:11:09 -0400 |
commit | f20174d914587c25b8f42b024316c71ebdb2fe6b (patch) | |
tree | d172cbb6b8ca7dba61fc371ac8c710b3d576ad0c /platform-logic | |
parent | 1012cdd907e5121b41fff13c65caf13e4b3e9fa3 (diff) |
Remove unused modules and fix pom structure
Removed modules not currently being used and restructured poms into
parent/child relationship to fix problem that was causing
version plugin not to update versions properly.
Change-Id: I41d63d469a24c65e8771e1546c879ab1bf8d0d53
Issue-ID: SDNC-1315
Signed-off-by: Dan Timoney <dtimoney@att.com>
Former-commit-id: 9bf0c309085118b432f0fab1d7012a3b33180d4b
Diffstat (limited to 'platform-logic')
-rw-r--r-- | platform-logic/datachange/pom.xml | 7 | ||||
-rw-r--r-- | platform-logic/generic-resource-api/pom.xml | 7 | ||||
-rw-r--r-- | platform-logic/installer/pom.xml | 71 | ||||
-rw-r--r-- | platform-logic/lcm/pom.xml | 95 | ||||
-rw-r--r-- | platform-logic/optical-service/pom.xml | 7 | ||||
-rw-r--r-- | platform-logic/pom.xml | 11 | ||||
-rw-r--r-- | platform-logic/restapi-templates/pom.xml | 7 | ||||
-rw-r--r-- | platform-logic/restconfapi-yang/pom.xml | 7 | ||||
-rw-r--r-- | platform-logic/setup/pom.xml | 7 | ||||
-rw-r--r-- | platform-logic/vnfapi/pom.xml | 95 |
10 files changed, 152 insertions, 162 deletions
diff --git a/platform-logic/datachange/pom.xml b/platform-logic/datachange/pom.xml index a25894a9..591e3fd0 100644 --- a/platform-logic/datachange/pom.xml +++ b/platform-logic/datachange/pom.xml @@ -3,10 +3,9 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.parent</groupId> - <artifactId>odlparent-lite</artifactId> - <version>2.0.0</version> - <relativePath/> + <groupId>org.onap.sdnc.oam</groupId> + <artifactId>platform-logic</artifactId> + <version>2.0.0-SNAPSHOT</version> </parent> <groupId>org.onap.sdnc.oam</groupId> diff --git a/platform-logic/generic-resource-api/pom.xml b/platform-logic/generic-resource-api/pom.xml index aff80fa0..9cac7531 100644 --- a/platform-logic/generic-resource-api/pom.xml +++ b/platform-logic/generic-resource-api/pom.xml @@ -3,10 +3,9 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.parent</groupId> - <artifactId>odlparent-lite</artifactId> - <version>2.0.0</version> - <relativePath/> + <groupId>org.onap.sdnc.oam</groupId> + <artifactId>platform-logic</artifactId> + <version>2.0.0-SNAPSHOT</version> </parent> <groupId>org.onap.sdnc.oam</groupId> diff --git a/platform-logic/installer/pom.xml b/platform-logic/installer/pom.xml index 17aa8968..2d1551a2 100644 --- a/platform-logic/installer/pom.xml +++ b/platform-logic/installer/pom.xml @@ -1,47 +1,46 @@ <?xml version="1.0" encoding="UTF-8"?> <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> + <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.onap.ccsdk.parent</groupId> - <artifactId>odlparent-lite</artifactId> - <version>2.0.0</version> - <relativePath/> - </parent> + <parent> + <groupId>org.onap.sdnc.oam</groupId> + <artifactId>platform-logic</artifactId> + <version>2.0.0-SNAPSHOT</version> + </parent> - <groupId>org.onap.sdnc.oam</groupId> - <artifactId>platform-logic-installer</artifactId> - <version>2.0.0-SNAPSHOT</version> - <packaging>pom</packaging> + <groupId>org.onap.sdnc.oam</groupId> + <artifactId>platform-logic-installer</artifactId> + <version>2.0.0-SNAPSHOT</version> + <packaging>pom</packaging> - <name>sdnc-oam :: platform-logic :: ${project.artifactId}</name> - <description>Contains platform-level service logic installer</description> + <name>sdnc-oam :: platform-logic :: ${project.artifactId}</name> + <description>Contains platform-level service logic installer</description> - <build> - <plugins> + <build> + <plugins> - <plugin> - <artifactId>maven-assembly-plugin</artifactId> - <version>2.6</version> - <executions> - <execution> - <id>create-zip</id> - <goals> - <goal>single</goal> - </goals> - <phase>package</phase> - <configuration> - <attach>true</attach> - <descriptors> - <descriptor>src/assembly/assemble_zip.xml</descriptor> - </descriptors> - <appendAssemblyId>false</appendAssemblyId> - </configuration> - </execution> + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <version>2.6</version> + <executions> + <execution> + <id>create-zip</id> + <goals> + <goal>single</goal> + </goals> + <phase>package</phase> + <configuration> + <attach>true</attach> + <descriptors> + <descriptor>src/assembly/assemble_zip.xml</descriptor> + </descriptors> + <appendAssemblyId>false</appendAssemblyId> + </configuration> + </execution> - </executions> - </plugin> + </executions> + </plugin> </plugins> - </build> + </build> </project> diff --git a/platform-logic/lcm/pom.xml b/platform-logic/lcm/pom.xml index df2ac6cd..a8b895cc 100644 --- a/platform-logic/lcm/pom.xml +++ b/platform-logic/lcm/pom.xml @@ -1,56 +1,55 @@ <?xml version="1.0" encoding="UTF-8"?> <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> + <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.onap.ccsdk.parent</groupId> - <artifactId>odlparent-lite</artifactId> - <version>2.0.0</version> - <relativePath/> - </parent> + <parent> + <groupId>org.onap.sdnc.oam</groupId> + <artifactId>platform-logic</artifactId> + <version>2.0.0-SNAPSHOT</version> + </parent> - <groupId>org.onap.sdnc.oam</groupId> - <artifactId>platform-logic-lcm</artifactId> - <version>2.0.0-SNAPSHOT</version> - <packaging>pom</packaging> + <groupId>org.onap.sdnc.oam</groupId> + <artifactId>platform-logic-lcm</artifactId> + <version>2.0.0-SNAPSHOT</version> + <packaging>pom</packaging> <name>sdnc-oam :: platform-logic :: ${project.artifactId}</name> - <description>Contains platform-level service logic for the LCM</description> + <description>Contains platform-level service logic for the LCM</description> - <build> - <plugins> - <plugin> - <artifactId>maven-resources-plugin</artifactId> - <version>2.6</version> - <executions> - <execution> - <id>copy-version</id> - <goals> - <goal>copy-resources</goal> - </goals><!-- here the phase you need --> - <phase>validate</phase> - <configuration> - <outputDirectory>../target/svclogic/graphs/lcm</outputDirectory> - <resources> - <resource> - <directory>src/main/xml</directory> - <includes> - <include>**/*.xml</include> - </includes> - <filtering>true</filtering> - </resource> - <resource> - <directory>src/main/resources</directory> - <includes> - <include>graph.versions</include> - </includes> - <filtering>true</filtering> - </resource> - </resources> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> + <build> + <plugins> + <plugin> + <artifactId>maven-resources-plugin</artifactId> + <version>2.6</version> + <executions> + <execution> + <id>copy-version</id> + <goals> + <goal>copy-resources</goal> + </goals><!-- here the phase you need --> + <phase>validate</phase> + <configuration> + <outputDirectory>../target/svclogic/graphs/lcm</outputDirectory> + <resources> + <resource> + <directory>src/main/xml</directory> + <includes> + <include>**/*.xml</include> + </includes> + <filtering>true</filtering> + </resource> + <resource> + <directory>src/main/resources</directory> + <includes> + <include>graph.versions</include> + </includes> + <filtering>true</filtering> + </resource> + </resources> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> </project> diff --git a/platform-logic/optical-service/pom.xml b/platform-logic/optical-service/pom.xml index 99e7b658..9c067b0d 100644 --- a/platform-logic/optical-service/pom.xml +++ b/platform-logic/optical-service/pom.xml @@ -3,10 +3,9 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.parent</groupId> - <artifactId>odlparent-lite</artifactId> - <version>2.0.0</version> - <relativePath/> + <groupId>org.onap.sdnc.oam</groupId> + <artifactId>platform-logic</artifactId> + <version>2.0.0-SNAPSHOT</version> </parent> <groupId>org.onap.sdnc.oam</groupId> diff --git a/platform-logic/pom.xml b/platform-logic/pom.xml index b57949b6..f638ce83 100644 --- a/platform-logic/pom.xml +++ b/platform-logic/pom.xml @@ -3,10 +3,9 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.parent</groupId> - <artifactId>odlparent-lite</artifactId> - <version>2.0.0</version> - <relativePath/> + <groupId>org.onap.sdnc.oam</groupId> + <artifactId>sdnc-oam</artifactId> + <version>2.0.0-SNAPSHOT</version> </parent> <groupId>org.onap.sdnc.oam</groupId> @@ -24,8 +23,8 @@ <module>setup</module> <module>generic-resource-api</module> <module>vnfapi</module> - <module>lcm</module> - <module>optical-service</module> + <module>lcm</module> + <module>optical-service</module> <module>restapi-templates</module> <module>restconfapi-yang</module> <module>datachange</module> diff --git a/platform-logic/restapi-templates/pom.xml b/platform-logic/restapi-templates/pom.xml index 426a44fe..d56d994f 100644 --- a/platform-logic/restapi-templates/pom.xml +++ b/platform-logic/restapi-templates/pom.xml @@ -3,10 +3,9 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.parent</groupId> - <artifactId>odlparent-lite</artifactId> - <version>2.0.0</version> - <relativePath/> + <groupId>org.onap.sdnc.oam</groupId> + <artifactId>platform-logic</artifactId> + <version>2.0.0-SNAPSHOT</version> </parent> <groupId>org.onap.sdnc.oam</groupId> diff --git a/platform-logic/restconfapi-yang/pom.xml b/platform-logic/restconfapi-yang/pom.xml index c75b76af..7e4ec049 100644 --- a/platform-logic/restconfapi-yang/pom.xml +++ b/platform-logic/restconfapi-yang/pom.xml @@ -3,10 +3,9 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.parent</groupId> - <artifactId>odlparent-lite</artifactId> - <version>2.0.0</version> - <relativePath/> + <groupId>org.onap.sdnc.oam</groupId> + <artifactId>platform-logic</artifactId> + <version>2.0.0-SNAPSHOT</version> </parent> <groupId>org.onap.sdnc.oam</groupId> diff --git a/platform-logic/setup/pom.xml b/platform-logic/setup/pom.xml index 25a3cca4..14ba4a33 100644 --- a/platform-logic/setup/pom.xml +++ b/platform-logic/setup/pom.xml @@ -3,10 +3,9 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.parent</groupId> - <artifactId>odlparent-lite</artifactId> - <version>2.0.0</version> - <relativePath/> + <groupId>org.onap.sdnc.oam</groupId> + <artifactId>platform-logic</artifactId> + <version>2.0.0-SNAPSHOT</version> </parent> <groupId>org.onap.sdnc.oam</groupId> diff --git a/platform-logic/vnfapi/pom.xml b/platform-logic/vnfapi/pom.xml index 511710ef..1ec28e8a 100644 --- a/platform-logic/vnfapi/pom.xml +++ b/platform-logic/vnfapi/pom.xml @@ -1,56 +1,55 @@ <?xml version="1.0" encoding="UTF-8"?> <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> + <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.onap.ccsdk.parent</groupId> - <artifactId>odlparent-lite</artifactId> - <version>2.0.0</version> - <relativePath/> - </parent> + <parent> + <groupId>org.onap.sdnc.oam</groupId> + <artifactId>platform-logic</artifactId> + <version>2.0.0-SNAPSHOT</version> + </parent> - <groupId>org.onap.sdnc.oam</groupId> - <artifactId>platform-logic-vnfapi</artifactId> - <version>2.0.0-SNAPSHOT</version> - <packaging>pom</packaging> + <groupId>org.onap.sdnc.oam</groupId> + <artifactId>platform-logic-vnfapi</artifactId> + <version>2.0.0-SNAPSHOT</version> + <packaging>pom</packaging> <name>sdnc-oam :: platform-logic :: ${project.artifactId}</name> - <description>Contains platform-level service logic for the VNF-API</description> + <description>Contains platform-level service logic for the VNF-API</description> - <build> - <plugins> - <plugin> - <artifactId>maven-resources-plugin</artifactId> - <version>2.6</version> - <executions> - <execution> - <id>copy-version</id> - <goals> - <goal>copy-resources</goal> - </goals><!-- here the phase you need --> - <phase>validate</phase> - <configuration> - <outputDirectory>../target/svclogic/graphs/vnfapi</outputDirectory> - <resources> - <resource> - <directory>src/main/xml</directory> - <includes> - <include>**/*.xml</include> - </includes> - <filtering>true</filtering> - </resource> - <resource> - <directory>src/main/resources</directory> - <includes> - <include>graph.versions</include> - </includes> - <filtering>true</filtering> - </resource> - </resources> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> + <build> + <plugins> + <plugin> + <artifactId>maven-resources-plugin</artifactId> + <version>2.6</version> + <executions> + <execution> + <id>copy-version</id> + <goals> + <goal>copy-resources</goal> + </goals><!-- here the phase you need --> + <phase>validate</phase> + <configuration> + <outputDirectory>../target/svclogic/graphs/vnfapi</outputDirectory> + <resources> + <resource> + <directory>src/main/xml</directory> + <includes> + <include>**/*.xml</include> + </includes> + <filtering>true</filtering> + </resource> + <resource> + <directory>src/main/resources</directory> + <includes> + <include>graph.versions</include> + </includes> + <filtering>true</filtering> + </resource> + </resources> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> </project> |