summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xdatarouter-node/pom.xml4
-rw-r--r--datarouter-prov-client/pom.xml4
-rwxr-xr-xdatarouter-prov/pom.xml4
-rwxr-xr-xdatarouter-subscriber/pom.xml4
-rwxr-xr-xpom.xml36
5 files changed, 31 insertions, 21 deletions
diff --git a/datarouter-node/pom.xml b/datarouter-node/pom.xml
index ffaa2602..cf16792c 100755
--- a/datarouter-node/pom.xml
+++ b/datarouter-node/pom.xml
@@ -198,8 +198,8 @@
<build>
<plugins>
<plugin>
- <groupId>org.codehaus.gmaven</groupId>
- <artifactId>gmaven-plugin</artifactId>
+ <groupId>org.codehaus.gmavenplus</groupId>
+ <artifactId>gmavenplus-plugin</artifactId>
</plugin>
<plugin>
<groupId>io.fabric8</groupId>
diff --git a/datarouter-prov-client/pom.xml b/datarouter-prov-client/pom.xml
index 4188fbfe..8170974f 100644
--- a/datarouter-prov-client/pom.xml
+++ b/datarouter-prov-client/pom.xml
@@ -64,8 +64,8 @@
<build>
<plugins>
<plugin>
- <groupId>org.codehaus.gmaven</groupId>
- <artifactId>gmaven-plugin</artifactId>
+ <groupId>org.codehaus.gmavenplus</groupId>
+ <artifactId>gmavenplus-plugin</artifactId>
</plugin>
<plugin>
<groupId>io.fabric8</groupId>
diff --git a/datarouter-prov/pom.xml b/datarouter-prov/pom.xml
index d43ae688..0dc3068d 100755
--- a/datarouter-prov/pom.xml
+++ b/datarouter-prov/pom.xml
@@ -248,8 +248,8 @@
<build>
<plugins>
<plugin>
- <groupId>org.codehaus.gmaven</groupId>
- <artifactId>gmaven-plugin</artifactId>
+ <groupId>org.codehaus.gmavenplus</groupId>
+ <artifactId>gmavenplus-plugin</artifactId>
</plugin>
<plugin>
<groupId>io.fabric8</groupId>
diff --git a/datarouter-subscriber/pom.xml b/datarouter-subscriber/pom.xml
index 8ca5bf0e..0fa93495 100755
--- a/datarouter-subscriber/pom.xml
+++ b/datarouter-subscriber/pom.xml
@@ -158,8 +158,8 @@
<build>
<plugins>
<plugin>
- <groupId>org.codehaus.gmaven</groupId>
- <artifactId>gmaven-plugin</artifactId>
+ <groupId>org.codehaus.gmavenplus</groupId>
+ <artifactId>gmavenplus-plugin</artifactId>
</plugin>
<plugin>
<groupId>io.fabric8</groupId>
diff --git a/pom.xml b/pom.xml
index edf0d24f..91c9dac0 100755
--- a/pom.xml
+++ b/pom.xml
@@ -64,8 +64,8 @@
<qos.logback.version>1.2.7</qos.logback.version>
<qos.logback.classic.version>1.2.3</qos.logback.classic.version>
<commons-codec.version>1.15</commons-codec.version>
- <gmaven-plugin.version>1.5</gmaven-plugin.version>
<gmavenplus-plugin.version>3.0.0</gmavenplus-plugin.version>
+ <groovy.version>4.0.13</groovy.version>
<io.fabric8.version>0.33.0</io.fabric8.version>
<docker.apiVersion>2.2.54</docker.apiVersion>
<commons-lang.version>2.4</commons-lang.version>
@@ -432,6 +432,14 @@
<groupId>org.codehaus.gmavenplus</groupId>
<artifactId>gmavenplus-plugin</artifactId>
<version>${gmavenplus-plugin.version}</version>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.groovy</groupId>
+ <artifactId>groovy-all</artifactId>
+ <version>${groovy.version}</version>
+ <type>pom</type>
+ </dependency>
+ </dependencies>
<executions>
<execution>
<phase>validate</phase>
@@ -443,18 +451,20 @@
<ver>${project.version}</ver>
</properties>
<!-- Setup image tags per https://wiki.onap.org/display/DW/Independent+Versioning+and+Release+Process#IndependentVersioningandReleaseProcess-StandardizedDockerTagging -->
- <source>
- println 'ver: ' + project.properties['ver'];
- if ( project.properties['ver'].endsWith("-SNAPSHOT") ) {
- project.properties['dockertag1']=project.properties['ver'] + "-latest";
- project.properties['dockertag2']=project.properties['ver'] + "-" + project.properties['timestamp'];
- } else {
- project.properties['dockertag1']=project.properties['ver'] + "-STAGING-latest";
- project.properties['dockertag2']=project.properties['ver'] + "-STAGING-" + project.properties['timestamp'];
- }
- println 'docker tag 1: ' + project.properties['dockertag1'];
- println 'docker tag 2: ' + project.properties['dockertag2'];
- </source>
+ <scripts>
+ <script>
+ println 'ver: ' + project.properties['revision'];
+ if ( project.properties['revision'].endsWith("-SNAPSHOT") ) {
+ project.properties['dockertag1']=project.properties['revision'] + "-latest";
+ project.properties['dockertag2']=project.properties['revision'] + "-" + project.properties['timestamp'];
+ } else {
+ project.properties['dockertag1']=project.properties['revision'] + "-STAGING-latest";
+ project.properties['dockertag2']=project.properties['revision'] + "-STAGING-" + project.properties['timestamp'];
+ }
+ println 'docker tag 1: ' + project.properties['dockertag1'];
+ println 'docker tag 2: ' + project.properties['dockertag2'];
+ </script>
+ </scripts>
</configuration>
</execution>
</executions>