[DMAAP-BC] Bump version to 2.0.5

Signed-off-by: efiacor <fiachra.corcoran@est.tech>
Change-Id: I50f394594bf51540cf840a3e122565a8245762bc
Issue-ID: DMAAP-1565

diff --git a/dbc-client/pom.xml b/dbc-client/pom.xml
index 763f043..6fad50e 100644 (file)
--- a/dbc-client/pom.xml
+++ b/dbc-client/pom.xml
@@ -22,23 +22,17 @@
 <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">
   <modelVersion>4.0.0</modelVersion>
-  <groupId>org.onap.dmaap.buscontroller</groupId>
   <artifactId>dbc-client</artifactId>
-  <version>${artifact.version}</version>
   <name>dbc-client</name>
   <parent>
-    <groupId>org.onap.oparent</groupId>
-    <artifactId>oparent</artifactId>
-    <version>3.2.0</version>
-    <relativePath/>
+    <groupId>org.onap.dmaap.buscontroller</groupId>
+    <artifactId>parent</artifactId>
+    <version>${revision}</version>
+    <relativePath>../pom.xml</relativePath>
   </parent>
   <build>
     <finalName>dbc-client</finalName>
-
     <plugins>
-
-
-
       <!-- for Distribution management -->
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
@@ -260,7 +254,6 @@
     <jettyVersion>9.4.12.RC2</jettyVersion>
     <eelf.version>1.0.0</eelf.version>
     <swagger.version>1.5.19</swagger.version>
-    <artifact.version>2.0.2-SNAPSHOT</artifact.version>
     <!--  SONAR  -->
     <jacoco.version>0.7.7.201606060606</jacoco.version>
     <sonar-jacoco-listeners.version>3.2</sonar-jacoco-listeners.version>
@@ -278,7 +271,7 @@
     <docker.push.registry>nexus3.onap.org:10003</docker.push.registry>
 
     <!-- for Distribution Management -->
-    <sitePath>/content/sites/site/org/onap/dmaap/dbc-client/${artifact.version}</sitePath>
+    <sitePath>/content/sites/site/org/onap/dmaap/dbc-client/${revision}</sitePath>
 
     <timestamp>${maven.build.timestamp}</timestamp>
     <maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format>

diff --git a/dmaap-bc/pom.xml b/dmaap-bc/pom.xml
index 48cc024..b191825 100644 (file)
--- a/dmaap-bc/pom.xml
+++ b/dmaap-bc/pom.xml
@@ -22,15 +22,14 @@
 <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">
   <modelVersion>4.0.0</modelVersion>
-  <groupId>org.onap.dmaap.buscontroller</groupId>
   <artifactId>dmaap-bc</artifactId>
-  <version>${artifact.version}</version>
+  <version>${revision}</version>
   <name>dmaap-bc</name>
   <parent>
-    <groupId>org.onap.oparent</groupId>
-    <artifactId>oparent</artifactId>
-    <version>3.2.0</version>
-    <relativePath/>
+    <groupId>org.onap.dmaap.buscontroller</groupId>
+    <artifactId>parent</artifactId>
+    <version>${revision}</version>
+    <relativePath>../pom.xml</relativePath>
   </parent>
   <build>
     <finalName>dmaap-bc</finalName>
@@ -415,7 +414,7 @@
     <dependency>
       <groupId>org.onap.dmaap.dbcapi</groupId>
       <artifactId>dbcapi</artifactId>
-      <version>2.0.2</version>
+      <version>2.0.3</version>
     </dependency>
   </dependencies>
   <reporting>
@@ -454,7 +453,6 @@
     <jettyVersion>9.4.36.v20210114</jettyVersion>
     <eelf.version>1.0.0</eelf.version>
     <swagger.version>1.5.19</swagger.version>
-    <artifact.version>2.0.4-SNAPSHOT</artifact.version>
     <timestamp>${maven.build.timestamp}</timestamp>
     <maven.build.timestamp.format>yyyy-MM-dd HH:mm</maven.build.timestamp.format>
     <!--  SONAR  -->
@@ -477,7 +475,7 @@
     <maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format>
 
     <!-- for Distribution Management -->
-    <sitePath>/content/sites/site/org/onap/dmaap/dmaap-bc/${artifact.version}</sitePath>
+    <sitePath>/content/sites/site/org/onap/dmaap/dmaap-bc/${revision}</sitePath>
   </properties>
   <description>Packaging Platform (DMaaP) Bus Controller API as a Docker container.</description>
 </project>

diff --git a/pom.xml b/pom.xml
index 101d5c4..4f6f754 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.onap.dmaap.buscontroller</groupId>
   <artifactId>parent</artifactId>
-  <version>${artifactVersion}-SNAPSHOT</version>
+   <version>${revision}</version>
   <name>dmaap-buscontroller</name>
   <packaging>pom</packaging>
   
@@ -33,12 +33,15 @@
   </parent>
 
   <properties>
-    <artifactVersion>2.0.3</artifactVersion>
+    <revision>2.0.5-SNAPSHOT</revision>
     <multiproject.basedir>${basedir}</multiproject.basedir>
-        <docker.maven.plugin.version>1.0.0</docker.maven.plugin.version>
-        <skip.docker.build>true</skip.docker.build>
-        <skip.docker.tag>true</skip.docker.tag>
-        <skip.docker.push>true</skip.docker.push>
+    <docker.maven.plugin.version>1.0.0</docker.maven.plugin.version>
+    <skip.docker.build>false</skip.docker.build>
+    <skip.docker.tag>false</skip.docker.tag>
+    <skip.docker.push>false</skip.docker.push>
+    <docker.skip.build>false</docker.skip.build>
+    <docker.verbose>true</docker.verbose>
+    <docker.apiVersion>2.2.54</docker.apiVersion>
   </properties>
 
   <build>
@@ -46,9 +49,9 @@
         <plugin>
             <groupId>io.fabric8</groupId>
             <artifactId>docker-maven-plugin</artifactId>
-            <version>0.28.0</version>  
+            <version>0.28.0</version>
             <configuration>
-                <skipDockerBuild>${skip.docker.build}</skipDockerBuild>
+                <skipBuild>${skip.docker.build}</skipBuild>
             </configuration>
         </plugin>
     </plugins>

diff --git a/version.properties b/version.properties
index 0a7d7d9..14d3d8f 100644 (file)
--- a/version.properties
+++ b/version.properties
@@ -27,7 +27,7 @@
 
 major=2
 minor=0
-patch=4
+patch=5
 base_version=${major}.${minor}.${patch}
 
 # Release must be completed with git revision # in Jenkins