From 87dd35e2e9ce17461e2cf4480a2fd7c0d62a1601 Mon Sep 17 00:00:00 2001
From: Jan Mosig <jan.mosig@itemis.de>
Date: Fri, 12 Aug 2022 15:46:23 +0200
Subject: [PATCH 1/5] Updated project to latest things

---
 README.md                                     |  2 +-
 pom.xml                                       |  4 +-
 .../resources/archetype-resources/README.md   |  6 ++
 .../resources/archetype-resources/pom.xml     | 85 ++++++-------------
 4 files changed, 33 insertions(+), 64 deletions(-)

diff --git a/README.md b/README.md
index 6c1a4c8..cb91793 100644
--- a/README.md
+++ b/README.md
@@ -8,7 +8,7 @@ The latest release version always tries to include the latest versions of all us
 Projects created with this archetype will also contain reasonable default configuration for your favorit IDE. Have a look at the directory `ide_setup` for details.  
 
 ## Build  
-Note: JDK >=17 is required for the build. 
+Note: JDK >=11 is required for the build. 
   
 `mvn clean install`  
 
diff --git a/pom.xml b/pom.xml
index 70abc27..339c73e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -52,7 +52,7 @@
         <maven.compiler.release>11</maven.compiler.release>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <version.maven-archetype-plugin>3.2.0</version.maven-archetype-plugin>
+        <version.maven-archetype-plugin>3.2.1</version.maven-archetype-plugin>
         <version.replacer-plugin>1.5.3</version.replacer-plugin>
         <build.timestamp.formatted>${maven.build.timestamp}</build.timestamp.formatted>
         <maven.build.timestamp.format>yyyy-MM-dd HH:mm.ssZ</maven.build.timestamp.format>
@@ -90,7 +90,6 @@
             <plugin>
                 <artifactId>maven-install-plugin</artifactId>
             </plugin>
-
             <plugin>
                 <groupId>com.google.code.maven-replacer-plugin</groupId>
                 <artifactId>replacer</artifactId>
@@ -114,7 +113,6 @@
                     </replacements>
                 </configuration>
             </plugin>
-
         </plugins>
     </build>
 
diff --git a/src/main/resources/archetype-resources/README.md b/src/main/resources/archetype-resources/README.md
index d88af45..538ab22 100644
--- a/src/main/resources/archetype-resources/README.md
+++ b/src/main/resources/archetype-resources/README.md
@@ -1,2 +1,8 @@
 # A Fluffy New Project
 It's so fluffy!  
+
+## Build
+`mvn clean install`
+
+## Run
+Run `java -jar target/de.my.groupid.artifactid-1.0.0-shaded.jar` or `mvn exec:exec`
diff --git a/src/main/resources/archetype-resources/pom.xml b/src/main/resources/archetype-resources/pom.xml
index a002bb9..67c72c3 100644
--- a/src/main/resources/archetype-resources/pom.xml
+++ b/src/main/resources/archetype-resources/pom.xml
@@ -49,43 +49,41 @@
     <url>project.website</url>
 
     <properties>
-        <java.version>17</java.version>
+        <java.version>11</java.version>
         <maven.compiler.release>11</maven.compiler.release>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <!-- Only required for java < 9 <maven.compiler.source>${java.version}</maven.compiler.source> 
-            <maven.compiler.target>${java.version}</maven.compiler.target> -->
-        <maven-surefire-plugin.version>3.0.0-M5</maven-surefire-plugin.version>
-        <maven-failsafe-plugin.version>3.0.0-M5</maven-failsafe-plugin.version>
-        <maven-source-plugin.version>3.2.1</maven-source-plugin.version>
-        <maven-clean-plugin.version>3.1.0</maven-clean-plugin.version>
-        <maven-shade-plugin.version>3.2.4</maven-shade-plugin.version>
-        <maven-jar-plugin.version>3.2.2</maven-jar-plugin.version>
-        <maven-compiler-plugin.version>3.10.0</maven-compiler-plugin.version>
-        <maven-exec-plugin.version>3.0.0</maven-exec-plugin.version>
-        <maven-help-plugin.version>3.2.0</maven-help-plugin.version>
-        <maven-install-plugin.version>3.0.0-M1</maven-install-plugin.version>
         <build.timestamp.formatted>${maven.build.timestamp}</build.timestamp.formatted>
         <maven.build.timestamp.format>yyyy-MM-dd HH:mm.ssZ</maven.build.timestamp.format>
         <!-- Make sure we can use variables like ${variable.name} in resource 
             files. These will be expanded by the maven build as soon as the resources 
             plugin processes all contents of the configured resources directories. -->
         <resource.delimiter>${*}</resource.delimiter>
+        <!-- Only required for java < 9 <maven.compiler.source>${java.version}</maven.compiler.source> 
+            <maven.compiler.target>${java.version}</maven.compiler.target> -->
+        <maven-surefire-plugin.version>3.0.0-M7</maven-surefire-plugin.version>
+        <maven-failsafe-plugin.version>3.0.0-M7</maven-failsafe-plugin.version>
+        <maven-source-plugin.version>3.2.1</maven-source-plugin.version>
+        <maven-clean-plugin.version>3.2.0</maven-clean-plugin.version>
+        <maven-shade-plugin.version>3.3.0</maven-shade-plugin.version>
+        <maven-jar-plugin.version>3.2.2</maven-jar-plugin.version>
+        <maven-compiler-plugin.version>3.10.1</maven-compiler-plugin.version>
+        <maven-exec-plugin.version>3.1.0</maven-exec-plugin.version>
+        <maven-help-plugin.version>3.2.0</maven-help-plugin.version>
+        <maven-install-plugin.version>3.0.1</maven-install-plugin.version>
         <guava.version>31.1-jre</guava.version>
-        <mockito.version>4.3.1</mockito.version>
+        <mockito.version>4.6.1</mockito.version>
         <hamcrest.version>2.2</hamcrest.version>
-        <!-- Be aware: Spotbugs seems incompatible to JDK < 17 since 4.4.2 -->
-        <!-- See also profiles section -->
-        <spotbugs.plugin.version>4.5.3.0</spotbugs.plugin.version>
-        <spotbugs.version>4.5.3</spotbugs.version>
-        <junit.version>5.8.2</junit.version>
-        <jacoco.plugin.version>0.8.7</jacoco.plugin.version>
+        <spotbugs.plugin.version>4.7.1.1</spotbugs.plugin.version>
+        <spotbugs.version>4.7.1</spotbugs.version>
+        <junit.version>5.9.0</junit.version>
+        <jacoco.plugin.version>0.8.8</jacoco.plugin.version>
         <git-commit-id-plugin.version>5.0.0</git-commit-id-plugin.version>
-        <assertj.version>3.22.0</assertj.version>
-        <logback.version>1.2.10</logback.version>
-        <equalsverifier.version>3.9</equalsverifier.version>
-        <awaitility.version>4.1.1</awaitility.version>
-        <wiremock.version>2.32.0</wiremock.version>
+        <assertj.version>3.23.1</assertj.version>
+        <logback.version>1.2.11</logback.version>
+        <equalsverifier.version>3.10.1</equalsverifier.version>
+        <awaitility.version>4.2.0</awaitility.version>
+        <wiremock.version>2.33.2</wiremock.version>
         <arch.unit.version>0.23.1</arch.unit.version>
         <!-- Disable class data sharing (CDS) to avoid a nasty JVM warning. -->
         <!-- This usually has only a very small impact on performance and 
@@ -391,15 +389,6 @@
         </pluginManagement>
 
         <plugins>
-            <!-- <plugin> <groupId>io.github.git-commit-id</groupId> <artifactId>git-commit-id-maven-plugin</artifactId> 
-                <executions> <execution> <goals> <goal>revision</goal> </goals> </execution> 
-                </executions> <configuration> <verbose>false</verbose> <excludeProperties> 
-                <excludeProperty>git.user.*</excludeProperty> <excludeProperty>git.build.user.*</excludeProperty> 
-                <excludeProperty>git.closest.tag.*</excludeProperty> <excludeProperty>git.commit.message.*</excludeProperty> 
-                <excludeProperty>git.commit.user.*</excludeProperty> </excludeProperties> 
-                <dateFormat>yyyy-MM-dd'T'HH:mm:ssZ</dateFormat> <generateGitPropertiesFile>true</generateGitPropertiesFile> 
-                <generateGitPropertiesFilename>${project.build.outputDirectory}/git.properties</generateGitPropertiesFilename> 
-                </configuration> </plugin> -->
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
@@ -449,8 +438,7 @@
                     JVM running the maven process which then calls this plugin. -->
                 <configuration>
                     <executable>java</executable>
-                    <commandlineArgs>-jar
-                        ${project.build.directory}/${project.build.finalName}.jar</commandlineArgs>
+                    <commandlineArgs>-jar ${project.build.directory}/${project.build.finalName}-shaded.jar</commandlineArgs>
                 </configuration>
             </plugin>
             <plugin>
@@ -464,30 +452,6 @@
     </build>
 
     <profiles>
-        <profile>
-            <id>JDK16_or_earlier</id>
-            <activation>
-                <jdk>(,17)</jdk>
-            </activation>
-            <dependencies>
-                <dependency>
-                    <!-- Required to support null annotation checks according 
-                        to JSR-305 -->
-                    <groupId>com.github.spotbugs</groupId>
-                    <artifactId>spotbugs</artifactId>
-                    <version>4.2.0</version>
-                </dependency>
-            </dependencies>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>com.github.spotbugs</groupId>
-                        <artifactId>spotbugs-maven-plugin</artifactId>
-                        <version>4.2.0</version>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
         <profile>
             <id>mvn33</id>
             <activation>
@@ -560,6 +524,7 @@
                                         <!-- Only specify this if you are 
                                             sure that no dependency requires the settings from its own MANIFEST.MF file -->
                                         <exclude>META-INF/MANIFEST.MF</exclude>
+                                        <exclude>META-INF/DEPENDENCIES</exclude>
                                         <!-- filter out signature files from 
                                             signed dependencies, else repackaging fails with security exception -->
                                         <exclude>META-INF/*.SF</exclude>

From 15b0c02d07c7bedb1204eced1113611fdbb3d2b6 Mon Sep 17 00:00:00 2001
From: Jan Mosig <jan.mosig@itemis.de>
Date: Fri, 21 Jan 2022 11:43:03 +0100
Subject: [PATCH 2/5] Special test branch for archetype-plugin bug

---
 pom.xml | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 339c73e..4080f12 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@
     </parent>
 
     <artifactId>fluffyj.archetype</artifactId>
-    <version>1.13.0-SNAPSHOT</version>
+    <version>1.13.1-DONOTUSE</version>
     <packaging>maven-archetype</packaging>
 
     <name>Fluffy J Archetype</name>
@@ -114,6 +114,13 @@
                 </configuration>
             </plugin>
         </plugins>
+
+        <testResources>
+            <testResource>
+                <directory>src/test/resources</directory>
+                <filtering>true</filtering>
+            </testResource>
+        </testResources>
     </build>
 
     <profiles>

From fb9780d800fa71fc501ae3656416b1b4915b82f8 Mon Sep 17 00:00:00 2001
From: Jan Mosig <jan.mosig@itemis.de>
Date: Wed, 20 Nov 2024 14:32:56 +0100
Subject: [PATCH 3/5] Bumped dependencies

---
 pom.xml                                        |  2 +-
 .../fluffy-lifecycle-mapping-metadata.xml      |  4 ++--
 src/main/resources/archetype-resources/pom.xml | 18 +++++++++---------
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/pom.xml b/pom.xml
index e4a6c7a..5c1cead 100644
--- a/pom.xml
+++ b/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>com.itemis</groupId>
         <artifactId>org-parent</artifactId>
-        <version>5.8.7</version>
+        <version>5.8.8</version>
     </parent>
 
     <artifactId>fluffyj.archetype</artifactId>
diff --git a/src/main/resources/archetype-resources/ide_setup/eclipse/fluffy-lifecycle-mapping-metadata.xml b/src/main/resources/archetype-resources/ide_setup/eclipse/fluffy-lifecycle-mapping-metadata.xml
index 178a6cc..0e5739f 100644
--- a/src/main/resources/archetype-resources/ide_setup/eclipse/fluffy-lifecycle-mapping-metadata.xml
+++ b/src/main/resources/archetype-resources/ide_setup/eclipse/fluffy-lifecycle-mapping-metadata.xml
@@ -5,7 +5,7 @@
             <pluginExecutionFilter>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-help-plugin</artifactId>
-                <versionRange>3.5.0</versionRange>
+                <versionRange>3.5.1</versionRange>
                 <goals>
                     <goal>active-profiles</goal>
                 </goals>
@@ -18,7 +18,7 @@
             <pluginExecutionFilter>
                 <groupId>com.github.spotbugs</groupId>
                 <artifactId>spotbugs-maven-plugin</artifactId>
-                <versionRange>4.8.6.3</versionRange>
+                <versionRange>4.8.6.6</versionRange>
                 <goals>
                     <goal>check</goal>
                 </goals>
diff --git a/src/main/resources/archetype-resources/pom.xml b/src/main/resources/archetype-resources/pom.xml
index 3cf72b3..f5675df 100644
--- a/src/main/resources/archetype-resources/pom.xml
+++ b/src/main/resources/archetype-resources/pom.xml
@@ -61,27 +61,27 @@
         <resource.delimiter>${*}</resource.delimiter>
         <!-- Only required for java < 9 <maven.compiler.source>${java.version}</maven.compiler.source> 
             <maven.compiler.target>${java.version}</maven.compiler.target> -->
-        <maven-surefire-plugin.version>3.5.0</maven-surefire-plugin.version>
-        <maven-failsafe-plugin.version>3.5.0</maven-failsafe-plugin.version>
+        <maven-surefire-plugin.version>3.5.2</maven-surefire-plugin.version>
+        <maven-failsafe-plugin.version>3.5.2</maven-failsafe-plugin.version>
         <maven-source-plugin.version>3.3.1</maven-source-plugin.version>
         <maven-clean-plugin.version>3.4.0</maven-clean-plugin.version>
         <maven-shade-plugin.version>3.6.0</maven-shade-plugin.version>
         <maven-jar-plugin.version>3.4.2</maven-jar-plugin.version>
         <maven-compiler-plugin.version>3.13.0</maven-compiler-plugin.version>
         <maven-exec-plugin.version>3.4.1</maven-exec-plugin.version>
-        <maven-help-plugin.version>3.5.0</maven-help-plugin.version>
+        <maven-help-plugin.version>3.5.1</maven-help-plugin.version>
         <maven-install-plugin.version>3.1.3</maven-install-plugin.version>
-        <guava.version>33.3.0-jre</guava.version>
-        <mockito.version>5.13.0</mockito.version>
+        <guava.version>33.3.1-jre</guava.version>
+        <mockito.version>5.14.2</mockito.version>
         <hamcrest.version>3.0</hamcrest.version>
-        <spotbugs.plugin.version>4.8.6.3</spotbugs.plugin.version>
+        <spotbugs.plugin.version>4.8.6.6</spotbugs.plugin.version>
         <spotbugs.version>4.8.6</spotbugs.version>
-        <junit.version>5.11.0</junit.version>
+        <junit.version>5.11.3</junit.version>
         <jacoco.plugin.version>0.8.12</jacoco.plugin.version>
         <git-commit-id-plugin.version>9.0.1</git-commit-id-plugin.version>
         <assertj.version>3.26.3</assertj.version>
-        <logback.version>1.5.8</logback.version>
-        <equalsverifier.version>3.16.2</equalsverifier.version>
+        <logback.version>1.5.12</logback.version>
+        <equalsverifier.version>3.17.3</equalsverifier.version>
         <awaitility.version>4.2.2</awaitility.version>
         <wiremock.version>3.9.1</wiremock.version>
         <arch.unit.version>1.3.0</arch.unit.version>

From edd81e808a10f8431d1d77d896a332bde5adfdc5 Mon Sep 17 00:00:00 2001
From: Jan Mosig <jan.mosig@itemis.de>
Date: Fri, 13 Dec 2024 14:26:37 +0100
Subject: [PATCH 4/5] Bumped dependencies

---
 README.md                                     |  34 +----
 pom.xml                                       |  27 ++--
 .../resources/archetype-resources/pom.xml     | 129 ++++++------------
 3 files changed, 55 insertions(+), 135 deletions(-)

diff --git a/README.md b/README.md
index cb91793..51a4869 100644
--- a/README.md
+++ b/README.md
@@ -5,47 +5,19 @@ Contains defaults for often used maven properties and common test dependencies,
 
 The latest release version always tries to include the latest versions of all used dependencies and plugins.  
 
-Projects created with this archetype will also contain reasonable default configuration for your favorit IDE. Have a look at the directory `ide_setup` for details.  
+Projects created with this archetype will also contain reasonable default configuration for your favorite IDE. Have a look at the directory `ide_setup` for details.  
 
 ## Build  
-Note: JDK >=11 is required for the build. 
+Note: JDK >=21 is required for the build. 
   
 `mvn clean install`  
 
-### Maven < 3.5.0
-When building with older Maven versions (looking at you, 3.3.9), make sure to activate the corresponding profile:
-  
-`mvn clean install -Pmvn33`  
-  
-This is required, because Maven switched from Eclipse Aether to Maven Artifact Resolver since 3.5.0.
-  
 ## Usage
 Generate a new project with this command:  
 `mvn archetype:generate -B -DarchetypeGroupId=com.itemis -DarchetypeArtifactId=fluffyj.archetype -DarchetypeVersion=1.13.0-SNAPSHOT -DgroupId=de.my.groupid -DartifactId=de.my.groupid.artifactid -Dversion=1.0.0-SNAPSHOT -Dpackage=de.my.groupid.artifactid`
   
-Build the created project with `mvn clean install`. When building with Maven < 3.5.0, you need to activate the appropriate profile: `mvn clean install -Pmvn33`.
-  
-### Note on usage with Java >=16
-When running Maven with Java >16 make sure to use the latest archetype plugin version (currently 3.2.0). You can force the version by calling Maven like this:  
-  
-`mvn org.apache.maven.plugins:maven-archetype-plugin:3.2.0:generate ...`  
+Build the created project with `mvn clean install`.
   
-Background: The fluffy archetype is using a post generation script based on Groovy. Java 16 is the first Java version not permitting old Groovy versions to do any reflection without providing a proper module configuration. If you use an old archetype plugin version (e. g. 3.0.1), you are also going to use an old Groovy version. This will result in an error like this:  
-  
-`
- Unable to make protected void java.lang.Object.finalize() throws java.lang.Throwable accessible: module java.base does not "opens java.lang" to unnamed module
- `  
-
-Until Java 16 this used to be:  
-`[INFO] Executing META-INF/archetype-post-generate.groovy post-generation script
-WARNING: An illegal reflective access operation has occurred
-WARNING: Illegal reflective access by org.codehaus.groovy.reflection.CachedClass$3$1 (file:/C:/Users/itsme/.m2/repository/org/codehaus/groovy/groovy/1.8.3/groovy-1.8.3.jar) to method java.lang.Object.finalize()
-WARNING: Please consider reporting this to the maintainers of org.codehaus.groovy.reflection.CachedClass$3$1
-WARNING: Use --illegal-access=warn to enable warnings of further illegal reflective access operations
-WARNING: All illegal access operations will be denied in a future release`  
-  
-In order to prevent this, an up to date Groovy version must be used, which is only the case with up to date versions of the archetype plugin.  
-
 ## Development
 The latest snapshot lives on the `develop` branch. The latest release lives on the `main` branch. A tag will be created for every release.
 
diff --git a/pom.xml b/pom.xml
index 4080f12..21ffba2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@
     </parent>
 
     <artifactId>fluffyj.archetype</artifactId>
-    <version>1.13.1-DONOTUSE</version>
+    <version>1.14.0-SNAPSHOT</version>
     <packaging>maven-archetype</packaging>
 
     <name>Fluffy J Archetype</name>
@@ -48,11 +48,12 @@
     </scm>
 
     <properties>
-        <java.version>17</java.version>
-        <maven.compiler.release>11</maven.compiler.release>
+        <java.version>21</java.version>
+        <maven.compiler.release>17</maven.compiler.release>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <version.maven-archetype-plugin>3.2.1</version.maven-archetype-plugin>
+        <version.maven-archetype-plugin>3.3.1</version.maven-archetype-plugin>
+        <version.maven-deploy-plugin>3.1.3</version.maven-deploy-plugin>
         <version.replacer-plugin>1.5.3</version.replacer-plugin>
         <build.timestamp.formatted>${maven.build.timestamp}</build.timestamp.formatted>
         <maven.build.timestamp.format>yyyy-MM-dd HH:mm.ssZ</maven.build.timestamp.format>
@@ -75,6 +76,10 @@
             <plugin>
                 <artifactId>maven-clean-plugin</artifactId>
             </plugin>
+            <plugin>
+                <artifactId>maven-deploy-plugin</artifactId>
+                <version>${version.maven-deploy-plugin}</version>
+            </plugin>
             <plugin>
                 <artifactId>maven-archetype-plugin</artifactId>
             </plugin>
@@ -123,18 +128,4 @@
         </testResources>
     </build>
 
-    <profiles>
-        <!-- Use this profile when building with Maven <= 3.5.0 due to switch 
-            from Eclipse Aether to Maven Artifact Resolver -->
-        <!-- See https://jaxenter.com/apache-maven-3-5-0-nothing-see-3-4-0-move-along-133180.html -->
-        <profile>
-            <id>mvn33</id>
-            <activation>
-                <activeByDefault>false</activeByDefault>
-            </activation>
-            <properties>
-                <fluffy.profiles>-Pmvn33</fluffy.profiles>
-            </properties>
-        </profile>
-    </profiles>
 </project>
diff --git a/src/main/resources/archetype-resources/pom.xml b/src/main/resources/archetype-resources/pom.xml
index 67c72c3..eb4e1d7 100644
--- a/src/main/resources/archetype-resources/pom.xml
+++ b/src/main/resources/archetype-resources/pom.xml
@@ -49,8 +49,8 @@
     <url>project.website</url>
 
     <properties>
-        <java.version>11</java.version>
-        <maven.compiler.release>11</maven.compiler.release>
+        <java.version>17</java.version>
+        <maven.compiler.release>17</maven.compiler.release>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <build.timestamp.formatted>${maven.build.timestamp}</build.timestamp.formatted>
@@ -59,32 +59,32 @@
             files. These will be expanded by the maven build as soon as the resources 
             plugin processes all contents of the configured resources directories. -->
         <resource.delimiter>${*}</resource.delimiter>
-        <!-- Only required for java < 9 <maven.compiler.source>${java.version}</maven.compiler.source> 
+        <!-- Only required for java < 9
+        <maven.compiler.source>${java.version}</maven.compiler.source> 
             <maven.compiler.target>${java.version}</maven.compiler.target> -->
-        <maven-surefire-plugin.version>3.0.0-M7</maven-surefire-plugin.version>
-        <maven-failsafe-plugin.version>3.0.0-M7</maven-failsafe-plugin.version>
-        <maven-source-plugin.version>3.2.1</maven-source-plugin.version>
-        <maven-clean-plugin.version>3.2.0</maven-clean-plugin.version>
-        <maven-shade-plugin.version>3.3.0</maven-shade-plugin.version>
-        <maven-jar-plugin.version>3.2.2</maven-jar-plugin.version>
-        <maven-compiler-plugin.version>3.10.1</maven-compiler-plugin.version>
-        <maven-exec-plugin.version>3.1.0</maven-exec-plugin.version>
-        <maven-help-plugin.version>3.2.0</maven-help-plugin.version>
-        <maven-install-plugin.version>3.0.1</maven-install-plugin.version>
-        <guava.version>31.1-jre</guava.version>
-        <mockito.version>4.6.1</mockito.version>
-        <hamcrest.version>2.2</hamcrest.version>
-        <spotbugs.plugin.version>4.7.1.1</spotbugs.plugin.version>
-        <spotbugs.version>4.7.1</spotbugs.version>
-        <junit.version>5.9.0</junit.version>
-        <jacoco.plugin.version>0.8.8</jacoco.plugin.version>
-        <git-commit-id-plugin.version>5.0.0</git-commit-id-plugin.version>
-        <assertj.version>3.23.1</assertj.version>
-        <logback.version>1.2.11</logback.version>
-        <equalsverifier.version>3.10.1</equalsverifier.version>
-        <awaitility.version>4.2.0</awaitility.version>
-        <wiremock.version>2.33.2</wiremock.version>
-        <arch.unit.version>0.23.1</arch.unit.version>
+        <maven-surefire-plugin.version>3.5.2</maven-surefire-plugin.version>
+        <maven-failsafe-plugin.version>3.5.2</maven-failsafe-plugin.version>
+        <maven-source-plugin.version>3.3.1</maven-source-plugin.version>
+        <maven-clean-plugin.version>3.4.0</maven-clean-plugin.version>
+        <maven-shade-plugin.version>3.6.0</maven-shade-plugin.version>
+        <maven-jar-plugin.version>3.4.2</maven-jar-plugin.version>
+        <maven-compiler-plugin.version>3.13.0</maven-compiler-plugin.version>
+        <maven-exec-plugin.version>3.5.0</maven-exec-plugin.version>
+        <maven-help-plugin.version>3.5.1</maven-help-plugin.version>
+        <maven-install-plugin.version>3.1.3</maven-install-plugin.version>
+        <guava.version>33.3.1-jre</guava.version>
+        <mockito.version>5.14.2</mockito.version>
+        <hamcrest.version>3.0</hamcrest.version>
+        <spotbugs.plugin.version>4.8.6.4</spotbugs.plugin.version>
+        <spotbugs.version>4.8.6</spotbugs.version>
+        <junit.version>5.11.3</junit.version>
+        <jacoco.plugin.version>0.8.12</jacoco.plugin.version>
+        <assertj.version>3.26.3</assertj.version>
+        <logback.version>1.5.12</logback.version>
+        <equalsverifier.version>3.17.5</equalsverifier.version>
+        <awaitility.version>4.2.2</awaitility.version>
+        <wiremock.version>3.9.0</wiremock.version>
+        <arch.unit.version>1.3.0</arch.unit.version>
         <!-- Disable class data sharing (CDS) to avoid a nasty JVM warning. -->
         <!-- This usually has only a very small impact on performance and 
             memory usage. -->
@@ -95,7 +95,6 @@
 
     <dependencyManagement>
         <dependencies>
-            <!-- https://mvnrepository.com/artifact/com.google.guava/guava -->
             <dependency>
                 <groupId>com.google.guava</groupId>
                 <artifactId>guava</artifactId>
@@ -108,79 +107,68 @@
                 <artifactId>spotbugs</artifactId>
                 <version>${spotbugs.version}</version>
             </dependency>
-            <!-- https://mvnrepository.com/artifact/ch.qos.logback/logback-classic -->
             <dependency>
                 <groupId>ch.qos.logback</groupId>
                 <artifactId>logback-classic</artifactId>
                 <version>${logback.version}</version>
             </dependency>
-            <!-- https://mvnrepository.com/artifact/org.junit.jupiter/junit-jupiter-api -->
             <dependency>
                 <groupId>org.junit.jupiter</groupId>
                 <artifactId>junit-jupiter-api</artifactId>
                 <version>${junit.version}</version>
                 <scope>test</scope>
             </dependency>
-            <!-- https://mvnrepository.com/artifact/org.junit.jupiter/junit-jupiter-engine -->
             <dependency>
                 <groupId>org.junit.jupiter</groupId>
                 <artifactId>junit-jupiter-engine</artifactId>
                 <version>${junit.version}</version>
                 <scope>test</scope>
             </dependency>
-            <!-- https://mvnrepository.com/artifact/com.tngtech.archunit/archunit-junit5 -->
             <dependency>
                 <groupId>com.tngtech.archunit</groupId>
                 <artifactId>archunit-junit5</artifactId>
                 <version>${arch.unit.version}</version>
                 <scope>test</scope>
             </dependency>
-            <!-- https://mvnrepository.com/artifact/org.mockito/mockito-core -->
             <dependency>
                 <groupId>org.mockito</groupId>
                 <artifactId>mockito-core</artifactId>
                 <version>${mockito.version}</version>
                 <scope>test</scope>
             </dependency>
-            <!-- https://mvnrepository.com/artifact/org.mockito/mockito-junit-jupiter -->
             <dependency>
                 <groupId>org.mockito</groupId>
                 <artifactId>mockito-junit-jupiter</artifactId>
                 <version>${mockito.version}</version>
                 <scope>test</scope>
             </dependency>
-            <!-- https://mvnrepository.com/artifact/org.hamcrest/hamcrest -->
             <dependency>
                 <groupId>org.hamcrest</groupId>
                 <artifactId>hamcrest</artifactId>
                 <version>${hamcrest.version}</version>
                 <scope>test</scope>
             </dependency>
-            <!-- https://mvnrepository.com/artifact/org.assertj/assertj-core -->
             <dependency>
                 <groupId>org.assertj</groupId>
                 <artifactId>assertj-core</artifactId>
                 <version>${assertj.version}</version>
                 <scope>test</scope>
             </dependency>
-            <!-- https://mvnrepository.com/artifact/nl.jqno.equalsverifier/equalsverifier -->
             <dependency>
                 <groupId>nl.jqno.equalsverifier</groupId>
                 <artifactId>equalsverifier</artifactId>
                 <version>${equalsverifier.version}</version>
                 <scope>test</scope>
             </dependency>
-            <!-- https://mvnrepository.com/artifact/org.awaitility/awaitility -->
             <dependency>
                 <groupId>org.awaitility</groupId>
                 <artifactId>awaitility</artifactId>
                 <version>${awaitility.version}</version>
                 <scope>test</scope>
             </dependency>
-            <!-- https://search.maven.org/search?q=a:wiremock-jre8 -->
             <dependency>
-                <groupId>com.github.tomakehurst</groupId>
-                <artifactId>wiremock-jre8</artifactId>
+                <groupId>org.wiremock</groupId>
+                <artifactId>wiremock</artifactId>
                 <version>${wiremock.version}</version>
                 <scope>test</scope>
             </dependency>
@@ -249,8 +237,8 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>com.github.tomakehurst</groupId>
-            <artifactId>wiremock-jre8</artifactId>
+            <groupId>org.wiremock</groupId>
+            <artifactId>wiremock</artifactId>
             <scope>test</scope>
         </dependency>
         <!-- End of test dependencies -->
@@ -322,11 +310,6 @@
                     <artifactId>spotbugs-maven-plugin</artifactId>
                     <version>${spotbugs.plugin.version}</version>
                 </plugin>
-                <plugin>
-                    <groupId>io.github.git-commit-id</groupId>
-                    <artifactId>git-commit-id-maven-plugin</artifactId>
-                    <version>${git-commit-id-plugin.version}</version>
-                </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-surefire-plugin</artifactId>
@@ -400,7 +383,8 @@
                         the solution is to use MAVEN_OPTS="\-\-add-modules .. mvn clean verify". -->
                     <reuseForks>true</reuseForks>
                     <forkCount>1</forkCount>
-                    <!-- $argLine is 'injected' by JaCoCo and contains instructions 
+                    <!-- $argLine is 'injected' by JaCoCo and contains
+                    instructions 
                         to setup its agent -->
                     <argLine>${argLine}</argLine>
                     <argLine>${custom.jvm.options}</argLine>
@@ -413,7 +397,8 @@
             <plugin>
                 <artifactId>maven-source-plugin</artifactId>
             </plugin>
-            <!-- For warnings about illegal reflective access see https://issues.apache.org/jira/browse/GROOVY-8339 -->
+            <!-- For warnings about illegal reflective access see
+            https://issues.apache.org/jira/browse/GROOVY-8339 -->
             <plugin>
                 <groupId>com.github.spotbugs</groupId>
                 <artifactId>spotbugs-maven-plugin</artifactId>
@@ -438,7 +423,9 @@
                     JVM running the maven process which then calls this plugin. -->
                 <configuration>
                     <executable>java</executable>
-                    <commandlineArgs>-jar ${project.build.directory}/${project.build.finalName}-shaded.jar</commandlineArgs>
+                    <commandlineArgs>
+                        -jar
+                        ${project.build.directory}/${project.build.finalName}-shaded.jar</commandlineArgs>
                 </configuration>
             </plugin>
             <plugin>
@@ -452,39 +439,6 @@
     </build>
 
     <profiles>
-        <profile>
-            <id>mvn33</id>
-            <activation>
-                <activeByDefault>false</activeByDefault>
-            </activation>
-            <build>
-                <pluginManagement>
-                    <plugins>
-                        <!-- Required due to switch from Eclipse Aether to 
-                            Maven Artifact Resolver since 3.5.0 -->
-                        <!-- See https://jaxenter.com/apache-maven-3-5-0-nothing-see-3-4-0-move-along-133180.html -->
-                        <plugin>
-                            <groupId>org.apache.maven.plugins</groupId>
-                            <artifactId>maven-surefire-plugin</artifactId>
-                            <version>2.22.2</version>
-                        </plugin>
-                        <!-- Required due to switch from Eclipse Aether to 
-                            Maven Artifact Resolver since 3.5.0 -->
-                        <!-- See https://jaxenter.com/apache-maven-3-5-0-nothing-see-3-4-0-move-along-133180.html -->
-                        <plugin>
-                            <artifactId>maven-install-plugin</artifactId>
-                            <dependencies>
-                                <dependency>
-                                    <groupId>org.apache.maven</groupId>
-                                    <artifactId>maven-resolver-provider</artifactId>
-                                    <version>3.5.0</version>
-                                </dependency>
-                            </dependencies>
-                        </plugin>
-                    </plugins>
-                </pluginManagement>
-            </build>
-        </profile>
         <profile>
             <id>create_uber_jar</id>
             <activation>
@@ -498,7 +452,8 @@
                         <configuration>
                             <!-- In some cases this could cause the resulting 
                                 jar to malfunction. Set it to 'false' if this happens. -->
-                            <!-- If this causes a warning, see: https://issues.apache.org/jira/browse/MSHADE-366 -->
+                            <!-- If this causes a warning, see:
+                            https://issues.apache.org/jira/browse/MSHADE-366 -->
                             <minimizeJar>true</minimizeJar>
                             <transformers>
                                 <transformer
@@ -515,7 +470,8 @@
                                     implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" />
                             </transformers>
                             <!-- Shading breaks module encapsulation anyway, 
-                                see: https://stackoverflow.com/questions/51751981/why-does-maven-shade-plugin-remove-module-info-class -->
+                                see:
+                            https://stackoverflow.com/questions/51751981/why-does-maven-shade-plugin-remove-module-info-class -->
                             <filters>
                                 <filter>
                                     <artifact>*:*</artifact>
@@ -558,4 +514,5 @@
             </build>
         </profile>
     </profiles>
+
 </project>

From 8897f097dfb973c188dd513bc3e4506ba9e4eb1c Mon Sep 17 00:00:00 2001
From: Jan Mosig <jan.mosig@itemis.de>
Date: Fri, 10 Jan 2025 15:29:47 +0100
Subject: [PATCH 5/5] Bug was fixed with new archetype plugin version

---
 pom.xml                                       | 12 +++-
 .../META-INF/archetype-post-generate.groovy   | 38 ------------
 .../META-INF/maven/archetype-metadata.xml     |  4 +-
 .../{gitignore => .gitignore}                 |  0
 .../resources/archetype-resources/pom.xml     | 59 +++++++++++--------
 5 files changed, 44 insertions(+), 69 deletions(-)
 delete mode 100644 src/main/resources/META-INF/archetype-post-generate.groovy
 rename src/main/resources/archetype-resources/{gitignore => .gitignore} (100%)

diff --git a/pom.xml b/pom.xml
index 21ffba2..8ab82a7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -16,7 +16,8 @@
     <packaging>maven-archetype</packaging>
 
     <name>Fluffy J Archetype</name>
-    <description>An improved variety of a Maven Java project archetype. Extra fluffy ❤</description>
+    <description>An improved variety of a Maven Java project archetype. Extra
+        fluffy ❤</description>
 
     <licenses>
         <license>
@@ -82,13 +83,17 @@
             </plugin>
             <plugin>
                 <artifactId>maven-archetype-plugin</artifactId>
+                <configuration>
+                    <useDefaultExcludes>false</useDefaultExcludes>
+                </configuration>
             </plugin>
             <plugin>
                 <artifactId>maven-resources-plugin</artifactId>
                 <configuration>
                     <encoding>UTF-8</encoding>
                     <propertiesEncoding>UTF-8</propertiesEncoding>
-                    <!-- See https://issues.apache.org/jira/browse/MRESOURCES-190?focusedCommentId=15182734&page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#comment-15182734 -->
+                    <!-- See
+                    https://issues.apache.org/jira/browse/MRESOURCES-190?focusedCommentId=15182734&page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#comment-15182734 -->
                     <addDefaultExcludes>false</addDefaultExcludes>
                 </configuration>
             </plugin>
@@ -109,7 +114,8 @@
                 </executions>
                 <configuration>
                     <delimiters>@</delimiters>
-                    <file>${project.build.testOutputDirectory}/projects/it-basic/goal.txt</file>
+                    <file>
+                        ${project.build.testOutputDirectory}/projects/it-basic/goal.txt</file>
                     <replacements>
                         <replacement>
                             <token>fluffy.profiles</token>
diff --git a/src/main/resources/META-INF/archetype-post-generate.groovy b/src/main/resources/META-INF/archetype-post-generate.groovy
deleted file mode 100644
index aa1fbbb..0000000
--- a/src/main/resources/META-INF/archetype-post-generate.groovy
+++ /dev/null
@@ -1,38 +0,0 @@
-import java.nio.file.Files
-import java.nio.file.Path
-import java.nio.file.Paths
-
-/*
-Adding .gitignore directly via maven resources plugin is currently broken.
-See: https://issues.apache.org/jira/projects/ARCHETYPE/issues/ARCHETYPE-505
-
-Thus, we include the file with a different filename and rename it manually with this post processing script.
-See: https://maven.apache.org/archetype/maven-archetype-plugin/advanced-usage.html
-*/
-
-Path gitIgnorePath = Paths.get(request.outputDirectory, request.artifactId, "gitignore");
-Path targetPath = gitIgnorePath.getParent().resolve(".gitignore");
-
-boolean isArchetypeBuild = gitIgnorePath.toString().contains("it-basic");
-boolean setupFailed = false;
-errMsg = "";
-
-if (Files.exists(gitIgnorePath)) {
-    System.out.println("Now setting up .gitignore file..");
-    try {
-        Files.move(gitIgnorePath, targetPath);
-    } catch (Exception e) {
-        errMsg = "[WARNING] Could not setup .gitignore file. Reason: " + e.getClass().getSimpleName() + ": " + e.getMessage();
-        setupFailed = true;
-    }
-} else {
-    errMsg = "[WARNING] Could not find $gitIgnorePath! Your project will not have a proper .gitignore file :(";
-    setupFailed = true;
-}
-
-if (setupFailed) {
-    System.err.println(errMsg);
-    if (isArchetypeBuild) {
-        throw new Exception("Stopping the build because the post processing script ran into a problem. See log for error details.");
-    }
-}
diff --git a/src/main/resources/META-INF/maven/archetype-metadata.xml b/src/main/resources/META-INF/maven/archetype-metadata.xml
index 8028108..fd252bb 100644
--- a/src/main/resources/META-INF/maven/archetype-metadata.xml
+++ b/src/main/resources/META-INF/maven/archetype-metadata.xml
@@ -9,9 +9,7 @@
         <fileSet filtered="true" encoding="UTF-8">
             <directory></directory>
             <includes>
-                <!-- Adding .gitignore is currently broken: https://issues.apache.org/jira/projects/ARCHETYPE/issues/ARCHETYPE-505 -->
-                <!-- Thus, it will be renamed to .gitignore via META-INF/archetype-post-generate.groovy -->
-                <include>gitignore</include>
+                <include>.gitignore</include>
                 <include>.editorconfig</include>
                 <include>README.md</include>
                 <include>spotbugs-exclude.xml</include>
diff --git a/src/main/resources/archetype-resources/gitignore b/src/main/resources/archetype-resources/.gitignore
similarity index 100%
rename from src/main/resources/archetype-resources/gitignore
rename to src/main/resources/archetype-resources/.gitignore
diff --git a/src/main/resources/archetype-resources/pom.xml b/src/main/resources/archetype-resources/pom.xml
index eb4e1d7..3ba002a 100644
--- a/src/main/resources/archetype-resources/pom.xml
+++ b/src/main/resources/archetype-resources/pom.xml
@@ -61,7 +61,8 @@
         <resource.delimiter>${*}</resource.delimiter>
         <!-- Only required for java < 9
         <maven.compiler.source>${java.version}</maven.compiler.source> 
-            <maven.compiler.target>${java.version}</maven.compiler.target> -->
+        <maven.compiler.target>${java.version}</maven.compiler.target>
+         -->
         <maven-surefire-plugin.version>3.5.2</maven-surefire-plugin.version>
         <maven-failsafe-plugin.version>3.5.2</maven-failsafe-plugin.version>
         <maven-source-plugin.version>3.3.1</maven-source-plugin.version>
@@ -72,22 +73,21 @@
         <maven-exec-plugin.version>3.5.0</maven-exec-plugin.version>
         <maven-help-plugin.version>3.5.1</maven-help-plugin.version>
         <maven-install-plugin.version>3.1.3</maven-install-plugin.version>
-        <guava.version>33.3.1-jre</guava.version>
+        <guava.version>33.4.0-jre</guava.version>
         <mockito.version>5.14.2</mockito.version>
         <hamcrest.version>3.0</hamcrest.version>
         <spotbugs.plugin.version>4.8.6.4</spotbugs.plugin.version>
         <spotbugs.version>4.8.6</spotbugs.version>
-        <junit.version>5.11.3</junit.version>
+        <junit.version>5.11.4</junit.version>
         <jacoco.plugin.version>0.8.12</jacoco.plugin.version>
-        <assertj.version>3.26.3</assertj.version>
-        <logback.version>1.5.12</logback.version>
-        <equalsverifier.version>3.17.5</equalsverifier.version>
+        <assertj.version>3.27.1</assertj.version>
+        <logback.version>1.5.16</logback.version>
+        <equalsverifier.version>3.18</equalsverifier.version>
         <awaitility.version>4.2.2</awaitility.version>
         <wiremock.version>3.9.0</wiremock.version>
         <arch.unit.version>1.3.0</arch.unit.version>
         <!-- Disable class data sharing (CDS) to avoid a nasty JVM warning. -->
-        <!-- This usually has only a very small impact on performance and 
-            memory usage. -->
+        <!-- This usually has only a very small impact on performance and memory usage. -->
         <!-- See https://stackoverflow.com/a/57957031 -->
         <!-- See https://kupczynski.info/2018/05/29/jvm-class-data-sharing.html -->
         <custom.jvm.options>-Xshare:off</custom.jvm.options>
@@ -112,6 +112,11 @@
                 <artifactId>logback-classic</artifactId>
                 <version>${logback.version}</version>
             </dependency>
+            <dependency>
+                <groupId>ch.qos.logback</groupId>
+                <artifactId>logback-core</artifactId>
+                <version>${logback.version}</version>
+            </dependency>
             <dependency>
                 <groupId>org.junit.jupiter</groupId>
                 <artifactId>junit-jupiter-api</artifactId>
@@ -180,13 +185,16 @@
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
         </dependency>
+        <dependency>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-core</artifactId>
+        </dependency>
         <dependency>
             <groupId>ch.qos.logback</groupId>
             <artifactId>logback-classic</artifactId>
         </dependency>
         <dependency>
-            <!-- Required to support null annotation checks according to 
-                JSR-305 -->
+            <!-- Required to support null annotation checks according to JSR-305 -->
             <groupId>com.github.spotbugs</groupId>
             <artifactId>spotbugs</artifactId>
         </dependency>
@@ -342,6 +350,9 @@
                     <version>${maven-compiler-plugin.version}</version>
                     <configuration>
                         <release>${maven.compiler.release}</release>
+                        <compilerArgs>
+                            <arg>-proc:full</arg>
+                        </compilerArgs>
                     </configuration>
                 </plugin>
                 <plugin>
@@ -383,9 +394,7 @@
                         the solution is to use MAVEN_OPTS="\-\-add-modules .. mvn clean verify". -->
                     <reuseForks>true</reuseForks>
                     <forkCount>1</forkCount>
-                    <!-- $argLine is 'injected' by JaCoCo and contains
-                    instructions 
-                        to setup its agent -->
+                    <!-- $argLine is 'injected' by JaCoCo and contains instructions to setup its agent -->
                     <argLine>${argLine}</argLine>
                     <argLine>${custom.jvm.options}</argLine>
                 </configuration>
@@ -397,8 +406,7 @@
             <plugin>
                 <artifactId>maven-source-plugin</artifactId>
             </plugin>
-            <!-- For warnings about illegal reflective access see
-            https://issues.apache.org/jira/browse/GROOVY-8339 -->
+            <!-- For warnings about illegal reflective access see https://issues.apache.org/jira/browse/GROOVY-8339 -->
             <plugin>
                 <groupId>com.github.spotbugs</groupId>
                 <artifactId>spotbugs-maven-plugin</artifactId>
@@ -450,10 +458,8 @@
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-shade-plugin</artifactId>
                         <configuration>
-                            <!-- In some cases this could cause the resulting 
-                                jar to malfunction. Set it to 'false' if this happens. -->
-                            <!-- If this causes a warning, see:
-                            https://issues.apache.org/jira/browse/MSHADE-366 -->
+                            <!-- In some cases this could cause the resulting jar to malfunction. Set it to 'false' if this happens. -->
+                            <!-- If this causes a warning, see: https://issues.apache.org/jira/browse/MSHADE-366 -->
                             <minimizeJar>true</minimizeJar>
                             <transformers>
                                 <transformer
@@ -469,20 +475,17 @@
                                 <transformer
                                     implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" />
                             </transformers>
-                            <!-- Shading breaks module encapsulation anyway, 
-                                see:
+                            <!-- Shading breaks module encapsulation anyway, see:
                             https://stackoverflow.com/questions/51751981/why-does-maven-shade-plugin-remove-module-info-class -->
                             <filters>
                                 <filter>
                                     <artifact>*:*</artifact>
                                     <excludes>
                                         <exclude>**/module-info.class</exclude>
-                                        <!-- Only specify this if you are 
-                                            sure that no dependency requires the settings from its own MANIFEST.MF file -->
+                                        <!-- Only specify this if you are sure that no dependency requires the settings from its own MANIFEST.MF file -->
                                         <exclude>META-INF/MANIFEST.MF</exclude>
                                         <exclude>META-INF/DEPENDENCIES</exclude>
-                                        <!-- filter out signature files from 
-                                            signed dependencies, else repackaging fails with security exception -->
+                                        <!-- filter out signature files from signed dependencies, else repackaging fails with security exception -->
                                         <exclude>META-INF/*.SF</exclude>
                                         <exclude>META-INF/*.DSA</exclude>
                                         <exclude>META-INF/*.RSA</exclude>
@@ -494,6 +497,12 @@
                                         <include>**</include>
                                     </includes>
                                 </filter>
+                                <filter>
+                                    <artifact>ch.qos.logback:logback-classic</artifact>
+                                    <includes>
+                                        <include>**</include>
+                                    </includes>
+                                </filter>
                             </filters>
                         </configuration>
                         <executions>