Merge remote-tracking branch 'origin/master' into create_function

Author: dengliming

build.gradle

@@ -222,18 +222,18 @@ javadoc {
 jar {
     manifest {
         attributes (
-            "Automatic-Module-Name": "net.sf.jsqlparser"
+                "Automatic-Module-Name": "net.sf.jsqlparser"
         )
     }
 
     bundle {
         properties.empty()
         bnd(
-            "Created-By": System.properties.get('user.name'),
-            "Bundle-SymbolicName": "net.sf.jsqlparser",
-            "Import-Package": "*",
-            "Export-Package": "net.sf.jsqlparser.*",
-            "Automatic-Module-Name": "net.sf.jsqlparser"
+                "Created-By": System.properties.get('user.name'),
+                "Bundle-SymbolicName": "net.sf.jsqlparser",
+                "Import-Package": "*",
+                "Export-Package": "net.sf.jsqlparser.*",
+                "Automatic-Module-Name": "net.sf.jsqlparser"
         )
     }
 
@@ -344,7 +344,7 @@ jacocoTestCoverageVerification {
 
                 //@todo: temporarily increased to 7000, we need to bring that down to 5500 after accepting the Keywords PR
                 maximum = 20000
-                }
+            }
             excludes = [
                     'net.sf.jsqlparser.util.validation.*',
                     'net.sf.jsqlparser.**.*Adapter',
@@ -379,27 +379,31 @@ spotbugsMain {
 spotbugs {
     // fail only on P1 and without the net.sf.jsqlparser.parser.*
     excludeFilter = file("config/spotbugs/spotBugsExcludeFilter.xml")
+}
 
-    // do not run over the test, although we should do that eventually
-    spotbugsTest.enabled = false
+// do not run over the test, although we should do that eventually
+tasks.named('spotbugsTest').configure {
+    enabled = false
 }
 
 pmd {
+    // later versions throw NPE
+    toolVersion = '7.17.0'
+
     consoleOutput = true
     sourceSets = [sourceSets.main]
 
     // clear the ruleset in order to use configured rules only
     ruleSets = []
-
-    //rulesMinimumPriority = 1
+    rulesMinimumPriority = 2
     ruleSetFiles = files("config/pmd/ruleset.xml")
+}
 
-    pmdMain {
-        excludes = [
-                "build/generated/*"
-                , "**/net/sf/jsqlparser/parser/SimpleCharStream.java"
-        ]
-    }
+tasks.named('pmdMain').configure {
+    excludes = [
+            "build/generated/*"
+            , "**/net/sf/jsqlparser/parser/SimpleCharStream.java"
+    ]
 }
 
 checkstyle {
@@ -462,28 +466,34 @@ tasks.register('renderRR') {
         }
 
         // Convert JJ file to EBNF
-        tasks.register("convertJJ", JavaExec) {
-            standardOutput = new FileOutputStream(new File(rrDir, "JSqlParserCC.ebnf"))
-            mainClass = "-jar"
-            args = [
-                    new File(rrDir, "convert.war").absolutePath,
-                    layout.buildDirectory.dir("generated/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jj").get().asFile.absolutePath
-            ]
-        }.get().exec()
+        def ebnfFile = new File(rrDir, "JSqlParserCC.ebnf")
+        def jjFile = layout.buildDirectory.dir("generated/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jj").get().asFile.absolutePath
+
+        def convertProc = new ProcessBuilder('java', '-jar',
+                new File(rrDir, "convert.war").absolutePath,
+                jjFile)
+                .redirectOutput(ebnfFile)
+                .redirectErrorStream(true)
+                .start()
+        if (convertProc.waitFor() != 0) {
+            throw new GradleException("Failed to convert JJ to EBNF")
+        }
 
         // Generate RR diagrams
-        tasks.register("generateRR", JavaExec) {
-            mainClass = "-jar"
-            args = [
-                    new File(rrDir, "rr.war").absolutePath,
-                    "-noepsilon",
-                    "-color:#4D88FF",
-                    "-offset:0",
-                    "-width:800",
-                    "-out:${new File(rrDir, "JSqlParserCC.xhtml")}",
-                    new File(rrDir, "JSqlParserCC.ebnf").absolutePath
-            ]
-        }.get().exec()
+        def rrProc = new ProcessBuilder('java', '-jar',
+                new File(rrDir, "rr.war").absolutePath,
+                "-noepsilon",
+                "-color:#4D88FF",
+                "-offset:0",
+                "-width:800",
+                "-out:${new File(rrDir, "JSqlParserCC.xhtml")}",
+                new File(rrDir, "JSqlParserCC.ebnf").absolutePath)
+                .redirectErrorStream(true)
+                .start()
+        rrProc.inputStream.eachLine { logger.info(it) }
+        if (rrProc.waitFor() != 0) {
+            throw new GradleException("Failed to generate RR diagrams")
+        }
     }
 }
 
@@ -535,7 +545,7 @@ tasks.register('updateKeywords', JavaExec) {
             file('src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt').absolutePath
             , file('src/site/sphinx/keywords.rst').absolutePath
     ]
-    main("net.sf.jsqlparser.parser.ParserKeywordsUtils")
+    mainClass.set("net.sf.jsqlparser.parser.ParserKeywordsUtils")
 
     dependsOn(compileJava)
 }
@@ -733,4 +743,4 @@ jmh {
     fork = 3
     iterations = 5
     timeOnIteration = '1s'
-}
+}

config/pmd/ruleset.xml

@@ -20,14 +20,15 @@ under the License.
 <ruleset name="Default Maven PMD Plugin Ruleset" xmlns="http://pmd.sourceforge.net/ruleset/2.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://pmd.sourceforge.net/ruleset/2.0.0 http://pmd.sourceforge.net/ruleset_2_0_0.xsd">
 
 	<description>
-        The default ruleset used by the Maven PMD Plugin, when no other ruleset is specified.
-        It contains the rules of the old (pre PMD 6.0.0) rulesets java-basic, java-empty, java-imports,
-        java-unnecessary, java-unusedcode.
+		Custom PMD ruleset, compatible with PMD 7.x.
 
-        This ruleset might be used as a starting point for an own customized ruleset [0].
+		Based on the old (pre PMD 6.0.0) rulesets java-basic, java-empty, java-imports,
+		java-unnecessary, java-unusedcode, migrated for PMD 7.
 
-        [0] https://pmd.github.io/latest/pmd_userdocs_making_rulesets.html
-    </description>
+		This ruleset might be used as a starting point for an own customized ruleset [0].
+
+		[0] https://pmd.github.io/latest/pmd_userdocs_making_rulesets.html
+	</description>
 
 	<rule ref="category/java/bestpractices.xml/AvoidUsingHardCodedIP" />
 	<rule ref="category/java/bestpractices.xml/CheckResultSet" />
@@ -46,6 +47,14 @@ under the License.
 	<rule ref="category/java/codestyle.xml/UselessParentheses" />
 	<rule ref="category/java/codestyle.xml/UselessQualifiedThis" />
 
+	<!-- PMD 7: replaces EmptyFinallyBlock, EmptyIfStmt, EmptyInitializer,
+	     EmptyStatementBlock, EmptySwitchStatements, EmptySynchronizedBlock,
+	     EmptyTryBlock, EmptyWhileStmt (all removed in PMD 7) -->
+	<rule ref="category/java/codestyle.xml/EmptyControlStatement" />
+
+	<!-- PMD 7: replaces EmptyStatementNotInLoop (removed in PMD 7) -->
+	<rule ref="category/java/codestyle.xml/UnnecessarySemicolon" />
+
 	<rule ref="category/java/codestyle.xml/MethodNamingConventions">
 		<properties>
 			<property name="methodPattern" value="[a-z][a-zA-Z0-9]*" />
@@ -63,14 +72,15 @@ under the License.
 	<rule ref="category/java/design.xml/UselessOverridingMethod" />
 	<rule ref="category/java/design.xml/AvoidThrowingNullPointerException" />
 
-
 	<rule ref="category/java/design.xml/CyclomaticComplexity">
 		<properties>
 			<property name="classReportLevel" value="200" />
 			<property name="methodReportLevel" value="120" />
 		</properties>
 	</rule>
-	<rule ref="category/java/design.xml/ExcessiveMethodLength" />
+
+	<!-- PMD 7: ExcessiveMethodLength was removed, use NcssCount instead -->
+	<rule ref="category/java/design.xml/NcssCount" />
 
 	<rule ref="category/java/errorprone.xml/AvoidBranchingStatementAsLastInLoop" />
 	<rule ref="category/java/errorprone.xml/AvoidDecimalLiteralsInBigDecimalConstructor" />
@@ -80,32 +90,25 @@ under the License.
 	<rule ref="category/java/errorprone.xml/CheckSkipResult" />
 	<rule ref="category/java/errorprone.xml/ClassCastExceptionWithToArray" />
 	<rule ref="category/java/errorprone.xml/DontUseFloatTypeForLoopIndices" />
+
+	<!-- EmptyCatchBlock is explicitly kept as a separate rule in PMD 7 -->
 	<rule ref="category/java/errorprone.xml/EmptyCatchBlock" />
-	<rule ref="category/java/errorprone.xml/EmptyFinallyBlock" />
-	<rule ref="category/java/errorprone.xml/EmptyIfStmt" />
-	<rule ref="category/java/errorprone.xml/EmptyInitializer" />
-	<rule ref="category/java/errorprone.xml/EmptyStatementBlock" />
-	<rule ref="category/java/errorprone.xml/EmptyStatementNotInLoop" />
-	<rule ref="category/java/errorprone.xml/EmptySwitchStatements" />
-	<rule ref="category/java/errorprone.xml/EmptySynchronizedBlock" />
-	<rule ref="category/java/errorprone.xml/EmptyTryBlock" />
-	<rule ref="category/java/errorprone.xml/EmptyWhileStmt" />
+
 	<rule ref="category/java/errorprone.xml/JumbledIncrementer" />
 	<rule ref="category/java/errorprone.xml/MisplacedNullCheck" />
 	<rule ref="category/java/errorprone.xml/OverrideBothEqualsAndHashcode" />
 	<rule ref="category/java/errorprone.xml/ReturnFromFinallyBlock" />
 	<rule ref="category/java/errorprone.xml/UnconditionalIfStatement" />
 	<rule ref="category/java/errorprone.xml/UnnecessaryConversionTemporary" />
 	<rule ref="category/java/errorprone.xml/UnusedNullCheckInEquals" />
-	<rule ref="category/java/errorprone.xml/UselessOperationOnImmutable" />
-    
-    <!-- for Codazy -->
+
+	<!-- for Codazy -->
 	<rule ref="category/java/multithreading.xml/AvoidThreadGroup" />
 	<rule ref="category/java/multithreading.xml/DontCallThreadRun" />
 	<rule ref="category/java/multithreading.xml/DoubleCheckedLocking" />
 
 	<rule ref="category/java/performance.xml/BigIntegerInstantiation" />
 
-    <!-- for Codazy -->
+	<!-- for Codazy -->
 	<!-- <rule ref="category/java/documentation.xml/UncommentedEmptyMethodBody" /> -->
-</ruleset>
+</ruleset>

gradle/wrapper/gradle-wrapper.jar

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.0-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME