Merge branch '3.0.x' into 3.1.x

Closes gh-36529
2023-07-24 16:09:32 +02:00
parent 54323d1a95 73cc54ad34
commit 89066b4d1e
2 changed files with 11 additions and 5 deletions
--- a/src/checkstyle/checkstyle.xml
+++ b/src/checkstyle/checkstyle.xml
@@ -23,7 +23,7 @@
 			<property name="id" value="mainCodeIllegalImportCheck"/>
 			<property name="regexp" value="true" />
 			<property name="illegalClasses"
-				value="^javax.annotation.PostConstruct"/>
+				value="javax.annotation.PostConstruct, jakarta.annotation.PostConstruct"/>
 		</module>
 		<module
 			name="com.puppycrawl.tools.checkstyle.checks.imports.ImportControlCheck">