summaryrefslogtreecommitdiffstats
path: root/vnfmarket-be/deployment
diff options
context:
space:
mode:
authorKanagaraj Manickam k00365106 <kanagaraj.manickam@huawei.com>2018-05-16 01:44:10 +0530
committerKanagaraj Manickam k00365106 <kanagaraj.manickam@huawei.com>2018-05-16 01:47:41 +0530
commit7d1432a75e430e5a37842f48275fa13bcaf3f0bb (patch)
tree310b81636b898c8faba931a7a5e3848a26ebafc6 /vnfmarket-be/deployment
parentd07ee6406ef18ba05c4554765c134150c595499b (diff)
Make core parent 1.1.1 in all sub modules
Issue-ID: VNFSDK-266 Change-Id: Ibb4766e58fe540f9bbebf2c3b6f9fcd20a82b22f Signed-off-by: Kanagaraj Manickam k00365106 <kanagaraj.manickam@huawei.com>
Diffstat (limited to 'vnfmarket-be/deployment')
-rw-r--r--vnfmarket-be/deployment/docker/docker-postgres/pom.xml30
-rw-r--r--vnfmarket-be/deployment/docker/docker-refrepo/pom.xml16
-rw-r--r--vnfmarket-be/deployment/pom.xml4
-rw-r--r--vnfmarket-be/deployment/zip/pom.xml18
4 files changed, 34 insertions, 34 deletions
diff --git a/vnfmarket-be/deployment/docker/docker-postgres/pom.xml b/vnfmarket-be/deployment/docker/docker-postgres/pom.xml
index f08a26ae..f9abcb3d 100644
--- a/vnfmarket-be/deployment/docker/docker-postgres/pom.xml
+++ b/vnfmarket-be/deployment/docker/docker-postgres/pom.xml
@@ -23,14 +23,14 @@
<parent>
<groupId>org.onap.vnfsdk.refrepo</groupId>
<artifactId>vnf-sdk-marketplace-core-parent</artifactId>
- <version>1.1.0</version>
+ <version>1.1.1</version>
</parent>
<artifactId>vnfmarket-docker-refrepo-postgres</artifactId>
<name>vnfmarket/deployment/docker/postgres</name>
<packaging>pom</packaging>
- <properties>
+ <properties>
<maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format>
<docker.push.registry></docker.push.registry>
<skip.docker.build>true</skip.docker.build>
@@ -38,19 +38,19 @@
<skip.docker.push>true</skip.docker.push>
<docker.skip>false</docker.skip>
<docker.skip.build>false</docker.skip.build>
- </properties>
- <profiles>
+ </properties>
+ <profiles>
<profile>
- <id>docker</id>
- <activation>
- <activeByDefault>false</activeByDefault>
- </activation>
- <build>
+ <id>docker</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <build>
<plugins>
<plugin>
<groupId>io.fabric8</groupId>
<artifactId>docker-maven-plugin</artifactId>
- <version>0.16.7</version>
+ <version>0.16.7</version>
<configuration>
<verbose>true</verbose>
<apiVersion>1.23</apiVersion>
@@ -77,7 +77,7 @@
</goals>
<configuration>
<removeAll>true</removeAll>
- <image>onap/vnfsdk/refrepo/postgres</image>
+ <image>onap/vnfsdk/refrepo/postgres</image>
</configuration>
</execution>
@@ -86,10 +86,10 @@
<phase>generate-sources</phase>
<goals>
<goal>build</goal>
- </goals>
+ </goals>
<configuration>
<skipDockerBuild>${docker.skip.build}</skipDockerBuild>
- </configuration>
+ </configuration>
</execution>
<execution>
<id>push-images</id>
@@ -101,7 +101,7 @@
<configuration>
<image>onap/vnfsdk/refrepo/postgres</image>
</configuration>
- </execution>
+ </execution>
</executions>
</plugin>
@@ -109,5 +109,5 @@
</build>
</profile>
</profiles>
- <version>1.1.1</version>
+ <version>1.1.2</version>
</project>
diff --git a/vnfmarket-be/deployment/docker/docker-refrepo/pom.xml b/vnfmarket-be/deployment/docker/docker-refrepo/pom.xml
index a47cfe7b..fbe5630a 100644
--- a/vnfmarket-be/deployment/docker/docker-refrepo/pom.xml
+++ b/vnfmarket-be/deployment/docker/docker-refrepo/pom.xml
@@ -23,14 +23,14 @@
<parent>
<groupId>org.onap.vnfsdk.refrepo</groupId>
<artifactId>vnf-sdk-marketplace-core-parent</artifactId>
- <version>1.1.0</version>
+ <version>1.1.1</version>
</parent>
<artifactId>vnfmarket-docker-refrepo</artifactId>
<name>vnfmarket/deployment/docker/refrepo</name>
<packaging>pom</packaging>
- <properties>
+ <properties>
<maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format>
<docker.push.registry></docker.push.registry>
<skip.docker.build>true</skip.docker.build>
@@ -61,8 +61,8 @@
</resource>
</resources>
</configuration>
-
- <executions>
+
+ <executions>
<execution>
<id>build-image</id>
<phase>package</phase>
@@ -72,7 +72,7 @@
<configuration>
<skipDockerBuild>${skip.docker.build}</skipDockerBuild>
</configuration>
- </execution>
+ </execution>
<execution>
<id>tag-image-timestamped-version</id>
<phase>deploy</phase>
@@ -99,12 +99,12 @@
<skipDockerTag>${skip.docker.tag}</skipDockerTag>
</configuration>
</execution>
-
+
</executions>
</plugin>
-
+
</plugins>
</build>
- <version>1.1.1</version>
+ <version>1.1.2</version>
</project>
diff --git a/vnfmarket-be/deployment/pom.xml b/vnfmarket-be/deployment/pom.xml
index 30641707..e5815d5f 100644
--- a/vnfmarket-be/deployment/pom.xml
+++ b/vnfmarket-be/deployment/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.onap.vnfsdk.refrepo</groupId>
<artifactId>vnf-sdk-marketplace-core-parent</artifactId>
- <version>1.1.0</version>
+ <version>1.1.1</version>
</parent>
<artifactId>vnfmarket-deployment</artifactId>
@@ -36,5 +36,5 @@
<module>docker/docker-refrepo</module>
</modules>
- <version>1.1.1</version>
+ <version>1.1.2</version>
</project>
diff --git a/vnfmarket-be/deployment/zip/pom.xml b/vnfmarket-be/deployment/zip/pom.xml
index a635d1cb..e641bf64 100644
--- a/vnfmarket-be/deployment/zip/pom.xml
+++ b/vnfmarket-be/deployment/zip/pom.xml
@@ -1,13 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (c) 2017, Huawei Technologies Co., Ltd.
-
+
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.
@@ -19,7 +19,7 @@
<parent>
<groupId>org.onap.vnfsdk.refrepo</groupId>
<artifactId>vnf-sdk-marketplace-core-parent</artifactId>
- <version>1.1.0</version>
+ <version>1.1.1</version>
</parent>
<artifactId>vnf-sdk-marketplace-deployment</artifactId>
@@ -79,13 +79,13 @@
ant.copy(todir: "${deployUnzip}/webapps/ROOT") {
fileset(dir: "${project.build.directory}/../../../vnf-sdk-marketplace/target/ROOT")
}
-
- ant.copy(todir: "${deployUnzip}/webapps/onapui") {
+
+ ant.copy(todir: "${deployUnzip}/webapps/onapui") {
fileset(dir: "${project.build.directory}/../../../../vnfmarket/src/main/webapp")
}
-
+
ant.copy(todir: "${deployUnzip}/webapps/apidocs") {
- fileset(dir: "${project.build.directory}/../../../vnf-sdk-marketplace/target/swagger-ui-master/dist") {
+ fileset(dir: "${project.build.directory}/../../../vnf-sdk-marketplace/target/swagger-ui-master/dist") {
exclude(name: "index.html")
}
fileset(dir: "${project.build.directory}/../../../vnf-sdk-marketplace/src/main/webapp/apidocs")
@@ -123,5 +123,5 @@
</plugin>
</plugins>
</build>
- <version>1.1.1</version>
+ <version>1.1.2</version>
</project>