Merge "OCI image spec labels for models-simulator"

diff --combined models-sim/packages/models-simulator-docker/pom.xml
index c2d6df5,4919a7f..15daf00
--- 1/models-sim/packages/models-simulator-docker/pom.xml
--- 2/models-sim/packages/models-simulator-docker/pom.xml
+++ b/models-sim/packages/models-simulator-docker/pom.xml
@@@ -53,9 -53,9 +53,9 @@@
          <finalName>${project.artifactId}-${project.version}</finalName>
          <plugins>
              <plugin>
 -                <groupId>org.codehaus.groovy.maven</groupId>
 -                <artifactId>gmaven-plugin</artifactId>
 -                <version>1.0</version>
 +                <groupId>org.codehaus.gmaven</groupId>
 +                <artifactId>groovy-maven-plugin</artifactId>
 +                <version>2.1.1</version>
                  <executions>
                      <execution>
                          <phase>validate</phase>
@@@ -63,12 -63,50 +63,36 @@@
                              <goal>execute</goal>
                          </goals>
                          <configuration>
 -                            <source>
 -                                println 'Project version: ' + project.properties['dist.project.version']
 -                                if (project.properties['dist.project.version'] != null) {
 -                                    def versionArray = project.properties['dist.project.version'].split('-')
 -                                    def minMaxVersionArray = versionArray[0].tokenize('.')
 -                                    if (project.properties['dist.project.version'].endsWith("-SNAPSHOT")) {
 -                                        project.properties['project.docker.latest.minmax.tag.version'] =
 -                                          minMaxVersionArray[0] + "." + minMaxVersionArray[1] + "-SNAPSHOT-latest"
 -                                    } else {
 -                                        project.properties['project.docker.latest.minmax.tag.version'] =
 -                                          minMaxVersionArray[0] + "." + minMaxVersionArray[1] + "-STAGING-latest"
 -                                    }
 -                                    println 'New tag for docker: ' + project.properties['project.docker.latest.minmax.tag.version']
 -                                }
 -                            </source>
 +                            <source>https://github.com/onap/policy-docker/raw/master/utils/groovy/docker-tag.groovy</source>
                          </configuration>
                      </execution>
                  </executions>
              </plugin>
  
+             <plugin>
+                 <groupId>io.github.git-commit-id</groupId>
+                 <artifactId>git-commit-id-maven-plugin</artifactId>
+                 <version>5.0.0</version>
+                 <executions>
+                     <execution>
+                         <id>get-the-git-infos</id>
+                         <goals>
+                             <goal>revision</goal>
+                         </goals>
+                         <phase>initialize</phase>
+                     </execution>
+                 </executions>
+                 <configuration>
+                     <skipPoms>false</skipPoms>
+                     <generateGitPropertiesFile>true</generateGitPropertiesFile>
+                     <includeOnlyProperties>
+                         <includeOnlyProperty>^git.build.(time|version)$</includeOnlyProperty>
+                         <includeOnlyProperty>^git.commit.id.abbrev$</includeOnlyProperty>
+                     </includeOnlyProperties>
+                     <commitIdGenerationMode>full</commitIdGenerationMode>
+                 </configuration>
+             </plugin>
+ 
              <plugin>
                  <groupId>io.fabric8</groupId>
                  <artifactId>docker-maven-plugin</artifactId>