From: Fiete Ostkamp <Fiete.Ostkamp@telekom.de>
Date: Wed, 9 Jul 2025 08:59:19 +0000 (+0200)
Subject: Fix plugin related issues
X-Git-Tag: 1.15.6~2
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=3b675ecff134b49e00ba24f81a6e0c63fc945e27;p=so.git

Fix plugin related issues

- update groovy-maven-plugin (2.0 -> 2.1.1) to fix warning that
  appears in Java 11+. In the future we should switch to the
  gmavenplus plugin
- exclude csar files from being eligible for filtering by the
  maven-resources-plugin in the asdc-controller module.
  This fixes an IndexOutputBounds exception that otherwise occurs
- bind the maven-dependency-plugin:unpack execution to the prepare-package
  phase to only execute it when the Docker images are build

Issue-ID: SO-4201
Change-Id: I339661406a4bce06e59ff5589977688c9d41f459
Signed-off-by: Fiete Ostkamp <Fiete.Ostkamp@telekom.de>
---

diff --git a/asdc-controller/pom.xml b/asdc-controller/pom.xml
index 262f5781d1..6bc09b456b 100644
--- a/asdc-controller/pom.xml
+++ b/asdc-controller/pom.xml
@@ -46,6 +46,15 @@
             </lifecycleMappingMetadata>
           </configuration>
         </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-resources-plugin</artifactId>
+          <configuration>
+            <nonFilteredFileExtensions>
+              <nonFilteredFileExtension>csar</nonFilteredFileExtension>
+            </nonFilteredFileExtensions>
+          </configuration>
+        </plugin>
       </plugins>
     </pluginManagement>
     <plugins>
diff --git a/pom.xml b/pom.xml
index f51fd3a208..6b891041fc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -391,7 +391,7 @@
       <plugin>
         <groupId>org.codehaus.gmaven</groupId>
         <artifactId>groovy-maven-plugin</artifactId>
-        <version>2.0</version>
+        <version>2.1.1</version>
         <executions>
           <!-- set absolute base path from super pom -->
           <execution>
@@ -650,6 +650,7 @@
           <executions>
             <execution>
               <id>extract-docker-file</id>
+              <phase>prepare-package</phase>
               <goals>
                 <goal>unpack</goal>
               </goals>