Hibernate
/
hibernate-orm
mirror of https://github.com/hibernate/hibernate-orm
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
hibernate-core/hibernate-core.gradle
View File

@ -68,7 +68,12 @@ dependencies {
testAnnotationProcessor project( ':hibernate-jpamodelgen' ) 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.antlr
antlr libs.antlrRuntime
xjc jakartaLibs.xjc xjc jakartaLibs.xjc
xjc jakartaLibs.jaxb xjc jakartaLibs.jaxb

6
local-build-plugins/src/main/java/org/hibernate/orm/antlr/AntlrPlugin.java
View File

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

2
settings.gradle
View File

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