From 8ea3716592081624b9af2eeaecc1ef4c1fab7ed6 Mon Sep 17 00:00:00 2001
From: sebthom <sebthom@users.noreply.github.com>
Date: Fri, 9 Aug 2024 12:39:00 +0200
Subject: [PATCH] build: improve Maven config

---
 pom.xml | 32 +++++++++++---------------------
 1 file changed, 11 insertions(+), 21 deletions(-)

diff --git a/pom.xml b/pom.xml
index 5cecf16664..bfd39b61d8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -117,17 +117,6 @@ check for new dependency/plugin updates using:
         </file>
       </activation>
 
-      <dependencies>
-        <dependency>
-          <!-- TODO this should actually be a plugin dependency of exec-maven-plugin but the classpath management
-               of the exec:exec goal is broken, see https://github.com/mojohaus/exec-maven-plugin/pull/432 -->
-          <groupId>com.vegardit.no-npe</groupId>
-          <artifactId>no-npe-eea-generator</artifactId>
-          <version>${project.version}</version>
-          <scope>provided</scope>
-        </dependency>
-      </dependencies>
-
       <build>
         <resources>
           <resource>
@@ -172,7 +161,7 @@ check for new dependency/plugin updates using:
           <plugin>
             <groupId>org.codehaus.mojo</groupId>
             <artifactId>exec-maven-plugin</artifactId>
-            <version>3.3.0</version>
+            <version>3.4.0</version>
             <executions>
               <execution>
                 <!-- generate/update *.eea files in src/main/resources -->
@@ -183,10 +172,7 @@ check for new dependency/plugin updates using:
                 </goals>
                 <configuration>
                   <classpathScope>provided</classpathScope>
-                  <executableDependency>
-                    <groupId>com.vegardit.no-npe</groupId>
-                    <artifactId>no-npe-eea-generator</artifactId>
-                  </executableDependency>
+                  <includePluginDependencies>true</includePluginDependencies>
                   <executable>java</executable>
                   <arguments>
                     <argument>-Deea-generator.action=${eea-generator.action}</argument>
@@ -211,11 +197,8 @@ check for new dependency/plugin updates using:
                   <goal>exec</goal>
                 </goals>
                 <configuration>
-                  <classpathScope>provided</classpathScope> <!-- TODO until https://github.com/mojohaus/exec-maven-plugin/pull/432 -->
-                  <executableDependency>
-                    <groupId>com.vegardit.no-npe</groupId>
-                    <artifactId>no-npe-eea-generator</artifactId>
-                  </executableDependency>
+                  <classpathScope>provided</classpathScope>
+                  <includePluginDependencies>true</includePluginDependencies>
                   <executable>java</executable>
                   <arguments>
                     <argument>-Deea-generator.action=minimize</argument>
@@ -229,6 +212,13 @@ check for new dependency/plugin updates using:
                 </configuration>
               </execution>
             </executions>
+            <dependencies>
+              <dependency>
+                <groupId>com.vegardit.no-npe</groupId>
+                <artifactId>no-npe-eea-generator</artifactId>
+                <version>${project.version}</version>
+              </dependency>
+            </dependencies>
           </plugin>
 
           <plugin>