summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--build4docker.sh2
-rw-r--r--discovery-ui/pom.xml6
-rw-r--r--distributions/msb-discovery/pom.xml4
-rw-r--r--distributions/pom.xml6
-rw-r--r--nginx-ext-consul/pom.xml4
-rw-r--r--pom.xml18
-rw-r--r--sdclient/discovery-service/pom.xml4
-rw-r--r--sdclient/discovery-standalone/pom.xml4
-rw-r--r--sdclient/pom.xml4
-rw-r--r--version.properties2
10 files changed, 27 insertions, 27 deletions
diff --git a/build4docker.sh b/build4docker.sh
index cc90355..2e1e96f 100644
--- a/build4docker.sh
+++ b/build4docker.sh
@@ -28,7 +28,7 @@ RELEASE_DIR=${RELEASE_BASE_DIR}/msb-discovery
DOCKER_RUN_NAME=msb_discovery
DOCKER_IMAGE_NAME=msb_discovery
DOCKER_LATEST_VERSION=latest
-DOCKER_RELEASE_VERSION=1.2.3
+DOCKER_RELEASE_VERSION=1.2.5
DOCKER_REPOSITORY=nexus3.onap.org:10003
TIMESTAMP=$(date +"%Y%m%dT%H%M%SZ")
diff --git a/discovery-ui/pom.xml b/discovery-ui/pom.xml
index 9dafd8b..d326ff9 100644
--- a/discovery-ui/pom.xml
+++ b/discovery-ui/pom.xml
@@ -21,14 +21,14 @@
<parent>
<groupId>org.onap.msb.discovery</groupId>
<artifactId>msb-discovery-parent</artifactId>
- <version>1.2.3-SNAPSHOT</version>
+ <version>1.2.5-SNAPSHOT</version>
</parent>
<groupId>org.onap.msb.discovery</groupId>
<artifactId>discovery-ui</artifactId>
<name>onap/msb/discovery/discovery-ui</name>
<packaging>jar</packaging>
- <version>1.2.3-SNAPSHOT</version>
+ <version>1.2.5-SNAPSHOT</version>
+
-
</project>
diff --git a/distributions/msb-discovery/pom.xml b/distributions/msb-discovery/pom.xml
index d506ed2..a31b081 100644
--- a/distributions/msb-discovery/pom.xml
+++ b/distributions/msb-discovery/pom.xml
@@ -20,12 +20,12 @@
<parent>
<groupId>org.onap.msb.discovery.distributions</groupId>
<artifactId>distributions-parent</artifactId>
- <version>1.2.3-SNAPSHOT</version>
+ <version>1.2.5-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.onap.msb.discovery.distributions</groupId>
<artifactId>msb-discovery</artifactId>
- <version>1.2.3-SNAPSHOT</version>
+ <version>1.2.5-SNAPSHOT</version>
<name>onap/msb/discovery/distributions/msb-discovery</name>
<packaging>pom</packaging>
diff --git a/distributions/pom.xml b/distributions/pom.xml
index e2c132a..61edbf8 100644
--- a/distributions/pom.xml
+++ b/distributions/pom.xml
@@ -21,16 +21,16 @@
<parent>
<groupId>org.onap.msb.discovery</groupId>
<artifactId>msb-discovery-parent</artifactId>
- <version>1.2.3-SNAPSHOT</version>
+ <version>1.2.5-SNAPSHOT</version>
</parent>
<groupId>org.onap.msb.discovery.distributions</groupId>
<artifactId>distributions-parent</artifactId>
- <version>1.2.3-SNAPSHOT</version>
+ <version>1.2.5-SNAPSHOT</version>
<name>onap/msb/discovery/distributions</name>
<packaging>pom</packaging>
<modules>
- <module>msb-discovery</module>
+ <module>msb-discovery</module>
</modules>
diff --git a/nginx-ext-consul/pom.xml b/nginx-ext-consul/pom.xml
index 1f87d8c..6b16997 100644
--- a/nginx-ext-consul/pom.xml
+++ b/nginx-ext-consul/pom.xml
@@ -20,14 +20,14 @@
<parent>
<groupId>org.onap.msb.discovery</groupId>
<artifactId>msb-discovery-parent</artifactId>
- <version>1.2.3-SNAPSHOT</version>
+ <version>1.2.5-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.onap.msb.discovery</groupId>
<artifactId>nginx-ext-consul</artifactId>
<name>onap/msb/discovery/nginx-ext-consul</name>
<packaging>pom</packaging>
- <version>1.2.3-SNAPSHOT</version>
+ <version>1.2.5-SNAPSHOT</version>
<properties>
<outputdir>target/assembly/openresty</outputdir>
diff --git a/pom.xml b/pom.xml
index 4c809ed..e5a13db 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,12 +23,12 @@
<artifactId>oparent</artifactId>
<version>1.2.0</version>
</parent>
-
+
<groupId>org.onap.msb.discovery</groupId>
<artifactId>msb-discovery-parent</artifactId>
- <version>1.2.3-SNAPSHOT</version>
+ <version>1.2.5-SNAPSHOT</version>
<packaging>pom</packaging>
- <name>msb-discovery</name>
+ <name>msb-discovery</name>
<properties>
@@ -48,7 +48,7 @@
<dockerFileDir>src/main/docker</dockerFileDir>
<blueprintFileDir>src/main/blueprint</blueprintFileDir>
<version.output>target/version</version.output>
-
+
<onap.nexus.javadocs-url>dav:https://nexus.onap.org/content/sites/site/org/onap/msb/discovery/${project.version}</onap.nexus.javadocs-url>
</properties>
@@ -63,9 +63,9 @@
<site>
<id>ecomp-site</id>
<url>${onap.nexus.javadocs-url}</url>
- </site>
+ </site>
</distributionManagement>
-
+
<build>
<resources>
<resource>
@@ -92,7 +92,7 @@
<artifactId>maven-antrun-plugin</artifactId>
<version>1.8</version>
</plugin>
-
+
<plugin>
<artifactId>maven-clean-plugin</artifactId>
<version>2.6.1</version>
@@ -160,8 +160,8 @@
</plugin>
</plugins>
</pluginManagement>
- </build>
-
+ </build>
+
</project>
diff --git a/sdclient/discovery-service/pom.xml b/sdclient/discovery-service/pom.xml
index a03a47b..a5b404a 100644
--- a/sdclient/discovery-service/pom.xml
+++ b/sdclient/discovery-service/pom.xml
@@ -13,14 +13,14 @@
<parent>
<groupId>org.onap.msb.discovery</groupId>
<artifactId>sdclient</artifactId>
- <version>1.2.3-SNAPSHOT</version>
+ <version>1.2.5-SNAPSHOT</version>
</parent>
<groupId>org.onap.msb.discovery.sdclient</groupId>
<artifactId>discovery-service</artifactId>
<name>onap/msb/discovery/sdclient/discovery-service</name>
<packaging>jar</packaging>
- <version>1.2.3-SNAPSHOT</version>
+ <version>1.2.5-SNAPSHOT</version>
<dependencies>
diff --git a/sdclient/discovery-standalone/pom.xml b/sdclient/discovery-standalone/pom.xml
index 32bce3c..0ce9e36 100644
--- a/sdclient/discovery-standalone/pom.xml
+++ b/sdclient/discovery-standalone/pom.xml
@@ -11,14 +11,14 @@
<parent>
<groupId>org.onap.msb.discovery</groupId>
<artifactId>sdclient</artifactId>
- <version>1.2.3-SNAPSHOT</version>
+ <version>1.2.5-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.onap.msb.discovery.sdclient</groupId>
<artifactId>discovery-standalone</artifactId>
<name>onap/msb/discovery/sdclient/discovery-standalone</name>
<packaging>pom</packaging>
- <version>1.2.3-SNAPSHOT</version>
+ <version>1.2.5-SNAPSHOT</version>
<properties>
<packageid>discovery-standalone</packageid>
diff --git a/sdclient/pom.xml b/sdclient/pom.xml
index 22b5232..8079b97 100644
--- a/sdclient/pom.xml
+++ b/sdclient/pom.xml
@@ -13,12 +13,12 @@
<parent>
<groupId>org.onap.msb.discovery</groupId>
<artifactId>msb-discovery-parent</artifactId>
- <version>1.2.3-SNAPSHOT</version>
+ <version>1.2.5-SNAPSHOT</version>
</parent>
<groupId>org.onap.msb.discovery</groupId>
<artifactId>sdclient</artifactId>
- <version>1.2.3-SNAPSHOT</version>
+ <version>1.2.5-SNAPSHOT</version>
<name>onap/msb/discovery/sdclient</name>
<packaging>pom</packaging>
diff --git a/version.properties b/version.properties
index 2b93152..4fd02cd 100644
--- a/version.properties
+++ b/version.properties
@@ -1,6 +1,6 @@
major=1
minor=2
-patch=3
+patch=5
base_version=${major}.${minor}.${patch}
release_version=${base_version}
snapshot_version=${base_version}-SNAPSHOT