From 7e6962d392724e3ecd67a899707216cf6c128254 Mon Sep 17 00:00:00 2001
From: Behrang Saeedzadeh <hello@behrang.org>
Date: Fri, 27 Feb 2026 21:33:32 +0000
Subject: [PATCH 1/2] Simplify Velocity conditional for JUnit BOM dependency
 management

Replace #elseif version check with #else to apply JUnit BOM
dependencyManagement for all non-JUnit 4 versions.

This change, makes the if conditions closer to and more consistent
with archetype-resources/src/test/java/AppTest.java:

```
    #if ( $junitVersion == $null || $junitVersion.startsWith("4."))
```
---
 .../src/main/resources-filtered/archetype-resources/pom.xml     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/maven-archetype-quickstart/src/main/resources-filtered/archetype-resources/pom.xml b/maven-archetype-quickstart/src/main/resources-filtered/archetype-resources/pom.xml
index e022e43..37f5324 100644
--- a/maven-archetype-quickstart/src/main/resources-filtered/archetype-resources/pom.xml
+++ b/maven-archetype-quickstart/src/main/resources-filtered/archetype-resources/pom.xml
@@ -18,7 +18,7 @@
       <scope>test</scope>
     </dependency>
   </dependencies>
-#elseif ( $ver.startsWith("5.") )
+#else
   <dependencyManagement>
     <dependencies>
       <dependency>

From 96922019347bf57bf39d7baa21192dcf8852447e Mon Sep 17 00:00:00 2001
From: Behrang Saeedzadeh <hello@behrang.org>
Date: Fri, 27 Feb 2026 21:44:29 +0000
Subject: [PATCH 2/2] Add integration test for Java 25 with JUnit 6.x

Add reference project and archetype properties for testing the
quickstart archetype with Java 25 and JUnit 6.0.3.
---
 .../it-java-25-junit-6.x/archetype.properties |  6 ++
 .../projects/it-java-25-junit-6.x/goal.txt    |  1 +
 .../reference/.mvn/jvm.config                 |  0
 .../reference/.mvn/maven.config               |  0
 .../it-java-25-junit-6.x/reference/pom.xml    | 90 +++++++++++++++++++
 .../reference/src/main/java/it/pkg/App.java   | 10 +++
 .../src/test/java/it/pkg/AppTest.java         | 19 ++++
 7 files changed, 126 insertions(+)
 create mode 100644 maven-archetype-quickstart/src/test/resources/projects/it-java-25-junit-6.x/archetype.properties
 create mode 100644 maven-archetype-quickstart/src/test/resources/projects/it-java-25-junit-6.x/goal.txt
 create mode 100644 maven-archetype-quickstart/src/test/resources/projects/it-java-25-junit-6.x/reference/.mvn/jvm.config
 create mode 100644 maven-archetype-quickstart/src/test/resources/projects/it-java-25-junit-6.x/reference/.mvn/maven.config
 create mode 100644 maven-archetype-quickstart/src/test/resources/projects/it-java-25-junit-6.x/reference/pom.xml
 create mode 100644 maven-archetype-quickstart/src/test/resources/projects/it-java-25-junit-6.x/reference/src/main/java/it/pkg/App.java
 create mode 100644 maven-archetype-quickstart/src/test/resources/projects/it-java-25-junit-6.x/reference/src/test/java/it/pkg/AppTest.java

diff --git a/maven-archetype-quickstart/src/test/resources/projects/it-java-25-junit-6.x/archetype.properties b/maven-archetype-quickstart/src/test/resources/projects/it-java-25-junit-6.x/archetype.properties
new file mode 100644
index 0000000..cf39421
--- /dev/null
+++ b/maven-archetype-quickstart/src/test/resources/projects/it-java-25-junit-6.x/archetype.properties
@@ -0,0 +1,6 @@
+groupId=archetype.it
+artifactId=java-25-junit-6x-quickstart
+version=0.1-SNAPSHOT
+package=it.pkg
+javaCompilerVersion=25
+junitVersion=6.0.3
diff --git a/maven-archetype-quickstart/src/test/resources/projects/it-java-25-junit-6.x/goal.txt b/maven-archetype-quickstart/src/test/resources/projects/it-java-25-junit-6.x/goal.txt
new file mode 100644
index 0000000..30d74d2
--- /dev/null
+++ b/maven-archetype-quickstart/src/test/resources/projects/it-java-25-junit-6.x/goal.txt
@@ -0,0 +1 @@
+test
\ No newline at end of file
diff --git a/maven-archetype-quickstart/src/test/resources/projects/it-java-25-junit-6.x/reference/.mvn/jvm.config b/maven-archetype-quickstart/src/test/resources/projects/it-java-25-junit-6.x/reference/.mvn/jvm.config
new file mode 100644
index 0000000..e69de29
diff --git a/maven-archetype-quickstart/src/test/resources/projects/it-java-25-junit-6.x/reference/.mvn/maven.config b/maven-archetype-quickstart/src/test/resources/projects/it-java-25-junit-6.x/reference/.mvn/maven.config
new file mode 100644
index 0000000..e69de29
diff --git a/maven-archetype-quickstart/src/test/resources/projects/it-java-25-junit-6.x/reference/pom.xml b/maven-archetype-quickstart/src/test/resources/projects/it-java-25-junit-6.x/reference/pom.xml
new file mode 100644
index 0000000..5c590f4
--- /dev/null
+++ b/maven-archetype-quickstart/src/test/resources/projects/it-java-25-junit-6.x/reference/pom.xml
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <groupId>archetype.it</groupId>
+  <artifactId>java-25-junit-6x-quickstart</artifactId>
+  <version>0.1-SNAPSHOT</version>
+
+  <name>java-25-junit-6x-quickstart</name>
+  <!-- FIXME change it to the project's website -->
+  <url>http://www.example.com</url>
+
+  <properties>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <maven.compiler.release>25</maven.compiler.release>
+  </properties>
+
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>org.junit</groupId>
+        <artifactId>junit-bom</artifactId>
+        <version>6.0.3</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-api</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <!-- Optionally: parameterized tests support -->
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-params</artifactId>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <pluginManagement><!-- lock down plugins versions to avoid using Maven defaults (may be moved to parent pom) -->
+      <plugins>
+        <!-- clean lifecycle, see https://maven.apache.org/ref/current/maven-core/lifecycles.html#clean_Lifecycle -->
+        <plugin>
+          <artifactId>maven-clean-plugin</artifactId>
+          <version>${version.maven-clean-plugin}</version>
+        </plugin>
+        <!-- default lifecycle, jar packaging: see https://maven.apache.org/ref/current/maven-core/default-bindings.html#Plugin_bindings_for_jar_packaging -->
+        <plugin>
+          <artifactId>maven-resources-plugin</artifactId>
+          <version>${version.maven-resources-plugin}</version>
+        </plugin>
+        <plugin>
+          <artifactId>maven-compiler-plugin</artifactId>
+          <version>${version.maven-compiler-plugin}</version>
+        </plugin>
+        <plugin>
+          <artifactId>maven-surefire-plugin</artifactId>
+          <version>${version.maven-surefire}</version>
+        </plugin>
+        <plugin>
+          <artifactId>maven-jar-plugin</artifactId>
+          <version>${version.maven-jar-plugin}</version>
+        </plugin>
+        <plugin>
+          <artifactId>maven-install-plugin</artifactId>
+          <version>${version.maven-install-plugin}</version>
+        </plugin>
+        <plugin>
+          <artifactId>maven-deploy-plugin</artifactId>
+          <version>${version.maven-deploy-plugin}</version>
+        </plugin>
+        <!-- site lifecycle, see https://maven.apache.org/ref/current/maven-core/lifecycles.html#site_Lifecycle -->
+        <plugin>
+          <artifactId>maven-site-plugin</artifactId>
+          <version>${version.maven-site-plugin}</version>
+        </plugin>
+        <plugin>
+          <artifactId>maven-project-info-reports-plugin</artifactId>
+          <version>${version.maven-project-info-reports-plugin}</version>
+        </plugin>
+      </plugins>
+    </pluginManagement>
+  </build>
+</project>
diff --git a/maven-archetype-quickstart/src/test/resources/projects/it-java-25-junit-6.x/reference/src/main/java/it/pkg/App.java b/maven-archetype-quickstart/src/test/resources/projects/it-java-25-junit-6.x/reference/src/main/java/it/pkg/App.java
new file mode 100644
index 0000000..02c5517
--- /dev/null
+++ b/maven-archetype-quickstart/src/test/resources/projects/it-java-25-junit-6.x/reference/src/main/java/it/pkg/App.java
@@ -0,0 +1,10 @@
+package it.pkg;
+
+/**
+ * Hello world!
+ */
+public class App {
+    public static void main(String[] args) {
+        System.out.println("Hello World!");
+    }
+}
diff --git a/maven-archetype-quickstart/src/test/resources/projects/it-java-25-junit-6.x/reference/src/test/java/it/pkg/AppTest.java b/maven-archetype-quickstart/src/test/resources/projects/it-java-25-junit-6.x/reference/src/test/java/it/pkg/AppTest.java
new file mode 100644
index 0000000..372fc9e
--- /dev/null
+++ b/maven-archetype-quickstart/src/test/resources/projects/it-java-25-junit-6.x/reference/src/test/java/it/pkg/AppTest.java
@@ -0,0 +1,19 @@
+package it.pkg;
+
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import org.junit.jupiter.api.Test;
+
+/**
+ * Unit test for simple App.
+ */
+public class AppTest {
+
+    /**
+     * Rigorous Test :-)
+     */
+    @Test
+    public void shouldAnswerWithTrue() {
+        assertTrue(true);
+    }
+}