diff options
| author |   Michael Dürre <michael.duerre@highstreet-technologies.com> | 2020-02-07 07:23:27 +0100 |
|---|---|---|
| committer |   Dan Timoney <dtimoney@att.com> | 2020-02-19 14:29:16 +0000 |
| commit | 8bbe748d631353b8c48c7d71eb733cf85712884c (patch) | |
| tree | 025ce26fe32065f5608d516d79f51f483c5d4459 /installation/sdnc-web/pom.xml | |
| parent | f0cbef6e5e20b947252c1ff9ef851de7990f8128 (diff) | |
fixed sdnc-web pom
fixed parent and also some other props sync to sdnc-image
Issue-ID: SDNC-1064
Signed-off-by: Michael Dürre <michael.duerre@highstreet-technologies.com>
Change-Id: I7807e6298da407d0e87db24e6b95b32d4655c5f7
Signed-off-by: Michael Dürre <michael.duerre@highstreet-technologies.com>
Former-commit-id: b5cd53a8da9d5a4707875e97d6975097217e9545
Diffstat (limited to 'installation/sdnc-web/pom.xml')
| -rw-r--r-- | installation/sdnc-web/pom.xml | 63 |
1 files changed, 27 insertions, 36 deletions
diff --git a/installation/sdnc-web/pom.xml b/installation/sdnc-web/pom.xml index bf91b5c6..1ae66ab6 100644 --- a/installation/sdnc-web/pom.xml +++ b/installation/sdnc-web/pom.xml @@ -6,7 +6,6 @@ <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> <version>1.5.1</version> - <relativePath /> </parent> <groupId>org.onap.sdnc.oam</groupId> @@ -15,20 +14,19 @@ <packaging>pom</packaging> <name>sdnc-oam :: installation :: ${project.artifactId}</name> - <description>Creates SDN Controller Docker container</description> + <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>oof-pci/ccsdk-odlwt-webserver</image.name> - <ccsdk.build.timestamp>${maven.build.timestamp}</ccsdk.build.timestamp> + <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>0.7.1-SNAPSHOT</ccsdk.features.version> - <platform-logic-installer.version>${project.version}</platform-logic-installer.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> - <ansible.gpg.key>93C4A3FD7BB9C367</ansible.gpg.key> </properties> <dependencies> @@ -41,16 +39,16 @@ <groupId>org.onap.ccsdk.features.sdnr.wt</groupId> <artifactId>sdnr-wt-odlux-apps-installer</artifactId> <version>${ccsdk.features.version}</version> - <classifier>repo</classifier> - <type>zip</type> + <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> - <dependency> - <groupId>org.onap.ccsdk.features.sdnr.wt</groupId> - <artifactId>sdnr-wt-helpserver-installer</artifactId> - <version>${ccsdk.features.version}</version> - <classifier>repo</classifier> - <type>zip</type> - </dependency> </dependencies> <build> @@ -66,7 +64,7 @@ <goal>execute</goal> </goals> <configuration> - <source>${basedir}/src/main/scripts/TagVersion.groovy</source> + <source>${basedir}/../TagVersion.groovy</source> </configuration> </execution> </executions> @@ -79,7 +77,7 @@ <id>copy-dockerfile</id> <goals> <goal>copy-resources</goal> - </goals> <!-- here the phase you need --> + </goals> <!-- here the phase you need --> <phase>validate</phase> <configuration> <outputDirectory>${basedir}/target/docker-stage</outputDirectory> @@ -98,7 +96,7 @@ <id>copy-siteconf</id> <goals> <goal>copy-resources</goal> - </goals> <!-- here the phase you need --> + </goals> <!-- here the phase you need --> <phase>validate</phase> <configuration> <outputDirectory>${basedir}/target/docker-stage</outputDirectory> @@ -118,7 +116,7 @@ <id>copy-scripts</id> <goals> <goal>copy-resources</goal> - </goals> <!-- here the phase you need --> + </goals> <!-- here the phase you need --> <phase>validate</phase> <configuration> <outputDirectory>${basedir}/target/docker-stage/bin</outputDirectory> @@ -267,16 +265,16 @@ <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> + <!-- 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> @@ -323,12 +321,5 @@ </executions> </plugin> </plugins> - <extensions> - <extension><!-- this extension is required by wagon in order to pass the proxy --> - <groupId>org.apache.maven.wagon</groupId> - <artifactId>wagon-http-lightweight</artifactId> - <version>2.2</version> - </extension> - </extensions> </build> </project> |