Add build helper for major/minor versions

Issue-ID: AAI-2579
Signed-off-by: Jimmy Forsyth <jf2512@att.com>
Change-Id: I93b6c4f840787e74ca6e787e1d967536ee975c27

diff --git a/pom.xml b/pom.xml
index 2aca23d..e60005b 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -449,7 +449,7 @@ limitations under the License.
                     <imageTags>
                         <imageTag>latest</imageTag>
                        <tag>${project.docker.latesttag.version}</tag>
                     <imageTags>
                         <imageTag>latest</imageTag>
                        <tag>${project.docker.latesttag.version}</tag>

-                       <tag>${project.major.version}.${project.minor.version}-STAGING-${maven.build.timestamp}</tag>
+                       <tag>${parsedVersion.majorVersion}.${parsedVersion.minorVersion}-STAGING-${maven.build.timestamp}</tag>

                     </imageTags>
                     <forceTags>true</forceTags>
                 </configuration>
                     </imageTags>
                     <forceTags>true</forceTags>
                 </configuration>


@@ -571,9 +571,22 @@ limitations under the License.
                     </execution>
                 </executions>
             </plugin>
                     </execution>
                 </executions>
             </plugin>

-         </plugins>
+           <plugin>
+             <groupId>org.codehaus.mojo</groupId>
+             <artifactId>build-helper-maven-plugin</artifactId>
+              <version>3.0.0</version>
+              <executions>
+               <execution>
+                 <id>parse-version</id>
+                 <goals>
+                   <goal>parse-version</goal>
+                 </goals>
+               </execution>
+              </executions>
+           </plugin>
+       </plugins>

     </build>
     </build>

-
+    

     <distributionManagement>
         <site>
             <id>ecomp-javadoc</id>
     <distributionManagement>
         <site>
             <id>ecomp-javadoc</id>