From 4e9c78dc19b2168b9f4781ad0b3da993b7489d48 Mon Sep 17 00:00:00 2001
From: danielhanrahan <daniel.hanrahan@est.tech>
Date: Wed, 29 Jun 2022 11:23:27 +0100
Subject: [PATCH] use url resource for docker-tag -- models

use groovy url resource from docker repo
to identify the tag for docker.

Issue-ID: POLICY-3378
Signed-off-by: danielhanrahan <daniel.hanrahan@est.tech>
Change-Id: Ie93decd775f7169bf9c1705c961f60c00acf7ecf
---
 .../packages/models-simulator-docker/pom.xml       | 22 ++++------------------
 1 file changed, 4 insertions(+), 18 deletions(-)

diff --git a/models-sim/packages/models-simulator-docker/pom.xml b/models-sim/packages/models-simulator-docker/pom.xml
index f1a902445..c2d6df587 100644
--- a/models-sim/packages/models-simulator-docker/pom.xml
+++ b/models-sim/packages/models-simulator-docker/pom.xml
@@ -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,21 +63,7 @@
                             <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>
-- 
2.16.6