xfix groovy plugin issue

migrate to java17 compatible plugin

Issue-ID: SDNC-1783
Signed-off-by: Michael Dürre <michael.duerre@highstreet-technologies.com>
Change-Id: I2ce84b7a261cf2f436693311714750fa060392ce
Signed-off-by: Michael Dürre <michael.duerre@highstreet-technologies.com>
Former-commit-id: 16e5965477c56cbdcaa15fb54b17251c49f55c19

diff --git a/installation/admportal/pom.xml b/installation/admportal/pom.xml
index 34e44b6..3313355 100644 (file)
--- a/installation/admportal/pom.xml
+++ b/installation/admportal/pom.xml
@@ -31,8 +31,9 @@
         <plugins>
 
             <plugin>
-                <groupId>org.codehaus.groovy.maven</groupId>
-                <artifactId>gmaven-plugin</artifactId>
+                <groupId>org.codehaus.gmaven</groupId>
+                <artifactId>groovy-maven-plugin</artifactId>
+                <version>2.1.1</version>
                 <executions>
                     <execution>
                         <phase>validate</phase>

diff --git a/installation/ansible-server/pom.xml b/installation/ansible-server/pom.xml
index f171636..cd02346 100644 (file)
--- a/installation/ansible-server/pom.xml
+++ b/installation/ansible-server/pom.xml
@@ -29,9 +29,9 @@
     <build>
         <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>

diff --git a/installation/dmaap-listener/pom.xml b/installation/dmaap-listener/pom.xml
index 8189cb1..f09e156 100644 (file)
--- a/installation/dmaap-listener/pom.xml
+++ b/installation/dmaap-listener/pom.xml
@@ -43,9 +43,9 @@
     <build>
         <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>

diff --git a/installation/sdnc-web/pom.xml b/installation/sdnc-web/pom.xml
index 30a1477..c8351cb 100644 (file)
--- a/installation/sdnc-web/pom.xml
+++ b/installation/sdnc-web/pom.xml
@@ -36,9 +36,9 @@
     <build>
         <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>

diff --git a/installation/sdnc/pom.xml b/installation/sdnc/pom.xml
index 0caa093..c2a0cc7 100644 (file)
--- a/installation/sdnc/pom.xml
+++ b/installation/sdnc/pom.xml
@@ -149,9 +149,9 @@
     <build>
         <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>

diff --git a/installation/ueb-listener/pom.xml b/installation/ueb-listener/pom.xml
index 5536630..baba6b7 100644 (file)
--- a/installation/ueb-listener/pom.xml
+++ b/installation/ueb-listener/pom.xml
@@ -43,9 +43,9 @@
     <build>
         <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>

diff --git a/pom.xml b/pom.xml
index 750e883..53576be 100755 (executable)
--- a/pom.xml
+++ b/pom.xml
@@ -32,10 +32,10 @@
         <ccsdk.features.version>1.5.0-SNAPSHOT</ccsdk.features.version>
         <ccsdk.sli.northbound.version>${ccsdk.sli.version}</ccsdk.sli.northbound.version>
         <!-- docker images versions -->
-        <ccsdk.docker.alpine.j11.version>1.4-STAGING-latest</ccsdk.docker.alpine.j11.version> <!-- Used by dmaap-listener, ueb-listener -->
-        <ccsdk.docker.odlsli.alpine.version>1.4-SNAPSHOT-latest</ccsdk.docker.odlsli.alpine.version> <!-- Used by sdnc -->
-        <ccsdk.docker.ansible.server.version>1.4-STAGING-latest</ccsdk.docker.ansible.server.version> <!-- Used by ansible-server -->
-        <ccsdk.docker.ubuntu.version>1.4-STAGING-latest</ccsdk.docker.ubuntu.version> <!-- Used by admportal -->
+        <ccsdk.docker.alpine.j11.version>1.4.3</ccsdk.docker.alpine.j11.version> <!-- Used by dmaap-listener, ueb-listener -->
+        <ccsdk.docker.odlsli.alpine.version>1.4.3</ccsdk.docker.odlsli.alpine.version> <!-- Used by sdnc -->
+        <ccsdk.docker.ansible.server.version>1.4.3</ccsdk.docker.ansible.server.version> <!-- Used by ansible-server -->
+        <ccsdk.docker.ubuntu.version>1.4.3</ccsdk.docker.ubuntu.version> <!-- Used by admportal -->
     </properties>
 
     <modules>