diff --git a/build.gradle b/build.gradle
index 15e9e50e2..4366b9749 100644
--- a/build.gradle
+++ b/build.gradle
@@ -11,6 +11,7 @@ buildscript {
 
 plugins {
     id 'java'
+    id "com.vanniktech.maven.publish" version "latest.release"
     id 'maven-publish'
     id 'signing'
 
@@ -62,16 +63,17 @@ def getVersion = { boolean considerSnapshot ->
         snapshot = "-SNAPSHOT"
     }
 
-    return patch != null
-            ? "${major}.${minor}.${patch}${snapshot}"
-            : "${major}.${minor}${snapshot}"
+    return "${major}.${minor}" +
+            (patch != null ? ".${patch}" : "") +
+            (build != null ? ".${build}" : "") +
+            snapshot
 }
 
 
 // for publishing a release, call Gradle with Environment Variable RELEASE:
 // RELEASE=true gradle JSQLParser:publish
 version = getVersion( !System.getenv("RELEASE") )
-group = 'com.github.jsqlparser'
+group = 'com.manticore-projects.jsqlformatter'
 description = 'JSQLParser library'
 
 tasks.register('generateBuildInfo') {
@@ -198,9 +200,6 @@ compileJavacc {
 }
 
 java {
-    withSourcesJar()
-    withJavadocJar()
-
     sourceCompatibility = '11'
     targetCompatibility = '11'
 
@@ -598,89 +597,56 @@ tasks.register('sphinx', Exec) {
     }
 }
 
-publish {
-    dependsOn(check, gitChangelogTask, renderRR, xslt, xmldoc)
-}
+mavenPublishing {
+    publishToMavenCentral(true)
+    signAllPublications()
 
-publishing {
-    publications {
-        mavenJava(MavenPublication) {
-            artifactId = 'jsqlparser'
+    coordinates(group, "jsqlparser", version)
 
-            from components.java
+    pom {
+        name.set('JSQLParser library')
+        description.set('Parse SQL Statements into Abstract Syntax Trees (AST)')
+        url.set('https://github.com/JSQLParser/JSqlParser')
 
-            versionMapping {
-                usage('java-api') {
-                    fromResolutionOf('runtimeClasspath')
-                }
-                usage('java-runtime') {
-                    fromResolutionResult()
-                }
+        licenses {
+            license {
+                name.set('GNU Library or Lesser General Public License (LGPL) V2.1')
+                url.set('http://www.gnu.org/licenses/lgpl-2.1.html')
             }
-
-            pom {
-                name.set('JSQLParser library')
-                description.set('Parse SQL Statements into Abstract Syntax Trees (AST)')
-                url.set('https://github.com/JSQLParser/JSqlParser')
-
-                licenses {
-                    license {
-                        name.set('GNU Library or Lesser General Public License (LGPL) V2.1')
-                        url.set('http://www.gnu.org/licenses/lgpl-2.1.html')
-                    }
-                    license {
-                        name.set('The Apache Software License, Version 2.0')
-                        url.set('http://www.apache.org/licenses/LICENSE-2.0.txt')
-                    }
-                }
-
-                developers {
-                    developer {
-                        id.set('twa')
-                        name.set('Tobias Warneke')
-                        email.set('t.warneke@gmx.net')
-                    }
-                    developer {
-                        id.set('are')
-                        name.set('Andreas Reichel')
-                        email.set('andreas@manticore-projects.com')
-                    }
-                }
-
-                scm {
-                    connection.set('scm:git:https://github.com/JSQLParser/JSqlParser.git')
-                    developerConnection.set('scm:git:ssh://git@github.com:JSQLParser/JSqlParser.git')
-                    url.set('https://github.com/JSQLParser/JSqlParser.git')
-                }
+            license {
+                name.set('The Apache Software License, Version 2.0')
+                url.set('http://www.apache.org/licenses/LICENSE-2.0.txt')
             }
         }
-    }
-
-    repositories {
-        maven {
-            name = "ossrh"
-            def releasesRepoUrl = "https://central.sonatype.com/repository/maven-releases"
-            def snapshotsRepoUrl = "https://central.sonatype.com/repository/maven-snapshots/"
-            url(version.endsWith('SNAPSHOT') ? snapshotsRepoUrl : releasesRepoUrl)
 
-            credentials {
-                username = providers.environmentVariable("ossrhUsername").orNull
-                password = providers.environmentVariable("ossrhPassword").orNull
+        developers {
+            developer {
+                id.set('twa')
+                name.set('Tobias Warneke')
+                email.set('t.warneke@gmx.net')
+            }
+            developer {
+                id.set('are')
+                name.set('Andreas Reichel')
+                email.set('andreas@manticore-projects.com')
             }
         }
+
+        scm {
+            connection.set('scm:git:https://github.com/JSQLParser/JSqlParser.git')
+            developerConnection.set('scm:git:ssh://git@github.com:JSQLParser/JSqlParser.git')
+            url.set('https://github.com/JSQLParser/JSqlParser.git')
+        }
     }
 }
 
+// Fix signing task dependencies
+tasks.withType(AbstractPublishToMaven).configureEach {
+    dependsOn(tasks.withType(Sign))
+}
 
 signing {
-    //def signingKey = findProperty("signingKey")
-    //def signingPassword = findProperty("signingPassword")
-    //useInMemoryPgpKeys(signingKey, signingPassword)
-
-    // don't sign SNAPSHOTS
-    if (!version.endsWith('SNAPSHOT')) {
-        sign publishing.publications.mavenJava
-    }
+    required { !version.endsWith("SNAPSHOT") && gradle.taskGraph.hasTask("publish") }
 }
 
 tasks.withType(JavaCompile).configureEach {
diff --git a/pom.xml b/pom.xml
index 20f6b7066..5a2eafeaf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -99,7 +99,7 @@
         <dependency>
             <groupId>org.assertj</groupId>
             <artifactId>assertj-core</artifactId>
-            <version>3.27.3</version>
+            <version>[3.27.7,)</version>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt b/src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt
index dd342b0b7..40d3b348d 100644
--- a/src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt
+++ b/src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt
@@ -15,7 +15,6 @@ options {
     DEBUG_LOOKAHEAD = false;
     DEBUG_TOKEN_MANAGER = false;
     CACHE_TOKENS = false;
-    SINGLE_TREE_FILE = false;
 //  FORCE_LA_CHECK = true;
     UNICODE_INPUT = true;
     JAVA_TEMPLATE_TYPE = "modern";