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 /installation | |
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 'installation')
-rw-r--r-- | installation/admportal/pom.xml | 24 | ||||
-rw-r--r-- | installation/ansible-server/pom.xml | 20 | ||||
-rw-r--r-- | installation/dmaap-listener/pom.xml | 23 | ||||
-rw-r--r-- | installation/pom.xml | 29 | ||||
-rw-r--r-- | installation/sdnc-web/pom.xml | 628 | ||||
-rw-r--r-- | installation/sdnc/pom.xml | 38 | ||||
-rw-r--r-- | installation/ueb-listener/pom.xml | 23 |
7 files changed, 390 insertions, 395 deletions
diff --git a/installation/admportal/pom.xml b/installation/admportal/pom.xml index b232c578..cbb84627 100644 --- a/installation/admportal/pom.xml +++ b/installation/admportal/pom.xml @@ -1,20 +1,23 @@ <?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/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.parent</groupId> - <artifactId>odlparent-lite</artifactId> - <version>2.0.0</version> + <groupId>org.onap.sdnc.oam</groupId> + <artifactId>installation</artifactId> + <version>2.0.0-SNAPSHOT</version> </parent> - <modelVersion>4.0.0</modelVersion> - <packaging>pom</packaging> <groupId>org.onap.sdnc.oam</groupId> <artifactId>installation-admportal</artifactId> - <version>2.0.0-SNAPSHOT</version> + <version>2.0.0-SNAPSHOT-SNAPSHOT</version> + <packaging>pom</packaging> <name>sdnc-oam :: installation :: ${project.artifactId}</name> <description>Creates admportal Docker container</description> + <organization> + <name>openECOMP</name> + </organization> <properties> <image.name>onap/admportal-sdnc-image</image.name> @@ -24,7 +27,6 @@ <maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format> </properties> - <build> <plugins> @@ -151,8 +153,8 @@ </executions> </plugin> <plugin> - <artifactId>exec-maven-plugin</artifactId> <groupId>org.codehaus.mojo</groupId> + <artifactId>exec-maven-plugin</artifactId> <version>1.5.0</version> <executions> <execution> @@ -227,9 +229,5 @@ </plugins> - </build> - <organization> - <name>openECOMP</name> - </organization> </project> diff --git a/installation/ansible-server/pom.xml b/installation/ansible-server/pom.xml index 7db0d741..f91ddfcd 100644 --- a/installation/ansible-server/pom.xml +++ b/installation/ansible-server/pom.xml @@ -1,19 +1,23 @@ <?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/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.parent</groupId> - <artifactId>odlparent-lite</artifactId> - <version>2.0.0</version> + <groupId>org.onap.sdnc.oam</groupId> + <artifactId>installation</artifactId> + <version>2.0.0-SNAPSHOT</version> </parent> - <modelVersion>4.0.0</modelVersion> - <packaging>pom</packaging> + <groupId>org.onap.sdnc.oam</groupId> <artifactId>installation-ansible-server</artifactId> <version>2.0.0-SNAPSHOT</version> + <packaging>pom</packaging> <name>sdnc-oam :: installation :: ${project.artifactId}</name> <description>Creates ansible-server Docker container</description> + <organization> + <name>ONAP</name> + </organization> <properties> <image.name>onap/sdnc-ansible-server-image</image.name> @@ -24,7 +28,6 @@ <maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format> </properties> - <build> <plugins> <plugin> @@ -121,7 +124,4 @@ </build> </profile> </profiles> - <organization> - <name>ONAP</name> - </organization> </project> diff --git a/installation/dmaap-listener/pom.xml b/installation/dmaap-listener/pom.xml index 5974aa4b..aa72d422 100644 --- a/installation/dmaap-listener/pom.xml +++ b/installation/dmaap-listener/pom.xml @@ -1,19 +1,23 @@ <?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/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.parent</groupId> - <artifactId>odlparent-lite</artifactId> - <version>2.0.0</version> + <groupId>org.onap.sdnc.oam</groupId> + <artifactId>installation</artifactId> + <version>2.0.0-SNAPSHOT</version> </parent> - <modelVersion>4.0.0</modelVersion> - <packaging>pom</packaging> + <groupId>org.onap.sdnc.oam</groupId> <artifactId>installation-dmaap-listener</artifactId> <version>2.0.0-SNAPSHOT</version> + <packaging>pom</packaging> <name>sdnc-oam :: installation :: ${project.artifactId}</name> <description>Creates dmaap-listener Docker container</description> + <organization> + <name>ONAP</name> + </organization> <properties> <image.name>onap/sdnc-dmaap-listener-image</image.name> @@ -24,7 +28,6 @@ <maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format> </properties> - <build> <plugins> @@ -142,8 +145,8 @@ </plugin> <plugin> - <artifactId>exec-maven-plugin</artifactId> <groupId>org.codehaus.mojo</groupId> + <artifactId>exec-maven-plugin</artifactId> <version>1.5.0</version> <executions> @@ -172,7 +175,6 @@ </executions> </plugin> </plugins> - </build> <profiles> @@ -225,7 +227,4 @@ </build> </profile> </profiles> - <organization> - <name>ONAP</name> - </organization> </project> diff --git a/installation/pom.xml b/installation/pom.xml index 0b8edce8..96d623d9 100644 --- a/installation/pom.xml +++ b/installation/pom.xml @@ -1,21 +1,29 @@ <?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/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.parent</groupId> - <artifactId>odlparent-lite</artifactId> - <version>2.0.0</version> + <groupId>org.onap.sdnc.oam</groupId> + <artifactId>sdnc-oam</artifactId> + <version>2.0.0-SNAPSHOT</version> </parent> - <modelVersion>4.0.0</modelVersion> - <packaging>pom</packaging> <groupId>org.onap.sdnc.oam</groupId> <artifactId>installation</artifactId> <version>2.0.0-SNAPSHOT</version> + <packaging>pom</packaging> <name>sdnc-oam :: installation</name> <description>Installs SDN-C on local file system</description> + <modules> + <module>ansible-server</module> + <module>sdnc</module> + <module>sdnc-web</module> + <module>ueb-listener</module> + <module>dmaap-listener</module> + </modules> + <properties> <application.name>installation</application.name> @@ -25,13 +33,4 @@ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> </properties> - - <modules> - <module>ansible-server</module> - <module>sdnc</module> - <module>sdnc-web</module> - <module>admportal</module> - <module>ueb-listener</module> - <module>dmaap-listener</module> - </modules> </project> diff --git a/installation/sdnc-web/pom.xml b/installation/sdnc-web/pom.xml index 3e6e9fde..ee49e7fb 100644 --- a/installation/sdnc-web/pom.xml +++ b/installation/sdnc-web/pom.xml @@ -1,325 +1,325 @@ <?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> - </parent> + <parent> + <groupId>org.onap.sdnc.oam</groupId> + <artifactId>installation</artifactId> + <version>2.0.0-SNAPSHOT</version> + </parent> - <groupId>org.onap.sdnc.oam</groupId> - <artifactId>installation-sdnc-web</artifactId> - <version>2.0.0-SNAPSHOT</version> - <packaging>pom</packaging> + <groupId>org.onap.sdnc.oam</groupId> + <artifactId>installation-sdnc-web</artifactId> + <version>2.0.0-SNAPSHOT</version> + <packaging>pom</packaging> - <name>sdnc-oam :: installation :: ${project.artifactId}</name> - <description>Creates SDN Controller WebUI Docker container</description> + <name>sdnc-oam :: installation :: ${project.artifactId}</name> + <description>Creates SDN Controller WebUI Docker container</description> - <properties> - <base.image.repo>docker.io/bitnami/nginx:1.16-debian-9</base.image.repo> - <image.name>onap/sdnc-web-image</image.name> - <sdnc.project.version>${project.version}</sdnc.project.version> - <sdnc.build.timestamp>${maven.build.timestamp}</sdnc.build.timestamp> - <ccsdk.groupId>org.onap.ccsdk.features.sdnr.wt</ccsdk.groupId> - <ccsdk.features.version>1.0.0-SNAPSHOT</ccsdk.features.version> - <docker.buildArg.https_proxy>${https_proxy}</docker.buildArg.https_proxy> - <maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format> - <docker.push.phase>deploy</docker.push.phase> - <docker.verbose>true</docker.verbose> - </properties> + <properties> + <base.image.repo>docker.io/bitnami/nginx:1.16-debian-9</base.image.repo> + <image.name>onap/sdnc-web-image</image.name> + <sdnc.project.version>${project.version}</sdnc.project.version> + <sdnc.build.timestamp>${maven.build.timestamp}</sdnc.build.timestamp> + <ccsdk.groupId>org.onap.ccsdk.features.sdnr.wt</ccsdk.groupId> + <ccsdk.features.version>1.0.0-SNAPSHOT</ccsdk.features.version> + <docker.buildArg.https_proxy>${https_proxy}</docker.buildArg.https_proxy> + <maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format> + <docker.push.phase>deploy</docker.push.phase> + <docker.verbose>true</docker.verbose> + </properties> - <dependencies> - <dependency> - <groupId>org.onap.ccsdk.features.sdnr.wt</groupId> - <artifactId>sdnr-wt-odlux-framework</artifactId> - <version>${ccsdk.features.version}</version> - </dependency> - <dependency> - <groupId>org.onap.ccsdk.features.sdnr.wt</groupId> - <artifactId>sdnr-wt-odlux-apps-installer</artifactId> - <version>${ccsdk.features.version}</version> - <type>zip</type> - <classifier>repo</classifier> - </dependency> - <dependency> - <groupId>org.onap.ccsdk.features.sdnr.wt</groupId> - <artifactId>sdnr-wt-helpserver-installer</artifactId> - <version>${ccsdk.features.version}</version> - <type>zip</type> - <classifier>repo</classifier> - </dependency> - </dependencies> + <dependencies> + <dependency> + <groupId>org.onap.ccsdk.features.sdnr.wt</groupId> + <artifactId>sdnr-wt-odlux-framework</artifactId> + <version>${ccsdk.features.version}</version> + </dependency> + <dependency> + <groupId>org.onap.ccsdk.features.sdnr.wt</groupId> + <artifactId>sdnr-wt-odlux-apps-installer</artifactId> + <version>${ccsdk.features.version}</version> + <type>zip</type> + <classifier>repo</classifier> + </dependency> + <dependency> + <groupId>org.onap.ccsdk.features.sdnr.wt</groupId> + <artifactId>sdnr-wt-helpserver-installer</artifactId> + <version>${ccsdk.features.version}</version> + <type>zip</type> + <classifier>repo</classifier> + </dependency> + </dependencies> - <build> - <plugins> - <plugin> - <groupId>org.codehaus.groovy.maven</groupId> - <artifactId>gmaven-plugin</artifactId> - <version>1.0</version> - <executions> - <execution> - <phase>validate</phase> - <goals> - <goal>execute</goal> - </goals> - <configuration> - <source>${basedir}/../TagVersion.groovy</source> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <artifactId>maven-resources-plugin</artifactId> - <version>2.6</version> - <executions> - <execution> - <id>copy-dockerfile</id> - <goals> - <goal>copy-resources</goal> - </goals> <!-- here the phase you need --> - <phase>validate</phase> - <configuration> - <outputDirectory>${basedir}/target/docker-stage</outputDirectory> - <resources> - <resource> - <directory>src/main/docker</directory> - <includes> - <include>Dockerfile</include> - </includes> - <filtering>true</filtering> - </resource> - </resources> - </configuration> - </execution> - <execution> - <id>copy-siteconf</id> - <goals> - <goal>copy-resources</goal> - </goals> <!-- here the phase you need --> - <phase>validate</phase> - <configuration> - <outputDirectory>${basedir}/target/docker-stage</outputDirectory> - <resources> - <resource> - <directory>src/main/resources</directory> - <includes> - <include>*.conf</include> - </includes> - <filtering>true</filtering> - </resource> - </resources> - </configuration> - </execution> + <build> + <plugins> + <plugin> + <groupId>org.codehaus.groovy.maven</groupId> + <artifactId>gmaven-plugin</artifactId> + <version>1.0</version> + <executions> + <execution> + <phase>validate</phase> + <goals> + <goal>execute</goal> + </goals> + <configuration> + <source>${basedir}/../TagVersion.groovy</source> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <artifactId>maven-resources-plugin</artifactId> + <version>2.6</version> + <executions> + <execution> + <id>copy-dockerfile</id> + <goals> + <goal>copy-resources</goal> + </goals> <!-- here the phase you need --> + <phase>validate</phase> + <configuration> + <outputDirectory>${basedir}/target/docker-stage</outputDirectory> + <resources> + <resource> + <directory>src/main/docker</directory> + <includes> + <include>Dockerfile</include> + </includes> + <filtering>true</filtering> + </resource> + </resources> + </configuration> + </execution> + <execution> + <id>copy-siteconf</id> + <goals> + <goal>copy-resources</goal> + </goals> <!-- here the phase you need --> + <phase>validate</phase> + <configuration> + <outputDirectory>${basedir}/target/docker-stage</outputDirectory> + <resources> + <resource> + <directory>src/main/resources</directory> + <includes> + <include>*.conf</include> + </includes> + <filtering>true</filtering> + </resource> + </resources> + </configuration> + </execution> - <execution> - <id>copy-scripts</id> - <goals> - <goal>copy-resources</goal> - </goals> <!-- here the phase you need --> - <phase>validate</phase> - <configuration> - <outputDirectory>${basedir}/target/docker-stage/bin</outputDirectory> - <resources> - <resource> - <directory>src/main/scripts</directory> - <includes> - <include>*.sh</include> - </includes> - <filtering>true</filtering> - </resource> - </resources> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - <executions> - <execution> - <id>unpack features</id> - <phase>generate-sources</phase> - <goals> - <goal>unpack</goal> - </goals> + <execution> + <id>copy-scripts</id> + <goals> + <goal>copy-resources</goal> + </goals> <!-- here the phase you need --> + <phase>validate</phase> + <configuration> + <outputDirectory>${basedir}/target/docker-stage/bin</outputDirectory> + <resources> + <resource> + <directory>src/main/scripts</directory> + <includes> + <include>*.sh</include> + </includes> + <filtering>true</filtering> + </resource> + </resources> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <executions> + <execution> + <id>unpack features</id> + <phase>generate-sources</phase> + <goals> + <goal>unpack</goal> + </goals> - <configuration> - <artifactItems> - <artifactItem> - <groupId>${ccsdk.groupId}</groupId> - <artifactId>sdnr-wt-odlux-framework</artifactId> - <version>${ccsdk.features.version}</version> - <type>jar</type> - <overWrite>false</overWrite> - <outputDirectory>${project.build.directory}/docker-stage/html</outputDirectory> - <includes>odlux/**</includes> - </artifactItem> - <!-- connectApp --> - <artifactItem> - <groupId>${ccsdk.groupId}</groupId> - <artifactId>sdnr-wt-odlux-app-connectApp</artifactId> - <version>${ccsdk.features.version}</version> - <type>jar</type> - <overWrite>false</overWrite> - <outputDirectory>${project.build.directory}/docker-stage/html</outputDirectory> - <includes>odlux/**</includes> - </artifactItem> - <!-- eventLogApp --> - <artifactItem> - <groupId>${ccsdk.groupId}</groupId> - <artifactId>sdnr-wt-odlux-app-eventLogApp</artifactId> - <version>${ccsdk.features.version}</version> - <type>jar</type> - <overWrite>false</overWrite> - <outputDirectory>${project.build.directory}/docker-stage/html</outputDirectory> - <includes>odlux/**</includes> - </artifactItem> - <!-- helpApp --> - <artifactItem> - <groupId>${ccsdk.groupId}</groupId> - <artifactId>sdnr-wt-odlux-app-helpApp</artifactId> - <version>${ccsdk.features.version}</version> - <type>jar</type> - <overWrite>false</overWrite> - <outputDirectory>${project.build.directory}/docker-stage/html</outputDirectory> - <includes>odlux/**</includes> - </artifactItem> - <!-- maintenanceApp --> - <artifactItem> - <groupId>${ccsdk.groupId}</groupId> - <artifactId>sdnr-wt-odlux-app-maintenanceApp</artifactId> - <version>${ccsdk.features.version}</version> - <type>jar</type> - <overWrite>false</overWrite> - <outputDirectory>${project.build.directory}/docker-stage/html</outputDirectory> - <includes>odlux/**</includes> - </artifactItem> - <!-- minimumApp --> - <artifactItem> - <groupId>${ccsdk.groupId}</groupId> - <artifactId>sdnr-wt-odlux-app-minimumApp</artifactId> - <version>${ccsdk.features.version}</version> - <type>jar</type> - <overWrite>false</overWrite> - <outputDirectory>${project.build.directory}/docker-stage/html</outputDirectory> - <includes>odlux/**</includes> - </artifactItem> - <!-- configurationApp --> - <artifactItem> - <groupId>${ccsdk.groupId}</groupId> - <artifactId>sdnr-wt-odlux-app-configurationApp</artifactId> - <version>${ccsdk.features.version}</version> - <type>jar</type> - <overWrite>false</overWrite> - <outputDirectory>${project.build.directory}/docker-stage/html</outputDirectory> - <includes>odlux/**</includes> - </artifactItem> - <!-- demoApp --> - <artifactItem> - <groupId>${ccsdk.groupId}</groupId> - <artifactId>sdnr-wt-odlux-app-demoApp</artifactId> - <version>${ccsdk.features.version}</version> - <type>jar</type> - <overWrite>false</overWrite> - <outputDirectory>${project.build.directory}/docker-stage/html</outputDirectory> - <includes>odlux/**</includes> - </artifactItem> - <!-- faultApp --> - <artifactItem> - <groupId>${ccsdk.groupId}</groupId> - <artifactId>sdnr-wt-odlux-app-faultApp</artifactId> - <version>${ccsdk.features.version}</version> - <type>jar</type> - <overWrite>false</overWrite> - <outputDirectory>${project.build.directory}/docker-stage/html</outputDirectory> - <includes>odlux/*</includes> - </artifactItem> - <!-- inventoryApp --> - <artifactItem> - <groupId>${ccsdk.groupId}</groupId> - <artifactId>sdnr-wt-odlux-app-inventoryApp</artifactId> - <version>${ccsdk.features.version}</version> - <type>jar</type> - <overWrite>false</overWrite> - <outputDirectory>${project.build.directory}/docker-stage/html</outputDirectory> - <includes>odlux/**</includes> - </artifactItem> - <!-- mediatorApp --> - <artifactItem> - <groupId>${ccsdk.groupId}</groupId> - <artifactId>sdnr-wt-odlux-app-mediatorApp</artifactId> - <version>${ccsdk.features.version}</version> - <type>jar</type> - <overWrite>false</overWrite> - <outputDirectory>${project.build.directory}/docker-stage/html</outputDirectory> - <includes>odlux/**</includes> - </artifactItem> - <!-- performanceHistoryApp --> - <artifactItem> - <groupId>${ccsdk.groupId}</groupId> - <artifactId>sdnr-wt-odlux-app-performanceHistoryApp</artifactId> - <version>${ccsdk.features.version}</version> - <type>jar</type> - <overWrite>false</overWrite> - <outputDirectory>${project.build.directory}/docker-stage/html</outputDirectory> - <includes>odlux/**</includes> - </artifactItem> - <!-- helpserver resources --> - <artifactItem> - <groupId>${ccsdk.groupId}</groupId> - <artifactId>sdnr-wt-helpserver-provider</artifactId> - <version>${ccsdk.features.version}</version> - <type>jar</type> - <overWrite>false</overWrite> - <outputDirectory>${project.build.directory}/docker-stage/html</outputDirectory> - <includes>help/**</includes> - </artifactItem> - </artifactItems> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <groupId>io.fabric8</groupId> - <artifactId>docker-maven-plugin</artifactId> - <version>0.16.5</version> - <inherited>false</inherited> - <configuration> - <images> - <image> - <name>${image.name}</name> - <build> - <cleanup>try</cleanup> - <dockerFileDir>${basedir}/target/docker-stage</dockerFileDir> - <dockerFile>${basedir}/target/docker-stage/Dockerfile</dockerFile> - <tags> - <tag>${project.docker.latestminortag.version}</tag> - <tag>${project.docker.latestfulltag.version}</tag> - <tag>${project.docker.latesttagtimestamp.version}</tag> - </tags> - </build> - </image> - </images> - </configuration> - <executions> - <execution> - <id>generate-images</id> - <phase>package</phase> - <goals> - <goal>build</goal> - </goals> - </execution> - <execution> - <id>push-images</id> - <phase>${docker.push.phase}</phase> - <goals> - <goal>build</goal> - <goal>push</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> + <configuration> + <artifactItems> + <artifactItem> + <groupId>${ccsdk.groupId}</groupId> + <artifactId>sdnr-wt-odlux-framework</artifactId> + <version>${ccsdk.features.version}</version> + <type>jar</type> + <overWrite>false</overWrite> + <outputDirectory>${project.build.directory}/docker-stage/html</outputDirectory> + <includes>odlux/**</includes> + </artifactItem> + <!-- connectApp --> + <artifactItem> + <groupId>${ccsdk.groupId}</groupId> + <artifactId>sdnr-wt-odlux-app-connectApp</artifactId> + <version>${ccsdk.features.version}</version> + <type>jar</type> + <overWrite>false</overWrite> + <outputDirectory>${project.build.directory}/docker-stage/html</outputDirectory> + <includes>odlux/**</includes> + </artifactItem> + <!-- eventLogApp --> + <artifactItem> + <groupId>${ccsdk.groupId}</groupId> + <artifactId>sdnr-wt-odlux-app-eventLogApp</artifactId> + <version>${ccsdk.features.version}</version> + <type>jar</type> + <overWrite>false</overWrite> + <outputDirectory>${project.build.directory}/docker-stage/html</outputDirectory> + <includes>odlux/**</includes> + </artifactItem> + <!-- helpApp --> + <artifactItem> + <groupId>${ccsdk.groupId}</groupId> + <artifactId>sdnr-wt-odlux-app-helpApp</artifactId> + <version>${ccsdk.features.version}</version> + <type>jar</type> + <overWrite>false</overWrite> + <outputDirectory>${project.build.directory}/docker-stage/html</outputDirectory> + <includes>odlux/**</includes> + </artifactItem> + <!-- maintenanceApp --> + <artifactItem> + <groupId>${ccsdk.groupId}</groupId> + <artifactId>sdnr-wt-odlux-app-maintenanceApp</artifactId> + <version>${ccsdk.features.version}</version> + <type>jar</type> + <overWrite>false</overWrite> + <outputDirectory>${project.build.directory}/docker-stage/html</outputDirectory> + <includes>odlux/**</includes> + </artifactItem> + <!-- minimumApp --> + <artifactItem> + <groupId>${ccsdk.groupId}</groupId> + <artifactId>sdnr-wt-odlux-app-minimumApp</artifactId> + <version>${ccsdk.features.version}</version> + <type>jar</type> + <overWrite>false</overWrite> + <outputDirectory>${project.build.directory}/docker-stage/html</outputDirectory> + <includes>odlux/**</includes> + </artifactItem> + <!-- configurationApp --> + <artifactItem> + <groupId>${ccsdk.groupId}</groupId> + <artifactId>sdnr-wt-odlux-app-configurationApp</artifactId> + <version>${ccsdk.features.version}</version> + <type>jar</type> + <overWrite>false</overWrite> + <outputDirectory>${project.build.directory}/docker-stage/html</outputDirectory> + <includes>odlux/**</includes> + </artifactItem> + <!-- demoApp --> + <artifactItem> + <groupId>${ccsdk.groupId}</groupId> + <artifactId>sdnr-wt-odlux-app-demoApp</artifactId> + <version>${ccsdk.features.version}</version> + <type>jar</type> + <overWrite>false</overWrite> + <outputDirectory>${project.build.directory}/docker-stage/html</outputDirectory> + <includes>odlux/**</includes> + </artifactItem> + <!-- faultApp --> + <artifactItem> + <groupId>${ccsdk.groupId}</groupId> + <artifactId>sdnr-wt-odlux-app-faultApp</artifactId> + <version>${ccsdk.features.version}</version> + <type>jar</type> + <overWrite>false</overWrite> + <outputDirectory>${project.build.directory}/docker-stage/html</outputDirectory> + <includes>odlux/*</includes> + </artifactItem> + <!-- inventoryApp --> + <artifactItem> + <groupId>${ccsdk.groupId}</groupId> + <artifactId>sdnr-wt-odlux-app-inventoryApp</artifactId> + <version>${ccsdk.features.version}</version> + <type>jar</type> + <overWrite>false</overWrite> + <outputDirectory>${project.build.directory}/docker-stage/html</outputDirectory> + <includes>odlux/**</includes> + </artifactItem> + <!-- mediatorApp --> + <artifactItem> + <groupId>${ccsdk.groupId}</groupId> + <artifactId>sdnr-wt-odlux-app-mediatorApp</artifactId> + <version>${ccsdk.features.version}</version> + <type>jar</type> + <overWrite>false</overWrite> + <outputDirectory>${project.build.directory}/docker-stage/html</outputDirectory> + <includes>odlux/**</includes> + </artifactItem> + <!-- performanceHistoryApp --> + <artifactItem> + <groupId>${ccsdk.groupId}</groupId> + <artifactId>sdnr-wt-odlux-app-performanceHistoryApp</artifactId> + <version>${ccsdk.features.version}</version> + <type>jar</type> + <overWrite>false</overWrite> + <outputDirectory>${project.build.directory}/docker-stage/html</outputDirectory> + <includes>odlux/**</includes> + </artifactItem> + <!-- helpserver resources --> + <artifactItem> + <groupId>${ccsdk.groupId}</groupId> + <artifactId>sdnr-wt-helpserver-provider</artifactId> + <version>${ccsdk.features.version}</version> + <type>jar</type> + <overWrite>false</overWrite> + <outputDirectory>${project.build.directory}/docker-stage/html</outputDirectory> + <includes>help/**</includes> + </artifactItem> + </artifactItems> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <groupId>io.fabric8</groupId> + <artifactId>docker-maven-plugin</artifactId> + <version>0.16.5</version> + <inherited>false</inherited> + <configuration> + <images> + <image> + <name>${image.name}</name> + <build> + <cleanup>try</cleanup> + <dockerFileDir>${basedir}/target/docker-stage</dockerFileDir> + <dockerFile>${basedir}/target/docker-stage/Dockerfile</dockerFile> + <tags> + <tag>${project.docker.latestminortag.version}</tag> + <tag>${project.docker.latestfulltag.version}</tag> + <tag>${project.docker.latesttagtimestamp.version}</tag> + </tags> + </build> + </image> + </images> + </configuration> + <executions> + <execution> + <id>generate-images</id> + <phase>package</phase> + <goals> + <goal>build</goal> + </goals> + </execution> + <execution> + <id>push-images</id> + <phase>${docker.push.phase}</phase> + <goals> + <goal>build</goal> + <goal>push</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> </project> diff --git a/installation/sdnc/pom.xml b/installation/sdnc/pom.xml index 9c832fb0..abc69283 100644 --- a/installation/sdnc/pom.xml +++ b/installation/sdnc/pom.xml @@ -1,20 +1,23 @@ <?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/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.parent</groupId> - <artifactId>odlparent-lite</artifactId> - <version>2.0.0</version> + <groupId>org.onap.sdnc.oam</groupId> + <artifactId>installation</artifactId> + <version>2.0.0-SNAPSHOT</version> </parent> - <modelVersion>4.0.0</modelVersion> - <packaging>pom</packaging> <groupId>org.onap.sdnc.oam</groupId> <artifactId>installation-sdnc</artifactId> <version>2.0.0-SNAPSHOT</version> + <packaging>pom</packaging> <name>sdnc-oam :: installation :: ${project.artifactId}</name> <description>Creates SDN Controller Docker container</description> + <organization> + <name>ONAP</name> + </organization> <properties> <image.name>onap/sdnc-aaf-image</image.name> @@ -38,59 +41,59 @@ <groupId>org.onap.sdnc.northbound</groupId> <artifactId>generic-resource-api-installer</artifactId> <version>${sdnc.northbound.version}</version> - <classifier>repo</classifier> <type>zip</type> + <classifier>repo</classifier> </dependency> <dependency> <groupId>org.onap.sdnc.northbound</groupId> <artifactId>vnfapi-installer</artifactId> <version>${sdnc.northbound.version}</version> - <classifier>repo</classifier> <type>zip</type> + <classifier>repo</classifier> </dependency> <dependency> <groupId>org.onap.sdnc.northbound</groupId> <artifactId>optical-service-installer</artifactId> <version>${sdnc.northbound.version}</version> - <classifier>repo</classifier> <type>zip</type> + <classifier>repo</classifier> </dependency> - <dependency> + <dependency> <groupId>org.onap.sdnc.northbound</groupId> <artifactId>vnftools-installer</artifactId> <version>${sdnc.northbound.version}</version> - <classifier>repo</classifier> <type>zip</type> + <classifier>repo</classifier> </dependency> <dependency> <groupId>org.onap.sdnc.northbound</groupId> <artifactId>sdnc-northbound-features-installer</artifactId> <version>${sdnc.northbound.version}</version> - <classifier>repo</classifier> <type>zip</type> + <classifier>repo</classifier> </dependency> <dependency> <groupId>org.onap.ccsdk.features.sdnr.northbound</groupId> <artifactId>oofpcipoc-installer</artifactId> <version>${ccsdk.features.version}</version> - <classifier>repo</classifier> <type>zip</type> + <classifier>repo</classifier> </dependency> <dependency> <groupId>org.onap.ccsdk.features.sdnr.northbound</groupId> <artifactId>sdnr-northbound-features-installer</artifactId> <version>${ccsdk.features.version}</version> - <classifier>repo</classifier> <type>zip</type> + <classifier>repo</classifier> </dependency> <dependency> <groupId>org.onap.ccsdk.features.sdnr.wt</groupId> <artifactId>sdnr-wt-feature-aggregator-installer</artifactId> <version>${ccsdk.features.version}</version> - <classifier>repo</classifier> <type>zip</type> + <classifier>repo</classifier> </dependency> </dependencies> @@ -403,8 +406,8 @@ </executions> </plugin> <plugin> - <artifactId>exec-maven-plugin</artifactId> <groupId>org.codehaus.mojo</groupId> + <artifactId>exec-maven-plugin</artifactId> <version>1.5.0</version> <executions> <execution> @@ -431,7 +434,4 @@ </plugin> </plugins> </build> - <organization> - <name>ONAP</name> - </organization> </project> diff --git a/installation/ueb-listener/pom.xml b/installation/ueb-listener/pom.xml index 02746abf..eabd44b1 100644 --- a/installation/ueb-listener/pom.xml +++ b/installation/ueb-listener/pom.xml @@ -1,19 +1,23 @@ <?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/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.parent</groupId> - <artifactId>odlparent-lite</artifactId> - <version>2.0.0</version> + <groupId>org.onap.sdnc.oam</groupId> + <artifactId>installation</artifactId> + <version>2.0.0-SNAPSHOT</version> </parent> - <modelVersion>4.0.0</modelVersion> - <packaging>pom</packaging> + <groupId>org.onap.sdnc.oam</groupId> <artifactId>installation-ueb-listener</artifactId> <version>2.0.0-SNAPSHOT</version> + <packaging>pom</packaging> <name>sdnc-oam :: installation :: ${project.artifactId}</name> <description>Creates ueb-listener Docker container</description> + <organization> + <name>ONAP</name> + </organization> <properties> <image.name>onap/sdnc-ueb-listener-image</image.name> @@ -25,7 +29,6 @@ <maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format> </properties> - <build> <plugins> @@ -143,8 +146,8 @@ </plugin> <plugin> - <artifactId>exec-maven-plugin</artifactId> <groupId>org.codehaus.mojo</groupId> + <artifactId>exec-maven-plugin</artifactId> <version>1.5.0</version> <executions> @@ -173,7 +176,6 @@ </executions> </plugin> </plugins> - </build> <profiles> @@ -227,7 +229,4 @@ </build> </profile> </profiles> - <organization> - <name>ONAP</name> - </organization> </project> |