aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMoshe Hoadley <moshehoa@amdocs.com>2017-10-31 12:22:12 +0200
committerMoshe Hoadley <moshehoa@amdocs.com>2017-10-31 12:48:00 +0200
commitc2d8256b1a98bbcb892af2706f0b9a1ecafe3b81 (patch)
tree0d6d84711f622f260f2fee3a712eb832f5c9facd
parent6ba0027cf667324d2fff174b4c455ea30bedd850 (diff)
fix for VNFSDK-120
Change-Id: Ie2315395b6db15025e2c6744afb431d331cccc05 Signed-off-by: Moshe Hoadley <moshehoa@amdocs.com>
-rw-r--r--pom.xml6
-rw-r--r--vnfmarket-be/deployment/docker/docker-postgres/pom.xml1
-rw-r--r--vnfmarket-be/deployment/docker/docker-refrepo/pom.xml1
-rw-r--r--vnfmarket-be/deployment/pom.xml1
-rw-r--r--vnfmarket-be/deployment/zip/pom.xml1
-rw-r--r--vnfmarket-be/pom.xml5
-rw-r--r--vnfmarket-be/portal-marketplace/pom.xml2
-rw-r--r--vnfmarket/pom.xml4
8 files changed, 9 insertions, 12 deletions
diff --git a/pom.xml b/pom.xml
index 20774d47..2ce5cbd0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,7 +21,6 @@
<groupId>org.onap.oparent</groupId>
<artifactId>oparent</artifactId>
<version>0.1.1</version>
- <relativePath>../../oparent</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -31,7 +30,8 @@
<packaging>pom</packaging>
<name>vnfsdk-refrepo</name>
- <modules>
- <module>vnfmarket-be</module>
+ <modules>
+ <module>vnfmarket</module>
+ <module>vnfmarket-be</module>
</modules>
</project>
diff --git a/vnfmarket-be/deployment/docker/docker-postgres/pom.xml b/vnfmarket-be/deployment/docker/docker-postgres/pom.xml
index 036b59c1..1e841f04 100644
--- a/vnfmarket-be/deployment/docker/docker-postgres/pom.xml
+++ b/vnfmarket-be/deployment/docker/docker-postgres/pom.xml
@@ -24,7 +24,6 @@
<groupId>org.onap.vnfsdk.refrepo</groupId>
<artifactId>vnf-sdk-marketplace-core-parent</artifactId>
<version>1.0.0-SNAPSHOT</version>
- <relativePath>../../../pom.xml</relativePath>
</parent>
<artifactId>vnfmarket-docker-refrepo-postgres</artifactId>
diff --git a/vnfmarket-be/deployment/docker/docker-refrepo/pom.xml b/vnfmarket-be/deployment/docker/docker-refrepo/pom.xml
index a3f2d8a7..2925e0c8 100644
--- a/vnfmarket-be/deployment/docker/docker-refrepo/pom.xml
+++ b/vnfmarket-be/deployment/docker/docker-refrepo/pom.xml
@@ -24,7 +24,6 @@
<groupId>org.onap.vnfsdk.refrepo</groupId>
<artifactId>vnf-sdk-marketplace-core-parent</artifactId>
<version>1.0.0-SNAPSHOT</version>
- <relativePath>../../../pom.xml</relativePath>
</parent>
<artifactId>vnfmarket-docker-refrepo</artifactId>
diff --git a/vnfmarket-be/deployment/pom.xml b/vnfmarket-be/deployment/pom.xml
index 5841c313..c0aba199 100644
--- a/vnfmarket-be/deployment/pom.xml
+++ b/vnfmarket-be/deployment/pom.xml
@@ -24,7 +24,6 @@
<groupId>org.onap.vnfsdk.refrepo</groupId>
<artifactId>vnf-sdk-marketplace-core-parent</artifactId>
<version>1.0.0-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
</parent>
<artifactId>vnfmarket-deployment</artifactId>
diff --git a/vnfmarket-be/deployment/zip/pom.xml b/vnfmarket-be/deployment/zip/pom.xml
index bddd57cc..a36bebac 100644
--- a/vnfmarket-be/deployment/zip/pom.xml
+++ b/vnfmarket-be/deployment/zip/pom.xml
@@ -20,7 +20,6 @@
<groupId>org.onap.vnfsdk.refrepo</groupId>
<artifactId>vnf-sdk-marketplace-core-parent</artifactId>
<version>1.0.0-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>vnf-sdk-marketplace-deployment</artifactId>
diff --git a/vnfmarket-be/pom.xml b/vnfmarket-be/pom.xml
index c3ce4820..f9b29f53 100644
--- a/vnfmarket-be/pom.xml
+++ b/vnfmarket-be/pom.xml
@@ -31,7 +31,8 @@
<tag>HEAD</tag>
</scm>
<modules>
- <module>vnf-sdk-marketplace</module>
- <module>deployment</module>
+ <module>vnf-sdk-marketplace</module>
+ <module>portal-marketplace</module>
+ <module>deployment</module>
</modules>
</project>
diff --git a/vnfmarket-be/portal-marketplace/pom.xml b/vnfmarket-be/portal-marketplace/pom.xml
index 60937ceb..6f5b01f4 100644
--- a/vnfmarket-be/portal-marketplace/pom.xml
+++ b/vnfmarket-be/portal-marketplace/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.onap.vnfsdk.refrepo</groupId>
<artifactId>vnf-sdk-marketplace-core-parent</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>portal-marketplace</artifactId>
diff --git a/vnfmarket/pom.xml b/vnfmarket/pom.xml
index 46597fdc..6d8240fb 100644
--- a/vnfmarket/pom.xml
+++ b/vnfmarket/pom.xml
@@ -18,9 +18,9 @@
-->
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
- <groupId>org.onap.vnfsdk.refrepo</groupId>
+ <groupId>org.onap.oparent</groupId>
<artifactId>oparent</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>0.1.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>