HHH-15206 - Upgrade to ANTLR 4.10

This commit is contained in:
Steve Ebersole 2022-04-27 06:44:57 -05:00
parent 03384af943
commit 9e9a8135dc
3 changed files with 9 additions and 4 deletions

View File

@ -68,7 +68,12 @@ dependencies {
testAnnotationProcessor project( ':hibernate-jpamodelgen' )
// NOTE: it seems like, since 4.10, the Antlr Tool no longer defines
// transitive dep on the corresponding Antlr Runtime. At least, I get
// errors about mismatched versions if I do not include the runtime
// dependency here.
antlr libs.antlr
antlr libs.antlrRuntime
xjc jakartaLibs.xjc
xjc jakartaLibs.jaxb

View File

@ -10,7 +10,7 @@ import org.gradle.api.Plugin;
import org.gradle.api.Project;
import org.gradle.api.Task;
import org.gradle.api.artifacts.Configuration;
import org.gradle.api.plugins.JavaPluginConvention;
import org.gradle.api.plugins.JavaPluginExtension;
import org.gradle.api.tasks.SourceSet;
/**
@ -46,8 +46,8 @@ public class AntlrPlugin implements Plugin<Project> {
final Configuration antlrDependencies = project.getConfigurations().maybeCreate( ANTLR );
final SourceSet mainSourceSet = project.getConvention()
.getPlugin( JavaPluginConvention.class )
final SourceSet mainSourceSet = project.getExtensions()
.getByType( JavaPluginExtension.class )
.getSourceSets()
.getByName( SourceSet.MAIN_SOURCE_SET_NAME );
mainSourceSet.setCompileClasspath( mainSourceSet.getCompileClasspath().plus( antlrDependencies ) );

View File

@ -57,7 +57,7 @@ dependencyResolutionManagement {
versionCatalogs {
libs {
version( "antlr", "4.9.1" )
version( "antlr", "4.10" )
version( "hcann", "6.0.0.Final" )
version( "geolatte", "1.8.2" )
version( "byteBuddy", "1.12.9" )