Skip to content

Commit 4f11c2f

Browse files
build: upgrade JavaCC (manticore branch)
Signed-off-by: Andreas Reichel <andreas@manticore-projects.com>
1 parent 9c76556 commit 4f11c2f

2 files changed

Lines changed: 8 additions & 6 deletions

File tree

‎build.gradle‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -165,13 +165,13 @@ dependencies {
165165
xmlDoclet ('com.manticore-projects.tools:xml-doclet:+'){ changing = true }
166166

167167
// enforce latest version of JavaCC
168-
testImplementation('com.manticore-projects.jsqlformatter:javacc-core:+')
169-
testImplementation('com.manticore-projects.jsqlformatter:javacc-java:+')
168+
testImplementation('com.manticore-projects.jsqlformatter:javacc-core:[8.1.2.1941,)')
169+
testImplementation('com.manticore-projects.jsqlformatter:javacc-java:[8.1.2.1941,)')
170170

171171
jmh 'org.openjdk.jmh:jmh-core:+'
172172
jmh 'org.openjdk.jmh:jmh-generator-annprocess:+'
173-
javacc('com.manticore-projects.jsqlformatter:javacc-core:+')
174-
javacc('com.manticore-projects.jsqlformatter:javacc-java:+')
173+
javacc('com.manticore-projects.jsqlformatter:javacc-core:[8.1.2.1941,)')
174+
javacc('com.manticore-projects.jsqlformatter:javacc-java:[8.1.2.1941,)')
175175
}
176176

177177
compileJavacc {
@@ -447,7 +447,9 @@ tasks.register('renderRR') {
447447
def ebnfFile = new File(rrDir, "JSqlParserCC.ebnf")
448448
def jjFile = layout.buildDirectory.dir("generated/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jj").get().asFile.absolutePath
449449

450-
def convertProc = new ProcessBuilder('java', '-jar',
450+
def convertProc = new ProcessBuilder('java',
451+
'-Djdk.xml.maxElementDepth=0',
452+
'-jar',
451453
new File(rrDir, "convert.war").absolutePath,
452454
jjFile)
453455
.redirectOutput(ebnfFile)

‎pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@
120120
is expected to track the newest fork build. Pin it (e.g. 8.1.1.1939) before cutting a
121121
release so the release is reproducible.
122122
-->
123-
<javacc.version>[8.1.1.1939,)</javacc.version>
123+
<javacc.version>[8.1.2.1941,)</javacc.version>
124124
<junit.version>5.14.4</junit.version>
125125
<mockito.version>5.23.0</mockito.version>
126126
<assertj.version>3.27.7</assertj.version>

0 commit comments

Comments
 (0)