[freemarker] branch 3 updated: Forward ported from 2.3-gae: FREEMARKER-214 - updating JavaCC to 7.0.12

[ddekany]

This is an automated email from the ASF dual-hosted git repository.

ddekany pushed a commit to branch 3
in repository https://gitbox.apache.org/repos/asf/freemarker.git


The following commit(s) were added to refs/heads/3 by this push:
     new bb4bdd31 Forward ported from 2.3-gae: FREEMARKER-214 - updating JavaCC 
to 7.0.12
bb4bdd31 is described below

commit bb4bdd31ff6600e9e58b8a6ca140dbd4470f5f41
Author: ddekany <ddek...@apache.org>
AuthorDate: Sat May 20 10:21:30 2023 +0200

    Forward ported from 2.3-gae: FREEMARKER-214 - updating JavaCC to 7.0.12
---
 .../freemarker/build/core/CompileJavaccTask.kt       | 20 ++++++++++----------
 freemarker-core/build.gradle.kts                     |  2 +-
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git 
a/buildSrc/core/src/main/kotlin/org/apache/freemarker/build/core/CompileJavaccTask.kt
 
b/buildSrc/core/src/main/kotlin/org/apache/freemarker/build/core/CompileJavaccTask.kt
index a16a1833..a6ba8a7c 100644
--- 
a/buildSrc/core/src/main/kotlin/org/apache/freemarker/build/core/CompileJavaccTask.kt
+++ 
b/buildSrc/core/src/main/kotlin/org/apache/freemarker/build/core/CompileJavaccTask.kt
@@ -19,15 +19,6 @@
 
 package org.apache.freemarker.build.core
 
-import java.io.File
-import java.nio.charset.StandardCharsets
-import java.nio.file.FileVisitResult
-import java.nio.file.Files
-import java.nio.file.Path
-import java.nio.file.SimpleFileVisitor
-import java.nio.file.attribute.BasicFileAttributes
-import java.util.*
-import javax.inject.Inject
 import org.gradle.api.DefaultTask
 import org.gradle.api.file.EmptyFileVisitor
 import org.gradle.api.file.FileSystemOperations
@@ -43,6 +34,15 @@ import org.gradle.process.ExecOperations
 import org.gradle.workers.WorkAction
 import org.gradle.workers.WorkParameters
 import org.gradle.workers.WorkerExecutor
+import java.io.File
+import java.nio.charset.StandardCharsets
+import java.nio.file.FileVisitResult
+import java.nio.file.Files
+import java.nio.file.Path
+import java.nio.file.SimpleFileVisitor
+import java.nio.file.attribute.BasicFileAttributes
+import java.util.*
+import javax.inject.Inject
 
 private const val JAVACC_MAIN_CLASS = "org.javacc.parser.Main"
 
@@ -63,7 +63,7 @@ open class CompileJavaccTask @Inject constructor(
     val sourceDirectory = 
objects.directoryProperty().value(layout.projectDirectory.dir("src/main/javacc"))
 
     @Input
-    val javaccVersion = objects.property<String>().value("6.1.2")
+    val javaccVersion = objects.property<String>().value("7.0.12")
 
     private val javaccClasspath = objects.fileCollection().apply {
         val dependencies = project.dependencies
diff --git a/freemarker-core/build.gradle.kts b/freemarker-core/build.gradle.kts
index 09aeabb7..5b418ca4 100644
--- a/freemarker-core/build.gradle.kts
+++ b/freemarker-core/build.gradle.kts
@@ -37,7 +37,7 @@ dependencies {
 val compileJavacc = 
tasks.register<org.apache.freemarker.build.core.CompileJavaccTask>("compileJavacc")
 {
     sourceDirectory.set(file("src/main/javacc"))
     
destinationDirectory.set(buildDir.toPath().resolve("generated").resolve("javacc").toFile())
-    javaccVersion.set("6.1.2")
+    javaccVersion.set("7.0.12")
 
     fileNameOverrides.addAll(
         "ParseException.java",