From 68041f1bda7f0989e2623e67537d5e37c806fe5e Mon Sep 17 00:00:00 2001
From: LiZongbo <lizongbo@gmail.com>
Date: Sun, 16 Jun 2024 15:59:43 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0module-info.java=E8=A7=84?=
 =?UTF-8?q?=E9=81=BF=E8=87=AA=E5=8A=A8=E7=94=9F=E6=88=90=E7=9A=84=E4=B8=8D?=
 =?UTF-8?q?=E8=A7=84=E8=8C=83=E7=9A=84=E6=A8=A1=E5=9D=97=E5=90=8D=20#5979?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

增加module-info.java规避自动生成的不规范的模块名 #5979
---
 druid-spring-boot-3-starter/pom.xml              |  2 ++
 .../src/main/java/module-info.java               | 16 ++++++++++++++++
 pom.xml                                          |  4 ++--
 src/checkstyle/druid-checks.xml                  |  3 +++
 4 files changed, 23 insertions(+), 2 deletions(-)
 create mode 100644 druid-spring-boot-3-starter/src/main/java/module-info.java

diff --git a/druid-spring-boot-3-starter/pom.xml b/druid-spring-boot-3-starter/pom.xml
index 7217ecda8..7c6d85655 100644
--- a/druid-spring-boot-3-starter/pom.xml
+++ b/druid-spring-boot-3-starter/pom.xml
@@ -119,6 +119,8 @@
             <plugin>
                 <artifactId>maven-compiler-plugin</artifactId>
                 <configuration>
+                    <source>9</source>
+                    <target>9</target>
                     <annotationProcessorPaths>
                         <path>
                             <groupId>org.springframework.boot</groupId>
diff --git a/druid-spring-boot-3-starter/src/main/java/module-info.java b/druid-spring-boot-3-starter/src/main/java/module-info.java
new file mode 100644
index 000000000..95dd02b1c
--- /dev/null
+++ b/druid-spring-boot-3-starter/src/main/java/module-info.java
@@ -0,0 +1,16 @@
+open module druid.spring.boot3.starter {
+    exports com.alibaba.druid.spring.boot3.autoconfigure;
+    exports com.alibaba.druid.spring.boot3.autoconfigure.stat;
+    exports com.alibaba.druid.spring.boot3.autoconfigure.properties;
+    requires spring.boot;
+    requires spring.boot.autoconfigure;
+    requires spring.context;
+    requires spring.core;
+    requires spring.aop;
+    requires spring.beans;
+    requires druid;
+    requires org.slf4j;
+    requires java.sql;
+    requires java.naming;
+    requires java.management;
+}
diff --git a/pom.xml b/pom.xml
index 42494aca2..3ee7b6923 100644
--- a/pom.xml
+++ b/pom.xml
@@ -150,12 +150,12 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-checkstyle-plugin</artifactId>
-				<version>3.1.2</version>
+				<version>3.4.0</version>
 				<dependencies>
 					<dependency>
 						<groupId>com.puppycrawl.tools</groupId>
 						<artifactId>checkstyle</artifactId>
-						<version>9.2</version>
+						<version>10.17.0</version>
 					</dependency>
 				</dependencies>
 				<executions>
diff --git a/src/checkstyle/druid-checks.xml b/src/checkstyle/druid-checks.xml
index a654bb404..1cba2f5fc 100644
--- a/src/checkstyle/druid-checks.xml
+++ b/src/checkstyle/druid-checks.xml
@@ -3,6 +3,9 @@
         "-//Puppy Crawl//DTD Check Configuration 1.3//EN"
         "http://checkstyle.sourceforge.net/dtds/configuration_1_3.dtd">
 <module name="Checker">
+    <module name="BeforeExecutionExclusionFileFilter">
+        <property name="fileNamePattern" value="module\-info\.java$"/>
+    </module>
     <module name="FileTabCharacter"/>
     <module name="NewlineAtEndOfFile"/>
     <module name="RegexpMultiline">