From 164b2607df611896f5079615cd60bf4b04f14843 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Aur=C3=A9lien=20Mino?= <aurelien.mino@gmail.com>
Date: Sat, 28 Oct 2023 00:21:20 +0200
Subject: [PATCH 1/2] (generator) Checkstyle rule to prevent use of junit4

---
 checkstyle.xml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/checkstyle.xml b/checkstyle.xml
index 637afe5b456..b9998419749 100644
--- a/checkstyle.xml
+++ b/checkstyle.xml
@@ -4,5 +4,10 @@
   <module name="TreeWalker">
     <module name="RedundantImport" />
     <module name="UnusedImports" />
+    <module name="IllegalImport">
+      <property name="regexp" value="true" />
+      <!-- Reject any org.junit import that's not also org.junit.jupiter: -->
+      <property name="illegalClasses" value="^org\.junit\.(?!jupiter\.)(?!platform\.).+" />
+    </module>
   </module>
 </module>

From 175939c7ec10361521a031ddefc656a307b3f7b2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Aur=C3=A9lien=20Mino?= <aurelien.mino@gmail.com>
Date: Sat, 28 Oct 2023 00:22:36 +0200
Subject: [PATCH 2/2] (applications) Checkstyle rule to prevent use of junit4

---
 .../server/javatool/checkstyle/main/checkstyle.xml.mustache  | 5 +++++
 .../checkstyle/domain/CheckstyleModuleFactoryTest.java       | 4 +++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/main/resources/generator/server/javatool/checkstyle/main/checkstyle.xml.mustache b/src/main/resources/generator/server/javatool/checkstyle/main/checkstyle.xml.mustache
index 637afe5b456..8ef5e1082f7 100644
--- a/src/main/resources/generator/server/javatool/checkstyle/main/checkstyle.xml.mustache
+++ b/src/main/resources/generator/server/javatool/checkstyle/main/checkstyle.xml.mustache
@@ -4,5 +4,10 @@
   <module name="TreeWalker">
     <module name="RedundantImport" />
     <module name="UnusedImports" />
+    <module name="IllegalImport">
+      <property name="regexp" value="true"/>
+      <!-- Reject any org.junit import that's not also org.junit.jupiter: -->
+      <property name="illegalClasses" value="^org\.junit\.(?!jupiter\.)(?!platform\.).+"/>
+    </module>
   </module>
 </module>
diff --git a/src/test/java/tech/jhipster/lite/generator/server/javatool/checkstyle/domain/CheckstyleModuleFactoryTest.java b/src/test/java/tech/jhipster/lite/generator/server/javatool/checkstyle/domain/CheckstyleModuleFactoryTest.java
index 621bc740345..e7ac1194c2b 100644
--- a/src/test/java/tech/jhipster/lite/generator/server/javatool/checkstyle/domain/CheckstyleModuleFactoryTest.java
+++ b/src/test/java/tech/jhipster/lite/generator/server/javatool/checkstyle/domain/CheckstyleModuleFactoryTest.java
@@ -1,6 +1,7 @@
 package tech.jhipster.lite.generator.server.javatool.checkstyle.domain;
 
-import static tech.jhipster.lite.module.infrastructure.secondary.JHipsterModulesAssertions.*;
+import static tech.jhipster.lite.module.infrastructure.secondary.JHipsterModulesAssertions.assertThatModuleWithFiles;
+import static tech.jhipster.lite.module.infrastructure.secondary.JHipsterModulesAssertions.pomFile;
 
 import org.junit.jupiter.api.Test;
 import tech.jhipster.lite.TestFileUtils;
@@ -49,6 +50,7 @@ void shouldBuildModule() {
       )
       .and()
       .hasFile("checkstyle.xml")
+      .containing("<module name=\"IllegalImport\">")
       .containing("<module name=\"Checker\">")
       .containing("<module name=\"TreeWalker\">")
       .containing("<module name=\"UnusedImports\" />");